The Unified and Autonomous Development Platform
fix issue #73: Issue/build/pull request references from commits of forked project is incorrect
Robin Shen453022dae1b0
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.javaindex effe619618..f70d54838c 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.java@@ -8,6 +8,7 @@ import java.util.HashSet;import java.util.Iterator;import java.util.List;import java.util.Map;+import java.util.Set;import java.util.concurrent.Callable;import java.util.concurrent.atomic.AtomicInteger;import java.util.concurrent.locks.ReadWriteLock;@@ -41,6 +42,7 @@ import org.slf4j.Logger;import org.slf4j.LoggerFactory;import com.google.common.base.Preconditions;+import com.google.common.collect.Sets;import io.onedev.commons.launcher.loader.Listen;import io.onedev.commons.utils.FileUtils;@@ -161,8 +163,8 @@ public class DefaultBuildManager extends AbstractEntityManager<Build> implements@Overridepublic Build find(Project project, long number) {EntityCriteria<Build> criteria = newCriteria();- criteria.add(Restrictions.eq("project", project));- criteria.add(Restrictions.eq("number", number));+ criteria.add(Restrictions.eq(Build.PROP_NUMBER_SCOPE, project.getForkRoot()));+ criteria.add(Restrictions.eq(Build.PROP_NUMBER, number));criteria.setCacheable(true);return find(criteria);}@@ -260,10 +262,10 @@ public class DefaultBuildManager extends AbstractEntityManager<Build> implementsRoot<Build> root = query.from(Build.class);List<Predicate> predicates = new ArrayList<>();- predicates.add(builder.equal(root.get("project"), project));- predicates.add(builder.equal(root.get("commitHash"), commitId.name()));+ predicates.add(builder.equal(root.get(Build.PROP_PROJECT), project));+ predicates.add(builder.equal(root.get(Build.PROP_COMMIT), commitId.name()));if (jobName != null)- predicates.add(builder.equal(root.get("jobName"), jobName));+ predicates.add(builder.equal(root.get(Build.PROP_JOB), jobName));for (Map.Entry<String, List<String>> entry: params.entrySet()) {if (!entry.getValue().isEmpty()) {@@ -288,9 +290,9 @@ public class DefaultBuildManager extends AbstractEntityManager<Build> implementspublic Collection<Build> queryUnfinished() {EntityCriteria<Build> criteria = newCriteria();criteria.add(Restrictions.or(- Restrictions.eq("status", Status.PENDING),- Restrictions.eq("status", Status.RUNNING),- Restrictions.eq("status", Status.WAITING)));+ Restrictions.eq(Build.PROP_STATUS, Status.PENDING),+ Restrictions.eq(Build.PROP_STATUS, Status.RUNNING),+ Restrictions.eq(Build.PROP_STATUS, Status.WAITING)));criteria.setCacheable(true);return query(criteria);}@@ -301,34 +303,43 @@ public class DefaultBuildManager extends AbstractEntityManager<Build> implementsList<Build> builds = new ArrayList<>();EntityCriteria<Build> criteria = newCriteria();- criteria.add(Restrictions.eq(Build.PROP_PROJECT, project));++ Set<Project> projects = Sets.newHashSet(project);+ projects.addAll(project.getForkParents());- if (!SecurityUtils.canManage(project)) {+ List<Criterion> projectCriterions = new ArrayList<>();+ for (Project each: projects) {List<Criterion> jobCriterions = new ArrayList<>();- for (String jobName: getAccessibleJobNames(project).get(project))+ for (String jobName: getAccessibleJobNames(each).get(each))jobCriterions.add(Restrictions.eq(Build.PROP_JOB, jobName));- if (!jobCriterions.isEmpty())- criteria.add(Restrictions.or(jobCriterions.toArray(new Criterion[jobCriterions.size()])));- else- return builds;- }-- if (term.startsWith("#"))- term = term.substring(1);- if (term.length() != 0) {- try {- long buildNumber = Long.parseLong(term);- criteria.add(Restrictions.eq("number", buildNumber));- } catch (NumberFormatException e) {- criteria.add(Restrictions.or(- Restrictions.ilike("version", term, MatchMode.ANYWHERE),- Restrictions.ilike("jobName", term, MatchMode.ANYWHERE)));+ if (!jobCriterions.isEmpty()) {+ projectCriterions.add(Restrictions.and(+ Restrictions.eq(Build.PROP_PROJECT, each),+ Restrictions.or(jobCriterions.toArray(new Criterion[0]))));}}- criteria.addOrder(Order.desc("number"));- builds.addAll(query(criteria, 0, count));-+ if (!projectCriterions.isEmpty()) {+ criteria.add(Restrictions.or(projectCriterions.toArray(new Criterion[0])));++ if (term.startsWith("#"))+ term = term.substring(1);+ if (term.length() != 0) {+ try {+ long buildNumber = Long.parseLong(term);+ criteria.add(Restrictions.eq(Build.PROP_NUMBER, buildNumber));+ } catch (NumberFormatException e) {+ criteria.add(Restrictions.or(+ Restrictions.ilike(Build.PROP_VERSION, term, MatchMode.ANYWHERE),+ Restrictions.ilike(Build.PROP_JOB, term, MatchMode.ANYWHERE)));+ }+ }++ criteria.addOrder(Order.desc(Build.PROP_PROJECT));+ criteria.addOrder(Order.desc(Build.PROP_NUMBER));+ builds.addAll(query(criteria, 0, count));+ }+return builds;}@@ -358,9 +369,11 @@ public class DefaultBuildManager extends AbstractEntityManager<Build> implements@Overridepublic void create(Build build) {Preconditions.checkArgument(build.isNew());- Query<?> query = getSession().createQuery("select max(number) from Build where project=:project");- query.setParameter("project", build.getProject());- build.setNumber(getNextNumber(build.getProject(), query));+ build.setNumberScope(build.getProject().getForkRoot());+ Query<?> query = getSession().createQuery(String.format("select max(%s) from Build where %s=:numberScope",+ Build.PROP_NUMBER, Build.PROP_NUMBER_SCOPE));+ query.setParameter("numberScope", build.getNumberScope());+ build.setNumber(getNextNumber(build.getNumberScope(), query));save(build);for (BuildParam param: build.getParams())buildParamManager.save(param);diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueManager.javaindex 7f82089f77..227034749a 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueManager.java@@ -10,6 +10,7 @@ import java.util.Map;import java.util.Set;import java.util.concurrent.locks.ReadWriteLock;import java.util.concurrent.locks.ReentrantReadWriteLock;+import java.util.stream.Collectors;import javax.annotation.Nullable;import javax.inject.Inject;@@ -30,6 +31,7 @@ import org.slf4j.Logger;import org.slf4j.LoggerFactory;import com.google.common.base.Preconditions;+import com.google.common.collect.Sets;import io.onedev.commons.launcher.loader.Listen;import io.onedev.commons.launcher.loader.ListenerRegistry;@@ -135,8 +137,8 @@ public class DefaultIssueManager extends AbstractEntityManager<Issue> implements@Overridepublic Issue find(Project project, long number) {EntityCriteria<Issue> criteria = newCriteria();- criteria.add(Restrictions.eq("project", project));- criteria.add(Restrictions.eq("number", number));+ criteria.add(Restrictions.eq(Issue.PROP_NUMBER_SCOPE, project.getForkRoot()));+ criteria.add(Restrictions.eq(Issue.PROP_NUMBER, number));criteria.setCacheable(true);return find(criteria);}@@ -157,9 +159,11 @@ public class DefaultIssueManager extends AbstractEntityManager<Issue> implements@Overridepublic void open(Issue issue) {Preconditions.checkArgument(issue.isNew());- Query<?> query = getSession().createQuery("select max(number) from Issue where project=:project");- query.setParameter("project", issue.getProject());- issue.setNumber(getNextNumber(issue.getProject(), query));+ issue.setNumberScope(issue.getProject().getForkRoot());+ Query<?> query = getSession().createQuery(String.format("select max(%s) from Issue where %s=:numberScope",+ Issue.PROP_NUMBER, Issue.PROP_NUMBER_SCOPE));+ query.setParameter("numberScope", issue.getNumberScope());+ issue.setNumber(getNextNumber(issue.getNumberScope(), query));IssueOpened event = new IssueOpened(issue);issue.setLastUpdate(event.getLastUpdate());@@ -363,28 +367,28 @@ public class DefaultIssueManager extends AbstractEntityManager<Issue> implements@Sessional@Overridepublic List<Issue> query(Project project, String term, int count) {- List<Issue> issues = new ArrayList<>();-EntityCriteria<Issue> criteria = newCriteria();- criteria.add(Restrictions.eq(Issue.PROP_PROJECT, project));++ Set<Project> projects = Sets.newHashSet(project);+ projects.addAll(project.getForkParents().stream().filter(it->SecurityUtils.canAccess(it)).collect(Collectors.toSet()));+ criteria.add(Restrictions.in(Issue.PROP_PROJECT, projects));if (term.startsWith("#"))term = term.substring(1);if (term.length() != 0) {try {long buildNumber = Long.parseLong(term);- criteria.add(Restrictions.eq("number", buildNumber));+ criteria.add(Restrictions.eq(Issue.PROP_NUMBER, buildNumber));} catch (NumberFormatException e) {criteria.add(Restrictions.or(- Restrictions.ilike("title", term, MatchMode.ANYWHERE),- Restrictions.ilike("noSpaceTitle", term, MatchMode.ANYWHERE)));+ Restrictions.ilike(Issue.PROP_TITLE, term, MatchMode.ANYWHERE),+ Restrictions.ilike(Issue.PROP_NO_SPACE_TITLE, term, MatchMode.ANYWHERE)));}}-- criteria.addOrder(Order.desc("number"));- issues.addAll(query(criteria, 0, count));-- return issues;++ criteria.addOrder(Order.desc(Issue.PROP_PROJECT));+ criteria.addOrder(Order.desc(Issue.PROP_NUMBER));+ return query(criteria, 0, count);}@SuppressWarnings("unchecked")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.javaindex 5d985dc33b..002bef641d 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@@ -61,8 +61,10 @@ import io.onedev.server.infomanager.CommitInfoManager;import io.onedev.server.model.Build;import io.onedev.server.model.Group;import io.onedev.server.model.GroupAuthorization;+import io.onedev.server.model.Issue;import io.onedev.server.model.Membership;import io.onedev.server.model.Project;+import io.onedev.server.model.PullRequest;import io.onedev.server.model.User;import io.onedev.server.model.UserAuthorization;import io.onedev.server.model.support.BranchProtection;@@ -209,16 +211,42 @@ public class DefaultProjectManager extends AbstractEntityManager<Project>usage.checkInUse("Project '" + project.getName() + "'");- for (Build build: project.getBuilds())- buildManager.delete(build);+ for (Project fork: project.getForks()) {+ Collection<Project> descendants = fork.getForkChildren();+ descendants.add(fork);+ for (Project descendant: descendants) {+ Query<?> query = getSession().createQuery(String.format("update Issue set %s=:fork where %s=:descendant",+ Issue.PROP_NUMBER_SCOPE, Issue.PROP_PROJECT));+ query.setParameter("fork", fork);+ query.setParameter("descendant", descendant);+ query.executeUpdate();++ query = getSession().createQuery(String.format("update Build set %s=:fork where %s=:descendant",+ Build.PROP_NUMBER_SCOPE, Build.PROP_PROJECT));+ query.setParameter("fork", fork);+ query.setParameter("descendant", descendant);+ query.executeUpdate();++ query = getSession().createQuery(String.format("update PullRequest set %s=:fork where %s=:descendant",+ PullRequest.PROP_NUMBER_SCOPE, PullRequest.PROP_TARGET_PROJECT));+ query.setParameter("fork", fork);+ query.setParameter("descendant", descendant);+ query.executeUpdate();+ }+ }- Query<?> query = getSession().createQuery("update Project set forkedFrom=null where forkedFrom=:forkedFrom");+ Query<?> query = getSession().createQuery(String.format("update Project set %s=null where %s=:forkedFrom",+ Project.PROP_FORKED_FROM, Project.PROP_FORKED_FROM));query.setParameter("forkedFrom", project);query.executeUpdate();- query = getSession().createQuery("update PullRequest set sourceProject=null where sourceProject=:sourceProject");+ query = getSession().createQuery(String.format("update PullRequest set %s=null where %s=:sourceProject",+ PullRequest.PROP_SOURCE_PROJECT, PullRequest.PROP_SOURCE_PROJECT));query.setParameter("sourceProject", project);query.executeUpdate();++ for (Build build: project.getBuilds())+ buildManager.delete(build);dao.remove(project);diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.javaindex 21ba420c3a..2f55df9dee 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java@@ -54,6 +54,7 @@ import org.slf4j.LoggerFactory;import com.google.common.base.Preconditions;import com.google.common.collect.Lists;+import com.google.common.collect.Sets;import io.onedev.commons.launcher.loader.Listen;import io.onedev.commons.launcher.loader.ListenerRegistry;@@ -354,10 +355,13 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequest@Overridepublic void open(PullRequest request) {Preconditions.checkArgument(request.isNew());- Query<?> query = getSession().createQuery("select max(number) from PullRequest where targetProject=:project");- query.setParameter("project", request.getTargetProject());- request.setNumber(getNextNumber(request.getTargetProject(), query));-++ request.setNumberScope(request.getTargetProject().getForkRoot());+ Query<?> query = getSession().createQuery(String.format("select max(%s) from PullRequest where %s=:numberScope",+ PullRequest.PROP_NUMBER, PullRequest.PROP_NUMBER_SCOPE));+ query.setParameter("numberScope", request.getNumberScope());+ request.setNumber(getNextNumber(request.getNumberScope(), query));+PullRequestOpened event = new PullRequestOpened(request);request.setLastUpdate(event.getLastUpdate());@@ -1003,7 +1007,7 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequestRoot<PullRequest> root, CriteriaBuilder builder) {List<Predicate> predicates = new ArrayList<>();if (targetProject != null) {- predicates.add(builder.equal(root.get("targetProject"), targetProject));+ predicates.add(builder.equal(root.get(PullRequest.PROP_TARGET_PROJECT), targetProject));} else if (!SecurityUtils.isAdministrator()) {Collection<Project> projects = projectManager.getPermittedProjects(new ReadCode());if (!projects.isEmpty())@@ -1111,8 +1115,8 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequest@Overridepublic PullRequest find(Project targetProject, long number) {EntityCriteria<PullRequest> criteria = newCriteria();- criteria.add(Restrictions.eq("targetProject", targetProject));- criteria.add(Restrictions.eq("number", number));+ criteria.add(Restrictions.eq(PullRequest.PROP_NUMBER_SCOPE, targetProject.getForkRoot()));+ criteria.add(Restrictions.eq(PullRequest.PROP_NUMBER, number));criteria.setCacheable(true);return find(criteria);}@@ -1135,22 +1139,26 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequestList<PullRequest> requests = new ArrayList<>();EntityCriteria<PullRequest> criteria = newCriteria();- criteria.add(Restrictions.eq(PullRequest.PROP_TARGET_PROJECT, project));++ Set<Project> projects = Sets.newHashSet(project);+ projects.addAll(project.getForkParents().stream().filter(it->SecurityUtils.canReadCode(it)).collect(Collectors.toSet()));+ criteria.add(Restrictions.in(PullRequest.PROP_TARGET_PROJECT, projects));if (term.startsWith("#"))term = term.substring(1);if (term.length() != 0) {try {long buildNumber = Long.parseLong(term);- criteria.add(Restrictions.eq("number", buildNumber));+ criteria.add(Restrictions.eq(PullRequest.PROP_NUMBER, buildNumber));} catch (NumberFormatException e) {criteria.add(Restrictions.or(- Restrictions.ilike("title", term, MatchMode.ANYWHERE),- Restrictions.ilike("noSpaceTitle", term, MatchMode.ANYWHERE)));+ Restrictions.ilike(PullRequest.PROP_TITLE, term, MatchMode.ANYWHERE),+ Restrictions.ilike(PullRequest.PROP_NO_SPACE_TITLE, term, MatchMode.ANYWHERE)));}}- criteria.addOrder(Order.desc("number"));+ criteria.addOrder(Order.desc(PullRequest.PROP_TARGET_PROJECT));+ criteria.addOrder(Order.desc(PullRequest.PROP_NUMBER));requests.addAll(query(criteria, 0, count));return requests;diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultRoleManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultRoleManager.javaindex 8ed3a37b00..e32682a2ce 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultRoleManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultRoleManager.java@@ -123,7 +123,7 @@ public class DefaultRoleManager extends AbstractEntityManager<Role> implements Rreporter.setName("Reporter");reporter.setCodePrivilege(CodePrivilege.NONE);ExcludeIssueFields allfieldsExcept = new ExcludeIssueFields();- allfieldsExcept.getExcludeFields().add("Assignee");+ allfieldsExcept.getExcludeFields().add("Assignees");reporter.setEditableIssueFields(allfieldsExcept);jobPrivilege = new JobPrivilege();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.javaindex 7a67239a64..55d8440a25 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@@ -6,6 +6,8 @@ import java.io.InputStream;import java.nio.charset.StandardCharsets;import java.nio.file.Files;import java.nio.file.Path;+import java.util.Collection;+import java.util.Collections;import java.util.HashMap;import java.util.HashSet;import java.util.Map;@@ -1582,7 +1584,17 @@ public class DataMigrator {}}+ private Long getForkedRoot38(Map<Long, Long> forkedFroms, Long projectId) {+ Long forkedFrom = forkedFroms.get(projectId);+ if (forkedFrom != null)+ return getForkedRoot38(forkedFroms, forkedFrom);+ else+ return projectId;+ }+private void migrate38(File dataDir, Stack<Integer> versions) {+ Map<Long, Long> forkedFroms = new HashMap<>();+for (File file: dataDir.listFiles()) {if (file.getName().contains(".xml")) {VersionedDocument dom = VersionedDocument.fromFile(file);@@ -1590,28 +1602,28 @@ public class DataMigrator {if (node instanceof Element) {Element element = (Element) node;if (element.elementTextTrim("query").equals("all"))- element.detach();+ element.element("query").detach();}}for (Node node: dom.selectNodes("//io.onedev.server.model.support.issue.NamedIssueQuery")) {if (node instanceof Element) {Element element = (Element) node;if (element.elementTextTrim("query").equals("all"))- element.detach();+ element.element("query").detach();}}for (Node node: dom.selectNodes("//io.onedev.server.model.support.build.NamedBuildQuery")) {if (node instanceof Element) {Element element = (Element) node;if (element.elementTextTrim("query").equals("all"))- element.detach();+ element.element("query").detach();}}for (Node node: dom.selectNodes("//io.onedev.server.model.support.NamedProjectQuery")) {if (node instanceof Element) {Element element = (Element) node;if (element.elementTextTrim("query").equals("all"))- element.detach();+ element.element("query").detach();}}for (Node node: dom.selectNodes("//issueQuery")) {@@ -1640,7 +1652,118 @@ public class DataMigrator {element.detach();}dom.writeToFile(file, false);- }+ } else if (file.getName().startsWith("Projects.xml")) {+ VersionedDocument dom = VersionedDocument.fromFile(file);+ for (Element element: dom.getRootElement().elements()) {+ Long projectId = Long.valueOf(element.elementTextTrim("id"));+ Element forkedFromElement = element.element("forkedFrom");+ if (forkedFromElement != null)+ forkedFroms.put(projectId, Long.valueOf(forkedFromElement.getTextTrim()));+ else+ forkedFroms.put(projectId, null);+ }+ }+ }++ Map<Long, Long> forkedRoots = new HashMap<>();+ for (Long projectId: forkedFroms.keySet()) {+ forkedRoots.put(projectId, getForkedRoot38(forkedFroms, projectId));+ }++ Map<Long, Set<Long>> issueNumbers = new HashMap<>();+ Map<Long, Set<Long>> buildNumbers = new HashMap<>();+ Map<Long, Set<Long>> pullRequestNumbers = new HashMap<>();++ for (Long forkedRoot: forkedRoots.values()) {+ issueNumbers.put(forkedRoot, new HashSet<>());+ buildNumbers.put(forkedRoot, new HashSet<>());+ pullRequestNumbers.put(forkedRoot, new HashSet<>());+ }++ for (File file: dataDir.listFiles()) {+ if (file.getName().startsWith("Issues.xml")) {+ VersionedDocument dom = VersionedDocument.fromFile(file);+ for (Element element: dom.getRootElement().elements()) {+ Long issueNumber = Long.valueOf(element.elementTextTrim("number"));+ Long projectId = Long.valueOf(element.elementTextTrim("project"));+ if (projectId.equals(forkedRoots.get(projectId)))+ issueNumbers.get(projectId).add(issueNumber);+ }+ } else if (file.getName().startsWith("Builds.xml")) {+ VersionedDocument dom = VersionedDocument.fromFile(file);+ for (Element element: dom.getRootElement().elements()) {+ Long buildNumber = Long.valueOf(element.elementTextTrim("number"));+ Long projectId = Long.valueOf(element.elementTextTrim("project"));+ if (projectId.equals(forkedRoots.get(projectId)))+ buildNumbers.get(projectId).add(buildNumber);+ }+ } else if (file.getName().startsWith("PullRequests.xml")) {+ VersionedDocument dom = VersionedDocument.fromFile(file);+ for (Element element: dom.getRootElement().elements()) {+ Long requestNumber = Long.valueOf(element.elementTextTrim("number"));+ Long projectId = Long.valueOf(element.elementTextTrim("targetProject"));+ if (projectId.equals(forkedRoots.get(projectId)))+ pullRequestNumbers.get(projectId).add(requestNumber);+ }+ }+ }++ for (File file: dataDir.listFiles()) {+ if (file.getName().startsWith("Issues.xml")) {+ VersionedDocument dom = VersionedDocument.fromFile(file);+ for (Element element: dom.getRootElement().elements()) {+ Element numberElement = element.element("number");+ Long issueNumber = Long.valueOf(numberElement.getTextTrim());+ Long projectId = Long.valueOf(element.elementTextTrim("project"));+ Long forkedRoot = forkedRoots.get(projectId);+ element.addElement("numberScope").setText(forkedRoot.toString());+ if (!projectId.equals(forkedRoot)) {+ Set<Long> issueNumbersOfForkedRoot = issueNumbers.get(forkedRoot);+ if (issueNumbersOfForkedRoot.contains(issueNumber)) {+ issueNumber = Collections.max(issueNumbersOfForkedRoot) + 1;+ numberElement.setText(issueNumber.toString());+ }+ issueNumbersOfForkedRoot.add(issueNumber);+ }+ }+ dom.writeToFile(file, false);+ } else if (file.getName().startsWith("Builds.xml")) {+ VersionedDocument dom = VersionedDocument.fromFile(file);+ for (Element element: dom.getRootElement().elements()) {+ Element numberElement = element.element("number");+ Long buildNumber = Long.valueOf(numberElement.getTextTrim());+ Long projectId = Long.valueOf(element.elementTextTrim("project"));+ Long forkedRoot = forkedRoots.get(projectId);+ element.addElement("numberScope").setText(forkedRoot.toString());+ if (!projectId.equals(forkedRoot)) {+ Set<Long> buildNumbersOfForkedRoot = buildNumbers.get(forkedRoot);+ if (buildNumbersOfForkedRoot.contains(buildNumber)) {+ buildNumber = Collections.max(buildNumbersOfForkedRoot) + 1;+ numberElement.setText(buildNumber.toString());+ }+ buildNumbersOfForkedRoot.add(buildNumber);+ }+ }+ dom.writeToFile(file, false);+ } else if (file.getName().startsWith("PullRequests.xml")) {+ VersionedDocument dom = VersionedDocument.fromFile(file);+ for (Element element: dom.getRootElement().elements()) {+ Element numberElement = element.element("number");+ Long requestNumber = Long.valueOf(numberElement.getTextTrim());+ Long projectId = Long.valueOf(element.elementTextTrim("targetProject"));+ Long forkedRoot = forkedRoots.get(projectId);+ element.addElement("numberScope").setText(forkedRoot.toString());+ if (!projectId.equals(forkedRoot)) {+ Set<Long> requestNumbersOfForkedRoot = pullRequestNumbers.get(forkedRoot);+ if (requestNumbersOfForkedRoot.contains(requestNumber)) {+ requestNumber = Collections.max(requestNumbersOfForkedRoot) + 1;+ numberElement.setText(requestNumber.toString());+ }+ requestNumbersOfForkedRoot.add(requestNumber);+ }+ }+ dom.writeToFile(file, false);+ }}}diff --git a/server-core/src/main/java/io/onedev/server/model/Build.java b/server-core/src/main/java/io/onedev/server/model/Build.javaindex 725f49cd54..3d22bed6e2 100644--- a/server-core/src/main/java/io/onedev/server/model/Build.java+++ b/server-core/src/main/java/io/onedev/server/model/Build.java@@ -87,9 +87,9 @@ import io.onedev.server.web.util.WicketUtils;@Index(columnList=PROP_SUBMITTER_NAME), @Index(columnList=PROP_CANCELLER_NAME), @Index(columnList=PROP_COMMIT),@Index(columnList=PROP_NUMBER), @Index(columnList=PROP_JOB), @Index(columnList=PROP_STATUS),@Index(columnList=PROP_SUBMIT_DATE), @Index(columnList=PROP_PENDING_DATE), @Index(columnList=PROP_RUNNING_DATE),- @Index(columnList=PROP_FINISH_DATE), @Index(columnList=PROP_VERSION),+ @Index(columnList=PROP_FINISH_DATE), @Index(columnList=PROP_VERSION), @Index(columnList="o_numberScope_id"),@Index(columnList="o_project_id, " + PROP_COMMIT)},- uniqueConstraints={@UniqueConstraint(columnNames={"o_project_id", PROP_NUMBER})}+ uniqueConstraints={@UniqueConstraint(columnNames={"o_numberScope_id", PROP_NUMBER})})@Cache(usage=CacheConcurrencyStrategy.READ_WRITE)public class Build extends AbstractEntity implements Referenceable {@@ -98,6 +98,8 @@ public class Build extends AbstractEntity implements Referenceable {public static final String PROP_ID = "id";+ public static final String PROP_NUMBER_SCOPE = "numberScope";+public static final String FIELD_NUMBER = "Number";public static final String PROP_NUMBER = "number";@@ -225,6 +227,10 @@ public class Build extends AbstractEntity implements Referenceable {};+ @ManyToOne(fetch=FetchType.LAZY)+ @JoinColumn(nullable=false)+ private Project numberScope;+@ManyToOne(fetch=FetchType.LAZY)@JoinColumn(nullable=false)private Project project;@@ -297,6 +303,14 @@ public class Build extends AbstractEntity implements Referenceable {private transient Map<Integer, Collection<Long>> numbersOfStreamPreviousCache = new HashMap<>();+ public Project getNumberScope() {+ return numberScope;+ }++ public void setNumberScope(Project numberScope) {+ this.numberScope = numberScope;+ }+public Project getProject() {return project;}diff --git a/server-core/src/main/java/io/onedev/server/model/Issue.java b/server-core/src/main/java/io/onedev/server/model/Issue.javaindex c92bd9dc4a..a647650a27 100644--- a/server-core/src/main/java/io/onedev/server/model/Issue.java+++ b/server-core/src/main/java/io/onedev/server/model/Issue.java@@ -82,8 +82,8 @@ import io.onedev.server.web.editable.annotation.Editable;@Index(columnList=PROP_NUMBER), @Index(columnList=PROP_SUBMIT_DATE),@Index(columnList="o_submitter_id"), @Index(columnList=PROP_VOTE_COUNT),@Index(columnList=PROP_COMMENT_COUNT), @Index(columnList="o_milestone_id"),- @Index(columnList=LastUpdate.COLUMN_DATE)},- uniqueConstraints={@UniqueConstraint(columnNames={"o_project_id", PROP_NUMBER})})+ @Index(columnList=LastUpdate.COLUMN_DATE), @Index(columnList="o_numberScope_id")},+ uniqueConstraints={@UniqueConstraint(columnNames={"o_numberScope_id", PROP_NUMBER})})@Cache(usage=CacheConcurrencyStrategy.READ_WRITE)//use dynamic update in order not to overwrite other edits while background threads change update date@DynamicUpdate@@ -92,6 +92,8 @@ public class Issue extends AbstractEntity implements Referenceable, AttachmentStprivate static final long serialVersionUID = 1L;+ public static final String PROP_NUMBER_SCOPE = "numberScope";+public static final String FIELD_NUMBER = "Number";public static final String PROP_NUMBER = "number";@@ -173,6 +175,10 @@ public class Issue extends AbstractEntity implements Referenceable, AttachmentSt@Column(length=16384)private String description;+ @ManyToOne(fetch=FetchType.LAZY)+ @JoinColumn(nullable=false)+ private Project numberScope;+@ManyToOne(fetch=FetchType.LAZY)@JoinColumn(nullable=false)private Project project;@@ -253,6 +259,14 @@ public class Issue extends AbstractEntity implements Referenceable, AttachmentStthis.description = description;}+ public Project getNumberScope() {+ return numberScope;+ }++ public void setNumberScope(Project numberScope) {+ this.numberScope = numberScope;+ }+public Project getProject() {return project;}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.javaindex 0afba86f25..83804f4f3f 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@@ -491,13 +491,23 @@ public class Project extends AbstractEntity {* @return* all descendant projects forking from current project*/- public List<Project> getForkDescendants() {- List<Project> descendants = new ArrayList<>();- descendants.add(this);- for (Project fork: getForks())- descendants.addAll(fork.getForkDescendants());+ public List<Project> getForkChildren() {+ List<Project> children = new ArrayList<>();+ for (Project fork: getForks()) {+ children.add(fork);+ children.addAll(fork.getForkChildren());+ }- return descendants;+ return children;+ }++ public List<Project> getForkParents() {+ List<Project> forkParents = new ArrayList<>();+ if (getForkedFrom() != null) {+ forkParents.add(getForkedFrom());+ forkParents.addAll(getForkedFrom().getForkParents());+ }+ return forkParents;}public Repository getRepository() {diff --git a/server-core/src/main/java/io/onedev/server/model/PullRequest.java b/server-core/src/main/java/io/onedev/server/model/PullRequest.javaindex 957e350d7a..7b38cbf68d 100644--- a/server-core/src/main/java/io/onedev/server/model/PullRequest.java+++ b/server-core/src/main/java/io/onedev/server/model/PullRequest.java@@ -86,8 +86,8 @@ import io.onedev.server.web.util.WicketUtils;@Index(columnList="o_submitter_id"), @Index(columnList=PROP_HEAD_COMMIT_HASH),@Index(columnList=MergePreview.COLUMN_REQUEST_HEAD), @Index(columnList=CloseInfo.COLUMN_DATE),@Index(columnList=CloseInfo.COLUMN_STATUS), @Index(columnList=CloseInfo.COLUMN_USER),- @Index(columnList=CloseInfo.COLUMN_USER_NAME)},- uniqueConstraints={@UniqueConstraint(columnNames={"o_targetProject_id", PROP_NUMBER})})+ @Index(columnList=CloseInfo.COLUMN_USER_NAME), @Index(columnList="o_numberScope_id")},+ uniqueConstraints={@UniqueConstraint(columnNames={"o_numberScope_id", PROP_NUMBER})})//use dynamic update in order not to overwrite other edits while background threads change update date@DynamicUpdate@Cache(usage=CacheConcurrencyStrategy.READ_WRITE)@@ -95,6 +95,8 @@ public class PullRequest extends AbstractEntity implements Referenceable, Attachprivate static final long serialVersionUID = 1L;+ public static final String PROP_NUMBER_SCOPE = "numberScope";+public static final String FIELD_NUMBER = "Number";public static final String PROP_NUMBER = "number";@@ -219,6 +221,10 @@ public class PullRequest extends AbstractEntity implements Referenceable, Attachprivate String submitterName;+ @ManyToOne(fetch=FetchType.LAZY)+ @JoinColumn(nullable=false)+ private Project numberScope;+@ManyToOne(fetch=FetchType.LAZY)@JoinColumn(nullable=false)private Project targetProject;@@ -348,6 +354,14 @@ public class PullRequest extends AbstractEntity implements Referenceable, Attachreturn submitterName;}+ public Project getNumberScope() {+ return numberScope;+ }++ public void setNumberScope(Project numberScope) {+ this.numberScope = numberScope;+ }+public Project getTargetProject() {return targetProject;}diff --git a/server-core/src/main/java/io/onedev/server/persistence/dao/AbstractEntityManager.java b/server-core/src/main/java/io/onedev/server/persistence/dao/AbstractEntityManager.javaindex 235e906f7b..6acb9318c4 100644--- a/server-core/src/main/java/io/onedev/server/persistence/dao/AbstractEntityManager.java+++ b/server-core/src/main/java/io/onedev/server/persistence/dao/AbstractEntityManager.java@@ -32,10 +32,10 @@ public abstract class AbstractEntityManager<T extends AbstractEntity> implementsthis.dao = dao;}- protected long getNextNumber(Project project, Query<?> maxNumberQuery) {+ protected long getNextNumber(Project numberScope, Query<?> maxNumberQuery) {AtomicLong nextNumber;synchronized (nextNumbers) {- nextNumber = nextNumbers.get(project.getId());+ nextNumber = nextNumbers.get(numberScope.getId());}if (nextNumber == null) {long maxNumber;@@ -51,10 +51,10 @@ public abstract class AbstractEntityManager<T extends AbstractEntity> implements* if there are limited connections.*/synchronized (nextNumbers) {- nextNumber = nextNumbers.get(project.getId());+ nextNumber = nextNumbers.get(numberScope.getId());if (nextNumber == null) {nextNumber = new AtomicLong(maxNumber+1);- nextNumbers.put(project.getId(), nextNumber);+ nextNumbers.put(numberScope.getId(), nextNumber);}}}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/EntityQuery.java b/server-core/src/main/java/io/onedev/server/search/entity/EntityQuery.javaindex b1b104d03d..00e9cab4f8 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/EntityQuery.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/EntityQuery.java@@ -183,8 +183,6 @@ public abstract class EntityQuery<T extends AbstractEntity> implements SerializaStringBuilder builder = new StringBuilder();if (getCriteria() != null)builder.append(getCriteria().toString()).append(" ");- else- builder.append("all");if (!getSorts().isEmpty()) {builder.append("order by ");for (EntitySort sort: getSorts())diff --git a/server-core/src/main/java/io/onedev/server/util/markdown/MentionProcessor.java b/server-core/src/main/java/io/onedev/server/util/markdown/MentionProcessor.javaindex c268328988..3ddb93a670 100644--- a/server-core/src/main/java/io/onedev/server/util/markdown/MentionProcessor.java+++ b/server-core/src/main/java/io/onedev/server/util/markdown/MentionProcessor.java@@ -3,6 +3,8 @@ package io.onedev.server.util.markdown;import org.apache.wicket.request.cycle.RequestCycle;import org.jsoup.nodes.Document;+import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.UserManager;import io.onedev.server.model.Project;public class MentionProcessor extends MentionParser implements MarkdownProcessor {@@ -14,7 +16,7 @@ public class MentionProcessor extends MentionParser implements MarkdownProcessor@Overrideprotected String toHtml(String userName) {- if (RequestCycle.get() != null) {+ if (RequestCycle.get() != null && OneDev.getInstance(UserManager.class).findByName(userName) != null) {return String.format("<a class='reference mention' data-reference='%s'>@%s</a>",userName, userName);} else {diff --git a/server-core/src/main/java/io/onedev/server/web/asset/revisioncompare/RevisionCompareCssResourceReference.java b/server-core/src/main/java/io/onedev/server/web/asset/revisioncompare/RevisionCompareCssResourceReference.javanew file mode 100644index 0000000000..844d2f679d--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/asset/revisioncompare/RevisionCompareCssResourceReference.java@@ -0,0 +1,13 @@+package io.onedev.server.web.asset.revisioncompare;++import io.onedev.server.web.page.base.BaseDependentCssResourceReference;++public class RevisionCompareCssResourceReference extends BaseDependentCssResourceReference {++ private static final long serialVersionUID = 1L;++ public RevisionCompareCssResourceReference() {+ super(RevisionCompareCssResourceReference.class, "revision-compare.css");+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/asset/revisioncompare/revision-compare.css b/server-core/src/main/java/io/onedev/server/web/asset/revisioncompare/revision-compare.cssnew file mode 100644index 0000000000..fe18620d12--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/asset/revisioncompare/revision-compare.css@@ -0,0 +1,38 @@+table.revision-compare {+ width: auto;+}+table.revision-compare td {+ vertical-align: top;+ background: #FAFAFA;+ border: 2px solid #E0E0E0;+ padding: 20px;+}+table.revision-compare td.action {+ text-align: center;+ background: white;+ padding-top: 47px;+ border-top: none;+ border-bottom: none;+}+table.revision-compare .revision .title .checkbox {+ margin: 0 0 0 16px;+}+table.revision-compare .revision .title label {+ font-size: 16px;+ font-weight: normal;+}+table.revision-compare .revision .title span {+ color: #888;+ margin-left: 4px;+}+table.revision-compare .revision .title a {+ color: #666;+ margin-left: 4px;+}+table.revision-compare .revision .message {+ margin-top: 8px;+}+table.revision-compare .revision .message a {+ font-size: 13px;+ color: #888;+}\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/component/branch/picker/AffinalBranchPicker.java b/server-core/src/main/java/io/onedev/server/web/component/branch/picker/AffinalBranchPicker.javaindex dc279c0c5f..3f1da457f6 100644--- a/server-core/src/main/java/io/onedev/server/web/component/branch/picker/AffinalBranchPicker.java+++ b/server-core/src/main/java/io/onedev/server/web/component/branch/picker/AffinalBranchPicker.java@@ -70,7 +70,8 @@ public abstract class AffinalBranchPicker extends Panel {@Overrideprotected Collection<Project> load() {Project project = OneDev.getInstance(Dao.class).load(Project.class, projectId);- List<Project> affinals = project.getForkRoot().getForkDescendants();+ List<Project> affinals = project.getForkRoot().getForkChildren();+ affinals.add(0, project.getForkRoot());for (Iterator<Project> it = affinals.iterator(); it.hasNext();) {if (!SecurityUtils.canReadCode(it.next()))it.remove();diff --git a/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownEditor.html b/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownEditor.htmlindex ef9b67abe6..3b10885ec6 100644--- a/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownEditor.html+++ b/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownEditor.html@@ -18,7 +18,9 @@<span class="separator pull-left"></span><a class="do-emoji pull-left" title="Show emojis"><i class="fa fa-smile-o"></i></a><a class="do-mention pull-left" title="Mention someone"><i class="fa fa-at"></i></a>- <a class="do-hashtag pull-left" title="Reference issue/build/pull request"><i class="fa fa-hashtag"></i></a>+ <a class="do-reference pull-left" data-reference="issue" title="Reference issue"><i class="fa fa-bug"></i></a>+ <a class="do-reference pull-left" data-reference="pull request" title="Reference pull request"><i class="fa fa-ext fa-branch-compare"></i></a>+ <a class="do-reference pull-left" data-reference="build" title="Reference build"><i class="fa fa-play-circle"></i></a></div><div class="pull-left dropdown compact-mode"><a data-toggle="dropdown" type="button"><i class="fa fa-chevron-down"></i></a>@@ -38,7 +40,9 @@<li role="separator" class="divider"></li><li><a class="do-emoji"><i class="fa fa-smile-o fa-fw"></i> Show Emojis</a></li><li><a class="do-mention"><i class="fa fa-at fa-fw"></i> Mention Someone</a></li>- <li><a class="do-hashtag"><i class="fa fa-hashtag fa-fw"></i> Reference Pull Request/Issue</a></li>+ <li><a class="do-reference" data-reference="issue"><i class="fa fa-bug fa-fw"></i> Reference Issue</a></li>+ <li><a class="do-reference" data-reference="pull request"><i class="fa fa-ext fa-branch-compare fa-fw"></i> Reference Pull Request</a></li>+ <li><a class="do-reference" data-reference="build"><i class="fa fa-play-circle fa-fw"></i> Reference Build</a></li></ul></div><div class="pull-right clearfix">diff --git a/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownEditor.java b/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownEditor.javaindex 670d970c96..902d84fd62 100644--- a/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownEditor.java@@ -67,7 +67,7 @@ import io.onedev.server.web.page.project.blob.render.BlobRenderContext;@SuppressWarnings("serial")public class MarkdownEditor extends FormComponentPanel<String> {- protected static final int ATWHO_LIMIT = 5;+ protected static final int ATWHO_LIMIT = 10;private final boolean compactMode;@@ -318,16 +318,8 @@ public class MarkdownEditor extends FormComponentPanel<String> {elsereferenceProject = null;if (referenceProject != null || StringUtils.isBlank(referenceProjectName)) {- int count;- if ("issue".equals(referenceQueryType)- || "pull request".equals(referenceQueryType)- || "build".equals(referenceQueryType)) {- count = ATWHO_LIMIT*3;- } else {- count = ATWHO_LIMIT;- }- if (StringUtils.isBlank(referenceQueryType) || "issue".equals(referenceQueryType)) {- for (Issue issue: getReferenceSupport().findIssues(referenceProject, referenceQuery, count)) {+ if ("issue".equals(referenceQueryType)) {+ for (Issue issue: getReferenceSupport().findIssues(referenceProject, referenceQuery, ATWHO_LIMIT)) {Map<String, String> referenceMap = new HashMap<>();referenceMap.put("referenceType", "issue");referenceMap.put("referenceNumber", String.valueOf(issue.getNumber()));@@ -335,9 +327,8 @@ public class MarkdownEditor extends FormComponentPanel<String> {referenceMap.put("searchKey", issue.getNumber() + " " + StringUtils.deleteWhitespace(issue.getTitle()));referenceList.add(referenceMap);}- }- if (StringUtils.isBlank(referenceQueryType) || "pullrequest".equals(referenceQueryType)) {- for (PullRequest request: getReferenceSupport().findPullRequests(referenceProject, referenceQuery, count)) {+ } else if ("pullrequest".equals(referenceQueryType)) {+ for (PullRequest request: getReferenceSupport().findPullRequests(referenceProject, referenceQuery, ATWHO_LIMIT)) {Map<String, String> referenceMap = new HashMap<>();referenceMap.put("referenceType", "pull request");referenceMap.put("referenceNumber", String.valueOf(request.getNumber()));@@ -345,9 +336,8 @@ public class MarkdownEditor extends FormComponentPanel<String> {referenceMap.put("searchKey", request.getNumber() + " " + StringUtils.deleteWhitespace(request.getTitle()));referenceList.add(referenceMap);}- }- if (StringUtils.isBlank(referenceQueryType) || "build".equals(referenceQueryType)) {- for (Build build: getReferenceSupport().findBuilds(referenceProject, referenceQuery, count)) {+ } else if ("build".equals(referenceQueryType)) {+ for (Build build: getReferenceSupport().findBuilds(referenceProject, referenceQuery, ATWHO_LIMIT)) {Map<String, String> referenceMap = new HashMap<>();referenceMap.put("referenceType", "build");referenceMap.put("referenceNumber", String.valueOf(build.getNumber()));diff --git a/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownViewer.java b/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownViewer.javaindex caaf440f47..654cfb3ef6 100644--- a/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownViewer.java+++ b/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownViewer.java@@ -35,6 +35,7 @@ import io.onedev.server.model.User;import io.onedev.server.model.support.pullrequest.CloseInfo;import io.onedev.server.util.ColorUtils;import io.onedev.server.util.DateUtils;+import io.onedev.server.util.SecurityUtils;import io.onedev.server.util.markdown.MarkdownManager;import io.onedev.server.web.avatar.AvatarManager;import io.onedev.server.web.behavior.AbstractPostAjaxBehavior;@@ -132,7 +133,8 @@ public class MarkdownViewer extends GenericPanel<String> {switch (referenceType) {case "issue":Issue issue = OneDev.getInstance(IssueManager.class).find(referenceId);- if (issue != null) {+ // check permission here as issue project may not be the same as current project+ if (issue != null && SecurityUtils.canAccess(issue.getProject())) {String color = OneDev.getInstance(SettingManager.class).getIssueSetting().getStateSpec(issue.getState()).getColor();String script = String.format("onedev.server.markdown.renderIssueTooltip('%s', '%s', '%s', '%s')",JavaScriptEscape.escapeJavaScript(issue.getTitle()), JavaScriptEscape.escapeJavaScript(issue.getState()),@@ -142,7 +144,8 @@ public class MarkdownViewer extends GenericPanel<String> {break;case "pull request":PullRequest request = OneDev.getInstance(PullRequestManager.class).find(referenceId);- if (request != null) {+ // check permission here as target project may not be the same as current project+ if (request != null && SecurityUtils.canReadCode(request.getTargetProject())) {String statusCss;String status;CloseInfo closeInfo = request.getCloseInfo();@@ -164,7 +167,8 @@ public class MarkdownViewer extends GenericPanel<String> {break;case "build":Build build = OneDev.getInstance(BuildManager.class).find(referenceId);- if (build != null) {+ // check permission here as build project may not be the same as current project+ if (build != null && SecurityUtils.canAccess(build)) {String statusCss = "fa build-status build-status-" + build.getStatus().name().toLowerCase();String statusTitle = build.getStatus().getDisplayName();diff --git a/server-core/src/main/java/io/onedev/server/web/component/markdown/markdown.js b/server-core/src/main/java/io/onedev/server/web/component/markdown/markdown.jsindex 1dab62819c..b92d173866 100644--- a/server-core/src/main/java/io/onedev/server/web/component/markdown/markdown.js+++ b/server-core/src/main/java/io/onedev/server/web/component/markdown/markdown.js@@ -495,23 +495,29 @@ onedev.server.markdown = {if (!canMentionUser)$head.find(".do-mention").remove();if (!canReferenceEntity)- $head.find(".do-hashtag").remove();+ $head.find(".do-reference").remove();- $head.find(".do-mention, .do-hashtag").click(function() {+ $head.find(".do-mention, .do-reference").click(function() {if (!$edit.is(":visible"))return;- var atChar = $(this).hasClass("do-mention")? "@": "#";+ var atChar = $(this).hasClass("do-mention")? "@": "#";var prevChar;var caret = $input.caret();- if (caret != 0) {+ if (caret != 0)prevChar = $input.val().charAt(caret-1);- }- if (prevChar === undefined || prevChar === ' ') {- $input.caret(atChar);- } else {- $input.caret(" " + atChar);- }++ var prefix = $(this).data("reference");+ if (prefix === undefined)+ prefix = "";+ else+ prefix = prefix + " ";++ if (prevChar === undefined || prevChar === ' ' || prevChar === '\n')+ $input.caret(prefix + atChar);+ else+ $input.caret(" " + prefix + atChar);+$input.atwho("run");onedev.server.markdown.fireInputEvent($input);});diff --git a/server-core/src/main/java/io/onedev/server/web/component/project/comment/CommentInput.java b/server-core/src/main/java/io/onedev/server/web/component/project/comment/CommentInput.javaindex 7cca2a54c5..cdd6751794 100644--- a/server-core/src/main/java/io/onedev/server/web/component/project/comment/CommentInput.java+++ b/server-core/src/main/java/io/onedev/server/web/component/project/comment/CommentInput.java@@ -80,9 +80,9 @@ public abstract class CommentInput extends MarkdownEditor {@Overridepublic List<Issue> findIssues(@Nullable Project project, String query, int count) {- if (project == null)+ if (project == null)project = getProject();- if (SecurityUtils.canAccess(project))+ if (SecurityUtils.canAccess(project))return OneDev.getInstance(IssueManager.class).query(project, query, count);elsereturn new ArrayList<>();diff --git a/server-core/src/main/java/io/onedev/server/web/component/revisionpicker/AffinalRevisionPicker.java b/server-core/src/main/java/io/onedev/server/web/component/revisionpicker/AffinalRevisionPicker.javaindex 3a7dcd50e3..9131225e50 100644--- a/server-core/src/main/java/io/onedev/server/web/component/revisionpicker/AffinalRevisionPicker.java+++ b/server-core/src/main/java/io/onedev/server/web/component/revisionpicker/AffinalRevisionPicker.java@@ -70,7 +70,8 @@ public abstract class AffinalRevisionPicker extends Panel {@Overrideprotected Collection<Project> load() {Project project = OneDev.getInstance(Dao.class).load(Project.class, projectId);- List<Project> affinals = project.getForkRoot().getForkDescendants();+ List<Project> affinals = project.getForkRoot().getForkChildren();+ affinals.add(0, project.getForkRoot());for (Iterator<Project> it = affinals.iterator(); it.hasNext();) {if (!SecurityUtils.canReadCode(it.next()))it.remove();diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/user/UserPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/user/UserPage.javaindex 24001c3453..082818d5d4 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/user/UserPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/user/UserPage.java@@ -98,7 +98,7 @@ public abstract class UserPage extends AdministrationPage {tabs.add(new UserTab("Change Password", "fa fa-fw fa-key", UserPasswordPage.class));tabs.add(new UserTab("Belonging Groups", "fa fa-fw fa-group", UserMembershipsPage.class));tabs.add(new UserTab("Authorized Projects", "fa fa-fw fa-ext fa-repo", UserAuthorizationsPage.class));- tabs.add(new UserTab("Build Setting", "fa fa-fw fa-cubes", UserJobSecretsPage.class, UserBuildSettingPage.class));+ tabs.add(new UserTab("Build Setting", "fa fa-fw fa-play-circle", UserJobSecretsPage.class, UserBuildSettingPage.class));tabs.add(new UserTab("Web Hooks", "fa fa-fw fa-volume-up", UserWebHooksPage.class, UserWebHooksPage.class));return tabs;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.htmlindex 111ad4a4a8..4cbe3879ee 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@@ -64,7 +64,7 @@<li wicket:id="myProfile"><a wicket:id="link"><i class="fa fa-fw fa-list-alt"></i> My Profile</a></li><li wicket:id="myAvatar"><a wicket:id="link"><i class="fa fa-fw fa-picture-o"></i> Edit Avatar</a></li><li wicket:id="myPassword"><a wicket:id="link"><i class="fa fa-fw fa-key"></i> Change Password</a></li>- <li wicket:id="myBuildSetting"><a wicket:id="link"><i class="fa fa-fw fa-cubes"></i> Build Setting</a></li>+ <li wicket:id="myBuildSetting"><a wicket:id="link"><i class="fa fa-fw fa-play-circle"></i> Build Setting</a></li><li wicket:id="myWebHooks"><a wicket:id="link"><i class="fa fa-fw fa-volume-up"></i> Web Hooks</a></li><li role="separator" class="divider"></li><li><a wicket:id="signOut"><i class="fa fa-fw fa-sign-out"></i> <span wicket:id="label"></span></a></li>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.javaindex 092fe4c069..67c70607d8 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@@ -251,7 +251,7 @@ public abstract class ProjectPage extends LayoutPage implements ProjectAware {});- tabs.add(new ProjectTab(Model.of("Builds"), "fa fa-fw fa-cubes", 0, ProjectBuildsPage.class,+ tabs.add(new ProjectTab(Model.of("Builds"), "fa fa-fw fa-play-circle", 0, ProjectBuildsPage.class,BuildDetailPage.class, InvalidBuildPage.class) {@Override@@ -354,7 +354,7 @@ public abstract class ProjectPage extends LayoutPage implements ProjectAware {tabs.add(new ProjectSettingTab("Tag Protection", "fa fa-fw fa-lock", TagProtectionsPage.class));tabs.add(new ProjectSettingTab("Issue Setting", "fa fa-fw fa-bug",StateTransitionsPage.class, ProjectIssueSettingPage.class));- tabs.add(new ProjectSettingTab("Build Setting", "fa fa-fw fa-cubes",+ tabs.add(new ProjectSettingTab("Build Setting", "fa fa-fw fa-play-circle",ProjectJobSecretsPage.class, ProjectBuildSettingPage.class));tabs.add(new ProjectSettingTab("Web Hooks", "fa fa-fw fa-volume-up", ProjectWebHooksPage.class));return tabs;diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/markdown/MarkdownBlobEditor.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/markdown/MarkdownBlobEditor.javaindex 094b2fd709..d7448ed782 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/markdown/MarkdownBlobEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/markdown/MarkdownBlobEditor.java@@ -2,6 +2,7 @@ package io.onedev.server.web.page.project.blob.render.renderers.markdown;import java.nio.charset.Charset;import java.nio.charset.StandardCharsets;+import java.util.ArrayList;import java.util.List;import javax.annotation.Nullable;@@ -26,6 +27,7 @@ import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;import io.onedev.server.model.User;import io.onedev.server.util.ContentDetector;+import io.onedev.server.util.SecurityUtils;import io.onedev.server.util.markdown.MarkdownManager;import io.onedev.server.util.match.MatchScoreProvider;import io.onedev.server.util.match.MatchScoreUtils;@@ -109,9 +111,12 @@ abstract class MarkdownBlobEditor extends FormComponentPanel<byte[]> {@Overridepublic List<Issue> findIssues(@Nullable Project project, String query, int count) {- if (project == null)+ if (project == null)project = context.getProject();- return OneDev.getInstance(IssueManager.class).query(project, query, count);+ if (SecurityUtils.canAccess(project))+ return OneDev.getInstance(IssueManager.class).query(project, query, count);+ else+ return new ArrayList<>();}@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.javaindex 3b8a7327c0..b55aa42a31 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.java@@ -99,7 +99,10 @@ public abstract class BuildDetailPage extends ProjectPageBuild build = OneDev.getInstance(BuildManager.class).find(getProject(), buildNumber);if (build == null)throw new EntityNotFoundException("Unable to find build #" + buildNumber + " in project " + getProject());- return build;+ else if (!build.getProject().equals(getProject()))+ throw new RestartResponseException(getPageClass(), paramsOf(build, position));+ else+ return build;}};diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/compare/RevisionCompareCssResourceReference.java b/server-core/src/main/java/io/onedev/server/web/page/project/compare/RevisionCompareCssResourceReference.javanew file mode 100644index 0000000000..bfcbec653b--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/page/project/compare/RevisionCompareCssResourceReference.java@@ -0,0 +1,13 @@+package io.onedev.server.web.page.project.compare;++import org.apache.wicket.request.resource.CssResourceReference;++public class RevisionCompareCssResourceReference extends CssResourceReference {++ private static final long serialVersionUID = 1L;++ public RevisionCompareCssResourceReference() {+ super(RevisionCompareCssResourceReference.class, "revision-compare.css");+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/compare/RevisionComparePage.html b/server-core/src/main/java/io/onedev/server/web/page/project/compare/RevisionComparePage.htmlindex a3499dc3a7..d1a74f91c4 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/compare/RevisionComparePage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/project/compare/RevisionComparePage.html@@ -1,7 +1,7 @@<wicket:extend><div class="page-title">Revision Compare</div><div id="revision-compare">- <table class="revisions">+ <table class="revision-compare"><tr><td class="left revision"><div class="title clearfix">diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/compare/RevisionComparePage.java b/server-core/src/main/java/io/onedev/server/web/page/project/compare/RevisionComparePage.javaindex 9cdbb7e8f3..b5e6635dce 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/compare/RevisionComparePage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/compare/RevisionComparePage.java@@ -525,7 +525,8 @@ public class RevisionComparePage extends ProjectPage implements CommentSupport,@Overridepublic void renderHead(IHeaderResponse response) {super.renderHead(response);- response.render(CssHeaderItem.forReference(new RevisionCompareResourceReference()));+ response.render(CssHeaderItem.forReference(new io.onedev.server.web.asset.revisioncompare.RevisionCompareCssResourceReference()));+ response.render(CssHeaderItem.forReference(new RevisionCompareCssResourceReference()));}private void newTabPanel(@Nullable AjaxRequestTarget target) {diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/compare/RevisionCompareResourceReference.java b/server-core/src/main/java/io/onedev/server/web/page/project/compare/RevisionCompareResourceReference.javadeleted file mode 100644index b4ec5c9290..0000000000--- a/server-core/src/main/java/io/onedev/server/web/page/project/compare/RevisionCompareResourceReference.java+++ /dev/null@@ -1,13 +0,0 @@-package io.onedev.server.web.page.project.compare;--import org.apache.wicket.request.resource.CssResourceReference;--public class RevisionCompareResourceReference extends CssResourceReference {-- private static final long serialVersionUID = 1L;-- public RevisionCompareResourceReference() {- super(RevisionCompareResourceReference.class, "revision-compare.css");- }--}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/compare/revision-compare.css b/server-core/src/main/java/io/onedev/server/web/page/project/compare/revision-compare.cssindex 87697fcae9..830be0c2a8 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/compare/revision-compare.css+++ b/server-core/src/main/java/io/onedev/server/web/page/project/compare/revision-compare.css@@ -1,45 +1,6 @@-#revision-compare>div {+#revision-compare>* {margin-bottom: 20px;}-#revision-compare>div:LAST-CHILD {+#revision-compare>:LAST-CHILD {margin-bottom: 0;}-#revision-compare>.revisions {- margin-bottom: 20px;- width: auto;-}-#revision-compare>.revisions td {- vertical-align: middle;- background: #FAFAFA;- border: 2px solid #E0E0E0;- padding: 20px;-}-#revision-compare>.revisions td.action {- text-align: center;- background: white;- border-top: none;- border-bottom: none;-}-#revision-compare>.revisions .revision .title .checkbox {- margin: 0 0 0 16px;-}-#revision-compare>.revisions .revision .title label {- font-size: 16px;- color: #888;- font-weight: normal;-}-#revision-compare>.revisions .revision .title span {- color: #888;- margin-left: 4px;-}-#revision-compare>.revisions .revision .title a {- color: #666;- margin-left: 4px;-}-#revision-compare>.revisions .revision .message {- margin-top: 8px;-}-#revision-compare>.revisions .revision .message a {- font-size: 13px;- color: #888;-}\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.javaindex 50840537d2..80de9cad90 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.java@@ -76,7 +76,10 @@ public abstract class IssueDetailPage extends ProjectPage implements InputContexIssue issue = OneDev.getInstance(IssueManager.class).find(getProject(), issueNumber);if (issue == null)throw new EntityNotFoundException("Unable to find issue #" + issueNumber + " in project " + getProject());- return issue;+ else if (!issue.getProject().equals(getProject()))+ throw new RestartResponseException(getPageClass(), paramsOf(issue, position));+ else+ return issue;}};diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestCssResourceReference.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestCssResourceReference.javanew file mode 100644index 0000000000..dda8bb3357--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestCssResourceReference.java@@ -0,0 +1,13 @@+package io.onedev.server.web.page.project.pullrequests.create;++import org.apache.wicket.request.resource.CssResourceReference;++public class NewPullRequestCssResourceReference extends CssResourceReference {++ private static final long serialVersionUID = 1L;++ public NewPullRequestCssResourceReference() {+ super(NewPullRequestCssResourceReference.class, "new-pull-request.css");+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.htmlindex 32a0894be5..2667e0caf9 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.html@@ -1,9 +1,9 @@<wicket:extend><div class="page-title">New Pull Request</div><div id="new-request">- <table class="branches">+ <table class="branches revision-compare"><tr>- <td class="target branch">+ <td class="target branch revision"><div class="title clearfix"><label class="pull-left">Target</label></div>@@ -13,9 +13,9 @@</div></td><td class="action">- <a wicket:id="swap" class="swap btn btn-default" title="Swap"><i class="fa fa-arrow-left"></i></a>+ <a wicket:id="swap" class="swap btn btn-default" title="Swap"><i class="fa fa-exchange"></i></a></td>- <td class="source branch">+ <td class="source branch revision"><div class="title"><label>Source</label></div>diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.javaindex c8ec30caac..7f2c32b69a 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.java@@ -62,6 +62,7 @@ import io.onedev.server.util.ProjectAndBranch;import io.onedev.server.util.SecurityUtils;import io.onedev.server.util.diff.WhitespaceOption;import io.onedev.server.web.ajaxlistener.DisableGlobalLoadingIndicatorListener;+import io.onedev.server.web.asset.revisioncompare.RevisionCompareCssResourceReference;import io.onedev.server.web.behavior.ReferenceInputBehavior;import io.onedev.server.web.component.branch.BranchLink;import io.onedev.server.web.component.branch.picker.AffinalBranchPicker;@@ -174,7 +175,7 @@ public class NewPullRequestPage extends ProjectPage implements CommentSupport {PullRequest prevRequest = OneDev.getInstance(PullRequestManager.class).findLatest(getProject(), getLoginUser());if (prevRequest != null && source.equals(prevRequest.getSource()) && target.equals(prevRequest.getTarget()) && prevRequest.isOpen())pullRequestRef.set(prevRequest);- else if (target.getBranch() != null || source.getBranch() != null)+ else if (target.getBranch() != null && source.getBranch() != null)pullRequestRef.set(OneDev.getInstance(PullRequestManager.class).findEffective(target, source));if (pullRequestRef.get() == null) {@@ -772,7 +773,8 @@ public class NewPullRequestPage extends ProjectPage implements CommentSupport {@Overridepublic void renderHead(IHeaderResponse response) {super.renderHead(response);- response.render(CssHeaderItem.forReference(new NewPullRequestResourceReference()));+ response.render(CssHeaderItem.forReference(new RevisionCompareCssResourceReference()));+ response.render(CssHeaderItem.forReference(new NewPullRequestCssResourceReference()));}@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestResourceReference.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestResourceReference.javadeleted file mode 100644index 75c08f89e9..0000000000--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestResourceReference.java+++ /dev/null@@ -1,13 +0,0 @@-package io.onedev.server.web.page.project.pullrequests.create;--import org.apache.wicket.request.resource.CssResourceReference;--public class NewPullRequestResourceReference extends CssResourceReference {-- private static final long serialVersionUID = 1L;-- public NewPullRequestResourceReference() {- super(NewPullRequestResourceReference.class, "new-pull-request.css");- }--}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/new-pull-request.css b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/new-pull-request.cssindex 5187e4c08e..db797c04d9 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/new-pull-request.css+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/new-pull-request.css@@ -7,38 +7,11 @@}}-#new-request>div {+#new-request>* {margin-bottom: 20px;}-#new-request>.branches {- margin-bottom: 20px;- width: auto;-}-#new-request>.branches td {- vertical-align: middle;- background: #F5F5F5;- border: 2px solid #DDD;- border-radius: 4px;- padding: 20px;-}-#new-request>.branches td.action {- text-align: center;- background: white;- border-top: none;- border-bottom: none;- padding-left: 20px;- padding-right: 20px;-}-#new-request>.branches td.action a {- font-size: 18px;- color: #666;-}-#new-request>.branches .branch .message {- margin-top: 8px;-}-#new-request>.branches .branch .message a {- font-size: 13px;- color: #888;+#new-request>:last-child {+ margin-bottom: 0;}#new-request>.status .summary {font-size: 16px;diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.javaindex 94c43e2f77..590881a4e2 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java@@ -178,8 +178,11 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullRLong requestNumber = Long.valueOf(requestNumberString);PullRequest request = getPullRequestManager().find(getProject(), requestNumber);if (request == null)- throw new EntityNotFoundException("Unable to find request #" + requestNumber + " in project " + getProject());- return request;+ throw new EntityNotFoundException("Unable to find pull request #" + requestNumber + " in project " + getProject());+ else if (!request.getTargetProject().equals(getProject()))+ throw new RestartResponseException(getPageClass(), paramsOf(request, position));+ else+ return request;}};diff --git a/server-product/jsw/wrapper.conf b/server-product/jsw/wrapper.confindex c0895f745a..a5feb3b9ad 100644--- a/server-product/jsw/wrapper.conf+++ b/server-product/jsw/wrapper.conf@@ -69,7 +69,6 @@ wrapper.java.additional.auto_bits=TRUE# Java Additional Parameterswrapper.java.additional.1=-Djava.awt.headless=true-wrapper.java.additional.2=-Xverify:nonewrapper.java.additional.10=-XX:+IgnoreUnrecognizedVMOptionswrapper.java.additional.11=--add-opens=java.base/java.lang=ALL-UNNAMEDdiff --git a/server-product/system/conf/hibernate.properties b/server-product/system/conf/hibernate.propertiesindex 94d8c341cd..906bedeaf4 100644--- a/server-product/system/conf/hibernate.properties+++ b/server-product/system/conf/hibernate.properties@@ -5,7 +5,7 @@hibernate.dialect=org.hibernate.dialect.HSQLDialecthibernate.connection.driver_class=org.hsqldb.jdbc.JDBCDriver-hibernate.connection.url=jdbc:hsqldb:file:${installDir}/sampledb/onedev;hsqldb.tx=mvcc;hsqldb.lob_compressed=true;shutdown=true+hibernate.connection.url=jdbc:hsqldb:file:${installDir}/sampledb/onedev;hsqldb.tx=mvcc;hsqldb.lob_compressed=true;sql.ignore_case=true;shutdown=truehibernate.connection.username=sahibernate.connection.password=