diff --git a/o2server/build_common.xml b/o2server/build_common.xml
index de0380a62961cfbf6cb4e7ab5dfae4323228dbb9..b11b14b0718207906f3c62eb1413f764ec092323 100644
--- a/o2server/build_common.xml
+++ b/o2server/build_common.xml
@@ -43,7 +43,7 @@
-
+
describe project:${project}
@@ -111,7 +111,7 @@
diff --git a/o2server/x_base_core_project/src/main/java/com/x/base/core/entity/tools/EnhancePersistenceXmlWriter.java b/o2server/x_base_core_project/src/main/java/com/x/base/core/entity/tools/EnhancePersistenceXmlWriter.java
index 487dda3d7b902b81d99784983f3fbe42920b9bdc..b2372bef441ea5c67ba3b0366ee7fa2774c6557d 100644
--- a/o2server/x_base_core_project/src/main/java/com/x/base/core/entity/tools/EnhancePersistenceXmlWriter.java
+++ b/o2server/x_base_core_project/src/main/java/com/x/base/core/entity/tools/EnhancePersistenceXmlWriter.java
@@ -12,6 +12,7 @@ import java.util.stream.Collectors;
import javax.persistence.Entity;
import javax.persistence.MappedSuperclass;
+import org.apache.commons.io.FileUtils;
import org.dom4j.Document;
import org.dom4j.DocumentHelper;
import org.dom4j.Element;
@@ -50,7 +51,10 @@ public class EnhancePersistenceXmlWriter {
}
OutputFormat format = OutputFormat.createPrettyPrint();
format.setEncoding("UTF-8");
- XMLWriter writer = new XMLWriter(new FileWriter(new File(arg.getPath())), format);
+ File dir = new File(arg.getPath());
+ FileUtils.forceMkdir(dir);
+ File file = new File(dir, "persistence.xml");
+ XMLWriter writer = new XMLWriter(new FileWriter(file), format);
writer.write(document);
writer.close();
System.out.println("create enhance persistence.xml at path:" + arg.getPath());
@@ -68,18 +72,6 @@ public class EnhancePersistenceXmlWriter {
}
return list.stream().sorted(Comparator.comparing(Class::getName)).collect(Collectors.toList());
}
-// FastClasspathScanner scanner = new FastClasspathScanner(Packages.PREFIX);
-// ScanResult scanResult = scanner.scan();
-// List> sortedList = new ArrayList>();
-// for (String str : scanResult.getNamesOfClassesWithAnnotationsAnyOf(MappedSuperclass.class, Entity.class)) {
-// sortedList.add(Class.forName(str));
-// }
-// Collections.sort(sortedList, new Comparator>() {
-// public int compare(Class> c1, Class> c2) {
-// return c1.getCanonicalName().compareTo(c2.getCanonicalName());
-// }
-// });
-// return sortedList;
}
private static Set> scanMappedSuperclass(Class> clz) throws Exception {
diff --git a/o2server/x_console/src/test/java/com/x/server/console/test/TestClientService.java b/o2server/x_console/src/test/java/com/x/server/console/test/TestClientService.java
new file mode 100644
index 0000000000000000000000000000000000000000..d9794617d1afdfe369b6d6e40f8323ba811c346a
--- /dev/null
+++ b/o2server/x_console/src/test/java/com/x/server/console/test/TestClientService.java
@@ -0,0 +1,12 @@
+package com.x.server.console.test;
+
+public class TestClientService {
+
+ public static void main(String[] args) {
+ System.setProperty("wrapper.config", "D:/aaa.conf");
+ WrappedService w = new WrappedService();
+ w.init(); // read in configuration
+ w.install(); // start the service
+ }
+
+}