瀏覽代碼

startup 模块合并

hugui 9 年之前
父節點
當前提交
d7d464dff1
共有 51 個文件被更改,包括 369 次插入547 次删除
  1. 10 27
      build.cmd
  2. 18 33
      build.sh
  3. 1 1
      lts-admin/src/main/resources/spring-core.xml
  4. 6 2
      lts-core/src/main/java/com/lts/core/support/bean/JdkCompiler.java
  5. 1 43
      lts-monitor/pom.xml
  6. 0 25
      lts-monitor/release.xml
  7. 0 12
      lts-monitor/src/test/java/com/lts/monitor/MonitorAgentStartupTest.java
  8. 0 46
      lts-startup/lts-startup-admin/pom.xml
  9. 0 16
      lts-startup/lts-startup-admin/src/main/resources/bin/lts-admin.cmd
  10. 0 96
      lts-startup/lts-startup-jobtracker/pom.xml
  11. 0 25
      lts-startup/lts-startup-jobtracker/release.xml
  12. 0 7
      lts-startup/lts-startup-jobtracker/src/main/resources/conf/zoo/log4j.properties
  13. 0 3
      lts-startup/lts-startup-jobtracker/src/main/resources/start.md
  14. 0 104
      lts-startup/lts-startup-tasktracker/pom.xml
  15. 0 25
      lts-startup/lts-startup-tasktracker/release.xml
  16. 0 7
      lts-startup/lts-startup-tasktracker/src/main/resources/conf/log4j.properties
  17. 0 17
      lts-startup/lts-startup-tasktracker/src/test/java/com/lts/startup/TaskTrackerStartupTest.java
  18. 271 8
      lts-startup/pom.xml
  19. 2 2
      lts-startup/release.xml
  20. 2 2
      lts-startup/src/main/java/com/lts/startup/admin/JettyContainer.java
  21. 1 1
      lts-startup/src/main/java/com/lts/startup/admin/NetUtils.java
  22. 1 1
      lts-startup/src/main/java/com/lts/startup/jobtracker/CfgException.java
  23. 1 1
      lts-startup/src/main/java/com/lts/startup/jobtracker/JobTrackerCfg.java
  24. 1 1
      lts-startup/src/main/java/com/lts/startup/jobtracker/JobTrackerCfgLoader.java
  25. 1 1
      lts-startup/src/main/java/com/lts/startup/jobtracker/JobTrackerStartup.java
  26. 1 1
      lts-startup/src/main/java/com/lts/startup/tasktracker/CfgException.java
  27. 1 1
      lts-startup/src/main/java/com/lts/startup/tasktracker/DefaultStartup.java
  28. 1 1
      lts-startup/src/main/java/com/lts/startup/tasktracker/LTSXmlApplicationContext.java
  29. 1 1
      lts-startup/src/main/java/com/lts/startup/tasktracker/SpringStartup.java
  30. 1 1
      lts-startup/src/main/java/com/lts/startup/tasktracker/TaskTrackerCfg.java
  31. 1 1
      lts-startup/src/main/java/com/lts/startup/tasktracker/TaskTrackerCfgLoader.java
  32. 1 1
      lts-startup/src/main/java/com/lts/startup/tasktracker/TaskTrackerFactoryBean.java
  33. 1 1
      lts-startup/src/main/java/com/lts/startup/tasktracker/TaskTrackerStartup.java
  34. 1 1
      lts-startup/src/main/java/com/lts/startup/tasktracker/test/TestJobRunner.java
  35. 3 3
      lts-startup/src/main/resources/bin/jobtracker.cmd
  36. 5 6
      lts-startup/src/main/resources/bin/jobtracker.sh
  37. 18 0
      lts-startup/src/main/resources/bin/lts-admin.cmd
  38. 4 4
      lts-startup/src/main/resources/bin/lts-admin.sh
  39. 3 3
      lts-startup/src/main/resources/bin/lts-monitor.cmd
  40. 3 3
      lts-startup/src/main/resources/bin/lts-monitor.sh
  41. 1 1
      lts-startup/src/main/resources/bin/tasktracker.sh
  42. 0 0
      lts-startup/src/main/resources/conf/log4j.properties
  43. 0 0
      lts-startup/src/main/resources/conf/lts-admin.cfg
  44. 0 0
      lts-startup/src/main/resources/conf/lts-monitor.cfg
  45. 0 0
      lts-startup/src/main/resources/conf/readme.txt
  46. 1 1
      lts-startup/src/main/resources/conf/tasktracker.cfg
  47. 0 0
      lts-startup/src/main/resources/conf/zoo/jobtracker.cfg
  48. 0 0
      lts-startup/src/main/resources/conf/zoo/log4j.properties
  49. 0 0
      lts-startup/src/main/resources/conf/zoo/lts-monitor.cfg
  50. 1 1
      lts-startup/src/main/resources/spring/lts-startup.xml
  51. 5 10
      lts/pom.xml

+ 10 - 27
build.cmd

@@ -13,39 +13,22 @@ md "%BASE_HOME%\dist\%DIST_BIN_DIR%"
 
 set LTS_Bin_Dir=%BASE_HOME%dist\%DIST_BIN_DIR%
 
-set JobTracker_Startup_Dir=%BASE_HOME%\lts-startup\lts-startup-jobtracker
-cd %JobTracker_Startup_Dir%
-start mvn assembly:assembly -DskipTests
-echo "LTS: mvn assembly:assembly -DskipTests"
+set Startup_Dir=%BASE_HOME%\lts-startup\lts-startup
+cd %Startup_Dir%
+start mvn clean assembly:assembly -DskipTests -Pdefault
+echo "LTS: mvn clean assembly:assembly -DskipTests -Pdefault"
 echo "LTS: After sub window finished, close it , and press any key to continue" & pause>nul
 
-xcopy /e /y "%JobTracker_Startup_Dir%\target\lts-bin\lts" "%LTS_Bin_Dir%"
+xcopy /e /y "%Startup_Dir%\target\lts-bin\lts" "%LTS_Bin_Dir%"
 cd ..\..\
 
-set LTS_Admin_Startup_Dir=%BASE_HOME%/lts-startup/lts-startup-admin
-cd %LTS_Admin_Startup_Dir%
-start mvn assembly:assembly -DskipTests
-echo "LTS: mvn assembly:assembly -DskipTests"
+cd %Startup_Dir%
+start mvn clean assembly:assembly -DskipTests -Plts-admin
+echo "LTS: mvn clean assembly:assembly -DskipTests -Plts-admin"
 echo "LTS: After sub window finished, close it , and press any key to continue" & pause>nul
 
-xcopy /e /y "%LTS_Admin_Startup_Dir%\target\lts-bin\lts" "%LTS_Bin_Dir%"
-xcopy /e /y "%BASE_HOME%\lts-admin\target\lts-admin-%VERSION%.war" "%LTS_Bin_Dir%\lts-admin\lts-admin.war"
+xcopy /e /y "%Startup_Dir%\target\lts-bin\lts" "%LTS_Bin_Dir%\war\lib"
 cd ..\..\
 
-set TaskTracker_Startup_Dir=%BASE_HOME%\lts-startup\lts-startup-tasktracker
-cd %TaskTracker_Startup_Dir%
-start mvn assembly:assembly -DskipTests
-echo "LTS: mvn assembly:assembly -DskipTests"
-echo "LTS: After sub window finished, close it , and press any key to continue" & pause>nul
-
-xcopy /e /y "%TaskTracker_Startup_Dir%\target\lts-bin\lts" "%LTS_Bin_Dir%"
-cd ..\..\
-
-set LTS_Monitor_Startup_Dir=%BASE_HOME%\lts-monitor
-cd %LTS_Monitor_Startup_Dir%
-start mvn assembly:assembly -DskipTests
-echo "LTS: mvn assembly:assembly -DskipTests"
-echo "LTS: After sub window finished, close it , and press any key to continue" & pause>nul
-
-xcopy /e /y "%LTS_Monitor_Startup_Dir%\target\lts-bin\lts" "%LTS_Bin_Dir%"
+xcopy /e /y "%BASE_HOME%\lts-admin\target\lts-admin-%VERSION%.war" "%LTS_Bin_Dir%\war\lts-admin.war"
 cd ..\..\

+ 18 - 33
build.sh

@@ -10,37 +10,22 @@ cd $LTS_Bin_Dir
 
 mvn clean install -U -DskipTests
 
-Dist_Bin_Dir="lts-$VERSION-bin"
-mkdir -p $LTS_Bin_Dir/dist/$Dist_Bin_Dir
-
-# JobTracker 的打包
-JobTracker_Startup_Dir="$LTS_Bin_Dir/lts-startup/lts-startup-jobtracker"
-cd $JobTracker_Startup_Dir
-mvn assembly:assembly -DskipTests
-
-# LTS-Admin 打包
-LTS_Admin_Startup_Dir="$LTS_Bin_Dir/lts-startup/lts-startup-admin"
-cd $LTS_Admin_Startup_Dir
-mvn assembly:assembly -DskipTests
-
-# TaskTracker 打包
-TaskTracker_Startup_Dir="$LTS_Bin_Dir/lts-startup/lts-startup-tasktracker"
-cd $TaskTracker_Startup_Dir
-mvn assembly:assembly -DskipTests
-
-# LTS-Monitor 打包
-LTS_Monitor_Startup_Dir="$LTS_Bin_Dir/lts-monitor"
-cd $LTS_Monitor_Startup_Dir
-mvn assembly:assembly -DskipTests
-
-
-cp -rf $JobTracker_Startup_Dir/target/lts-bin/lts/*  $LTS_Bin_Dir/dist/$Dist_Bin_Dir
-cp -rf $LTS_Admin_Startup_Dir/target/lts-bin/lts/*  $LTS_Bin_Dir/dist/$Dist_Bin_Dir
-cp -rf $TaskTracker_Startup_Dir/target/lts-bin/lts/*  $LTS_Bin_Dir/dist/$Dist_Bin_Dir
-cp -rf $LTS_Monitor_Startup_Dir/target/lts-bin/lts/*  $LTS_Bin_Dir/dist/$Dist_Bin_Dir
-cp -rf $LTS_Bin_Dir/lts-admin/target/lts-admin-$VERSION.war $LTS_Bin_Dir/dist/$Dist_Bin_Dir/lts-admin/lts-admin.war
-
-# cd $LTS_Bin_Dir/dist
-# zip -r $Dist_Bin_Dir.zip $Dist_Bin_Dir/*
-# rm -rf $Dist_Bin_Dir
+Dist_Bin_Dir="$LTS_Bin_Dir/dist/lts-$VERSION-bin"
+mkdir -p $Dist_Bin_Dir
+
+Dist_Bin_Dir="$(cd "$(dirname "${Dist_Bin_Dir}/.")"; pwd)"
+
+mkdir -p $Dist_Bin_Dir
+
+# 打包
+Startup_Dir="$LTS_Bin_Dir/lts-startup/"
+cd $Startup_Dir
+mvn clean assembly:assembly -DskipTests -Pdefault
+
+cp -rf $Startup_Dir/target/lts-bin/lts/*  $Dist_Bin_Dir
+
+mkdir -p $Dist_Bin_Dir/war/jetty/lib
+mvn clean assembly:assembly -DskipTests -Plts-admin
+cp -rf $Startup_Dir/target/lts-bin/lts/lib  $Dist_Bin_Dir/war/jetty
+cp -rf $LTS_Bin_Dir/lts-admin/target/lts-admin-$VERSION.war $Dist_Bin_Dir/war/lts-admin.war
 

+ 1 - 1
lts-admin/src/main/resources/spring-core.xml

@@ -9,7 +9,7 @@
         http://www.springframework.org/schema/context/spring-context-4.0.xsd http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop.xsd"
 >
 
-    <context:component-scan base-package="com.lts">
+    <context:component-scan base-package="com.lts.admin">
         <context:exclude-filter type="regex" expression="com.lts.admin.web.*"/>
     </context:component-scan>
 

+ 6 - 2
lts-core/src/main/java/com/lts/core/support/bean/JdkCompiler.java

@@ -35,7 +35,10 @@ public class JdkCompiler {
 //        options.add("-target");
 //        options.add("1.6");
         StandardJavaFileManager manager = compiler.getStandardFileManager(diagnosticCollector, null, null);
-        final ClassLoader loader = Thread.currentThread().getContextClassLoader();
+        ClassLoader loader = Thread.currentThread().getContextClassLoader();
+        if (loader.getClass().getName().equals("org.springframework.boot.context.embedded.tomcat.TomcatEmbeddedWebappClassLoader")) {
+            loader = loader.getParent();
+        }
         if (loader instanceof URLClassLoader
                 && (!loader.getClass().getName().equals("sun.misc.Launcher$AppClassLoader"))) {
             try {
@@ -49,9 +52,10 @@ public class JdkCompiler {
                 throw new IllegalStateException(e.getMessage(), e);
             }
         }
+        final ClassLoader finalLoader = loader;
         classLoader = AccessController.doPrivileged(new PrivilegedAction<ClassLoaderImpl>() {
             public ClassLoaderImpl run() {
-                return new ClassLoaderImpl(loader);
+                return new ClassLoaderImpl(finalLoader);
             }
         });
         javaFileManager = new JavaFileManagerImpl(manager, classLoader);

+ 1 - 43
lts-monitor/pom.xml

@@ -17,53 +17,11 @@
             <artifactId>lts-core</artifactId>
             <version>${project.parent.version}</version>
         </dependency>
-        <dependency>
-            <groupId>com.alibaba</groupId>
-            <artifactId>fastjson</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.alibaba</groupId>
-            <artifactId>druid</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>io.netty</groupId>
-            <artifactId>netty-all</artifactId>
-        </dependency>
         <dependency>
             <groupId>log4j</groupId>
             <artifactId>log4j</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.github.sgroschupf</groupId>
-            <artifactId>zkclient</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>redis.clients</groupId>
-            <artifactId>jedis</artifactId>
+            <scope>provided</scope>
         </dependency>
     </dependencies>
 
-    <build>
-        <plugins>
-            <plugin>
-                <artifactId>maven-assembly-plugin</artifactId>
-                <version>2.5.3</version>
-                <configuration>
-                    <finalName>lts</finalName>
-                    <descriptors>
-                        <descriptor>release.xml</descriptor>
-                    </descriptors>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
 </project>

+ 0 - 25
lts-monitor/release.xml

@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<assembly>
-    <id>bin</id>
-    <baseDirectory>lts</baseDirectory>
-    <formats>
-        <format>dir</format>
-    </formats>
-    <fileSets>
-        <fileSet>
-            <directory>${project.basedir}/src/main/resources/conf</directory>
-            <outputDirectory>lts-monitor/conf</outputDirectory>
-        </fileSet>
-        <fileSet>
-            <directory>${project.basedir}/src/main/resources/bin</directory>
-            <outputDirectory>bin</outputDirectory>
-        </fileSet>
-    </fileSets>
-
-    <dependencySets>
-        <dependencySet>
-            <useProjectArtifact>true</useProjectArtifact>
-            <outputDirectory>lts-monitor/lib</outputDirectory>
-        </dependencySet>
-    </dependencySets>
-</assembly>

+ 0 - 12
lts-monitor/src/test/java/com/lts/monitor/MonitorAgentStartupTest.java

@@ -1,12 +0,0 @@
-package com.lts.monitor;
-
-/**
- * @author Robert HG (254963746@qq.com) on 3/11/16.
- */
-public class MonitorAgentStartupTest {
-
-    public static void main(String[] args) {
-        MonitorAgentStartup.main(new String[]{"/Users/hugui/Data/Workspace/github/light-task-scheduler/lts-monitor/src/main/resources/conf/zoo"});
-
-    }
-}

+ 0 - 46
lts-startup/lts-startup-admin/pom.xml

@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <artifactId>lts-startup</artifactId>
-        <groupId>com.lts</groupId>
-        <version>1.6.7-SNAPSHOT</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>lts-startup-admin</artifactId>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.mortbay.jetty</groupId>
-            <artifactId>jetty</artifactId>
-            <version>6.1.26</version>
-        </dependency>
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>javax.servlet-api</artifactId>
-            <version>3.1.0</version>
-        </dependency>
-        <dependency>
-            <groupId>org.mortbay.jetty</groupId>
-            <artifactId>jsp-2.1-glassfish</artifactId>
-            <version>2.1.v20100127</version>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <artifactId>maven-assembly-plugin</artifactId>
-                <version>2.5.3</version>
-                <configuration>
-                    <finalName>lts</finalName>
-                    <descriptors>
-                        <descriptor>release.xml</descriptor>
-                    </descriptors>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-</project>

+ 0 - 16
lts-startup/lts-startup-admin/src/main/resources/bin/lts-admin.cmd

@@ -1,16 +0,0 @@
-@echo off
-
-set JVMFLAGS=-Dfile.encoding=UTF-8
-set BASE_HOME=%~dp0%..
-md "%BASE_HOME%\logs"
-
-set CLASSPATH=%BASE_HOME%\lts-admin\lib\*;%CLASSPATH%
-
-set LTS_MAIN=com.lts.startup.JettyContainer
-
-echo LTS-Admin started
-
-java -cp "%CLASSPATH%" %JVMFLAGS% %LTS_MAIN% "%BASE_HOME%\lts-admin" %*
-
-pause>null
-

+ 0 - 96
lts-startup/lts-startup-jobtracker/pom.xml

@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <artifactId>lts-startup</artifactId>
-        <groupId>com.lts</groupId>
-        <version>1.6.7-SNAPSHOT</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>lts-startup-jobtracker</artifactId>
-
-    <dependencies>
-        <dependency>
-            <groupId>com.lts</groupId>
-            <artifactId>lts-jobtracker</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>log4j</groupId>
-            <artifactId>log4j</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.github.sgroschupf</groupId>
-            <artifactId>zkclient</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.curator</groupId>
-            <artifactId>curator-recipes</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>redis.clients</groupId>
-            <artifactId>jedis</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.mina</groupId>
-            <artifactId>mina-core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.caucho</groupId>
-            <artifactId>hessian</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>io.netty</groupId>
-            <artifactId>netty-all</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.mapdb</groupId>
-            <artifactId>mapdb</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.alibaba</groupId>
-            <artifactId>fastjson</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-databind</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.alibaba</groupId>
-            <artifactId>druid</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.mongodb</groupId>
-            <artifactId>mongo-java-driver</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.mongodb.morphia</groupId>
-            <artifactId>morphia</artifactId>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <artifactId>maven-assembly-plugin</artifactId>
-                <version>2.5.3</version>
-                <configuration>
-                    <finalName>lts</finalName>
-                    <descriptors>
-                        <descriptor>release.xml</descriptor>
-                    </descriptors>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-</project>

+ 0 - 25
lts-startup/lts-startup-jobtracker/release.xml

@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<assembly>
-    <id>bin</id>
-    <baseDirectory>lts</baseDirectory>
-    <formats>
-        <format>dir</format>
-    </formats>
-    <fileSets>
-        <fileSet>
-            <directory>${project.basedir}/src/main/resources/conf</directory>
-            <outputDirectory>jobtracker/conf</outputDirectory>
-        </fileSet>
-        <fileSet>
-            <directory>${project.basedir}/src/main/resources/bin</directory>
-            <outputDirectory>bin</outputDirectory>
-        </fileSet>
-    </fileSets>
-
-    <dependencySets>
-        <dependencySet>
-            <useProjectArtifact>true</useProjectArtifact>
-            <outputDirectory>jobtracker/lib</outputDirectory>
-        </dependencySet>
-    </dependencySets>
-</assembly>

+ 0 - 7
lts-startup/lts-startup-jobtracker/src/main/resources/conf/zoo/log4j.properties

@@ -1,7 +0,0 @@
-
-log4j.rootLogger=INFO,stdout
-
-log4j.appender.stdout.Threshold=INFO
-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=[%-5p] [%d{HH:mm:ss}] %c - %m%n

+ 0 - 3
lts-startup/lts-startup-jobtracker/src/main/resources/start.md

@@ -1,3 +0,0 @@
-sh ./bin/jobtracker.sh zoo start
-sh ./bin/lts-admin.sh start
-sh ./tasktracker/bin/tasktracker.sh  start

+ 0 - 104
lts-startup/lts-startup-tasktracker/pom.xml

@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <artifactId>lts-startup</artifactId>
-        <groupId>com.lts</groupId>
-        <version>1.6.7-SNAPSHOT</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>lts-startup-tasktracker</artifactId>
-
-    <dependencies>
-        <dependency>
-            <groupId>com.lts</groupId>
-            <artifactId>lts-tasktracker</artifactId>
-            <version>${project.parent.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.lts</groupId>
-            <artifactId>lts-spring</artifactId>
-            <version>${project.parent.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>log4j</groupId>
-            <artifactId>log4j</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.github.sgroschupf</groupId>
-            <artifactId>zkclient</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.curator</groupId>
-            <artifactId>curator-recipes</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>redis.clients</groupId>
-            <artifactId>jedis</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.sleepycat</groupId>
-            <artifactId>je</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.rocksdb</groupId>
-            <artifactId>rocksdbjni</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.fusesource.leveldbjni</groupId>
-            <artifactId>leveldbjni-all</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-context</artifactId>
-            <version>${springframework.version}</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.mina</groupId>
-            <artifactId>mina-core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.caucho</groupId>
-            <artifactId>hessian</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>io.netty</groupId>
-            <artifactId>netty-all</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.mapdb</groupId>
-            <artifactId>mapdb</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.alibaba</groupId>
-            <artifactId>fastjson</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-databind</artifactId>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <artifactId>maven-assembly-plugin</artifactId>
-                <version>2.5.3</version>
-                <configuration>
-                    <finalName>lts</finalName>
-                    <descriptors>
-                        <descriptor>release.xml</descriptor>
-                    </descriptors>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>

+ 0 - 25
lts-startup/lts-startup-tasktracker/release.xml

@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<assembly>
-    <id>bin</id>
-    <baseDirectory>lts</baseDirectory>
-    <formats>
-        <format>dir</format>
-    </formats>
-    <fileSets>
-        <fileSet>
-            <directory>${project.basedir}/src/main/resources/conf</directory>
-            <outputDirectory>tasktracker/conf</outputDirectory>
-        </fileSet>
-        <fileSet>
-            <directory>${project.basedir}/src/main/resources/bin</directory>
-            <outputDirectory>tasktracker/bin</outputDirectory>
-        </fileSet>
-    </fileSets>
-
-    <dependencySets>
-        <dependencySet>
-            <useProjectArtifact>true</useProjectArtifact>
-            <outputDirectory>tasktracker/lib</outputDirectory>
-        </dependencySet>
-    </dependencySets>
-</assembly>

+ 0 - 7
lts-startup/lts-startup-tasktracker/src/main/resources/conf/log4j.properties

@@ -1,7 +0,0 @@
-
-log4j.rootLogger=INFO,stdout
-
-log4j.appender.stdout.Threshold=INFO
-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=[%-5p] [%d{HH:mm:ss}] %c - %m%n

+ 0 - 17
lts-startup/lts-startup-tasktracker/src/test/java/com/lts/startup/TaskTrackerStartupTest.java

@@ -1,17 +0,0 @@
-package com.lts.startup;
-
-import org.junit.Test;
-
-import static org.junit.Assert.*;
-
-/**
- * @author Robert HG (254963746@qq.com) on 2/16/16.
- */
-public class TaskTrackerStartupTest {
-
-    @Test
-    public void testMain() throws Exception {
-
-        TaskTrackerStartup.main(new String[]{"/Users/hugui/Data/Workspace/github/light-task-scheduler/lts-startup/lts-startup-tasktracker/src/main/resources/conf"});
-    }
-}

+ 271 - 8
lts-startup/pom.xml

@@ -8,13 +8,276 @@
         <version>1.6.7-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
-
+    <packaging>jar</packaging>
     <artifactId>lts-startup</artifactId>
-    <packaging>pom</packaging>
-    <modules>
-        <module>lts-startup-jobtracker</module>
-        <module>lts-startup-admin</module>
-        <module>lts-startup-tasktracker</module>
-    </modules>
 
-</project>
+    <dependencies>
+        <dependency>
+            <groupId>com.lts</groupId>
+            <artifactId>lts-jobtracker</artifactId>
+            <version>${project.parent.version}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.lts</groupId>
+            <artifactId>lts-monitor</artifactId>
+            <version>${project.parent.version}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.lts</groupId>
+            <artifactId>lts-tasktracker</artifactId>
+            <version>${project.parent.version}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.lts</groupId>
+            <artifactId>lts-spring</artifactId>
+            <version>${project.parent.version}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>log4j</groupId>
+            <artifactId>log4j</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.github.sgroschupf</groupId>
+            <artifactId>zkclient</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.curator</groupId>
+            <artifactId>curator-recipes</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>redis.clients</groupId>
+            <artifactId>jedis</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.mina</groupId>
+            <artifactId>mina-core</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.caucho</groupId>
+            <artifactId>hessian</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.netty</groupId>
+            <artifactId>netty-all</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.mapdb</groupId>
+            <artifactId>mapdb</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>fastjson</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-core</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>druid</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.mongodb</groupId>
+            <artifactId>mongo-java-driver</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.mongodb.morphia</groupId>
+            <artifactId>morphia</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.sleepycat</groupId>
+            <artifactId>je</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.rocksdb</groupId>
+            <artifactId>rocksdbjni</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.fusesource.leveldbjni</groupId>
+            <artifactId>leveldbjni-all</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-context</artifactId>
+            <version>${springframework.version}</version>
+            <scope>provided</scope>
+        </dependency>
+        <!--<dependency>-->
+        <!--<groupId>org.mortbay.jetty</groupId>-->
+        <!--<artifactId>jsp-2.1-glassfish</artifactId>-->
+        <!--<version>2.1.v20100127</version>-->
+        <!--</dependency>-->
+        <dependency>
+            <groupId>org.mortbay.jetty</groupId>
+            <artifactId>jetty</artifactId>
+            <version>6.1.26</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>javax.servlet-api</artifactId>
+            <version>3.1.0</version>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+
+    <profiles>
+        <profile>
+            <id>default</id>
+            <dependencies>
+                <dependency>
+                    <groupId>com.lts</groupId>
+                    <artifactId>lts-jobtracker</artifactId>
+                    <version>${project.parent.version}</version>
+                </dependency>
+                <dependency>
+                    <groupId>com.lts</groupId>
+                    <artifactId>lts-monitor</artifactId>
+                    <version>${project.parent.version}</version>
+                </dependency>
+                <dependency>
+                    <groupId>com.lts</groupId>
+                    <artifactId>lts-tasktracker</artifactId>
+                    <version>${project.parent.version}</version>
+                </dependency>
+                <dependency>
+                    <groupId>com.lts</groupId>
+                    <artifactId>lts-spring</artifactId>
+                    <version>${project.parent.version}</version>
+                </dependency>
+                <dependency>
+                    <groupId>log4j</groupId>
+                    <artifactId>log4j</artifactId>
+                </dependency>
+                <dependency>
+                    <groupId>com.github.sgroschupf</groupId>
+                    <artifactId>zkclient</artifactId>
+                </dependency>
+                <dependency>
+                    <groupId>org.apache.curator</groupId>
+                    <artifactId>curator-recipes</artifactId>
+                </dependency>
+                <dependency>
+                    <groupId>redis.clients</groupId>
+                    <artifactId>jedis</artifactId>
+                </dependency>
+                <dependency>
+                    <groupId>org.apache.mina</groupId>
+                    <artifactId>mina-core</artifactId>
+                </dependency>
+                <dependency>
+                    <groupId>com.caucho</groupId>
+                    <artifactId>hessian</artifactId>
+                </dependency>
+                <dependency>
+                    <groupId>io.netty</groupId>
+                    <artifactId>netty-all</artifactId>
+                </dependency>
+                <dependency>
+                    <groupId>org.mapdb</groupId>
+                    <artifactId>mapdb</artifactId>
+                </dependency>
+                <dependency>
+                    <groupId>com.alibaba</groupId>
+                    <artifactId>fastjson</artifactId>
+                </dependency>
+                <dependency>
+                    <groupId>com.fasterxml.jackson.core</groupId>
+                    <artifactId>jackson-core</artifactId>
+                </dependency>
+                <dependency>
+                    <groupId>com.fasterxml.jackson.core</groupId>
+                    <artifactId>jackson-databind</artifactId>
+                </dependency>
+                <dependency>
+                    <groupId>mysql</groupId>
+                    <artifactId>mysql-connector-java</artifactId>
+                </dependency>
+                <dependency>
+                    <groupId>com.alibaba</groupId>
+                    <artifactId>druid</artifactId>
+                </dependency>
+                <dependency>
+                    <groupId>org.mongodb</groupId>
+                    <artifactId>mongo-java-driver</artifactId>
+                </dependency>
+                <dependency>
+                    <groupId>org.mongodb.morphia</groupId>
+                    <artifactId>morphia</artifactId>
+                </dependency>
+                <dependency>
+                    <groupId>com.sleepycat</groupId>
+                    <artifactId>je</artifactId>
+                </dependency>
+                <dependency>
+                    <groupId>org.rocksdb</groupId>
+                    <artifactId>rocksdbjni</artifactId>
+                </dependency>
+                <dependency>
+                    <groupId>org.fusesource.leveldbjni</groupId>
+                    <artifactId>leveldbjni-all</artifactId>
+                </dependency>
+            </dependencies>
+        </profile>
+        <profile>
+            <id>lts-admin</id>
+            <dependencies>
+                <dependency>
+                    <groupId>org.mortbay.jetty</groupId>
+                    <artifactId>jetty</artifactId>
+                    <version>6.1.26</version>
+                </dependency>
+                <dependency>
+                    <groupId>javax.servlet</groupId>
+                    <artifactId>javax.servlet-api</artifactId>
+                    <version>3.1.0</version>
+                </dependency>
+            </dependencies>
+        </profile>
+    </profiles>
+
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <version>2.5.3</version>
+                <configuration>
+                    <finalName>lts</finalName>
+                    <descriptors>
+                        <descriptor>release.xml</descriptor>
+                    </descriptors>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>

+ 2 - 2
lts-startup/lts-startup-admin/release.xml → lts-startup/release.xml

@@ -8,7 +8,7 @@
     <fileSets>
         <fileSet>
             <directory>${project.basedir}/src/main/resources/conf</directory>
-            <outputDirectory>lts-admin/conf</outputDirectory>
+            <outputDirectory>conf</outputDirectory>
         </fileSet>
         <fileSet>
             <directory>${project.basedir}/src/main/resources/bin</directory>
@@ -19,7 +19,7 @@
     <dependencySets>
         <dependencySet>
             <useProjectArtifact>true</useProjectArtifact>
-            <outputDirectory>lts-admin/lib</outputDirectory>
+            <outputDirectory>lib</outputDirectory>
         </dependencySet>
     </dependencySets>
 </assembly>

+ 2 - 2
lts-startup/lts-startup-admin/src/main/java/com/lts/startup/JettyContainer.java → lts-startup/src/main/java/com/lts/startup/admin/JettyContainer.java

@@ -1,4 +1,4 @@
-package com.lts.startup;
+package com.lts.startup.admin;
 
 import org.mortbay.jetty.Server;
 import org.mortbay.jetty.webapp.WebAppContext;
@@ -31,7 +31,7 @@ public class JettyContainer {
 
             Server server = new Server(Integer.parseInt(port));
             WebAppContext webapp = new WebAppContext();
-            webapp.setWar(confPath + "/lts-admin.war");
+            webapp.setWar(confPath + "/war/lts-admin.war");
             Map<String, String> initParams = new HashMap<String, String>();
             initParams.put("lts.admin.config.path", confPath + "/conf");
             webapp.setInitParams(initParams);

+ 1 - 1
lts-startup/lts-startup-admin/src/main/java/com/lts/startup/NetUtils.java → lts-startup/src/main/java/com/lts/startup/admin/NetUtils.java

@@ -1,4 +1,4 @@
-package com.lts.startup;
+package com.lts.startup.admin;
 
 import java.net.InetAddress;
 import java.net.NetworkInterface;

+ 1 - 1
lts-startup/lts-startup-tasktracker/src/main/java/com/lts/startup/CfgException.java → lts-startup/src/main/java/com/lts/startup/jobtracker/CfgException.java

@@ -1,4 +1,4 @@
-package com.lts.startup;
+package com.lts.startup.jobtracker;
 
 /**
  * @author Robert HG (254963746@qq.com) on 9/1/15.

+ 1 - 1
lts-startup/lts-startup-jobtracker/src/main/java/com/lts/startup/JobTrackerCfg.java → lts-startup/src/main/java/com/lts/startup/jobtracker/JobTrackerCfg.java

@@ -1,4 +1,4 @@
-package com.lts.startup;
+package com.lts.startup.jobtracker;
 
 import java.util.Map;
 

+ 1 - 1
lts-startup/lts-startup-jobtracker/src/main/java/com/lts/startup/JobTrackerCfgLoader.java → lts-startup/src/main/java/com/lts/startup/jobtracker/JobTrackerCfgLoader.java

@@ -1,4 +1,4 @@
-package com.lts.startup;
+package com.lts.startup.jobtracker;
 
 import com.lts.core.commons.file.FileUtils;
 import com.lts.core.commons.utils.StringUtils;

+ 1 - 1
lts-startup/lts-startup-jobtracker/src/main/java/com/lts/startup/JobTrackerStartup.java → lts-startup/src/main/java/com/lts/startup/jobtracker/JobTrackerStartup.java

@@ -1,4 +1,4 @@
-package com.lts.startup;
+package com.lts.startup.jobtracker;
 
 import com.lts.core.commons.utils.StringUtils;
 import com.lts.jobtracker.JobTracker;

+ 1 - 1
lts-startup/lts-startup-jobtracker/src/main/java/com/lts/startup/CfgException.java → lts-startup/src/main/java/com/lts/startup/tasktracker/CfgException.java

@@ -1,4 +1,4 @@
-package com.lts.startup;
+package com.lts.startup.tasktracker;
 
 /**
  * @author Robert HG (254963746@qq.com) on 9/1/15.

+ 1 - 1
lts-startup/lts-startup-tasktracker/src/main/java/com/lts/startup/DefaultStartup.java → lts-startup/src/main/java/com/lts/startup/tasktracker/DefaultStartup.java

@@ -1,4 +1,4 @@
-package com.lts.startup;
+package com.lts.startup.tasktracker;
 
 import com.lts.core.constant.Level;
 import com.lts.tasktracker.TaskTracker;

+ 1 - 1
lts-startup/lts-startup-tasktracker/src/main/java/com/lts/startup/LTSXmlApplicationContext.java → lts-startup/src/main/java/com/lts/startup/tasktracker/LTSXmlApplicationContext.java

@@ -1,4 +1,4 @@
-package com.lts.startup;
+package com.lts.startup.tasktracker;
 
 import com.lts.core.logger.Logger;
 import com.lts.core.logger.LoggerFactory;

+ 1 - 1
lts-startup/lts-startup-tasktracker/src/main/java/com/lts/startup/SpringStartup.java → lts-startup/src/main/java/com/lts/startup/tasktracker/SpringStartup.java

@@ -1,4 +1,4 @@
-package com.lts.startup;
+package com.lts.startup.tasktracker;
 
 import com.lts.tasktracker.TaskTracker;
 import org.springframework.context.ApplicationContext;

+ 1 - 1
lts-startup/lts-startup-tasktracker/src/main/java/com/lts/startup/TaskTrackerCfg.java → lts-startup/src/main/java/com/lts/startup/tasktracker/TaskTrackerCfg.java

@@ -1,4 +1,4 @@
-package com.lts.startup;
+package com.lts.startup.tasktracker;
 
 import com.lts.core.constant.Level;
 

+ 1 - 1
lts-startup/lts-startup-tasktracker/src/main/java/com/lts/startup/TaskTrackerCfgLoader.java → lts-startup/src/main/java/com/lts/startup/tasktracker/TaskTrackerCfgLoader.java

@@ -1,4 +1,4 @@
-package com.lts.startup;
+package com.lts.startup.tasktracker;
 
 import com.lts.core.commons.file.FileUtils;
 import com.lts.core.commons.utils.Assert;

+ 1 - 1
lts-startup/lts-startup-tasktracker/src/main/java/com/lts/startup/TaskTrackerFactoryBean.java → lts-startup/src/main/java/com/lts/startup/tasktracker/TaskTrackerFactoryBean.java

@@ -1,4 +1,4 @@
-package com.lts.startup;
+package com.lts.startup.tasktracker;
 
 import com.lts.core.commons.utils.CollectionUtils;
 import com.lts.spring.TaskTrackerAnnotationFactoryBean;

+ 1 - 1
lts-startup/lts-startup-tasktracker/src/main/java/com/lts/startup/TaskTrackerStartup.java → lts-startup/src/main/java/com/lts/startup/tasktracker/TaskTrackerStartup.java

@@ -1,4 +1,4 @@
-package com.lts.startup;
+package com.lts.startup.tasktracker;
 
 import com.lts.tasktracker.TaskTracker;
 

+ 1 - 1
lts-startup/lts-startup-tasktracker/src/main/java/com/lts/startup/test/TestJobRunner.java → lts-startup/src/main/java/com/lts/startup/tasktracker/test/TestJobRunner.java

@@ -1,4 +1,4 @@
-package com.lts.startup.test;
+package com.lts.startup.tasktracker.test;
 
 import com.lts.core.domain.Action;
 import com.lts.core.json.JSON;

+ 3 - 3
lts-startup/lts-startup-jobtracker/src/main/resources/bin/jobtracker.cmd → lts-startup/src/main/resources/bin/jobtracker.cmd

@@ -5,11 +5,11 @@ set JVMFLAGS=-Dfile.encoding=UTF-8
 set BASE_HOME=%~dp0%..\
 md "%BASE_HOME%\logs"
 
-set CLASSPATH=%BASE_HOME%\jobtracker\lib\*;%CLASSPATH%
+set CLASSPATH=%BASE_HOME%\lib\*;%CLASSPATH%
 
-set CONF_HOME=%BASE_HOME%\jobtracker\conf\%NODE_NAME%
+set CONF_HOME=%BASE_HOME%\conf\%NODE_NAME%
 
-set LTS_MAIN=com.lts.startup.JobTrackerStartup
+set LTS_MAIN=com.lts.startup.jobtracker.JobTrackerStartup
 
 echo JobTracker [%NODE_NAME%] started
 java -cp "%CLASSPATH%" %JVMFLAGS% %LTS_MAIN% "%CONF_HOME%" %*

+ 5 - 6
lts-startup/lts-startup-jobtracker/src/main/resources/bin/jobtracker.sh → lts-startup/src/main/resources/bin/jobtracker.sh

@@ -17,7 +17,7 @@ mkdir -p $JOB_TRACKER_HOME/../logs
 mkdir -p $JOB_TRACKER_HOME/../pid
 
 #把lib下的所有jar都加入到classpath中
-for i in "$JOB_TRACKER_HOME"/../jobtracker/lib/*.jar
+for i in "$JOB_TRACKER_HOME"/../lib/*.jar
 do
 	CLASSPATH="$i:$CLASSPATH"
 done
@@ -27,13 +27,12 @@ done
 NODE_NAME="$1"  # zoo
 
 # 转化为绝对路径
-CONF_HOME="$JOB_TRACKER_HOME/../jobtracker"
-CONF_HOME=$(cd "$(dirname "$CONF_HOME")"; pwd)
-CONF_HOME="$CONF_HOME/jobtracker/conf/$NODE_NAME"
-# echo $CONF_HOME
+CONF_HOME="${JOB_TRACKER_HOME}/../."
+CONF_HOME="$(cd "$(dirname "${CONF_HOME}")"; pwd)"
+CONF_HOME="$CONF_HOME/conf/$NODE_NAME"
 
 _LTS_DAEMON_OUT="$JOB_TRACKER_HOME/../logs/jobtracker-$NODE_NAME.out"
-LTS_MAIN="com.lts.startup.JobTrackerStartup"
+LTS_MAIN="com.lts.startup.jobtracker.JobTrackerStartup"
 
 LTS_PID_FILE="$JOB_TRACKER_HOME/../pid/jobtracker-$NODE_NAME.pid"
 

+ 18 - 0
lts-startup/src/main/resources/bin/lts-admin.cmd

@@ -0,0 +1,18 @@
+@echo off
+
+set JVMFLAGS=-Dfile.encoding=UTF-8
+set BASE_HOME=%~dp0%..
+md "%BASE_HOME%\logs"
+
+set CLASSPATH=%BASE_HOME%\war\jetty\lib\*;%CLASSPATH%
+
+set LTS_MAIN=com.lts.startup.admin.JettyContainer
+
+echo LTS-Admin started
+
+java -cp "%CLASSPATH%" %JVMFLAGS% %LTS_MAIN% "%BASE_HOME%" %*
+
+pause>null
+
+
+

+ 4 - 4
lts-startup/lts-startup-admin/src/main/resources/bin/lts-admin.sh → lts-startup/src/main/resources/bin/lts-admin.sh

@@ -13,8 +13,8 @@ else
   JAVA=java
 fi
 
-#把lts-admin/lib下的所有jar都加入到classpath中
-for i in "$LTS_ADMIN_HOME"/../lts-admin/lib/*.jar
+#把lib下的所有jar都加入到classpath中
+for i in "$LTS_ADMIN_HOME"/../war/jetty/lib/*.jar
 do
 	CLASSPATH="$i:$CLASSPATH"
 done
@@ -25,12 +25,12 @@ mkdir -p $LTS_ADMIN_HOME/../logs
 mkdir -p $LTS_ADMIN_HOME/../pid
 
 # 转化为绝对路径
-CONF_HOME="$LTS_ADMIN_HOME/../lts-admin/conf"
+CONF_HOME="$LTS_ADMIN_HOME/../."
 CONF_HOME=$(cd "$(dirname "$CONF_HOME")"; pwd)
 # echo $CONF_HOME
 
 _LTS_DAEMON_OUT="$LTS_ADMIN_HOME/../logs/lts-admin.out"
-LTS_MAIN="com.lts.startup.JettyContainer"
+LTS_MAIN="com.lts.startup.admin.JettyContainer"
 
 LTS_PID_FILE="$LTS_ADMIN_HOME/../pid/lts-admin.pid"
 

+ 3 - 3
lts-monitor/src/main/resources/bin/lts-monitor.cmd → lts-startup/src/main/resources/bin/lts-monitor.cmd

@@ -5,11 +5,11 @@ set JVMFLAGS=-Dfile.encoding=UTF-8
 set BASE_HOME=%~dp0%..\
 md "%BASE_HOME%\logs"
 
-set CLASSPATH=%BASE_HOME%\lts-monitor\lib\*;%CLASSPATH%
+set CLASSPATH=%BASE_HOME%\lib\*;%CLASSPATH%
 
-set CONF_HOME=%BASE_HOME%\lts-monitor\conf\%NODE_NAME%
+set CONF_HOME=%BASE_HOME%\conf\%NODE_NAME%
 
-set LTS_MAIN=com.lts.monitor.MonitorStartup
+set LTS_MAIN=com.lts.monitor.MonitorAgentStartup
 
 echo LtsMonitor [%NODE_NAME%] started
 java -cp "%CLASSPATH%" %JVMFLAGS% %LTS_MAIN% "%CONF_HOME%" %*

+ 3 - 3
lts-monitor/src/main/resources/bin/lts-monitor.sh → lts-startup/src/main/resources/bin/lts-monitor.sh

@@ -17,7 +17,7 @@ mkdir -p $LTS_MONITOR_HOME/../logs
 mkdir -p $LTS_MONITOR_HOME/../pid
 
 #把lib下的所有jar都加入到classpath中
-for i in "$LTS_MONITOR_HOME"/../lts-monitor/lib/*.jar
+for i in "$LTS_MONITOR_HOME"/../lib/*.jar
 do
 	CLASSPATH="$i:$CLASSPATH"
 done
@@ -27,9 +27,9 @@ done
 NODE_NAME="$1"  # zoo
 
 # 转化为绝对路径
-CONF_HOME="$LTS_MONITOR_HOME/../lts-monitor"
+CONF_HOME="$LTS_MONITOR_HOME/../."
 CONF_HOME=$(cd "$(dirname "$CONF_HOME")"; pwd)
-CONF_HOME="$CONF_HOME/lts-monitor/conf/$NODE_NAME"
+CONF_HOME="$CONF_HOME/conf/$NODE_NAME"
 # echo $CONF_HOME
 
 _LTS_DAEMON_OUT="$LTS_MONITOR_HOME/../logs/lts-monitor-$NODE_NAME.out"

+ 1 - 1
lts-startup/lts-startup-tasktracker/src/main/resources/bin/tasktracker.sh → lts-startup/src/main/resources/bin/tasktracker.sh

@@ -29,7 +29,7 @@ CONF_HOME="$TASK_TRACKER_HOME/conf/"
 # echo $CONF_HOME
 
 _LTS_DAEMON_OUT="$TASK_TRACKER_HOME/logs/tasktracker.out"
-LTS_MAIN="com.lts.startup.TaskTrackerStartup"
+LTS_MAIN="com.lts.startup.tasktracker.TaskTrackerStartup"
 
 LTS_PID_FILE="$TASK_TRACKER_HOME/pid/tasktracker.pid"
 

+ 0 - 0
lts-monitor/src/main/resources/conf/zoo/log4j.properties → lts-startup/src/main/resources/conf/log4j.properties


+ 0 - 0
lts-startup/lts-startup-admin/src/main/resources/conf/lts-admin.cfg → lts-startup/src/main/resources/conf/lts-admin.cfg


+ 0 - 0
lts-startup/lts-startup-admin/src/main/resources/conf/lts-monitor.cfg → lts-startup/src/main/resources/conf/lts-monitor.cfg


+ 0 - 0
lts-startup/lts-startup-jobtracker/src/main/resources/conf/readme.txt → lts-startup/src/main/resources/conf/readme.txt


+ 1 - 1
lts-startup/lts-startup-tasktracker/src/main/resources/conf/tasktracker.cfg → lts-startup/src/main/resources/conf/tasktracker.cfg

@@ -9,7 +9,7 @@ clusterName=test_cluster
 nodeGroup=test_trade_taskTracker
 
 # JobRunner 任务执行类
-jobRunnerClass=com.lts.startup.test.TestJobRunner
+jobRunnerClass=com.lts.startup.tasktracker.test.TestJobRunner
 
 # 运行线程数
 workThreads=10

+ 0 - 0
lts-startup/lts-startup-jobtracker/src/main/resources/conf/zoo/jobtracker.cfg → lts-startup/src/main/resources/conf/zoo/jobtracker.cfg


+ 0 - 0
lts-startup/lts-startup-admin/src/main/resources/conf/log4j.properties → lts-startup/src/main/resources/conf/zoo/log4j.properties


+ 0 - 0
lts-monitor/src/main/resources/conf/zoo/lts-monitor.cfg → lts-startup/src/main/resources/conf/zoo/lts-monitor.cfg


+ 1 - 1
lts-startup/lts-startup-tasktracker/src/main/resources/spring/lts-startup.xml → lts-startup/src/main/resources/spring/lts-startup.xml

@@ -5,6 +5,6 @@
         http://www.springframework.org/schema/beans/spring-beans-4.0.xsd"
         >
 
-    <bean id="ltsTaskTracker" class="com.lts.startup.TaskTrackerFactoryBean"/>
+    <bean id="ltsTaskTracker" class="com.lts.startup.tasktracker.TaskTrackerFactoryBean"/>
 
 </beans>

+ 5 - 10
lts/pom.xml

@@ -33,16 +33,11 @@
             <artifactId>lts-spring</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <!--<dependency>-->
-        <!--<groupId>com.lts</groupId>-->
-        <!--<artifactId>lts-startup-jobtracker</artifactId>-->
-        <!--<version>${project.version}</version>-->
-        <!--</dependency>-->
-        <!--<dependency>-->
-        <!--<groupId>com.lts</groupId>-->
-        <!--<artifactId>lts-startup-tasktracker</artifactId>-->
-        <!--<version>${project.version}</version>-->
-        <!--</dependency>-->
+        <dependency>
+            <groupId>com.lts</groupId>
+            <artifactId>lts-monitor</artifactId>
+            <version>${project.version}</version>
+        </dependency>
     </dependencies>
 
     <build>