diff --git a/build.cmd b/build.cmd
index 4bb062c76..eec12a98a 100644
--- a/build.cmd
+++ b/build.cmd
@@ -4,7 +4,7 @@ start mvn clean install -DskipTests
echo "LTS: mvn clean install -DskipTests"
echo "LTS: After sub window finished, close it , and press any key to continue" & pause>nul
-set VERSION=1.6.0-SNAPSHOT
+set VERSION=1.6.0-beta2
set BASE_HOME=%~dp0%
set DIST_BIN_DIR=lts-%VERSION%-bin
diff --git a/build.sh b/build.sh
index 0e51c0dc9..300195550 100644
--- a/build.sh
+++ b/build.sh
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
-VERSION="1.6.0-SNAPSHOT"
+VERSION="1.6.0-beta2"
LTS_BIN="${BASH_SOURCE-$0}"
LTS_BIN="$(dirname "${LTS_BIN}")"
diff --git a/lts-admin/pom.xml b/lts-admin/pom.xml
index 093d1c0fe..ac7f77c13 100644
--- a/lts-admin/pom.xml
+++ b/lts-admin/pom.xml
@@ -5,7 +5,7 @@
lts-parent
com.lts
- 1.6.0-SNAPSHOT
+ 1.6.0-beta2
4.0.0
war
diff --git a/lts-admin/src/main/java/com/lts/web/support/H2ConsoleWebServlet.java b/lts-admin/src/main/java/com/lts/web/support/H2ConsoleWebServlet.java
index 3e196a801..14f4229b3 100644
--- a/lts-admin/src/main/java/com/lts/web/support/H2ConsoleWebServlet.java
+++ b/lts-admin/src/main/java/com/lts/web/support/H2ConsoleWebServlet.java
@@ -3,27 +3,85 @@
import com.lts.core.constant.Constants;
import org.h2.server.web.WebServlet;
+import javax.servlet.ServletConfig;
import javax.servlet.ServletContext;
+import javax.servlet.ServletException;
+import java.util.Collections;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.Map;
/**
* H2 Console 的 servlet
+ *
* @author Robert HG (254963746@qq.com) on 9/26/15.
*/
public class H2ConsoleWebServlet extends WebServlet {
@Override
- public void init() {
+ public void init(ServletConfig config) throws ServletException {
+ ServletConfigFacade servletConfigFacade = new ServletConfigFacade(config);
- ServletContext servletContext = this.getServletConfig().getServletContext();
String monitorDBPath = AppConfigurer.getProperties("lts.admin.data.path",
Constants.USER_HOME) + "/.lts/h2/lts-admin";
// http://h2database.com/html/features.html#connection_modes
// http://h2database.com/html/features.html#auto_mixed_mode
- String url = "jdbc:h2:" + monitorDBPath+";AUTO_SERVER=TRUE";
- servletContext.setInitParameter("url", url);
- servletContext.setInitParameter("user", "lts");
- servletContext.setInitParameter("password", "");
+ String url = "jdbc:h2:" + monitorDBPath + ";AUTO_SERVER=TRUE";
+ servletConfigFacade.setInitParameter("url", url);
+ servletConfigFacade.setInitParameter("user", "lts");
+ servletConfigFacade.setInitParameter("password", "");
+ servletConfigFacade.setInitParameter("webAllowOthers", "true");
- super.init();
+ super.init(servletConfigFacade);
}
}
+
+/**
+ * 主要为解决 jetty embedded 的问题
+ */
+class ServletConfigFacade implements ServletConfig {
+
+ private ServletConfig servletConfig;
+
+ private Map initParams;
+
+ public ServletConfigFacade(ServletConfig servletConfig) {
+ this.servletConfig = servletConfig;
+ this.initParams = new HashMap();
+
+ initParams();
+ }
+
+ private void initParams() {
+ Enumeration> en = servletConfig.getInitParameterNames();
+ while (en.hasMoreElements()) {
+ String name = en.nextElement().toString();
+ String value = servletConfig.getInitParameter(name);
+ initParams.put(name, value);
+ }
+ }
+
+ @Override
+ public String getServletName() {
+ return servletConfig.getServletName();
+ }
+
+ @Override
+ public ServletContext getServletContext() {
+ return servletConfig.getServletContext();
+ }
+
+ @Override
+ public String getInitParameter(String name) {
+ return initParams.get(name);
+ }
+
+ @Override
+ public Enumeration getInitParameterNames() {
+ return Collections.enumeration(initParams.keySet());
+ }
+
+ public void setInitParameter(String name, String value) {
+ initParams.put(name, value);
+ }
+}
\ No newline at end of file
diff --git a/lts-admin/src/main/java/com/lts/web/support/LtsAdminJobClient.java b/lts-admin/src/main/java/com/lts/web/support/LtsAdminJobClient.java
index 6c020d3ca..2163ba9a9 100644
--- a/lts-admin/src/main/java/com/lts/web/support/LtsAdminJobClient.java
+++ b/lts-admin/src/main/java/com/lts/web/support/LtsAdminJobClient.java
@@ -1,6 +1,7 @@
package com.lts.web.support;
import com.lts.core.commons.utils.StringUtils;
+import com.lts.core.constant.Constants;
import com.lts.core.domain.Job;
import com.lts.jobclient.JobClient;
import com.lts.jobclient.domain.Response;
@@ -27,6 +28,7 @@ public void afterPropertiesSet() throws Exception {
if (StringUtils.isEmpty(clusterName)) {
throw new IllegalArgumentException("clusterName in lts-admin.cfg can not be null.");
}
+ jobClient.setFailStorePath(AppConfigurer.getProperties("lts.admin.data.path", Constants.USER_HOME));
jobClient.setClusterName(clusterName);
jobClient.setRegistryAddress(AppConfigurer.getProperties("registryAddress"));
diff --git a/lts-admin/src/main/resources/spring-web.xml b/lts-admin/src/main/resources/spring-web.xml
index 538947ea5..094a22704 100644
--- a/lts-admin/src/main/resources/spring-web.xml
+++ b/lts-admin/src/main/resources/spring-web.xml
@@ -38,7 +38,7 @@
- /views/velocity.properties
+ /WEB-INF/views/velocity.properties
lts-parent
com.lts
- 1.6.0-SNAPSHOT
+ 1.6.0-beta2
4.0.0
jar
diff --git a/lts-core/src/main/java/com/lts/core/support/Version.java b/lts-core/src/main/java/com/lts/core/support/Version.java
index 091741875..84386f8a3 100644
--- a/lts-core/src/main/java/com/lts/core/support/Version.java
+++ b/lts-core/src/main/java/com/lts/core/support/Version.java
@@ -20,7 +20,7 @@ private Version() {}
private static final Logger LOGGER = LoggerFactory.getLogger(Version.class);
- private static final String VERSION = getVersion(Version.class, "1.6.0-SNAPSHOT");
+ private static final String VERSION = getVersion(Version.class, "1.6.0-beta2");
static {
// 检查是否存在重复的jar包
diff --git a/lts-example/pom.xml b/lts-example/pom.xml
index 222a9168e..8acad7cbc 100644
--- a/lts-example/pom.xml
+++ b/lts-example/pom.xml
@@ -5,7 +5,7 @@
lts-parent
com.lts
- 1.6.0-SNAPSHOT
+ 1.6.0-beta2
4.0.0
lts-example
diff --git a/lts-jobclient/pom.xml b/lts-jobclient/pom.xml
index 0656ab142..65e5aa63d 100644
--- a/lts-jobclient/pom.xml
+++ b/lts-jobclient/pom.xml
@@ -5,7 +5,7 @@
lts-parent
com.lts
- 1.6.0-SNAPSHOT
+ 1.6.0-beta2
4.0.0
diff --git a/lts-jobtracker/pom.xml b/lts-jobtracker/pom.xml
index e6f15c48c..c54ec2d75 100644
--- a/lts-jobtracker/pom.xml
+++ b/lts-jobtracker/pom.xml
@@ -5,7 +5,7 @@
lts-parent
com.lts
- 1.6.0-SNAPSHOT
+ 1.6.0-beta2
4.0.0
diff --git a/lts-logger/lts-logger-api/pom.xml b/lts-logger/lts-logger-api/pom.xml
index 76d1569e3..59a860673 100644
--- a/lts-logger/lts-logger-api/pom.xml
+++ b/lts-logger/lts-logger-api/pom.xml
@@ -5,7 +5,7 @@
lts-logger
com.lts
- 1.6.0-SNAPSHOT
+ 1.6.0-beta2
4.0.0
diff --git a/lts-logger/lts-logger-console/pom.xml b/lts-logger/lts-logger-console/pom.xml
index b7c12c2c9..81b91dd4c 100644
--- a/lts-logger/lts-logger-console/pom.xml
+++ b/lts-logger/lts-logger-console/pom.xml
@@ -5,7 +5,7 @@
lts-logger
com.lts
- 1.6.0-SNAPSHOT
+ 1.6.0-beta2
4.0.0
diff --git a/lts-logger/lts-logger-mongo/pom.xml b/lts-logger/lts-logger-mongo/pom.xml
index 219fbed8b..1cc5e8019 100644
--- a/lts-logger/lts-logger-mongo/pom.xml
+++ b/lts-logger/lts-logger-mongo/pom.xml
@@ -5,7 +5,7 @@
lts-logger
com.lts
- 1.6.0-SNAPSHOT
+ 1.6.0-beta2
4.0.0
diff --git a/lts-logger/lts-logger-mysql/pom.xml b/lts-logger/lts-logger-mysql/pom.xml
index 8774de613..4b258f73f 100644
--- a/lts-logger/lts-logger-mysql/pom.xml
+++ b/lts-logger/lts-logger-mysql/pom.xml
@@ -5,7 +5,7 @@
lts-logger
com.lts
- 1.6.0-SNAPSHOT
+ 1.6.0-beta2
4.0.0
diff --git a/lts-logger/pom.xml b/lts-logger/pom.xml
index d227de5e7..a3cb6543a 100644
--- a/lts-logger/pom.xml
+++ b/lts-logger/pom.xml
@@ -5,7 +5,7 @@
lts-parent
com.lts
- 1.6.0-SNAPSHOT
+ 1.6.0-beta2
4.0.0
diff --git a/lts-queue/lts-queue-api/pom.xml b/lts-queue/lts-queue-api/pom.xml
index da996c5cc..217330af3 100644
--- a/lts-queue/lts-queue-api/pom.xml
+++ b/lts-queue/lts-queue-api/pom.xml
@@ -5,7 +5,7 @@
lts-queue
com.lts
- 1.6.0-SNAPSHOT
+ 1.6.0-beta2
4.0.0
diff --git a/lts-queue/lts-queue-mongo/pom.xml b/lts-queue/lts-queue-mongo/pom.xml
index b9fda99e6..952ea448d 100644
--- a/lts-queue/lts-queue-mongo/pom.xml
+++ b/lts-queue/lts-queue-mongo/pom.xml
@@ -5,7 +5,7 @@
lts-queue
com.lts
- 1.6.0-SNAPSHOT
+ 1.6.0-beta2
4.0.0
jar
diff --git a/lts-queue/lts-queue-mysql/pom.xml b/lts-queue/lts-queue-mysql/pom.xml
index 5bd5c916f..6b45f079e 100644
--- a/lts-queue/lts-queue-mysql/pom.xml
+++ b/lts-queue/lts-queue-mysql/pom.xml
@@ -5,7 +5,7 @@
lts-queue
com.lts
- 1.6.0-SNAPSHOT
+ 1.6.0-beta2
4.0.0
diff --git a/lts-queue/pom.xml b/lts-queue/pom.xml
index 75d68605d..68a5c6e6a 100644
--- a/lts-queue/pom.xml
+++ b/lts-queue/pom.xml
@@ -5,7 +5,7 @@
lts-parent
com.lts
- 1.6.0-SNAPSHOT
+ 1.6.0-beta2
4.0.0
diff --git a/lts-spring/pom.xml b/lts-spring/pom.xml
index 4d17ab002..8faeaa4b9 100644
--- a/lts-spring/pom.xml
+++ b/lts-spring/pom.xml
@@ -5,7 +5,7 @@
lts-parent
com.lts
- 1.6.0-SNAPSHOT
+ 1.6.0-beta2
4.0.0
jar
diff --git a/lts-startup/lts-startup-admin/pom.xml b/lts-startup/lts-startup-admin/pom.xml
index 25427942c..cef6ac8b6 100644
--- a/lts-startup/lts-startup-admin/pom.xml
+++ b/lts-startup/lts-startup-admin/pom.xml
@@ -5,7 +5,7 @@
lts-startup
com.lts
- 1.6.0-SNAPSHOT
+ 1.6.0-beta2
4.0.0
diff --git a/lts-startup/lts-startup-admin/src/main/java/com/lts/startup/JettyContainer.java b/lts-startup/lts-startup-admin/src/main/java/com/lts/startup/JettyContainer.java
index 8b68a6018..81803c011 100644
--- a/lts-startup/lts-startup-admin/src/main/java/com/lts/startup/JettyContainer.java
+++ b/lts-startup/lts-startup-admin/src/main/java/com/lts/startup/JettyContainer.java
@@ -39,7 +39,7 @@ public static void main(String[] args) {
server.setStopAtShutdown(true);
server.start();
- System.out.println("LTS-Admin started. http://" + NetUtils.getLocalHost() + ":" + port + "/main.html");
+ System.out.println("LTS-Admin started. http://" + NetUtils.getLocalHost() + ":" + port + "/index.htm");
} catch (Exception e) {
e.printStackTrace();
diff --git a/lts-startup/lts-startup-jobtracker/pom.xml b/lts-startup/lts-startup-jobtracker/pom.xml
index 782e18ed5..13a5c5897 100644
--- a/lts-startup/lts-startup-jobtracker/pom.xml
+++ b/lts-startup/lts-startup-jobtracker/pom.xml
@@ -5,7 +5,7 @@
lts-startup
com.lts
- 1.6.0-SNAPSHOT
+ 1.6.0-beta2
4.0.0
diff --git a/lts-startup/lts-startup-tasktracker/pom.xml b/lts-startup/lts-startup-tasktracker/pom.xml
index 92b8160f1..e04c04ba1 100644
--- a/lts-startup/lts-startup-tasktracker/pom.xml
+++ b/lts-startup/lts-startup-tasktracker/pom.xml
@@ -5,7 +5,7 @@
lts-startup
com.lts
- 1.6.0-SNAPSHOT
+ 1.6.0-beta2
4.0.0
diff --git a/lts-startup/pom.xml b/lts-startup/pom.xml
index 8d73eb10e..aa4a85f38 100644
--- a/lts-startup/pom.xml
+++ b/lts-startup/pom.xml
@@ -5,7 +5,7 @@
lts-parent
com.lts
- 1.6.0-SNAPSHOT
+ 1.6.0-beta2
4.0.0
diff --git a/lts-tasktracker/pom.xml b/lts-tasktracker/pom.xml
index 24d71c225..245c12c2a 100644
--- a/lts-tasktracker/pom.xml
+++ b/lts-tasktracker/pom.xml
@@ -5,7 +5,7 @@
lts-parent
com.lts
- 1.6.0-SNAPSHOT
+ 1.6.0-beta2
4.0.0
diff --git a/lts-tasktracker/src/main/java/com/lts/tasktracker/logger/BizLoggerImpl.java b/lts-tasktracker/src/main/java/com/lts/tasktracker/logger/BizLoggerImpl.java
index 81bfb2545..8f17e1f3d 100644
--- a/lts-tasktracker/src/main/java/com/lts/tasktracker/logger/BizLoggerImpl.java
+++ b/lts-tasktracker/src/main/java/com/lts/tasktracker/logger/BizLoggerImpl.java
@@ -22,6 +22,9 @@
import java.util.List;
/**
+ * 业务日志记录器实现
+ * 1. 业务日志会发送给JobTracker
+ * 2. 也会采取Fail And Store 的方式
* @author Robert HG (254963746@qq.com) on 3/27/15.
*/
public class BizLoggerImpl implements BizLogger {
diff --git a/lts-tasktracker/src/main/java/com/lts/tasktracker/runner/JobRunnerDelegate.java b/lts-tasktracker/src/main/java/com/lts/tasktracker/runner/JobRunnerDelegate.java
index 20cc889a5..abf65757b 100644
--- a/lts-tasktracker/src/main/java/com/lts/tasktracker/runner/JobRunnerDelegate.java
+++ b/lts-tasktracker/src/main/java/com/lts/tasktracker/runner/JobRunnerDelegate.java
@@ -17,8 +17,11 @@
import java.io.StringWriter;
/**
+ * Job Runner 的代理类,
+ * 1. 做一些错误处理之类的
+ * 2. 监控统计
+ * 3. Context信息设置
* @author Robert HG (254963746@qq.com) on 8/16/14.
- * Job Runner 的代理类, 要做一些错误处理之类的
*/
public class JobRunnerDelegate implements Runnable {
diff --git a/lts-tasktracker/src/main/java/com/lts/tasktracker/runner/RunnerPool.java b/lts-tasktracker/src/main/java/com/lts/tasktracker/runner/RunnerPool.java
index 3779a3c22..672f4da7f 100644
--- a/lts-tasktracker/src/main/java/com/lts/tasktracker/runner/RunnerPool.java
+++ b/lts-tasktracker/src/main/java/com/lts/tasktracker/runner/RunnerPool.java
@@ -118,7 +118,7 @@ public void stopWorking() {
threadPoolExecutor.shutdownNow();
Thread.sleep(1000);
threadPoolExecutor = initThreadPoolExecutor();
- LOGGER.error("stop working succeed ");
+ LOGGER.info("stop working succeed ");
} catch (Throwable t) {
LOGGER.error("stop working failed ", t);
}
diff --git a/lts-tasktracker/src/main/java/com/lts/tasktracker/support/JobPullMachine.java b/lts-tasktracker/src/main/java/com/lts/tasktracker/support/JobPullMachine.java
index fc892d71b..8398e8bab 100644
--- a/lts-tasktracker/src/main/java/com/lts/tasktracker/support/JobPullMachine.java
+++ b/lts-tasktracker/src/main/java/com/lts/tasktracker/support/JobPullMachine.java
@@ -22,6 +22,9 @@
/**
* 用来向JobTracker去取任务
+ * 1. 会订阅JobTracker的可用,不可用消息主题的订阅
+ * 2. 只有当JobTracker可用的时候才会去Pull任务
+ * 3. Pull只是会给JobTracker发送一个通知
* Robert HG (254963746@qq.com) on 3/25/15.
*/
public class JobPullMachine {
diff --git a/pom.xml b/pom.xml
index 371c5c457..d78c7c6fe 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
com.lts
lts-parent
pom
- 1.6.0-SNAPSHOT
+ 1.6.0-beta2
lts-core
lts-jobtracker