Skip to content

The Unified and Autonomous Development Platform

Minor ui changes

Andrea Del Benef921fdaeca99
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 d9daa95c92..861d5ba3c3 100644
--- a/server-core/src/main/java/io/onedev/server/CoreModule.java
+++ b/server-core/src/main/java/io/onedev/server/CoreModule.java
@@ -161,7 +161,7 @@ import io.onedev.server.git.GitFilter;
import io.onedev.server.git.GitPostReceiveCallback;
import io.onedev.server.git.GitPreReceiveCallback;
import io.onedev.server.git.config.GitConfig;
-import io.onedev.server.git.server.SimpleGitServer;
+import io.onedev.server.git.server.SimpleGitSshServer;
import io.onedev.server.infomanager.CodeCommentRelationInfoManager;
import io.onedev.server.infomanager.CommitInfoManager;
import io.onedev.server.infomanager.DefaultCodeCommentRelationInfoManager;
@@ -392,7 +392,7 @@ public class CoreModule extends AbstractPluginModule {
bind(WebHookManager.class);
bind(KeyPairProvider.class).to(DefaultTestKeyPair.class);
- bind(SimpleGitServer.class);
+ bind(SimpleGitSshServer.class);
contribute(ObjectMapperConfigurator.class, GitObjectMapperConfigurator.class);
contribute(ObjectMapperConfigurator.class, HibernateObjectMapperConfigurator.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 1adacd76d7..5ebdef2bc6 100644
--- a/server-core/src/main/java/io/onedev/server/OneDev.java
+++ b/server-core/src/main/java/io/onedev/server/OneDev.java
@@ -14,16 +14,13 @@ import java.util.List;
import java.util.Set;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.atomic.AtomicReference;
-
import javax.annotation.Nullable;
import javax.inject.Inject;
-
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.SystemUtils;
import org.apache.wicket.request.Url;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-
import io.onedev.commons.launcher.bootstrap.Bootstrap;
import io.onedev.commons.launcher.loader.AbstractPlugin;
import io.onedev.commons.launcher.loader.AppLoader;
@@ -36,7 +33,7 @@ import io.onedev.server.event.system.SystemStarted;
import io.onedev.server.event.system.SystemStarting;
import io.onedev.server.event.system.SystemStopped;
import io.onedev.server.event.system.SystemStopping;
-import io.onedev.server.git.server.SimpleGitServer;
+import io.onedev.server.git.server.SimpleGitSshServer;
import io.onedev.server.maintenance.DataManager;
import io.onedev.server.persistence.PersistManager;
import io.onedev.server.persistence.SessionManager;
@@ -74,13 +71,13 @@ public class OneDev extends AbstractPlugin implements Serializable {
private volatile InitStage initStage;
- private SimpleGitServer simpleGitServer;
+ private SimpleGitSshServer simpleGitSshServer;
@Inject
public OneDev(JettyRunner jettyRunner, PersistManager persistManager, TaskScheduler taskScheduler,
SessionManager sessionManager, ServerConfig serverConfig, DataManager dataManager,
SettingManager configManager, ExecutorService executorService,
- ListenerRegistry listenerRegistry, SimpleGitServer simpleGitServer) {
+ ListenerRegistry listenerRegistry, SimpleGitSshServer simpleGitSshServer) {
this.jettyRunner = jettyRunner;
this.persistManager = persistManager;
this.taskScheduler = taskScheduler;
@@ -90,7 +87,7 @@ public class OneDev extends AbstractPlugin implements Serializable {
this.serverConfig = serverConfig;
this.executorService = executorService;
this.listenerRegistry = listenerRegistry;
- this.simpleGitServer = simpleGitServer;
+ this.simpleGitSshServer = simpleGitSshServer;
initStage = new InitStage("Server is Starting...");
}
@@ -116,9 +113,9 @@ public class OneDev extends AbstractPlugin implements Serializable {
initStage.waitForFinish();
}
+ //TODO: provide better config support for Git server
try {
- simpleGitServer.start();
- logger.info("Git server started at port " + simpleGitServer.getPort());
+ simpleGitSshServer.start();
} catch (IOException e) {
e.printStackTrace();
}
@@ -138,6 +135,7 @@ public class OneDev extends AbstractPlugin implements Serializable {
listenerRegistry.post(new SystemStarted());
logger.info("Server is ready at " + configManager.getSystemSetting().getServerUrl() + ".");
+ logger.info("Git server started at port " + simpleGitSshServer.getPort());
initStage = null;
}
@@ -305,7 +303,7 @@ public class OneDev extends AbstractPlugin implements Serializable {
executorService.shutdown();
try {
- simpleGitServer.stop();
+ simpleGitSshServer.stop();
} catch (IOException e) {
// TODO Auto-generated catch block
e.printStackTrace();
diff --git a/server-core/src/main/java/io/onedev/server/git/server/SimpleGitServer.java b/server-core/src/main/java/io/onedev/server/git/server/SimpleGitSshServer.java
similarity index 96%
rename from server-core/src/main/java/io/onedev/server/git/server/SimpleGitServer.java
rename to server-core/src/main/java/io/onedev/server/git/server/SimpleGitSshServer.java
index 6016ce49a1..3f81ee3c1d 100644
--- a/server-core/src/main/java/io/onedev/server/git/server/SimpleGitServer.java
+++ b/server-core/src/main/java/io/onedev/server/git/server/SimpleGitSshServer.java
@@ -36,7 +36,7 @@ import org.eclipse.jgit.transport.UploadPack;
import io.onedev.server.entitymanager.ProjectManager;
@Singleton
-public class SimpleGitServer {
+public class SimpleGitSshServer {
private final Repository repository;
@@ -46,7 +46,7 @@ public class SimpleGitServer {
.newFixedThreadPool("SimpleGitServer", 4);
@Inject
- public SimpleGitServer(ProjectManager projectManager , KeyPairProvider keyPairProvider) {
+ public SimpleGitSshServer(ProjectManager projectManager , KeyPairProvider keyPairProvider) {
this.repository = null;
this.server = SshServer.setUpDefaultServer();
@@ -117,7 +117,7 @@ public class SimpleGitServer {
@Override
protected Path computeRootDir(Session session) throws IOException {
- return SimpleGitServer.this.repository.getDirectory()
+ return SimpleGitSshServer.this.repository.getDirectory()
.getParentFile().getAbsoluteFile().toPath();
}
});
diff --git a/server-core/src/main/java/io/onedev/server/maintenance/DefaultDataManager.java b/server-core/src/main/java/io/onedev/server/maintenance/DefaultDataManager.java
index ba9a7c6e52..09c560e280 100644
--- a/server-core/src/main/java/io/onedev/server/maintenance/DefaultDataManager.java
+++ b/server-core/src/main/java/io/onedev/server/maintenance/DefaultDataManager.java
@@ -8,21 +8,17 @@ import java.util.Collection;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
-
import javax.inject.Inject;
import javax.inject.Singleton;
import javax.validation.Validator;
-
import org.apache.shiro.authc.credential.PasswordService;
import org.joda.time.DateTime;
import org.joda.time.format.DateTimeFormat;
import org.quartz.CronScheduleBuilder;
import org.quartz.ScheduleBuilder;
-
import com.google.common.base.Throwables;
import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
-
import io.onedev.commons.launcher.bootstrap.Bootstrap;
import io.onedev.commons.launcher.loader.Listen;
import io.onedev.commons.launcher.loader.ManagedSerializedForm;
diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/SystemSetting.java b/server-core/src/main/java/io/onedev/server/model/support/administration/SystemSetting.java
index 23bce75242..88e7680482 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/administration/SystemSetting.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/SystemSetting.java
@@ -1,14 +1,11 @@
package io.onedev.server.model.support.administration;
import java.io.Serializable;
-
import javax.validation.ConstraintValidatorContext;
import javax.validation.Valid;
import javax.validation.constraints.NotNull;
-
import org.apache.commons.lang3.StringUtils;
import org.hibernate.validator.constraints.NotEmpty;
-
import io.onedev.server.git.config.CurlConfig;
import io.onedev.server.git.config.GitConfig;
import io.onedev.server.git.config.SystemCurl;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/my/sshkeys/MySshKeysPage.java b/server-core/src/main/java/io/onedev/server/web/page/my/sshkeys/MySshKeysPage.java
index 33fceaafc4..14692a4c1d 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/my/sshkeys/MySshKeysPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/my/sshkeys/MySshKeysPage.java
@@ -1,8 +1,11 @@
package io.onedev.server.web.page.my.sshkeys;
+import java.time.format.DateTimeFormatter;
import java.util.List;
import org.apache.wicket.Component;
import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.ajax.attributes.AjaxCallListener;
+import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
import org.apache.wicket.ajax.markup.html.AjaxLink;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
@@ -24,6 +27,8 @@ import io.onedev.server.web.page.my.MyPage;
@SuppressWarnings("serial")
public class MySshKeysPage extends MyPage {
+ private static final DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+
public MySshKeysPage(PageParameters params) {
super(params);
}
@@ -68,7 +73,7 @@ public class MySshKeysPage extends MyPage {
item.add(new Label("name", sshKey.getName()));
item.add(new Label("owner", sshKey.getOwner().getName()));
item.add(new Label("digest", sshKey.getDigest()));
- item.add(new Label("timestamp", sshKey.getTimestamp().toString()));
+ item.add(new Label("timestamp", sshKey.getTimestamp().format(formatter)));
item.add(new AjaxLink<Void>("delete") {
@Override
public void onClick(AjaxRequestTarget target) {
@@ -76,6 +81,20 @@ public class MySshKeysPage extends MyPage {
dao.remove(sshKey);
target.add(keyList);
}
+
+ @Override
+ protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
+ super.updateAjaxAttributes(attributes);
+ AjaxCallListener myAjaxCallListener = new AjaxCallListener() {
+
+ @Override
+ public CharSequence getPrecondition(Component component) {
+ return "return confirm(\"Are you sure you want to delete key \'"
+ + sshKey.getName() + "\'?\")";
+ }
+ };
+ attributes.getAjaxCallListeners().add(myAjaxCallListener);
+ }
});
}
}).setOutputMarkupId(true);
diff --git a/server-plugin/server-plugin-executor-kubernetes/src/main/java/io/onedev/server/plugin/executor/kubernetes/KubernetesExecutor.java b/server-plugin/server-plugin-executor-kubernetes/src/main/java/io/onedev/server/plugin/executor/kubernetes/KubernetesExecutor.java
index 694e7de14b..e2db97af4a 100644
--- a/server-plugin/server-plugin-executor-kubernetes/src/main/java/io/onedev/server/plugin/executor/kubernetes/KubernetesExecutor.java
+++ b/server-plugin/server-plugin-executor-kubernetes/src/main/java/io/onedev/server/plugin/executor/kubernetes/KubernetesExecutor.java
@@ -19,16 +19,13 @@ import java.util.Map;
import java.util.concurrent.TimeoutException;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicReference;
-
import javax.annotation.Nullable;
-
import org.apache.commons.codec.binary.Base64;
import org.apache.commons.io.IOUtils;
import org.hibernate.validator.constraints.NotEmpty;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.yaml.snakeyaml.Yaml;
-
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
@@ -36,7 +33,6 @@ import com.google.common.base.Preconditions;
import com.google.common.base.Splitter;
import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
-
import io.onedev.commons.utils.ExceptionUtils;
import io.onedev.commons.utils.FileUtils;
import io.onedev.commons.utils.StringUtils;
@@ -399,7 +395,7 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestData
}
private String getServerUrl() {
- return OneDev.getInstance(SettingManager.class).getSystemSetting().getServerUrl();
+ return OneDev.getInstance(SettingManager.class).getSystemSetting().getServerUrl().toString();
}
@Nullable