no message

2024-11-13 16:24:05 +08:00 · 2024-11-13 16:24:05 +08:00 · 1c720981b9
parent 4c8e54f725
commit 1c720981b9
56 changed files with 109 additions and 27 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1 +1,3 @@
 target/
+.idea/
+.settings/
--- a/.settings/org.eclipse.jdt.core.prefs
+++ b/.settings/org.eclipse.jdt.core.prefs
@ -1,12 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.6
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.6
--- a/lib/activation-1.0.2.jar
+++ b/lib/activation-1.0.2.jar
--- a/lib/antlr-2.7.6rc1.jar
+++ b/lib/antlr-2.7.6rc1.jar
--- a/lib/asm-2.2.jar
+++ b/lib/asm-2.2.jar
--- a/lib/cglib-nodep-2.1.jar
+++ b/lib/cglib-nodep-2.1.jar
--- a/lib/commons-beanutils-1.7.0.jar
+++ b/lib/commons-beanutils-1.7.0.jar
--- a/lib/commons-cli-1.0.jar
+++ b/lib/commons-cli-1.0.jar
--- a/lib/commons-codec-1.3.jar
+++ b/lib/commons-codec-1.3.jar
--- a/lib/commons-collections-3.1.jar
+++ b/lib/commons-collections-3.1.jar
--- a/lib/commons-dbcp-1.2.1.jar
+++ b/lib/commons-dbcp-1.2.1.jar
--- a/lib/commons-digester-1.7.jar
+++ b/lib/commons-digester-1.7.jar
--- a/lib/commons-fileupload-1.2.1.jar
+++ b/lib/commons-fileupload-1.2.1.jar
--- a/lib/commons-httpclient-3.1.jar
+++ b/lib/commons-httpclient-3.1.jar
--- a/lib/commons-io-1.3.2.jar
+++ b/lib/commons-io-1.3.2.jar
--- a/lib/commons-lang-2.1.jar
+++ b/lib/commons-lang-2.1.jar
--- a/lib/commons-logging-1.0.4.jar
+++ b/lib/commons-logging-1.0.4.jar
--- a/lib/commons-pool-1.2.jar
+++ b/lib/commons-pool-1.2.jar
--- a/lib/dom4j-1.6.1.jar
+++ b/lib/dom4j-1.6.1.jar
--- a/lib/el-api.jar
+++ b/lib/el-api.jar
--- a/lib/ezmorph-1.0.3.jar
+++ b/lib/ezmorph-1.0.3.jar
--- a/lib/gwt-servlet-1.5.3.jar
+++ b/lib/gwt-servlet-1.5.3.jar
--- a/lib/gwt-user-1.5.3.jar
+++ b/lib/gwt-user-1.5.3.jar
--- a/lib/gwtext-2.0.5.jar
+++ b/lib/gwtext-2.0.5.jar
--- a/lib/hibernate-3.2.jar
+++ b/lib/hibernate-3.2.jar
--- a/lib/high-server-1.1.1.jar
+++ b/lib/high-server-1.1.1.jar
--- a/lib/httpclient-4.2.1.jar
+++ b/lib/httpclient-4.2.1.jar
--- a/lib/httpcore-4.2.2.jar
+++ b/lib/httpcore-4.2.2.jar
--- a/lib/jasper-el.jar
+++ b/lib/jasper-el.jar
--- a/lib/jasper-jdt.jar
+++ b/lib/jasper-jdt.jar
--- a/lib/jasper.jar
+++ b/lib/jasper.jar
--- a/lib/jaxen-1.1-beta-5.jar
+++ b/lib/jaxen-1.1-beta-5.jar
--- a/lib/json-1.1.1.jar
+++ b/lib/json-1.1.1.jar
--- a/lib/json-lib-2.1-jdk15.jar
+++ b/lib/json-lib-2.1-jdk15.jar
--- a/lib/jsp-api.jar
+++ b/lib/jsp-api.jar
--- a/lib/jta-1.0.1.jar
+++ b/lib/jta-1.0.1.jar
--- a/lib/jxl-2.6.10.jar
+++ b/lib/jxl-2.6.10.jar
--- a/lib/log4j-1.2.12.jar
+++ b/lib/log4j-1.2.12.jar
--- a/lib/low-server-1.1.1.jar
+++ b/lib/low-server-1.1.1.jar
--- a/lib/mail-1.3.2.jar
+++ b/lib/mail-1.3.2.jar
--- a/lib/odmg-3.0.jar
+++ b/lib/odmg-3.0.jar
--- a/lib/ognl-2.6.5.jar
+++ b/lib/ognl-2.6.5.jar
--- a/lib/ojdbc14-10.2.0.1.0.jar
+++ b/lib/ojdbc14-10.2.0.1.0.jar
--- a/lib/org.mortbay.jetty.jar
+++ b/lib/org.mortbay.jetty.jar
--- a/lib/pinyin4j-2.5.0.jar
+++ b/lib/pinyin4j-2.5.0.jar
--- a/lib/push-0.0.1-SNAPSHOT.jar
+++ b/lib/push-0.0.1-SNAPSHOT.jar
--- a/lib/quartz-1.5.2.jar
+++ b/lib/quartz-1.5.2.jar
--- a/lib/sd-wms-1.1.1.jar
+++ b/lib/sd-wms-1.1.1.jar
--- a/lib/servlet-api-2.4-20040521.jar
+++ b/lib/servlet-api-2.4-20040521.jar
--- a/lib/spring-2m.jar
+++ b/lib/spring-2m.jar
--- a/lib/sqljdbc-2005.jar
+++ b/lib/sqljdbc-2005.jar
--- a/lib/tomcat-juli-7.0.0.jar
+++ b/lib/tomcat-juli-7.0.0.jar
--- a/lib/web-client-1.1.1.jar
+++ b/lib/web-client-1.1.1.jar
--- a/lib/xalan-2.4.0.jar
+++ b/lib/xalan-2.4.0.jar
--- a/sdtms.iml
+++ b/sdtms.iml
@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="EclipseModuleManager">
+    <varelement var="file://$MAVEN_REPO$/acegisecurity/jars/acegi-security-0.8.3.jar" value="MAVEN_REPO/acegisecurity/jars/acegi-security-0.8.3.jar" />
+    <varelement var="file://$MAVEN_REPO$/web/jars/low-server-1.1.1.jar" value="MAVEN_REPO/web/jars/low-server-1.1.1.jar" />
+    <varelement var="file://$MAVEN_REPO$/web/jars/high-server-1.1.1.jar" value="MAVEN_REPO/web/jars/high-server-1.1.1.jar" />
+    <varelement var="file://$MAVEN_REPO$/web/jars/web-client-1.1.1.jar" value="MAVEN_REPO/web/jars/web-client-1.1.1.jar" />
+    <varelement var="file://$MAVEN_REPO$/gxt/jars/gwtext-2.0.5.jar" value="MAVEN_REPO/gxt/jars/gwtext-2.0.5.jar" />
+    <varelement var="file://$MAVEN_REPO$/ognl/jars/ognl-2.6.5.jar" value="MAVEN_REPO/ognl/jars/ognl-2.6.5.jar" />
+    <varelement var="file://$MAVEN_REPO$/commons-logging/jars/commons-logging-1.0.4.jar" value="MAVEN_REPO/commons-logging/jars/commons-logging-1.0.4.jar" />
+    <varelement var="file://$MAVEN_REPO$/log4j/jars/log4j-1.2.12.jar" value="MAVEN_REPO/log4j/jars/log4j-1.2.12.jar" />
+    <varelement var="file://$MAVEN_REPO$/jxl/jars/jxl-2.6.jar" value="MAVEN_REPO/jxl/jars/jxl-2.6.jar" />
+    <varelement var="file://$MAVEN_REPO$/hibernate/jars/hibernate-3.2.jar" value="MAVEN_REPO/hibernate/jars/hibernate-3.2.jar" />
+    <varelement var="file://$MAVEN_REPO$/ehcache/jars/ehcache-1.2.jar" value="MAVEN_REPO/ehcache/jars/ehcache-1.2.jar" />
+    <varelement var="file://$MAVEN_REPO$/cglib/jars/cglib-nodep-2.1.jar" value="MAVEN_REPO/cglib/jars/cglib-nodep-2.1.jar" />
+    <varelement var="file://$MAVEN_REPO$/asm/jars/asm-2.2.jar" value="MAVEN_REPO/asm/jars/asm-2.2.jar" />
+    <varelement var="file://$MAVEN_REPO$/antlr/jars/antlr-2.7.6rc1.jar" value="MAVEN_REPO/antlr/jars/antlr-2.7.6rc1.jar" />
+    <varelement var="file://$MAVEN_REPO$/commons-collections/jars/commons-collections-3.1.jar" value="MAVEN_REPO/commons-collections/jars/commons-collections-3.1.jar" />
+    <varelement var="file://$MAVEN_REPO$/dom4j/jars/dom4j-1.6.1.jar" value="MAVEN_REPO/dom4j/jars/dom4j-1.6.1.jar" />
+    <varelement var="file://$MAVEN_REPO$/odmg/jars/odmg-3.0.jar" value="MAVEN_REPO/odmg/jars/odmg-3.0.jar" />
+    <varelement var="file://$MAVEN_REPO$/xalan/jars/xalan-2.4.0.jar" value="MAVEN_REPO/xalan/jars/xalan-2.4.0.jar" />
+    <varelement var="file://$MAVEN_REPO$/springframework/jars/spring-2m.jar" value="MAVEN_REPO/springframework/jars/spring-2m.jar" />
+    <varelement var="file://$MAVEN_REPO$/springframework/jars/spring-mock-2.0-rc3.jar" value="MAVEN_REPO/springframework/jars/spring-mock-2.0-rc3.jar" />
+    <varelement var="file://$MAVEN_REPO$/jta/jars/jta-1.0.1.jar" value="MAVEN_REPO/jta/jars/jta-1.0.1.jar" />
+    <varelement var="file://$MAVEN_REPO$/javamail/jars/mail-1.3.2.jar" value="MAVEN_REPO/javamail/jars/mail-1.3.2.jar" />
+    <varelement var="file://$MAVEN_REPO$/jaf/jars/activation-1.0.2.jar" value="MAVEN_REPO/jaf/jars/activation-1.0.2.jar" />
+    <varelement var="file://$MAVEN_REPO$/gwt/jars/gwt-user-1.5.3.jar" value="MAVEN_REPO/gwt/jars/gwt-user-1.5.3.jar" />
+    <varelement var="file://$MAVEN_REPO$/gwt/jars/gwt-servlet-1.5.3.jar" value="MAVEN_REPO/gwt/jars/gwt-servlet-1.5.3.jar" />
+    <varelement var="file://$MAVEN_REPO$/commons-codec/jars/commons-codec-1.3.jar" value="MAVEN_REPO/commons-codec/jars/commons-codec-1.3.jar" />
+    <varelement var="file://$MAVEN_REPO$/commons-httpclient/jars/commons-httpclient-3.1.jar" value="MAVEN_REPO/commons-httpclient/jars/commons-httpclient-3.1.jar" />
+    <varelement var="file://$MAVEN_REPO$/commons-digester/jars/commons-digester-1.7.jar" value="MAVEN_REPO/commons-digester/jars/commons-digester-1.7.jar" />
+    <varelement var="file://$MAVEN_REPO$/commons-dbcp/jars/commons-dbcp-1.2.1.jar" value="MAVEN_REPO/commons-dbcp/jars/commons-dbcp-1.2.1.jar" />
+    <varelement var="file://$MAVEN_REPO$/commons-pool/jars/commons-pool-1.2.jar" value="MAVEN_REPO/commons-pool/jars/commons-pool-1.2.jar" />
+    <varelement var="file://$MAVEN_REPO$/commons-lang/jars/commons-lang-2.1.jar" value="MAVEN_REPO/commons-lang/jars/commons-lang-2.1.jar" />
+    <varelement var="file://$MAVEN_REPO$/commons-beanutils/jars/commons-beanutils-1.7.0.jar" value="MAVEN_REPO/commons-beanutils/jars/commons-beanutils-1.7.0.jar" />
+    <varelement var="file://$MAVEN_REPO$/quartz/jars/quartz-1.5.2.jar" value="MAVEN_REPO/quartz/jars/quartz-1.5.2.jar" />
+    <varelement var="file://$MAVEN_REPO$/hsqldb/jars/hsqldb-1.8.0.1.jar" value="MAVEN_REPO/hsqldb/jars/hsqldb-1.8.0.1.jar" />
+    <varelement var="file://$MAVEN_REPO$/mysql/jars/mysql-connector-java-5.0.3-bin.jar" value="MAVEN_REPO/mysql/jars/mysql-connector-java-5.0.3-bin.jar" />
+    <varelement var="file://$MAVEN_REPO$/ojdbc/jars/ojdbc14-10.2.0.1.0.jar" value="MAVEN_REPO/ojdbc/jars/ojdbc14-10.2.0.1.0.jar" />
+    <varelement var="file://$MAVEN_REPO$/junit/jars/junit-3.8.1.jar" value="MAVEN_REPO/junit/jars/junit-3.8.1.jar" />
+    <varelement var="file://$MAVEN_REPO$/easymock/jars/easymock-1.1.jar" value="MAVEN_REPO/easymock/jars/easymock-1.1.jar" />
+    <varelement var="file://$MAVEN_REPO$/servletapi/jars/servlet-api-2.4-20040521.jar" value="MAVEN_REPO/servletapi/jars/servlet-api-2.4-20040521.jar" />
+    <varelement var="file://$MAVEN_REPO$/commons-cli/jars/commons-cli-1.0.jar" value="MAVEN_REPO/commons-cli/jars/commons-cli-1.0.jar" />
+    <varelement var="file://$MAVEN_REPO$/mssql/jars/msbase-2000.jar" value="MAVEN_REPO/mssql/jars/msbase-2000.jar" />
+    <varelement var="file://$MAVEN_REPO$/mssql/jars/mssqlserver-2000.jar" value="MAVEN_REPO/mssql/jars/mssqlserver-2000.jar" />
+    <varelement var="file://$MAVEN_REPO$/mssql/jars/msutil-2000.jar" value="MAVEN_REPO/mssql/jars/msutil-2000.jar" />
+    <varelement var="file://$MAVEN_REPO$/jetty/jars/org.mortbay.jetty.jar" value="MAVEN_REPO/jetty/jars/org.mortbay.jetty.jar" />
+    <varelement var="file://$MAVEN_REPO$/jetty/jars/org.mortbay.jmx.jar" value="MAVEN_REPO/jetty/jars/org.mortbay.jmx.jar" />
+    <varelement var="file://$MAVEN_REPO$/jetty/jars/jasper-compiler.jar" value="MAVEN_REPO/jetty/jars/jasper-compiler.jar" />
+    <varelement var="file://$MAVEN_REPO$/jetty/jars/jasper-runtime.jar" value="MAVEN_REPO/jetty/jars/jasper-runtime.jar" />
+    <varelement var="file://$MAVEN_REPO$/jetty/jars/javax.servlet.jar" value="MAVEN_REPO/jetty/jars/javax.servlet.jar" />
+    <varelement var="file://$MAVEN_REPO$/jaxen/jars/jaxen-1.1-beta-5.jar" value="MAVEN_REPO/jaxen/jars/jaxen-1.1-beta-5.jar" />
+    <varelement var="file://$MAVEN_REPO$/http/jars/httpclient-4.2.1.jar" value="MAVEN_REPO/http/jars/httpclient-4.2.1.jar" />
+    <varelement var="file://$MAVEN_REPO$/http/jars/httpcore-4.2.2.jar" value="MAVEN_REPO/http/jars/httpcore-4.2.2.jar" />
+    <varelement var="file://$MAVEN_REPO$/json/jars/ezmorph-1.0.3.jar" value="MAVEN_REPO/json/jars/ezmorph-1.0.3.jar" />
+    <varelement var="file://$MAVEN_REPO$/json/jars/json-lib-2.1-jdk15.jar" value="MAVEN_REPO/json/jars/json-lib-2.1-jdk15.jar" />
+    <varelement var="file://$MAVEN_REPO$/commons-fileupload/jars/commons-fileupload-1.2.1.jar" value="MAVEN_REPO/commons-fileupload/jars/commons-fileupload-1.2.1.jar" />
+    <varelement var="file://$MAVEN_REPO$/commons-io/jars/commons-io-1.3.2.jar" value="MAVEN_REPO/commons-io/jars/commons-io-1.3.2.jar" />
+    <varelement var="file://$MAVEN_REPO$/pushmessage/jars/push-0.0.1-SNAPSHOT.jar" value="MAVEN_REPO/pushmessage/jars/push-0.0.1-SNAPSHOT.jar" />
+    <varelement var="file://$MAVEN_REPO$/json/jars/json-1.1.1.jar" value="MAVEN_REPO/json/jars/json-1.1.1.jar" />
+    <varelement var="file://$MAVEN_REPO$/pinyin/jars/pinyin4j-2.5.0.jar" value="MAVEN_REPO/pinyin/jars/pinyin4j-2.5.0.jar" />
+    <varelement var="file://$MAVEN_REPO$/wms/jars/sd-wms-1.1.1.jar" value="MAVEN_REPO/wms/jars/sd-wms-1.1.1.jar" />
+    <varelement var="file://$MAVEN_REPO$/sqlserver/jars/sqljdbc4-2.0.jar" value="MAVEN_REPO/sqlserver/jars/sqljdbc4-2.0.jar" />
+    <src_description expected_position="0">
+      <src_folder value="file://$MODULE_DIR$/conf" expected_position="0" />
+      <src_folder value="file://$MODULE_DIR$/src/webapp" expected_position="1" />
+      <src_folder value="file://$MODULE_DIR$/src/main/java" expected_position="2" />
+      <src_folder value="file://$MODULE_DIR$/www/com.dev.stms.STMS" expected_position="3" />
+    </src_description>
+  </component>
+  <component name="NewModuleRootManager">
+    <output url="file://$MODULE_DIR$/target/sdtms/WEB-INF/classes" />
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/conf" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/webapp" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/www/com.dev.stms.STMS" isTestSource="false" />
+    </content>
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="file://$MODULE_DIR$/lib" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES>
+          <root url="file://$MODULE_DIR$/lib" />
+        </SOURCES>
+        <jarDirectory url="file://$MODULE_DIR$/lib" recursive="false" />
+        <jarDirectory url="file://$MODULE_DIR$/lib" recursive="false" type="SOURCES" />
+      </library>
+    </orderEntry>
+  </component>
+</module>
--- a/src/main/java/AjaxJettyLauncher.java
+++ b/src/main/java/AjaxJettyLauncher.java
@ -1,18 +1,14 @@
-
+import com.dev.energy.client.utils.StringUtils;
 import org.mortbay.http.SocketListener;
 import org.mortbay.jetty.Server;

-import com.dev.stms.server.service.vehicle.AppManager;
-import com.dev.stms.server.service.vehicle.pojo.DefaultAppManager;
-
 public class AjaxJettyLauncher {
 	protected int port = 8088;
 	protected String contextName = "sdtms";
-	protected String deployPath = "";
+	protected String deployPath = null;

 	public static void main(String[] args) throws Exception {
 		AjaxJettyLauncher jl = new AjaxJettyLauncher();
-		jl.init();
 		jl.run();
 	}

@ -37,7 +33,7 @@ public class AjaxJettyLauncher {
 	}

 	protected String getDeployPath() {
-		if (deployPath.length() == 0) {
+		if (StringUtils.isEmpty(deployPath)) {
 			deployPath = "./target/" + contextName + "/";
 		}
 		return deployPath;