修复calendar的包引用等

1、提交全部编译的代码
2、修复几个包的引用
3、处理了几个test.json的错误

.gitignore

@@ -1,2 +1,6 @@
 /o2cloud/
-/.settings/
+.classpath
+.project
+/.settings/
+/target/
+*_.java

o2server/pom.xml

@@ -395,18 +395,11 @@
 			<version>1.6.4</version>
 			<scope>provided</scope>
 		</dependency>
+		<!-- https://mvnrepository.com/artifact/org.mnode.ical4j/ical4j -->
 		<dependency>
-			<groupId>nl.captcha</groupId>
-			<artifactId>simplecaptcha</artifactId>
-			<version>1.1.1</version>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>net.fortuna.ical4j</groupId>
-			<artifactId>ical4j</artifactId>
-			<version>2.2.0</version>
-			<scope>system</scope>
-			<systemPath>${basedir}/../commons/ext/ical4j-2.2.0.jar</systemPath>
+		    <groupId>org.mnode.ical4j</groupId>
+		    <artifactId>ical4j</artifactId>
+		    <version>2.2.0</version>
 		</dependency>
 		<dependency>
 			<groupId>CheckPasswordStrength</groupId>

o2server/x_attendance_core_entity/src/main/java/com/x/attendance/entity/AttendanceAdmin_.java

@@ -11,7 +11,7 @@ import javax.persistence.metamodel.SingularAttribute;
 @javax.persistence.metamodel.StaticMetamodel
 (value=com.x.attendance.entity.AttendanceAdmin.class)
 @javax.annotation.Generated
-(value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Sun Dec 23 11:58:12 CST 2018")
+(value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Mon Dec 24 19:03:36 CST 2018")
 public class AttendanceAdmin_ extends SliceJpaObject_  {
     public static volatile SingularAttribute<AttendanceAdmin,String> adminLevel;
     public static volatile SingularAttribute<AttendanceAdmin,String> adminName;

o2server/x_attendance_core_entity/src/main/java/com/x/attendance/entity/AttendanceAppealInfo_.java

@@ -13,7 +13,7 @@ import javax.persistence.metamodel.SingularAttribute;
 @javax.persistence.metamodel.StaticMetamodel
 (value=com.x.attendance.entity.AttendanceAppealInfo.class)
 @javax.annotation.Generated
-(value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Sun Dec 23 11:58:12 CST 2018")
+(value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Mon Dec 24 19:03:36 CST 2018")
 public class AttendanceAppealInfo_ extends SliceJpaObject_  {
     public static volatile SingularAttribute<AttendanceAppealInfo,String> address;
     public static volatile SingularAttribute<AttendanceAppealInfo,String> appealDateString;

o2server/x_attendance_core_entity/src/main/java/com/x/attendance/entity/AttendanceDetailMobile_.java

@@ -13,7 +13,7 @@ import javax.persistence.metamodel.SingularAttribute;
 @javax.persistence.metamodel.StaticMetamodel
 (value=com.x.attendance.entity.AttendanceDetailMobile.class)
 @javax.annotation.Generated
-(value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Sun Dec 23 11:58:12 CST 2018")
+(value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Mon Dec 24 19:03:36 CST 2018")
 public class AttendanceDetailMobile_ extends SliceJpaObject_  {
     public static volatile SingularAttribute<AttendanceDetailMobile,String> description;
     public static volatile SingularAttribute<AttendanceDetailMobile,String> empName;

o2server/x_attendance_core_entity/src/main/java/com/x/attendance/entity/AttendanceDetail_.java

@@ -16,7 +16,7 @@ import javax.persistence.metamodel.SingularAttribute;
 @javax.persistence.metamodel.StaticMetamodel
 (value=com.x.attendance.entity.AttendanceDetail.class)
 @javax.annotation.Generated
-(value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Sun Dec 23 11:58:12 CST 2018")
+(value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Mon Dec 24 19:03:36 CST 2018")
 public class AttendanceDetail_ extends SliceJpaObject_  {
     public static volatile SingularAttribute<AttendanceDetail,String> abnormalDutyDayTime;
     public static volatile SingularAttribute<AttendanceDetail,Double> absence;

o2server/x_attendance_core_entity/src/main/java/com/x/attendance/entity/AttendanceEmployeeConfig_.java

@@ -11,7 +11,7 @@ import javax.persistence.metamodel.SingularAttribute;
 @javax.persistence.metamodel.StaticMetamodel
 (value=com.x.attendance.entity.AttendanceEmployeeConfig.class)
 @javax.annotation.Generated
-(value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Sun Dec 23 11:58:12 CST 2018")
+(value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Mon Dec 24 19:03:36 CST 2018")
 public class AttendanceEmployeeConfig_ extends SliceJpaObject_  {
     public static volatile SingularAttribute<AttendanceEmployeeConfig,String> configType;
     public static volatile SingularAttribute<AttendanceEmployeeConfig,String> empInTopUnitTime;

o2server/x_attendance_core_entity/src/main/java/com/x/attendance/entity/AttendanceImportFileInfo_.java

@@ -14,7 +14,7 @@ import javax.persistence.metamodel.SingularAttribute;
 @javax.persistence.metamodel.StaticMetamodel
 (value=com.x.attendance.entity.AttendanceImportFileInfo.class)
 @javax.annotation.Generated
-(value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Sun Dec 23 11:58:12 CST 2018")
+(value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Mon Dec 24 19:03:36 CST 2018")
 public class AttendanceImportFileInfo_ extends SliceJpaObject_  {
     public static volatile SingularAttribute<AttendanceImportFileInfo,String> creatorUid;
     public static volatile SingularAttribute<AttendanceImportFileInfo,String> currentProcessName;

o2server/x_attendance_core_entity/src/main/java/com/x/attendance/entity/AttendanceScheduleSetting_.java

@@ -11,7 +11,7 @@ import javax.persistence.metamodel.SingularAttribute;
 @javax.persistence.metamodel.StaticMetamodel
 (value=com.x.attendance.entity.AttendanceScheduleSetting.class)
 @javax.annotation.Generated
-(value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Sun Dec 23 11:58:12 CST 2018")
+(value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Mon Dec 24 19:03:36 CST 2018")
 public class AttendanceScheduleSetting_ extends SliceJpaObject_  {
     public static volatile SingularAttribute<AttendanceScheduleSetting,String> absenceStartTime;
     public static volatile SingularAttribute<AttendanceScheduleSetting,String> id;

o2server/x_attendance_core_entity/src/main/java/com/x/attendance/entity/AttendanceSelfHoliday_.java

@@ -13,7 +13,7 @@ import javax.persistence.metamodel.SingularAttribute;
 @javax.persistence.metamodel.StaticMetamodel
 (value=com.x.attendance.entity.AttendanceSelfHoliday.class)
 @javax.annotation.Generated
-(value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Sun Dec 23 11:58:12 CST 2018")
+(value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Mon Dec 24 19:03:36 CST 2018")
 public class AttendanceSelfHoliday_ extends SliceJpaObject_  {
     public static volatile SingularAttribute<AttendanceSelfHoliday,String> description;
     public static volatile SingularAttribute<AttendanceSelfHoliday,String> docId;

o2server/x_attendance_core_entity/src/main/java/com/x/attendance/entity/AttendanceSetting_.java

@@ -13,7 +13,7 @@ import javax.persistence.metamodel.SingularAttribute;
 @javax.persistence.metamodel.StaticMetamodel
 (value=com.x.attendance.entity.AttendanceSetting.class)
 @javax.annotation.Generated
-(value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Sun Dec 23 11:58:12 CST 2018")
+(value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Mon Dec 24 19:03:36 CST 2018")
 public class AttendanceSetting_ extends SliceJpaObject_  {
     public static volatile SingularAttribute<AttendanceSetting,String> configCode;
     public static volatile SingularAttribute<AttendanceSetting,String> configName;

o2server/x_attendance_core_entity/src/main/java/com/x/attendance/entity/AttendanceStatisticRequireLog_.java

@@ -12,7 +12,7 @@ import javax.persistence.metamodel.SingularAttribute;
 @javax.persistence.metamodel.StaticMetamodel
 (value=com.x.attendance.entity.AttendanceStatisticRequireLog.class)
 @javax.annotation.Generated
-(value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Sun Dec 23 11:58:12 CST 2018")
+(value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Mon Dec 24 19:03:36 CST 2018")
 public class AttendanceStatisticRequireLog_ extends SliceJpaObject_  {
     public static volatile SingularAttribute<AttendanceStatisticRequireLog,String> description;
     public static volatile SingularAttribute<AttendanceStatisticRequireLog,String> id;

o2server/x_attendance_core_entity/src/main/java/com/x/attendance/entity/AttendanceStatisticalCycle_.java

@@ -12,7 +12,7 @@ import javax.persistence.metamodel.SingularAttribute;
 @javax.persistence.metamodel.StaticMetamodel
 (value=com.x.attendance.entity.AttendanceStatisticalCycle.class)
 @javax.annotation.Generated
-(value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Sun Dec 23 11:58:12 CST 2018")
+(value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Mon Dec 24 19:03:36 CST 2018")
 public class AttendanceStatisticalCycle_ extends SliceJpaObject_  {
     public static volatile SingularAttribute<AttendanceStatisticalCycle,Date> cycleEndDate;
     public static volatile SingularAttribute<AttendanceStatisticalCycle,String> cycleEndDateString;

o2server/x_attendance_core_entity/src/main/java/com/x/attendance/entity/AttendanceWorkDayConfig_.java

@@ -11,7 +11,7 @@ import javax.persistence.metamodel.SingularAttribute;
 @javax.persistence.metamodel.StaticMetamodel
 (value=com.x.attendance.entity.AttendanceWorkDayConfig.class)
 @javax.annotation.Generated
-(value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Sun Dec 23 11:58:12 CST 2018")
+(value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Mon Dec 24 19:03:36 CST 2018")
 public class AttendanceWorkDayConfig_ extends SliceJpaObject_  {
     public static volatile SingularAttribute<AttendanceWorkDayConfig,String> configDate;
     public static volatile SingularAttribute<AttendanceWorkDayConfig,String> configMonth;

o2server/x_attendance_core_entity/src/main/java/com/x/attendance/entity/AttendanceWorkPlace_.java

@@ -12,7 +12,7 @@ import javax.persistence.metamodel.SingularAttribute;
 @javax.persistence.metamodel.StaticMetamodel
 (value=com.x.attendance.entity.AttendanceWorkPlace.class)
 @javax.annotation.Generated
-(value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Sun Dec 23 11:58:12 CST 2018")
+(value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Mon Dec 24 19:03:36 CST 2018")
 public class AttendanceWorkPlace_ extends SliceJpaObject_  {
     public static volatile SingularAttribute<AttendanceWorkPlace,String> creator;
     public static volatile SingularAttribute<AttendanceWorkPlace,String> description;

o2server/x_attendance_core_entity/src/main/java/com/x/attendance/entity/StatisticPersonForMonth_.java

@@ -13,7 +13,7 @@ import javax.persistence.metamodel.SingularAttribute;
 @javax.persistence.metamodel.StaticMetamodel
 (value=com.x.attendance.entity.StatisticPersonForMonth.class)
 @javax.annotation.Generated
-(value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Sun Dec 23 11:58:12 CST 2018")
+(value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Mon Dec 24 19:03:36 CST 2018")
 public class StatisticPersonForMonth_ extends SliceJpaObject_  {
     public static volatile SingularAttribute<StatisticPersonForMonth,Long> abNormalDutyCount;
     public static volatile SingularAttribute<StatisticPersonForMonth,Double> absenceDayCount;

o2server/x_attendance_core_entity/src/main/java/com/x/attendance/entity/StatisticTopUnitForDay_.java

@@ -13,7 +13,7 @@ import javax.persistence.metamodel.SingularAttribute;
 @javax.persistence.metamodel.StaticMetamodel
 (value=com.x.attendance.entity.StatisticTopUnitForDay.class)
 @javax.annotation.Generated
-(value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Sun Dec 23 11:58:12 CST 2018")
+(value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Mon Dec 24 19:03:36 CST 2018")
 public class StatisticTopUnitForDay_ extends SliceJpaObject_  {
     public static volatile SingularAttribute<StatisticTopUnitForDay,Long> abNormalDutyCount;
     public static volatile SingularAttribute<StatisticTopUnitForDay,Double> absenceDayCount;

o2server/x_attendance_core_entity/src/main/java/com/x/attendance/entity/StatisticTopUnitForMonth_.java

@@ -13,7 +13,7 @@ import javax.persistence.metamodel.SingularAttribute;
 @javax.persistence.metamodel.StaticMetamodel
 (value=com.x.attendance.entity.StatisticTopUnitForMonth.class)
 @javax.annotation.Generated
-(value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Sun Dec 23 11:58:12 CST 2018")
+(value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Mon Dec 24 19:03:36 CST 2018")
 public class StatisticTopUnitForMonth_ extends SliceJpaObject_  {
     public static volatile SingularAttribute<StatisticTopUnitForMonth,Long> abNormalDutyCount;
     public static volatile SingularAttribute<StatisticTopUnitForMonth,Double> absenceDayCount;

o2server/x_attendance_core_entity/src/main/java/com/x/attendance/entity/StatisticUnitForDay_.java

@@ -13,7 +13,7 @@ import javax.persistence.metamodel.SingularAttribute;
 @javax.persistence.metamodel.StaticMetamodel
 (value=com.x.attendance.entity.StatisticUnitForDay.class)
 @javax.annotation.Generated
-(value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Sun Dec 23 11:58:12 CST 2018")
+(value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Mon Dec 24 19:03:36 CST 2018")
 public class StatisticUnitForDay_ extends SliceJpaObject_  {
     public static volatile SingularAttribute<StatisticUnitForDay,Long> abNormalDutyCount;
     public static volatile SingularAttribute<StatisticUnitForDay,Double> absenceDayCount;

o2server/x_attendance_core_entity/src/main/java/com/x/attendance/entity/StatisticUnitForMonth_.java

@@ -13,7 +13,7 @@ import javax.persistence.metamodel.SingularAttribute;
 @javax.persistence.metamodel.StaticMetamodel
 (value=com.x.attendance.entity.StatisticUnitForMonth.class)
 @javax.annotation.Generated
-(value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Sun Dec 23 11:58:12 CST 2018")
+(value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Mon Dec 24 19:03:36 CST 2018")
 public class StatisticUnitForMonth_ extends SliceJpaObject_  {
     public static volatile SingularAttribute<StatisticUnitForMonth,Long> abNormalDutyCount;
     public static volatile SingularAttribute<StatisticUnitForMonth,Double> absenceDayCount;

o2server/x_base_core_project/src/main/java/com/x/base/core/entity/JpaObject_.java

@@ -12,7 +12,7 @@ import javax.persistence.metamodel.SingularAttribute;
 @javax.persistence.metamodel.StaticMetamodel
 (value=com.x.base.core.entity.JpaObject.class)
 @javax.annotation.Generated
-(value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Sun Dec 23 11:57:57 CST 2018")
+(value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Mon Dec 24 19:03:24 CST 2018")
 public class JpaObject_ {
     public static volatile SingularAttribute<JpaObject,Date> createTime;
     public static volatile SingularAttribute<JpaObject,Boolean> scratchBoolean;

o2server/x_base_core_project/src/main/java/com/x/base/core/entity/SliceJpaObject_.java

@@ -10,7 +10,7 @@ import javax.persistence.metamodel.SingularAttribute;
 @javax.persistence.metamodel.StaticMetamodel
 (value=com.x.base.core.entity.SliceJpaObject.class)
 @javax.annotation.Generated
-(value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Sun Dec 23 11:57:57 CST 2018")
+(value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Mon Dec 24 19:03:24 CST 2018")
 public class SliceJpaObject_ extends JpaObject_  {
     public static volatile SingularAttribute<SliceJpaObject,Integer> distributeFactor;
 }

o2server/x_base_core_project/src/main/java/com/x/base/core/entity/StorageObject_.java

@@ -8,6 +8,6 @@ package com.x.base.core.entity;
 @javax.persistence.metamodel.StaticMetamodel
 (value=com.x.base.core.entity.StorageObject.class)
 @javax.annotation.Generated
-(value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Sun Dec 23 11:57:57 CST 2018")
+(value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Mon Dec 24 19:03:24 CST 2018")
 public class StorageObject_ extends SliceJpaObject_  {
 }

o2server/x_bbs_core_entity/src/main/java/com/x/bbs/entity/BBSConfigSetting_.java

@@ -13,7 +13,7 @@ import javax.persistence.metamodel.SingularAttribute;
 @javax.persistence.metamodel.StaticMetamodel
 (value=com.x.bbs.entity.BBSConfigSetting.class)
 @javax.annotation.Generated
-(value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Sun Dec 23 11:58:33 CST 2018")
+(value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Mon Dec 24 19:03:55 CST 2018")
 public class BBSConfigSetting_ extends SliceJpaObject_  {
     public static volatile SingularAttribute<BBSConfigSetting,String> configCode;
     public static volatile SingularAttribute<BBSConfigSetting,String> configName;

o2server/x_bbs_core_entity/src/main/java/com/x/bbs/entity/BBSForumInfo_.java

@@ -15,7 +15,7 @@ import javax.persistence.metamodel.SingularAttribute;
 @javax.persistence.metamodel.StaticMetamodel
 (value=com.x.bbs.entity.BBSForumInfo.class)
 @javax.annotation.Generated
-(value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Sun Dec 23 11:58:33 CST 2018")
+(value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Mon Dec 24 19:03:55 CST 2018")
 public class BBSForumInfo_ extends SliceJpaObject_  {
     public static volatile SingularAttribute<BBSForumInfo,String> creatorName;
     public static volatile SingularAttribute<BBSForumInfo,String> forumColor;

o2server/x_bbs_core_entity/src/main/java/com/x/bbs/entity/BBSOperationRecord_.java

@@ -11,7 +11,7 @@ import javax.persistence.metamodel.SingularAttribute;
 @javax.persistence.metamodel.StaticMetamodel
 (value=com.x.bbs.entity.BBSOperationRecord.class)
 @javax.annotation.Generated
-(value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Sun Dec 23 11:58:33 CST 2018")
+(value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Mon Dec 24 19:03:55 CST 2018")
 public class BBSOperationRecord_ extends SliceJpaObject_  {
     public static volatile SingularAttribute<BBSOperationRecord,String> forumId;
     public static volatile SingularAttribute<BBSOperationRecord,String> forumName;

o2server/x_bbs_core_entity/src/main/java/com/x/bbs/entity/BBSPermissionInfo_.java

@@ -12,7 +12,7 @@ import javax.persistence.metamodel.SingularAttribute;
 @javax.persistence.metamodel.StaticMetamodel
 (value=com.x.bbs.entity.BBSPermissionInfo.class)
 @javax.annotation.Generated
-(value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Sun Dec 23 11:58:33 CST 2018")
+(value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Mon Dec 24 19:03:55 CST 2018")
 public class BBSPermissionInfo_ extends SliceJpaObject_  {
     public static volatile SingularAttribute<BBSPermissionInfo,String> description;
     public static volatile SingularAttribute<BBSPermissionInfo,String> forumId;

o2server/x_bbs_core_entity/src/main/java/com/x/bbs/entity/BBSPermissionRole_.java

@@ -12,7 +12,7 @@ import javax.persistence.metamodel.SingularAttribute;
 @javax.persistence.metamodel.StaticMetamodel
 (value=com.x.bbs.entity.BBSPermissionRole.class)
 @javax.annotation.Generated
-(value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Sun Dec 23 11:58:33 CST 2018")
+(value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Mon Dec 24 19:03:55 CST 2018")
 public class BBSPermissionRole_ extends SliceJpaObject_  {
     public static volatile SingularAttribute<BBSPermissionRole,String> description;
     public static volatile SingularAttribute<BBSPermissionRole,String> forumId;

o2server/x_bbs_core_entity/src/main/java/com/x/bbs/entity/BBSReplyInfo_.java

@@ -12,7 +12,7 @@ import javax.persistence.metamodel.SingularAttribute;
 @javax.persistence.metamodel.StaticMetamodel
 (value=com.x.bbs.entity.BBSReplyInfo.class)
 @javax.annotation.Generated
-(value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Sun Dec 23 11:58:33 CST 2018")
+(value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Mon Dec 24 19:03:55 CST 2018")
 public class BBSReplyInfo_ extends SliceJpaObject_  {
     public static volatile SingularAttribute<BBSReplyInfo,String> auditorName;
     public static volatile SingularAttribute<BBSReplyInfo,String> content;

o2server/x_bbs_core_entity/src/main/java/com/x/bbs/entity/BBSRoleInfo_.java

@@ -12,7 +12,7 @@ import javax.persistence.metamodel.SingularAttribute;
 @javax.persistence.metamodel.StaticMetamodel
 (value=com.x.bbs.entity.BBSRoleInfo.class)
 @javax.annotation.Generated
-(value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Sun Dec 23 11:58:33 CST 2018")
+(value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Mon Dec 24 19:03:55 CST 2018")
 public class BBSRoleInfo_ extends SliceJpaObject_  {
     public static volatile SingularAttribute<BBSRoleInfo,String> creatorName;
     public static volatile SingularAttribute<BBSRoleInfo,String> description;

o2server/x_bbs_core_entity/src/main/java/com/x/bbs/entity/BBSSectionInfo_.java

@@ -14,7 +14,7 @@ import javax.persistence.metamodel.SingularAttribute;
 @javax.persistence.metamodel.StaticMetamodel
 (value=com.x.bbs.entity.BBSSectionInfo.class)
 @javax.annotation.Generated
-(value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Sun Dec 23 11:58:33 CST 2018")
+(value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Mon Dec 24 19:03:55 CST 2018")
 public class BBSSectionInfo_ extends SliceJpaObject_  {
     public static volatile SingularAttribute<BBSSectionInfo,String> creatorName;
     public static volatile SingularAttribute<BBSSectionInfo,String> forumId;

o2server/x_bbs_core_entity/src/main/java/com/x/bbs/entity/BBSSubjectAttachment_.java

@@ -13,7 +13,7 @@ import javax.persistence.metamodel.SingularAttribute;
 @javax.persistence.metamodel.StaticMetamodel
 (value=com.x.bbs.entity.BBSSubjectAttachment.class)
 @javax.annotation.Generated
-(value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Sun Dec 23 11:58:33 CST 2018")
+(value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Mon Dec 24 19:03:55 CST 2018")
 public class BBSSubjectAttachment_ extends StorageObject_  {
     public static volatile SingularAttribute<BBSSubjectAttachment,String> creatorUid;
     public static volatile SingularAttribute<BBSSubjectAttachment,String> description;

o2server/x_bbs_core_entity/src/main/java/com/x/bbs/entity/BBSSubjectContent_.java

@@ -11,7 +11,7 @@ import javax.persistence.metamodel.SingularAttribute;
 @javax.persistence.metamodel.StaticMetamodel
 (value=com.x.bbs.entity.BBSSubjectContent.class)
 @javax.annotation.Generated
-(value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Sun Dec 23 11:58:33 CST 2018")
+(value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Mon Dec 24 19:03:55 CST 2018")
 public class BBSSubjectContent_ extends SliceJpaObject_  {
     public static volatile SingularAttribute<BBSSubjectContent,String> content;
     public static volatile SingularAttribute<BBSSubjectContent,String> id;

o2server/x_bbs_core_entity/src/main/java/com/x/bbs/entity/BBSSubjectInfo_.java

@@ -16,7 +16,7 @@ import javax.persistence.metamodel.SingularAttribute;
 @javax.persistence.metamodel.StaticMetamodel
 (value=com.x.bbs.entity.BBSSubjectInfo.class)
 @javax.annotation.Generated
-(value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Sun Dec 23 11:58:33 CST 2018")
+(value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Mon Dec 24 19:03:55 CST 2018")
 public class BBSSubjectInfo_ extends SliceJpaObject_  {
     public static volatile SingularAttribute<BBSSubjectInfo,String> acceptReplyId;
     public static volatile ListAttribute<BBSSubjectInfo,String> attachmentList;

o2server/x_bbs_core_entity/src/main/java/com/x/bbs/entity/BBSSubjectVoteResult_.java

@@ -11,7 +11,7 @@ import javax.persistence.metamodel.SingularAttribute;
 @javax.persistence.metamodel.StaticMetamodel
 (value=com.x.bbs.entity.BBSSubjectVoteResult.class)
 @javax.annotation.Generated
-(value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Sun Dec 23 11:58:33 CST 2018")
+(value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Mon Dec 24 19:03:55 CST 2018")
 public class BBSSubjectVoteResult_ extends SliceJpaObject_  {
     public static volatile SingularAttribute<BBSSubjectVoteResult,String> forumId;
     public static volatile SingularAttribute<BBSSubjectVoteResult,String> id;

o2server/x_bbs_core_entity/src/main/java/com/x/bbs/entity/BBSUserInfo_.java

@@ -15,7 +15,7 @@ import javax.persistence.metamodel.SingularAttribute;
 @javax.persistence.metamodel.StaticMetamodel
 (value=com.x.bbs.entity.BBSUserInfo.class)
 @javax.annotation.Generated
-(value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Sun Dec 23 11:58:33 CST 2018")
+(value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Mon Dec 24 19:03:55 CST 2018")
 public class BBSUserInfo_ extends SliceJpaObject_  {
     public static volatile SingularAttribute<BBSUserInfo,String> cardId;
     public static volatile SingularAttribute<BBSUserInfo,Long> creamCount;

o2server/x_bbs_core_entity/src/main/java/com/x/bbs/entity/BBSUserRole_.java

@@ -12,7 +12,7 @@ import javax.persistence.metamodel.SingularAttribute;
 @javax.persistence.metamodel.StaticMetamodel
 (value=com.x.bbs.entity.BBSUserRole.class)
 @javax.annotation.Generated
-(value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Sun Dec 23 11:58:33 CST 2018")
+(value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Mon Dec 24 19:03:55 CST 2018")
 public class BBSUserRole_ extends SliceJpaObject_  {
     public static volatile SingularAttribute<BBSUserRole,String> forumId;
     public static volatile SingularAttribute<BBSUserRole,String> id;

o2server/x_bbs_core_entity/src/main/java/com/x/bbs/entity/BBSVoteOptionGroup_.java

@@ -12,7 +12,7 @@ import javax.persistence.metamodel.SingularAttribute;
 @javax.persistence.metamodel.StaticMetamodel
 (value=com.x.bbs.entity.BBSVoteOptionGroup.class)
 @javax.annotation.Generated
-(value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Sun Dec 23 11:58:33 CST 2018")
+(value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Mon Dec 24 19:03:55 CST 2018")
 public class BBSVoteOptionGroup_ extends SliceJpaObject_  {
     public static volatile SingularAttribute<BBSVoteOptionGroup,String> creatorName;
     public static volatile SingularAttribute<BBSVoteOptionGroup,String> forumId;

o2server/x_bbs_core_entity/src/main/java/com/x/bbs/entity/BBSVoteOption_.java

@@ -12,7 +12,7 @@ import javax.persistence.metamodel.SingularAttribute;
 @javax.persistence.metamodel.StaticMetamodel
 (value=com.x.bbs.entity.BBSVoteOption.class)
 @javax.annotation.Generated
-(value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Sun Dec 23 11:58:33 CST 2018")
+(value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Mon Dec 24 19:03:55 CST 2018")
 public class BBSVoteOption_ extends SliceJpaObject_  {
     public static volatile SingularAttribute<BBSVoteOption,Integer> chooseCount;
     public static volatile SingularAttribute<BBSVoteOption,String> creatorName;

o2server/x_bbs_core_entity/src/main/java/com/x/bbs/entity/BBSVoteRecord_.java

@@ -11,7 +11,7 @@ import javax.persistence.metamodel.SingularAttribute;
 @javax.persistence.metamodel.StaticMetamodel
 (value=com.x.bbs.entity.BBSVoteRecord.class)
 @javax.annotation.Generated
-(value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Sun Dec 23 11:58:33 CST 2018")
+(value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Mon Dec 24 19:03:55 CST 2018")
 public class BBSVoteRecord_ extends SliceJpaObject_  {
     public static volatile SingularAttribute<BBSVoteRecord,String> forumId;
     public static volatile SingularAttribute<BBSVoteRecord,String> id;

o2server/x_calendar_assemble_control/src/main/java/com/x/calendar/assemble/control/jaxrs/event/ActionDestroyAfterEventId.java

@@ -34,6 +34,7 @@ public class ActionDestroyAfterEventId extends BaseAction {
 	
 	protected ActionResult<Wo> execute( HttpServletRequest request, EffectivePerson effectivePerson, String id ) throws Exception {
 		
+		LogUtil.INFO( ">>>>>>ActionDestroyAfterEventId.execute......" );
 		ActionResult<Wo> result = new ActionResult<>();
 		Integer count = 0;
 		Wo wo = new Wo();
@@ -154,4 +155,4 @@ public static class Wi extends Calendar_Event{
 	
 	public static class Wo extends WrapInteger {
 	}
-}
+}

o2server/x_calendar_assemble_control/src/main/java/com/x/calendar/assemble/control/jaxrs/event/ActionDestroySingleEventWithId.java

@@ -21,7 +21,7 @@ public class ActionDestroySingleEventWithId extends BaseAction {
 	private Logger logger = LoggerFactory.getLogger( ActionDestroySingleEventWithId.class );
 	
 	protected ActionResult<Wo> execute( HttpServletRequest request, EffectivePerson effectivePerson, String id ) throws Exception {
-
+		LogUtil.INFO( ">>>>>>ActionDestroySingleEventWithId.execute......" );
 		ActionResult<Wo> result = new ActionResult<>();
 		Calendar calendar = null;
 		Calendar_Event calendar_event = null;
@@ -113,4 +113,4 @@ public class ActionDestroySingleEventWithId extends BaseAction {
 	
 	}
 
-}
+}

o2server/x_calendar_core_entity/src/main/java/com/x/calendar/core/entity/Calendar_.java

@@ -13,7 +13,7 @@ import javax.persistence.metamodel.SingularAttribute;
 @javax.persistence.metamodel.StaticMetamodel
 (value=com.x.calendar.core.entity.Calendar.class)
 @javax.annotation.Generated
-(value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Sun Dec 23 11:58:39 CST 2018")
+(value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Mon Dec 24 19:03:59 CST 2018")
 public class Calendar_ extends SliceJpaObject_  {
     public static volatile SingularAttribute<Calendar,String> color;
     public static volatile SingularAttribute<Calendar,String> createor;

o2server/x_calendar_core_entity/src/main/java/com/x/calendar/core/entity/Calendar_EventRepeatMaster_.java

@@ -15,7 +15,7 @@ import javax.persistence.metamodel.SingularAttribute;
 @javax.persistence.metamodel.StaticMetamodel
 (value=com.x.calendar.core.entity.Calendar_EventRepeatMaster.class)
 @javax.annotation.Generated
-(value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Sun Dec 23 11:58:39 CST 2018")
+(value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Mon Dec 24 19:03:59 CST 2018")
 public class Calendar_EventRepeatMaster_ extends SliceJpaObject_  {
     public static volatile SingularAttribute<Calendar_EventRepeatMaster,Boolean> alarm;
     public static volatile SingularAttribute<Calendar_EventRepeatMaster,Date> alarmTime;

o2server/x_calendar_core_entity/src/main/java/com/x/calendar/core/entity/Calendar_Event_.java

@@ -15,7 +15,7 @@ import javax.persistence.metamodel.SingularAttribute;
 @javax.persistence.metamodel.StaticMetamodel
 (value=com.x.calendar.core.entity.Calendar_Event.class)
 @javax.annotation.Generated
-(value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Sun Dec 23 11:58:39 CST 2018")
+(value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Mon Dec 24 19:03:59 CST 2018")
 public class Calendar_Event_ extends SliceJpaObject_  {
     public static volatile SingularAttribute<Calendar_Event,Boolean> alarm;
     public static volatile SingularAttribute<Calendar_Event,Boolean> alarmAlready;

o2server/x_calendar_core_entity/src/main/java/com/x/calendar/core/entity/Calendar_SettingLobValue_.java

@@ -11,7 +11,7 @@ import javax.persistence.metamodel.SingularAttribute;
 @javax.persistence.metamodel.StaticMetamodel
 (value=com.x.calendar.core.entity.Calendar_SettingLobValue.class)
 @javax.annotation.Generated
-(value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Sun Dec 23 11:58:39 CST 2018")
+(value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Mon Dec 24 19:03:59 CST 2018")
 public class Calendar_SettingLobValue_ extends SliceJpaObject_  {
     public static volatile SingularAttribute<Calendar_SettingLobValue,String> id;
     public static volatile SingularAttribute<Calendar_SettingLobValue,String> lobValue;

o2server/x_calendar_core_entity/src/main/java/com/x/calendar/core/entity/Calendar_Setting_.java

@@ -13,7 +13,7 @@ import javax.persistence.metamodel.SingularAttribute;
 @javax.persistence.metamodel.StaticMetamodel
 (value=com.x.calendar.core.entity.Calendar_Setting.class)
 @javax.annotation.Generated
-(value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Sun Dec 23 11:58:39 CST 2018")
+(value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Mon Dec 24 19:03:59 CST 2018")
 public class Calendar_Setting_ extends SliceJpaObject_  {
     public static volatile SingularAttribute<Calendar_Setting,String> configCode;
     public static volatile SingularAttribute<Calendar_Setting,String> configName;

o2server/x_calendar_core_entity/src/main/resources/META-INF/persistence.xml

@@ -2,13 +2,13 @@
 
 <persistence xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/persistence  http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd" version="2.0">
   <persistence-unit name="enhance">
-    <class>com.x.calendar.core.entity.Calendar_Event</class>
-    <class>com.x.calendar.core.entity.Calendar</class>
-    <class>com.x.base.core.entity.SliceJpaObject</class>
     <class>com.x.base.core.entity.JpaObject</class>
+    <class>com.x.calendar.core.entity.Calendar</class>
     <class>com.x.calendar.core.entity.Calendar_SettingLobValue</class>
     <class>com.x.calendar.core.entity.Calendar_Setting</class>
     <class>com.x.calendar.core.entity.Calendar_EventRepeatMaster</class>
+    <class>com.x.calendar.core.entity.Calendar_Event</class>
+    <class>com.x.base.core.entity.SliceJpaObject</class>
     <class>com.x.base.core.entity.StorageObject</class>
   </persistence-unit>
 </persistence>

o2server/x_calendar_core_entity/src/test/resources/test.json

@@ -943,22 +943,6 @@
 		}
 	],
 
-	"com.x.attendance.entity.AttendanceDetailAppeal": 
-	[
-		{
-			"dataServer": "xd01",
-			"order": 1,
-			"toolLevel": "WARN",
-			"runtimeLevel": "WARN",
-			"dataCacheLevel": "WARN",
-			"metaDataLevel": "WARN",
-			"enhanceLevel": "WARN",
-			"queryLevel": "WARN",
-			"sqlLevel": "WARN",
-			"jdbcLevel": "WARN"
-		}
-	],
-
 	"com.x.cms.core.entity.element.View": 
 	[
 		{
@@ -1007,22 +991,6 @@
 		}
 	],
 
-	"com.x.attendance.entity.AttendanceAppealInfo": 
-	[
-		{
-			"dataServer": "xd01",
-			"order": 1,
-			"toolLevel": "WARN",
-			"runtimeLevel": "WARN",
-			"dataCacheLevel": "WARN",
-			"metaDataLevel": "WARN",
-			"enhanceLevel": "WARN",
-			"queryLevel": "WARN",
-			"sqlLevel": "WARN",
-			"jdbcLevel": "WARN"
-		}
-	],
-
 	"com.x.organization.core.entity.Custom": 
 	[
 		{
@@ -1295,22 +1263,6 @@
 		}
 	],
 
-	"com.x.attendance.entity.AttendanceDetailBakup": 
-	[
-		{
-			"dataServer": "xd01",
-			"order": 1,
-			"toolLevel": "WARN",
-			"runtimeLevel": "WARN",
-			"dataCacheLevel": "WARN",
-			"metaDataLevel": "WARN",
-			"enhanceLevel": "WARN",
-			"queryLevel": "WARN",
-			"sqlLevel": "WARN",
-			"jdbcLevel": "WARN"
-		}
-	],
-
 	"com.x.processplatform.core.entity.element.Merge": 
 	[
 		{

o2server/x_cms_core_entity/src/main/java/com/x/cms/core/entity/AppCategoryAdmin_.java

@@ -11,7 +11,7 @@ import javax.persistence.metamodel.SingularAttribute;
 @javax.persistence.metamodel.StaticMetamodel
 (value=com.x.cms.core.entity.AppCategoryAdmin.class)
 @javax.annotation.Generated
-(value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Sun Dec 23 11:58:51 CST 2018")
+(value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Mon Dec 24 19:04:08 CST 2018")
 public class AppCategoryAdmin_ extends SliceJpaObject_  {
     public static volatile SingularAttribute<AppCategoryAdmin,String> adminLevel;
     public static volatile SingularAttribute<AppCategoryAdmin,String> adminName;

o2server/x_cms_core_entity/src/main/java/com/x/cms/core/entity/AppCategoryPermission_.java

@@ -11,7 +11,7 @@ import javax.persistence.metamodel.SingularAttribute;
 @javax.persistence.metamodel.StaticMetamodel
 (value=com.x.cms.core.entity.AppCategoryPermission.class)
 @javax.annotation.Generated
-(value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Sun Dec 23 11:58:51 CST 2018")
+(value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Mon Dec 24 19:04:08 CST 2018")
 public class AppCategoryPermission_ extends SliceJpaObject_  {
     public static volatile SingularAttribute<AppCategoryPermission,String> appId;
     public static volatile SingularAttribute<AppCategoryPermission,String> creatorUid;

o2server/x_cms_core_entity/src/main/java/com/x/cms/core/entity/AppInfo_.java

@@ -13,7 +13,7 @@ import javax.persistence.metamodel.SingularAttribute;
 @javax.persistence.metamodel.StaticMetamodel
 (value=com.x.cms.core.entity.AppInfo.class)
 @javax.annotation.Generated
-(value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Sun Dec 23 11:58:51 CST 2018")
+(value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Mon Dec 24 19:04:08 CST 2018")
 public class AppInfo_ extends SliceJpaObject_  {
     public static volatile SingularAttribute<AppInfo,Boolean> allPeoplePublish;
     public static volatile SingularAttribute<AppInfo,Boolean> allPeopleView;

o2server/x_cms_core_entity/src/main/java/com/x/cms/core/entity/CategoryExt_.java

@@ -11,7 +11,7 @@ import javax.persistence.metamodel.SingularAttribute;
 @javax.persistence.metamodel.StaticMetamodel
 (value=com.x.cms.core.entity.CategoryExt.class)
 @javax.annotation.Generated
-(value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Sun Dec 23 11:58:51 CST 2018")
+(value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Mon Dec 24 19:04:08 CST 2018")
 public class CategoryExt_ extends SliceJpaObject_  {
     public static volatile SingularAttribute<CategoryExt,String> content;
     public static volatile SingularAttribute<CategoryExt,String> id;

o2server/x_cms_core_entity/src/main/java/com/x/cms/core/entity/CategoryInfo_.java

@@ -13,7 +13,7 @@ import javax.persistence.metamodel.SingularAttribute;
 @javax.persistence.metamodel.StaticMetamodel
 (value=com.x.cms.core.entity.CategoryInfo.class)
 @javax.annotation.Generated
-(value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Sun Dec 23 11:58:51 CST 2018")
+(value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Mon Dec 24 19:04:08 CST 2018")
 public class CategoryInfo_ extends SliceJpaObject_  {
     public static volatile SingularAttribute<CategoryInfo,Boolean> allPeoplePublish;
     public static volatile SingularAttribute<CategoryInfo,Boolean> allPeopleView;

o2server/x_cms_core_entity/src/main/java/com/x/cms/core/entity/DocumentPermission_.java

@@ -12,7 +12,7 @@ import javax.persistence.metamodel.SingularAttribute;
 @javax.persistence.metamodel.StaticMetamodel
 (value=com.x.cms.core.entity.DocumentPermission.class)
 @javax.annotation.Generated
-(value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Sun Dec 23 11:58:51 CST 2018")
+(value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Mon Dec 24 19:04:08 CST 2018")
 public class DocumentPermission_ extends SliceJpaObject_  {
     public static volatile SingularAttribute<DocumentPermission,String> appId;
     public static volatile SingularAttribute<DocumentPermission,String> appName;

o2server/x_cms_core_entity/src/main/java/com/x/cms/core/entity/DocumentViewRecord_.java

@@ -13,7 +13,7 @@ import javax.persistence.metamodel.SingularAttribute;
 @javax.persistence.metamodel.StaticMetamodel
 (value=com.x.cms.core.entity.DocumentViewRecord.class)
 @javax.annotation.Generated
-(value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Sun Dec 23 11:58:51 CST 2018")
+(value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Mon Dec 24 19:04:08 CST 2018")
 public class DocumentViewRecord_ extends SliceJpaObject_  {
     public static volatile SingularAttribute<DocumentViewRecord,String> appId;
     public static volatile SingularAttribute<DocumentViewRecord,String> appName;

o2server/x_cms_core_entity/src/main/java/com/x/cms/core/entity/Document_.java

@@ -15,7 +15,7 @@ import javax.persistence.metamodel.SingularAttribute;
 @javax.persistence.metamodel.StaticMetamodel
 (value=com.x.cms.core.entity.Document.class)
 @javax.annotation.Generated
-(value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Sun Dec 23 11:58:51 CST 2018")
+(value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Mon Dec 24 19:04:08 CST 2018")
 public class Document_ extends SliceJpaObject_  {
     public static volatile SingularAttribute<Document,String> appId;
     public static volatile SingularAttribute<Document,String> appName;

o2server/x_cms_core_entity/src/main/java/com/x/cms/core/entity/FileInfo_.java

@@ -14,7 +14,7 @@ import javax.persistence.metamodel.SingularAttribute;
 @javax.persistence.metamodel.StaticMetamodel
 (value=com.x.cms.core.entity.FileInfo.class)
 @javax.annotation.Generated
-(value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Sun Dec 23 11:58:51 CST 2018")
+(value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Mon Dec 24 19:04:08 CST 2018")
 public class FileInfo_ extends StorageObject_  {
     public static volatile SingularAttribute<FileInfo,String> appId;
     public static volatile SingularAttribute<FileInfo,String> categoryId;

o2server/x_cms_core_entity/src/main/java/com/x/cms/core/entity/Log_.java

@@ -11,7 +11,7 @@ import javax.persistence.metamodel.SingularAttribute;
 @javax.persistence.metamodel.StaticMetamodel
 (value=com.x.cms.core.entity.Log.class)
 @javax.annotation.Generated
-(value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Sun Dec 23 11:58:51 CST 2018")
+(value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Mon Dec 24 19:04:08 CST 2018")
 public class Log_ extends SliceJpaObject_  {
     public static volatile SingularAttribute<Log,String> appId;
     public static volatile SingularAttribute<Log,String> categoryId;

o2server/x_cms_core_entity/src/main/java/com/x/cms/core/entity/Review_.java

@@ -13,7 +13,7 @@ import javax.persistence.metamodel.SingularAttribute;
 @javax.persistence.metamodel.StaticMetamodel
 (value=com.x.cms.core.entity.Review.class)
 @javax.annotation.Generated
-(value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Sun Dec 23 11:58:51 CST 2018")
+(value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Mon Dec 24 19:04:08 CST 2018")
 public class Review_ extends SliceJpaObject_  {
     public static volatile SingularAttribute<Review,String> appAlias;
     public static volatile SingularAttribute<Review,String> appId;

o2server/x_cms_core_entity/src/main/java/com/x/cms/core/entity/element/AppDictItem_.java

@@ -19,7 +19,7 @@ import javax.persistence.metamodel.SingularAttribute;
 @javax.persistence.metamodel.StaticMetamodel
 (value=com.x.cms.core.entity.element.AppDictItem.class)
 @javax.annotation.Generated
-(value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Sun Dec 23 11:58:51 CST 2018")
+(value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Mon Dec 24 19:04:08 CST 2018")
 public class AppDictItem_ extends SliceJpaObject_  {
     public static volatile SingularAttribute<AppDictItem,String> appId;
     public static volatile SingularAttribute<AppDictItem,Boolean> booleanValue;

o2server/x_cms_core_entity/src/main/java/com/x/cms/core/entity/element/AppDict_.java

@@ -11,7 +11,7 @@ import javax.persistence.metamodel.SingularAttribute;
 @javax.persistence.metamodel.StaticMetamodel
 (value=com.x.cms.core.entity.element.AppDict.class)
 @javax.annotation.Generated
-(value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Sun Dec 23 11:58:51 CST 2018")
+(value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Mon Dec 24 19:04:08 CST 2018")
 public class AppDict_ extends SliceJpaObject_  {
     public static volatile SingularAttribute<AppDict,String> alias;
     public static volatile SingularAttribute<AppDict,String> appId;

o2server/x_cms_core_entity/src/main/java/com/x/cms/core/entity/element/FormField_.java

@@ -11,7 +11,7 @@ import javax.persistence.metamodel.SingularAttribute;
 @javax.persistence.metamodel.StaticMetamodel
 (value=com.x.cms.core.entity.element.FormField.class)
 @javax.annotation.Generated
-(value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Sun Dec 23 11:58:51 CST 2018")
+(value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Mon Dec 24 19:04:08 CST 2018")
 public class FormField_ extends SliceJpaObject_  {
     public static volatile SingularAttribute<FormField,String> appId;
     public static volatile SingularAttribute<FormField,String> dataType;

o2server/x_cms_core_entity/src/main/java/com/x/cms/core/entity/element/Form_.java

@@ -11,7 +11,7 @@ import javax.persistence.metamodel.SingularAttribute;
 @javax.persistence.metamodel.StaticMetamodel
 (value=com.x.cms.core.entity.element.Form.class)
 @javax.annotation.Generated
-(value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Sun Dec 23 11:58:51 CST 2018")
+(value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Mon Dec 24 19:04:08 CST 2018")
 public class Form_ extends SliceJpaObject_  {
     public static volatile SingularAttribute<Form,String> alias;
     public static volatile SingularAttribute<Form,String> appId;

o2server/x_cms_core_entity/src/main/java/com/x/cms/core/entity/element/QueryView_.java

@@ -15,7 +15,7 @@ import javax.persistence.metamodel.SingularAttribute;
 @javax.persistence.metamodel.StaticMetamodel
 (value=com.x.cms.core.entity.element.QueryView.class)
 @javax.annotation.Generated
-(value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Sun Dec 23 11:58:51 CST 2018")
+(value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Mon Dec 24 19:04:08 CST 2018")
 public class QueryView_ extends SliceJpaObject_  {
     public static volatile SingularAttribute<QueryView,String> afterCalculateGridScriptText;
     public static volatile SingularAttribute<QueryView,String> afterGridScriptText;

o2server/x_cms_core_entity/src/main/java/com/x/cms/core/entity/element/Script_.java

@@ -14,7 +14,7 @@ import javax.persistence.metamodel.SingularAttribute;
 @javax.persistence.metamodel.StaticMetamodel
 (value=com.x.cms.core.entity.element.Script.class)
 @javax.annotation.Generated
-(value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Sun Dec 23 11:58:51 CST 2018")
+(value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Mon Dec 24 19:04:08 CST 2018")
 public class Script_ extends SliceJpaObject_  {
     public static volatile SingularAttribute<Script,String> alias;
     public static volatile SingularAttribute<Script,String> appId;

o2server/x_cms_core_entity/src/main/java/com/x/cms/core/entity/element/TemplateForm_.java

@@ -11,7 +11,7 @@ import javax.persistence.metamodel.SingularAttribute;
 @javax.persistence.metamodel.StaticMetamodel
 (value=com.x.cms.core.entity.element.TemplateForm.class)
 @javax.annotation.Generated
-(value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Sun Dec 23 11:58:51 CST 2018")
+(value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Mon Dec 24 19:04:08 CST 2018")
 public class TemplateForm_ extends SliceJpaObject_  {
     public static volatile SingularAttribute<TemplateForm,String> alias;
     public static volatile SingularAttribute<TemplateForm,String> category;

o2server/x_cms_core_entity/src/main/java/com/x/cms/core/entity/element/ViewCategory_.java

@@ -11,7 +11,7 @@ import javax.persistence.metamodel.SingularAttribute;
 @javax.persistence.metamodel.StaticMetamodel
 (value=com.x.cms.core.entity.element.ViewCategory.class)
 @javax.annotation.Generated
-(value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Sun Dec 23 11:58:51 CST 2018")
+(value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Mon Dec 24 19:04:08 CST 2018")
 public class ViewCategory_ extends SliceJpaObject_  {
     public static volatile SingularAttribute<ViewCategory,String> categoryId;
     public static volatile SingularAttribute<ViewCategory,String> editor;

o2server/x_cms_core_entity/src/main/java/com/x/cms/core/entity/element/ViewFieldConfig_.java

@@ -12,7 +12,7 @@ import javax.persistence.metamodel.SingularAttribute;
 @javax.persistence.metamodel.StaticMetamodel
 (value=com.x.cms.core.entity.element.ViewFieldConfig.class)
 @javax.annotation.Generated
-(value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Sun Dec 23 11:58:51 CST 2018")
+(value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Mon Dec 24 19:04:08 CST 2018")
 public class ViewFieldConfig_ extends SliceJpaObject_  {
     public static volatile SingularAttribute<ViewFieldConfig,String> description;
     public static volatile SingularAttribute<ViewFieldConfig,String> editor;

o2server/x_cms_core_entity/src/main/java/com/x/cms/core/entity/element/View_.java

@@ -13,7 +13,7 @@ import javax.persistence.metamodel.SingularAttribute;
 @javax.persistence.metamodel.StaticMetamodel
 (value=com.x.cms.core.entity.element.View.class)
 @javax.annotation.Generated
-(value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Sun Dec 23 11:58:51 CST 2018")
+(value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Mon Dec 24 19:04:08 CST 2018")
 public class View_ extends SliceJpaObject_  {
     public static volatile SingularAttribute<View,String> alias;
     public static volatile SingularAttribute<View,String> appId;

o2server/x_cms_core_entity/src/main/resources/META-INF/persistence.xml

@@ -2,29 +2,29 @@
 
 <persistence xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/persistence  http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd" version="2.0">
   <persistence-unit name="enhance">
+    <class>com.x.cms.core.entity.element.Form</class>
+    <class>com.x.cms.core.entity.element.ViewCategory</class>
     <class>com.x.base.core.entity.SliceJpaObject</class>
-    <class>com.x.cms.core.entity.element.FormField</class>
+    <class>com.x.cms.core.entity.DocumentViewRecord</class>
+    <class>com.x.cms.core.entity.AppCategoryPermission</class>
+    <class>com.x.cms.core.entity.CategoryExt</class>
+    <class>com.x.cms.core.entity.AppCategoryAdmin</class>
     <class>com.x.cms.core.entity.element.ViewFieldConfig</class>
     <class>com.x.base.core.entity.JpaObject</class>
     <class>com.x.cms.core.entity.FileInfo</class>
-    <class>com.x.cms.core.entity.AppInfo</class>
     <class>com.x.cms.core.entity.CategoryInfo</class>
-    <class>com.x.cms.core.entity.AppCategoryPermission</class>
-    <class>com.x.cms.core.entity.AppCategoryAdmin</class>
     <class>com.x.cms.core.entity.Log</class>
-    <class>com.x.cms.core.entity.Document</class>
+    <class>com.x.cms.core.entity.element.Script</class>
     <class>com.x.cms.core.entity.Review</class>
-    <class>com.x.cms.core.entity.element.TemplateForm</class>
-    <class>com.x.cms.core.entity.element.AppDict</class>
+    <class>com.x.cms.core.entity.element.FormField</class>
+    <class>com.x.cms.core.entity.element.View</class>
     <class>com.x.cms.core.entity.element.QueryView</class>
-    <class>com.x.cms.core.entity.element.ViewCategory</class>
-    <class>com.x.cms.core.entity.element.Script</class>
-    <class>com.x.cms.core.entity.DocumentViewRecord</class>
-    <class>com.x.cms.core.entity.element.AppDictItem</class>
     <class>com.x.cms.core.entity.DocumentPermission</class>
-    <class>com.x.cms.core.entity.element.View</class>
+    <class>com.x.cms.core.entity.element.AppDict</class>
     <class>com.x.base.core.entity.StorageObject</class>
-    <class>com.x.cms.core.entity.element.Form</class>
-    <class>com.x.cms.core.entity.CategoryExt</class>
+    <class>com.x.cms.core.entity.Document</class>
+    <class>com.x.cms.core.entity.element.TemplateForm</class>
+    <class>com.x.cms.core.entity.element.AppDictItem</class>
+    <class>com.x.cms.core.entity.AppInfo</class>
   </persistence-unit>
 </persistence>

o2server/x_cms_core_entity/src/test/resources/test.json

@@ -943,22 +943,6 @@
 		}
 	],
 
-	"com.x.attendance.entity.AttendanceDetailAppeal": 
-	[
-		{
-			"dataServer": "xd01",
-			"order": 1,
-			"toolLevel": "WARN",
-			"runtimeLevel": "WARN",
-			"dataCacheLevel": "WARN",
-			"metaDataLevel": "WARN",
-			"enhanceLevel": "WARN",
-			"queryLevel": "WARN",
-			"sqlLevel": "WARN",
-			"jdbcLevel": "WARN"
-		}
-	],
-
 	"com.x.cms.core.entity.element.View": 
 	[
 		{
@@ -1007,21 +991,6 @@
 		}
 	],
 
-	"com.x.attendance.entity.AttendanceAppealInfo": 
-	[
-		{
-			"dataServer": "xd01",
-			"order": 1,
-			"toolLevel": "WARN",
-			"runtimeLevel": "WARN",
-			"dataCacheLevel": "WARN",
-			"metaDataLevel": "WARN",
-			"enhanceLevel": "WARN",
-			"queryLevel": "WARN",
-			"sqlLevel": "WARN",
-			"jdbcLevel": "WARN"
-		}
-	],
 
 	"com.x.organization.core.entity.Custom": 
 	[
@@ -1295,21 +1264,6 @@
 		}
 	],
 
-	"com.x.attendance.entity.AttendanceDetailBakup": 
-	[
-		{
-			"dataServer": "xd01",
-			"order": 1,
-			"toolLevel": "WARN",
-			"runtimeLevel": "WARN",
-			"dataCacheLevel": "WARN",
-			"metaDataLevel": "WARN",
-			"enhanceLevel": "WARN",
-			"queryLevel": "WARN",
-			"sqlLevel": "WARN",
-			"jdbcLevel": "WARN"
-		}
-	],
 
 	"com.x.processplatform.core.entity.element.Merge": 
 	[

o2server/x_collaboration_core_entity/src/main/java/com/x/collaboration/core/entity/Dialog_.java

@@ -12,7 +12,7 @@ import javax.persistence.metamodel.SingularAttribute;
 @javax.persistence.metamodel.StaticMetamodel
 (value=com.x.collaboration.core.entity.Dialog.class)
 @javax.annotation.Generated
-(value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Sun Dec 23 11:59:00 CST 2018")
+(value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Mon Dec 24 19:04:14 CST 2018")
 public class Dialog_ extends SliceJpaObject_  {
     public static volatile SingularAttribute<Dialog,Boolean> arrived;
     public static volatile SingularAttribute<Dialog,String> body;

o2server/x_collaboration_core_entity/src/main/java/com/x/collaboration/core/entity/Notification_.java

@@ -11,7 +11,7 @@ import javax.persistence.metamodel.SingularAttribute;
 @javax.persistence.metamodel.StaticMetamodel
 (value=com.x.collaboration.core.entity.Notification.class)
 @javax.annotation.Generated
-(value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Sun Dec 23 11:59:00 CST 2018")
+(value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Mon Dec 24 19:04:14 CST 2018")
 public class Notification_ extends SliceJpaObject_  {
     public static volatile SingularAttribute<Notification,String> body;
     public static volatile SingularAttribute<Notification,String> id;

o2server/x_collaboration_core_entity/src/main/java/com/x/collaboration/core/entity/SMSMessage_.java

@@ -11,7 +11,7 @@ import javax.persistence.metamodel.SingularAttribute;
 @javax.persistence.metamodel.StaticMetamodel
 (value=com.x.collaboration.core.entity.SMSMessage.class)
 @javax.annotation.Generated
-(value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Sun Dec 23 11:59:00 CST 2018")
+(value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Mon Dec 24 19:04:14 CST 2018")
 public class SMSMessage_ extends SliceJpaObject_  {
     public static volatile SingularAttribute<SMSMessage,String> id;
     public static volatile SingularAttribute<SMSMessage,String> message;

o2server/x_collaboration_core_entity/src/main/java/com/x/collaboration/core/entity/Talk_.java

@@ -12,7 +12,7 @@ import javax.persistence.metamodel.SingularAttribute;
 @javax.persistence.metamodel.StaticMetamodel
 (value=com.x.collaboration.core.entity.Talk.class)
 @javax.annotation.Generated
-(value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Sun Dec 23 11:59:00 CST 2018")
+(value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Mon Dec 24 19:04:14 CST 2018")
 public class Talk_ extends SliceJpaObject_  {
     public static volatile SingularAttribute<Talk,Boolean> arrived;
     public static volatile SingularAttribute<Talk,String> body;

o2server/x_component_core_entity/src/main/java/com/x/component/core/entity/Component_.java

@@ -14,7 +14,7 @@ import javax.persistence.metamodel.SingularAttribute;
 @javax.persistence.metamodel.StaticMetamodel
 (value=com.x.component.core.entity.Component.class)
 @javax.annotation.Generated
-(value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Sun Dec 23 11:59:04 CST 2018")
+(value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Mon Dec 24 19:04:17 CST 2018")
 public class Component_ extends SliceJpaObject_  {
     public static volatile ListAttribute<Component,String> allowList;
     public static volatile ListAttribute<Component,String> denyList;

o2server/x_console/src/main/java/com/x/server/console/Main.java

@@ -59,6 +59,7 @@ import com.x.server.console.server.Servers;
 public class Main {
 
 	private static final String MANIFEST_FILENAME = "manifest.cfg";
+	private static final String GITIGNORE_FILENAME = ".gitignore";
 
 	public static void main(String[] args) throws Exception {
 		String base = getBasePath();
@@ -700,8 +701,7 @@ public class Main {
 	/**
 	 * 检查store目录下的war文件是否全部在manifest.cfg中
 	 * 
-	 * @param base
-	 *            o2server的根目录
+	 * @param base o2server的根目录
 	 */
 	private static void scanWar(String base) throws Exception {
 		File dir = new File(base, "store");
@@ -717,7 +717,11 @@ public class Main {
 			if (o.getName().equals(MANIFEST_FILENAME)) {
 				continue;
 			}
+			if (o.getName().equals(GITIGNORE_FILENAME)) {
+				continue;
+			}
 			if (!manifestNames.contains(o.getName())) {
+				System.out.println("扫描 store 过程中删除无效的文件:" + o.getName());
 				o.delete();
 			}
 		}
@@ -739,7 +743,7 @@ public class Main {
 			throw new Exception("commons/ext manifest is empty.");
 		}
 		for (File file : extDir.listFiles()) {
-			if (!file.getName().equals(MANIFEST_FILENAME)) {
+			if ((!file.getName().equals(MANIFEST_FILENAME)) && (!file.getName().equals(GITIGNORE_FILENAME))) {
 				if (!extDirManifestNames.remove(file.getName())) {
 					System.out.println("载入 commons/ext 过程中删除无效的文件:" + file.getName());
 					file.delete();
@@ -761,7 +765,7 @@ public class Main {
 		}
 		List<String> jarsDirManifestNames = readManifest(jarsDirManifest);
 		for (File file : jarsDir.listFiles()) {
-			if (!file.getName().equals(MANIFEST_FILENAME)) {
+			if ((!file.getName().equals(MANIFEST_FILENAME)) && (!file.getName().equals(GITIGNORE_FILENAME))) {
 				if (!jarsDirManifestNames.remove(file.getName())) {
 					System.out.println("载入 store/jars 过程中删除无效的文件:" + file.getName());
 					file.delete();

o2server/x_file_core_entity/src/main/java/com/x/file/core/entity/open/File_.java

@@ -13,7 +13,7 @@ import javax.persistence.metamodel.SingularAttribute;
 @javax.persistence.metamodel.StaticMetamodel
 (value=com.x.file.core.entity.open.File.class)
 @javax.annotation.Generated
-(value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Sun Dec 23 11:59:08 CST 2018")
+(value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Mon Dec 24 19:04:20 CST 2018")
 public class File_ extends StorageObject_  {
     public static volatile SingularAttribute<File,String> extension;
     public static volatile SingularAttribute<File,String> id;

o2server/x_file_core_entity/src/main/java/com/x/file/core/entity/personal/Attachment_.java

@@ -14,7 +14,7 @@ import javax.persistence.metamodel.SingularAttribute;
 @javax.persistence.metamodel.StaticMetamodel
 (value=com.x.file.core.entity.personal.Attachment.class)
 @javax.annotation.Generated
-(value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Sun Dec 23 11:59:08 CST 2018")
+(value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Mon Dec 24 19:04:20 CST 2018")
 public class Attachment_ extends StorageObject_  {
     public static volatile ListAttribute<Attachment,String> editorList;
     public static volatile SingularAttribute<Attachment,String> extension;

o2server/x_file_core_entity/src/main/java/com/x/file/core/entity/personal/Folder_.java

@@ -11,7 +11,7 @@ import javax.persistence.metamodel.SingularAttribute;
 @javax.persistence.metamodel.StaticMetamodel
 (value=com.x.file.core.entity.personal.Folder.class)
 @javax.annotation.Generated
-(value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Sun Dec 23 11:59:08 CST 2018")
+(value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Mon Dec 24 19:04:20 CST 2018")
 public class Folder_ extends SliceJpaObject_  {
     public static volatile SingularAttribute<Folder,String> id;
     public static volatile SingularAttribute<Folder,String> name;

o2server/x_general_core_entity/src/main/java/com/x/general/core/entity/area/District_.java

@@ -11,7 +11,7 @@ import javax.persistence.metamodel.SingularAttribute;
 @javax.persistence.metamodel.StaticMetamodel
 (value=com.x.general.core.entity.area.District.class)
 @javax.annotation.Generated
-(value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Sun Dec 23 11:59:12 CST 2018")
+(value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Mon Dec 24 19:04:24 CST 2018")
 public class District_ extends SliceJpaObject_  {
     public static volatile SingularAttribute<District,String> center;
     public static volatile SingularAttribute<District,String> city;

o2server/x_general_core_entity/src/main/resources/META-INF/persistence.xml

@@ -2,9 +2,9 @@
 
 <persistence xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/persistence  http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd" version="2.0">
   <persistence-unit name="enhance">
-    <class>com.x.base.core.entity.JpaObject</class>
-    <class>com.x.general.core.entity.area.District</class>
     <class>com.x.base.core.entity.SliceJpaObject</class>
+    <class>com.x.base.core.entity.JpaObject</class>
     <class>com.x.base.core.entity.StorageObject</class>
+    <class>com.x.general.core.entity.area.District</class>
   </persistence-unit>
 </persistence>

o2server/x_hotpic_core_entity/src/main/java/com/x/hotpic/entity/HotPictureInfo_.java

@@ -11,7 +11,7 @@ import javax.persistence.metamodel.SingularAttribute;
 @javax.persistence.metamodel.StaticMetamodel
 (value=com.x.hotpic.entity.HotPictureInfo.class)
 @javax.annotation.Generated
-(value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Sun Dec 23 11:59:16 CST 2018")
+(value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Mon Dec 24 19:04:27 CST 2018")
 public class HotPictureInfo_ extends SliceJpaObject_  {
     public static volatile SingularAttribute<HotPictureInfo,String> application;
     public static volatile SingularAttribute<HotPictureInfo,String> creator;

o2server/x_meeting_core_entity/src/main/java/com/x/meeting/core/entity/Attachment_.java

@@ -14,7 +14,7 @@ import javax.persistence.metamodel.SingularAttribute;
 @javax.persistence.metamodel.StaticMetamodel
 (value=com.x.meeting.core.entity.Attachment.class)
 @javax.annotation.Generated
-(value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Sun Dec 23 11:59:20 CST 2018")
+(value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Mon Dec 24 19:04:30 CST 2018")
 public class Attachment_ extends StorageObject_  {
     public static volatile SingularAttribute<Attachment,String> extension;
     public static volatile SingularAttribute<Attachment,String> id;

o2server/x_meeting_core_entity/src/main/java/com/x/meeting/core/entity/Building_.java

@@ -11,7 +11,7 @@ import javax.persistence.metamodel.SingularAttribute;
 @javax.persistence.metamodel.StaticMetamodel
 (value=com.x.meeting.core.entity.Building.class)
 @javax.annotation.Generated
-(value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Sun Dec 23 11:59:20 CST 2018")
+(value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Mon Dec 24 19:04:30 CST 2018")
 public class Building_ extends SliceJpaObject_  {
     public static volatile SingularAttribute<Building,String> address;
     public static volatile SingularAttribute<Building,String> id;

o2server/x_meeting_core_entity/src/main/java/com/x/meeting/core/entity/Meeting_.java

@@ -14,7 +14,7 @@ import javax.persistence.metamodel.SingularAttribute;
 @javax.persistence.metamodel.StaticMetamodel
 (value=com.x.meeting.core.entity.Meeting.class)
 @javax.annotation.Generated
-(value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Sun Dec 23 11:59:20 CST 2018")
+(value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Mon Dec 24 19:04:30 CST 2018")
 public class Meeting_ extends SliceJpaObject_  {
     public static volatile ListAttribute<Meeting,String> acceptPersonList;
     public static volatile SingularAttribute<Meeting,Date> actualCompletedTime;

o2server/x_meeting_core_entity/src/main/java/com/x/meeting/core/entity/Room_.java

@@ -13,7 +13,7 @@ import javax.persistence.metamodel.SingularAttribute;
 @javax.persistence.metamodel.StaticMetamodel
 (value=com.x.meeting.core.entity.Room.class)
 @javax.annotation.Generated
-(value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Sun Dec 23 11:59:21 CST 2018")
+(value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Mon Dec 24 19:04:30 CST 2018")
 public class Room_ extends SliceJpaObject_  {
     public static volatile SingularAttribute<Room,String> auditor;
     public static volatile SingularAttribute<Room,Boolean> available;

o2server/x_meeting_core_entity/src/main/resources/META-INF/persistence.xml

@@ -2,12 +2,12 @@
 
 <persistence xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/persistence  http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd" version="2.0">
   <persistence-unit name="enhance">
+    <class>com.x.base.core.entity.SliceJpaObject</class>
+    <class>com.x.meeting.core.entity.Building</class>
     <class>com.x.base.core.entity.JpaObject</class>
-    <class>com.x.meeting.core.entity.Attachment</class>
     <class>com.x.meeting.core.entity.Room</class>
-    <class>com.x.meeting.core.entity.Meeting</class>
-    <class>com.x.base.core.entity.SliceJpaObject</class>
     <class>com.x.base.core.entity.StorageObject</class>
-    <class>com.x.meeting.core.entity.Building</class>
+    <class>com.x.meeting.core.entity.Attachment</class>
+    <class>com.x.meeting.core.entity.Meeting</class>
   </persistence-unit>
 </persistence>

o2server/x_message_core_entity/src/main/java/com/x/message/core/entity/Mass_.java

@@ -12,7 +12,7 @@ import javax.persistence.metamodel.SingularAttribute;
 @javax.persistence.metamodel.StaticMetamodel
 (value=com.x.message.core.entity.Mass.class)
 @javax.annotation.Generated
-(value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Sun Dec 23 11:59:26 CST 2018")
+(value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Mon Dec 24 19:04:33 CST 2018")
 public class Mass_ extends SliceJpaObject_  {
     public static volatile SingularAttribute<Mass,String> body;
     public static volatile SingularAttribute<Mass,String> creatorPerson;

o2server/x_message_core_entity/src/main/java/com/x/message/core/entity/Message_.java

@@ -12,7 +12,7 @@ import javax.persistence.metamodel.SingularAttribute;
 @javax.persistence.metamodel.StaticMetamodel
 (value=com.x.message.core.entity.Message.class)
 @javax.annotation.Generated
-(value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Sun Dec 23 11:59:26 CST 2018")
+(value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Mon Dec 24 19:04:33 CST 2018")
 public class Message_ extends SliceJpaObject_  {
     public static volatile SingularAttribute<Message,String> body;
     public static volatile ListAttribute<Message,String> consumerList;

o2server/x_mind_core_entity/src/main/java/com/x/mind/entity/MindBaseInfo_.java

@@ -14,7 +14,7 @@ import javax.persistence.metamodel.SingularAttribute;
 @javax.persistence.metamodel.StaticMetamodel
 (value=com.x.mind.entity.MindBaseInfo.class)
 @javax.annotation.Generated
-(value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Sun Dec 23 11:59:30 CST 2018")
+(value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Mon Dec 24 19:04:37 CST 2018")
 public class MindBaseInfo_ extends SliceJpaObject_  {
     public static volatile SingularAttribute<MindBaseInfo,Boolean> cooperative;
     public static volatile SingularAttribute<MindBaseInfo,String> cooperative_sequence;

o2server/x_mind_core_entity/src/main/java/com/x/mind/entity/MindContentInfo_.java

@@ -11,7 +11,7 @@ import javax.persistence.metamodel.SingularAttribute;
 @javax.persistence.metamodel.StaticMetamodel
 (value=com.x.mind.entity.MindContentInfo.class)
 @javax.annotation.Generated
-(value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Sun Dec 23 11:59:30 CST 2018")
+(value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Mon Dec 24 19:04:37 CST 2018")
 public class MindContentInfo_ extends SliceJpaObject_  {
     public static volatile SingularAttribute<MindContentInfo,String> content;
     public static volatile SingularAttribute<MindContentInfo,String> id;

o2server/x_mind_core_entity/src/main/java/com/x/mind/entity/MindFolderInfo_.java

@@ -12,7 +12,7 @@ import javax.persistence.metamodel.SingularAttribute;
 @javax.persistence.metamodel.StaticMetamodel
 (value=com.x.mind.entity.MindFolderInfo.class)
 @javax.annotation.Generated
-(value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Sun Dec 23 11:59:30 CST 2018")
+(value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Mon Dec 24 19:04:37 CST 2018")
 public class MindFolderInfo_ extends SliceJpaObject_  {
     public static volatile SingularAttribute<MindFolderInfo,String> creator;
     public static volatile SingularAttribute<MindFolderInfo,String> creatorUnit;

o2server/x_mind_core_entity/src/main/java/com/x/mind/entity/MindIconInfo_.java

@@ -11,7 +11,7 @@ import javax.persistence.metamodel.SingularAttribute;
 @javax.persistence.metamodel.StaticMetamodel
 (value=com.x.mind.entity.MindIconInfo.class)
 @javax.annotation.Generated
-(value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Sun Dec 23 11:59:30 CST 2018")
+(value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Mon Dec 24 19:04:37 CST 2018")
 public class MindIconInfo_ extends SliceJpaObject_  {
     public static volatile SingularAttribute<MindIconInfo,String> content;
     public static volatile SingularAttribute<MindIconInfo,String> id;

o2server/x_mind_core_entity/src/main/java/com/x/mind/entity/MindRecycleInfo_.java

@@ -14,7 +14,7 @@ import javax.persistence.metamodel.SingularAttribute;
 @javax.persistence.metamodel.StaticMetamodel
 (value=com.x.mind.entity.MindRecycleInfo.class)
 @javax.annotation.Generated
-(value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Sun Dec 23 11:59:30 CST 2018")
+(value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Mon Dec 24 19:04:37 CST 2018")
 public class MindRecycleInfo_ extends SliceJpaObject_  {
     public static volatile SingularAttribute<MindRecycleInfo,String> creator;
     public static volatile SingularAttribute<MindRecycleInfo,String> creatorUnit;

o2server/x_mind_core_entity/src/main/java/com/x/mind/entity/MindShareRecord_.java

@@ -11,7 +11,7 @@ import javax.persistence.metamodel.SingularAttribute;
 @javax.persistence.metamodel.StaticMetamodel
 (value=com.x.mind.entity.MindShareRecord.class)
 @javax.annotation.Generated
-(value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Sun Dec 23 11:59:30 CST 2018")
+(value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Mon Dec 24 19:04:37 CST 2018")
 public class MindShareRecord_ extends SliceJpaObject_  {
     public static volatile SingularAttribute<MindShareRecord,String> fileId;
     public static volatile SingularAttribute<MindShareRecord,String> fileStatus;

o2server/x_mind_core_entity/src/main/java/com/x/mind/entity/MindVersionContent_.java

@@ -11,7 +11,7 @@ import javax.persistence.metamodel.SingularAttribute;
 @javax.persistence.metamodel.StaticMetamodel
 (value=com.x.mind.entity.MindVersionContent.class)
 @javax.annotation.Generated
-(value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Sun Dec 23 11:59:30 CST 2018")
+(value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Mon Dec 24 19:04:37 CST 2018")
 public class MindVersionContent_ extends SliceJpaObject_  {
     public static volatile SingularAttribute<MindVersionContent,String> content;
     public static volatile SingularAttribute<MindVersionContent,String> id;

o2server/x_mind_core_entity/src/main/java/com/x/mind/entity/MindVersionInfo_.java

@@ -13,7 +13,7 @@ import javax.persistence.metamodel.SingularAttribute;
 @javax.persistence.metamodel.StaticMetamodel
 (value=com.x.mind.entity.MindVersionInfo.class)
 @javax.annotation.Generated
-(value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Sun Dec 23 11:59:30 CST 2018")
+(value="org.apache.openjpa.persistence.meta.AnnotationProcessor6",date="Mon Dec 24 19:04:37 CST 2018")
 public class MindVersionInfo_ extends SliceJpaObject_  {
     public static volatile SingularAttribute<MindVersionInfo,String> creator;
     public static volatile SingularAttribute<MindVersionInfo,String> creatorUnit;