更新javapoet

o2server/build_common.xml

@@ -43,7 +43,7 @@
 		</delete>
 		<echo message="metamodel complete." />
 	</target>
-
+	<!--
 	<target name="createPersistenceXml">
 		<mkdir dir="${basedir}/src/main/resources/META-INF" />
 		<java classname="com.x.base.core.entity.tools.PersistenceXmlWriter" fork="true">
@@ -60,12 +60,12 @@
 			</classpath>
 			<arg value="{
 				project:'${project}',
-				path:'${basedir}/src/main/resources/META-INF/x_persistence.xml'
+				path:'${basedir}/src/main/resources/META-INF'
 			}" />
 		</java>
 		<echo>${project} create persistence xml: ${basedir}/src/main/resources/META-INF/x_persistence.xml</echo>
 	</target>
-
+-->
 	<target name="describe">
 		<echo>describe project:${project}</echo>
 		<mkdir dir="${basedir}/src/main/webapp/describe" />
@@ -111,7 +111,7 @@
 				</fileset>
 			</classpath>
 			<arg value="{
-					path:'${basedir}/src/main/resources/META-INF/persistence.xml'
+					path:'${basedir}/src/main/resources/META-INF'
 				}" />
 		</java>
 		<sleep seconds="1" />

o2server/commons/ext/manifest.cfg

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f37a03d5dd14fcad8edffdecb3114bb8a203b8b6f512d766408779d99c82a6ad
-size 2749
+oid sha256:b3387d4a9d1a9f4966047134699d662fc614236fb36efd8ff19983b7d650144e
+size 2795

o2server/commons/ext/openjpa-3.0.1-SNAPSHOT.jar

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:194a0d6b78356bda24f11da2553fe946f37ffe48d05b25dddc73e7efb66a626a
-size 4566145
+oid sha256:25436c2ed582046406b2dbe030402a13d9c0a08ca5ddb26291696668baecfa9e
+size 4574360

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<Class<?>> sortedList = new ArrayList<Class<?>>();
-//		for (String str : scanResult.getNamesOfClassesWithAnnotationsAnyOf(MappedSuperclass.class, Entity.class)) {
-//			sortedList.add(Class.forName(str));
-//		}
-//		Collections.sort(sortedList, new Comparator<Class<?>>() {
-//			public int compare(Class<?> c1, Class<?> c2) {
-//				return c1.getCanonicalName().compareTo(c2.getCanonicalName());
-//			}
-//		});
-//		return sortedList;
 	}
 
 	private static Set<Class<?>> scanMappedSuperclass(Class<?> clz) throws Exception {

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
+	}
+
+}