删除实体增强类

o2server/x_attendance_assemble_control/src/main/resources/META-INF/x_persistence.xml

@@ -1,130 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<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="com.x.attendance.entity.AttendanceAdmin" transaction-type="RESOURCE_LOCAL">
-    <provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider>
-    <class>com.x.attendance.entity.AttendanceAdmin</class>
-    <class>com.x.base.core.entity.SliceJpaObject</class>
-    <class>com.x.base.core.entity.JpaObject</class>
-    <properties/>
-  </persistence-unit>
-  <persistence-unit name="com.x.attendance.entity.AttendanceAppealInfo" transaction-type="RESOURCE_LOCAL">
-    <provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider>
-    <class>com.x.base.core.entity.SliceJpaObject</class>
-    <class>com.x.base.core.entity.JpaObject</class>
-    <class>com.x.attendance.entity.AttendanceAppealInfo</class>
-    <properties/>
-  </persistence-unit>
-  <persistence-unit name="com.x.attendance.entity.AttendanceDetail" transaction-type="RESOURCE_LOCAL">
-    <provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider>
-    <class>com.x.attendance.entity.AttendanceDetail</class>
-    <class>com.x.base.core.entity.SliceJpaObject</class>
-    <class>com.x.base.core.entity.JpaObject</class>
-    <properties/>
-  </persistence-unit>
-  <persistence-unit name="com.x.attendance.entity.AttendanceDetailMobile" transaction-type="RESOURCE_LOCAL">
-    <provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider>
-    <class>com.x.base.core.entity.SliceJpaObject</class>
-    <class>com.x.base.core.entity.JpaObject</class>
-    <class>com.x.attendance.entity.AttendanceDetailMobile</class>
-    <properties/>
-  </persistence-unit>
-  <persistence-unit name="com.x.attendance.entity.AttendanceEmployeeConfig" transaction-type="RESOURCE_LOCAL">
-    <provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider>
-    <class>com.x.base.core.entity.SliceJpaObject</class>
-    <class>com.x.base.core.entity.JpaObject</class>
-    <class>com.x.attendance.entity.AttendanceEmployeeConfig</class>
-    <properties/>
-  </persistence-unit>
-  <persistence-unit name="com.x.attendance.entity.AttendanceImportFileInfo" transaction-type="RESOURCE_LOCAL">
-    <provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider>
-    <class>com.x.base.core.entity.SliceJpaObject</class>
-    <class>com.x.base.core.entity.JpaObject</class>
-    <class>com.x.attendance.entity.AttendanceImportFileInfo</class>
-    <properties/>
-  </persistence-unit>
-  <persistence-unit name="com.x.attendance.entity.AttendanceScheduleSetting" transaction-type="RESOURCE_LOCAL">
-    <provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider>
-    <class>com.x.base.core.entity.SliceJpaObject</class>
-    <class>com.x.base.core.entity.JpaObject</class>
-    <class>com.x.attendance.entity.AttendanceScheduleSetting</class>
-    <properties/>
-  </persistence-unit>
-  <persistence-unit name="com.x.attendance.entity.AttendanceSelfHoliday" transaction-type="RESOURCE_LOCAL">
-    <provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider>
-    <class>com.x.base.core.entity.SliceJpaObject</class>
-    <class>com.x.base.core.entity.JpaObject</class>
-    <class>com.x.attendance.entity.AttendanceSelfHoliday</class>
-    <properties/>
-  </persistence-unit>
-  <persistence-unit name="com.x.attendance.entity.AttendanceSetting" transaction-type="RESOURCE_LOCAL">
-    <provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider>
-    <class>com.x.base.core.entity.SliceJpaObject</class>
-    <class>com.x.base.core.entity.JpaObject</class>
-    <class>com.x.attendance.entity.AttendanceSetting</class>
-    <properties/>
-  </persistence-unit>
-  <persistence-unit name="com.x.attendance.entity.AttendanceStatisticRequireLog" transaction-type="RESOURCE_LOCAL">
-    <provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider>
-    <class>com.x.base.core.entity.SliceJpaObject</class>
-    <class>com.x.base.core.entity.JpaObject</class>
-    <class>com.x.attendance.entity.AttendanceStatisticRequireLog</class>
-    <properties/>
-  </persistence-unit>
-  <persistence-unit name="com.x.attendance.entity.AttendanceStatisticalCycle" transaction-type="RESOURCE_LOCAL">
-    <provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider>
-    <class>com.x.attendance.entity.AttendanceStatisticalCycle</class>
-    <class>com.x.base.core.entity.SliceJpaObject</class>
-    <class>com.x.base.core.entity.JpaObject</class>
-    <properties/>
-  </persistence-unit>
-  <persistence-unit name="com.x.attendance.entity.AttendanceWorkDayConfig" transaction-type="RESOURCE_LOCAL">
-    <provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider>
-    <class>com.x.base.core.entity.SliceJpaObject</class>
-    <class>com.x.attendance.entity.AttendanceWorkDayConfig</class>
-    <class>com.x.base.core.entity.JpaObject</class>
-    <properties/>
-  </persistence-unit>
-  <persistence-unit name="com.x.attendance.entity.AttendanceWorkPlace" transaction-type="RESOURCE_LOCAL">
-    <provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider>
-    <class>com.x.base.core.entity.SliceJpaObject</class>
-    <class>com.x.base.core.entity.JpaObject</class>
-    <class>com.x.attendance.entity.AttendanceWorkPlace</class>
-    <properties/>
-  </persistence-unit>
-  <persistence-unit name="com.x.attendance.entity.StatisticPersonForMonth" transaction-type="RESOURCE_LOCAL">
-    <provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider>
-    <class>com.x.base.core.entity.SliceJpaObject</class>
-    <class>com.x.base.core.entity.JpaObject</class>
-    <class>com.x.attendance.entity.StatisticPersonForMonth</class>
-    <properties/>
-  </persistence-unit>
-  <persistence-unit name="com.x.attendance.entity.StatisticTopUnitForDay" transaction-type="RESOURCE_LOCAL">
-    <provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider>
-    <class>com.x.attendance.entity.StatisticTopUnitForDay</class>
-    <class>com.x.base.core.entity.SliceJpaObject</class>
-    <class>com.x.base.core.entity.JpaObject</class>
-    <properties/>
-  </persistence-unit>
-  <persistence-unit name="com.x.attendance.entity.StatisticTopUnitForMonth" transaction-type="RESOURCE_LOCAL">
-    <provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider>
-    <class>com.x.base.core.entity.SliceJpaObject</class>
-    <class>com.x.base.core.entity.JpaObject</class>
-    <class>com.x.attendance.entity.StatisticTopUnitForMonth</class>
-    <properties/>
-  </persistence-unit>
-  <persistence-unit name="com.x.attendance.entity.StatisticUnitForDay" transaction-type="RESOURCE_LOCAL">
-    <provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider>
-    <class>com.x.base.core.entity.SliceJpaObject</class>
-    <class>com.x.base.core.entity.JpaObject</class>
-    <class>com.x.attendance.entity.StatisticUnitForDay</class>
-    <properties/>
-  </persistence-unit>
-  <persistence-unit name="com.x.attendance.entity.StatisticUnitForMonth" transaction-type="RESOURCE_LOCAL">
-    <provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider>
-    <class>com.x.base.core.entity.SliceJpaObject</class>
-    <class>com.x.base.core.entity.JpaObject</class>
-    <class>com.x.attendance.entity.StatisticUnitForMonth</class>
-    <properties/>
-  </persistence-unit>
-</persistence>

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

@@ -1,21 +0,0 @@
-/** 
- *  Generated by OpenJPA MetaModel Generator Tool.
-**/
-
-package com.x.attendance.entity;
-
-import com.x.base.core.entity.SliceJpaObject_;
-import java.lang.String;
-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="Thu Dec 27 11:39:25 CST 2018")
-public class AttendanceAdmin_ extends SliceJpaObject_  {
-    public static volatile SingularAttribute<AttendanceAdmin,String> adminLevel;
-    public static volatile SingularAttribute<AttendanceAdmin,String> adminName;
-    public static volatile SingularAttribute<AttendanceAdmin,String> id;
-    public static volatile SingularAttribute<AttendanceAdmin,String> unitName;
-    public static volatile SingularAttribute<AttendanceAdmin,String> unitOu;
-}

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

@@ -1,48 +0,0 @@
-/** 
- *  Generated by OpenJPA MetaModel Generator Tool.
-**/
-
-package com.x.attendance.entity;
-
-import com.x.base.core.entity.SliceJpaObject_;
-import java.lang.Integer;
-import java.lang.String;
-import java.util.Date;
-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="Thu Dec 27 11:39:25 CST 2018")
-public class AttendanceAppealInfo_ extends SliceJpaObject_  {
-    public static volatile SingularAttribute<AttendanceAppealInfo,String> address;
-    public static volatile SingularAttribute<AttendanceAppealInfo,String> appealDateString;
-    public static volatile SingularAttribute<AttendanceAppealInfo,String> appealDescription;
-    public static volatile SingularAttribute<AttendanceAppealInfo,String> appealReason;
-    public static volatile SingularAttribute<AttendanceAppealInfo,String> archiveTime;
-    public static volatile SingularAttribute<AttendanceAppealInfo,String> currentProcessor;
-    public static volatile SingularAttribute<AttendanceAppealInfo,String> detailId;
-    public static volatile SingularAttribute<AttendanceAppealInfo,String> empName;
-    public static volatile SingularAttribute<AttendanceAppealInfo,String> endTime;
-    public static volatile SingularAttribute<AttendanceAppealInfo,String> id;
-    public static volatile SingularAttribute<AttendanceAppealInfo,String> monthString;
-    public static volatile SingularAttribute<AttendanceAppealInfo,String> opinion1;
-    public static volatile SingularAttribute<AttendanceAppealInfo,String> opinion2;
-    public static volatile SingularAttribute<AttendanceAppealInfo,String> processPerson1;
-    public static volatile SingularAttribute<AttendanceAppealInfo,String> processPerson2;
-    public static volatile SingularAttribute<AttendanceAppealInfo,String> processPersonTopUnit1;
-    public static volatile SingularAttribute<AttendanceAppealInfo,String> processPersonTopUnit2;
-    public static volatile SingularAttribute<AttendanceAppealInfo,String> processPersonUnit1;
-    public static volatile SingularAttribute<AttendanceAppealInfo,String> processPersonUnit2;
-    public static volatile SingularAttribute<AttendanceAppealInfo,Date> processTime1;
-    public static volatile SingularAttribute<AttendanceAppealInfo,Date> processTime2;
-    public static volatile SingularAttribute<AttendanceAppealInfo,String> reason;
-    public static volatile SingularAttribute<AttendanceAppealInfo,Date> recordDate;
-    public static volatile SingularAttribute<AttendanceAppealInfo,String> recordDateString;
-    public static volatile SingularAttribute<AttendanceAppealInfo,String> selfHolidayType;
-    public static volatile SingularAttribute<AttendanceAppealInfo,String> startTime;
-    public static volatile SingularAttribute<AttendanceAppealInfo,Integer> status;
-    public static volatile SingularAttribute<AttendanceAppealInfo,String> topUnitName;
-    public static volatile SingularAttribute<AttendanceAppealInfo,String> unitName;
-    public static volatile SingularAttribute<AttendanceAppealInfo,String> yearString;
-}

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

@@ -1,32 +0,0 @@
-/** 
- *  Generated by OpenJPA MetaModel Generator Tool.
-**/
-
-package com.x.attendance.entity;
-
-import com.x.base.core.entity.SliceJpaObject_;
-import java.lang.Integer;
-import java.lang.String;
-import java.util.Date;
-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="Thu Dec 27 11:39:25 CST 2018")
-public class AttendanceDetailMobile_ extends SliceJpaObject_  {
-    public static volatile SingularAttribute<AttendanceDetailMobile,String> description;
-    public static volatile SingularAttribute<AttendanceDetailMobile,String> empName;
-    public static volatile SingularAttribute<AttendanceDetailMobile,String> empNo;
-    public static volatile SingularAttribute<AttendanceDetailMobile,String> id;
-    public static volatile SingularAttribute<AttendanceDetailMobile,String> latitude;
-    public static volatile SingularAttribute<AttendanceDetailMobile,String> longitude;
-    public static volatile SingularAttribute<AttendanceDetailMobile,String> optMachineType;
-    public static volatile SingularAttribute<AttendanceDetailMobile,String> optSystemName;
-    public static volatile SingularAttribute<AttendanceDetailMobile,String> recordAddress;
-    public static volatile SingularAttribute<AttendanceDetailMobile,Date> recordDate;
-    public static volatile SingularAttribute<AttendanceDetailMobile,String> recordDateString;
-    public static volatile SingularAttribute<AttendanceDetailMobile,Integer> recordStatus;
-    public static volatile SingularAttribute<AttendanceDetailMobile,String> signDescription;
-    public static volatile SingularAttribute<AttendanceDetailMobile,String> signTime;
-}

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

@@ -1,64 +0,0 @@
-/** 
- *  Generated by OpenJPA MetaModel Generator Tool.
-**/
-
-package com.x.attendance.entity;
-
-import com.x.base.core.entity.SliceJpaObject_;
-import java.lang.Boolean;
-import java.lang.Double;
-import java.lang.Integer;
-import java.lang.Long;
-import java.lang.String;
-import java.util.Date;
-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="Thu Dec 27 11:39:25 CST 2018")
-public class AttendanceDetail_ extends SliceJpaObject_  {
-    public static volatile SingularAttribute<AttendanceDetail,String> abnormalDutyDayTime;
-    public static volatile SingularAttribute<AttendanceDetail,Double> absence;
-    public static volatile SingularAttribute<AttendanceDetail,String> absentDayTime;
-    public static volatile SingularAttribute<AttendanceDetail,String> appealDescription;
-    public static volatile SingularAttribute<AttendanceDetail,String> appealProcessor;
-    public static volatile SingularAttribute<AttendanceDetail,String> appealReason;
-    public static volatile SingularAttribute<AttendanceDetail,Integer> appealStatus;
-    public static volatile SingularAttribute<AttendanceDetail,String> archiveTime;
-    public static volatile SingularAttribute<AttendanceDetail,Double> attendance;
-    public static volatile SingularAttribute<AttendanceDetail,String> batchName;
-    public static volatile SingularAttribute<AttendanceDetail,String> cycleMonth;
-    public static volatile SingularAttribute<AttendanceDetail,String> cycleYear;
-    public static volatile SingularAttribute<AttendanceDetail,String> description;
-    public static volatile SingularAttribute<AttendanceDetail,String> empName;
-    public static volatile SingularAttribute<AttendanceDetail,String> empNo;
-    public static volatile SingularAttribute<AttendanceDetail,Double> getSelfHolidayDays;
-    public static volatile SingularAttribute<AttendanceDetail,String> id;
-    public static volatile SingularAttribute<AttendanceDetail,Boolean> isAbnormalDuty;
-    public static volatile SingularAttribute<AttendanceDetail,Boolean> isAbsent;
-    public static volatile SingularAttribute<AttendanceDetail,Boolean> isGetSelfHolidays;
-    public static volatile SingularAttribute<AttendanceDetail,Boolean> isHoliday;
-    public static volatile SingularAttribute<AttendanceDetail,Boolean> isLackOfTime;
-    public static volatile SingularAttribute<AttendanceDetail,Boolean> isLate;
-    public static volatile SingularAttribute<AttendanceDetail,Boolean> isLeaveEarlier;
-    public static volatile SingularAttribute<AttendanceDetail,Boolean> isWeekend;
-    public static volatile SingularAttribute<AttendanceDetail,Boolean> isWorkOvertime;
-    public static volatile SingularAttribute<AttendanceDetail,Boolean> isWorkday;
-    public static volatile SingularAttribute<AttendanceDetail,Long> lateTimeDuration;
-    public static volatile SingularAttribute<AttendanceDetail,Long> leaveEarlierTimeDuration;
-    public static volatile SingularAttribute<AttendanceDetail,String> monthString;
-    public static volatile SingularAttribute<AttendanceDetail,String> offDutyTime;
-    public static volatile SingularAttribute<AttendanceDetail,String> offWorkTime;
-    public static volatile SingularAttribute<AttendanceDetail,String> onDutyTime;
-    public static volatile SingularAttribute<AttendanceDetail,String> onWorkTime;
-    public static volatile SingularAttribute<AttendanceDetail,Date> recordDate;
-    public static volatile SingularAttribute<AttendanceDetail,String> recordDateString;
-    public static volatile SingularAttribute<AttendanceDetail,Integer> recordStatus;
-    public static volatile SingularAttribute<AttendanceDetail,String> selfHolidayDayTime;
-    public static volatile SingularAttribute<AttendanceDetail,String> topUnitName;
-    public static volatile SingularAttribute<AttendanceDetail,String> unitName;
-    public static volatile SingularAttribute<AttendanceDetail,Long> workOvertimeTimeDuration;
-    public static volatile SingularAttribute<AttendanceDetail,Long> workTimeDuration;
-    public static volatile SingularAttribute<AttendanceDetail,String> yearString;
-}

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

@@ -1,25 +0,0 @@
-/** 
- *  Generated by OpenJPA MetaModel Generator Tool.
-**/
-
-package com.x.attendance.entity;
-
-import com.x.base.core.entity.SliceJpaObject_;
-import java.lang.String;
-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="Thu Dec 27 11:39:25 CST 2018")
-public class AttendanceEmployeeConfig_ extends SliceJpaObject_  {
-    public static volatile SingularAttribute<AttendanceEmployeeConfig,String> configType;
-    public static volatile SingularAttribute<AttendanceEmployeeConfig,String> empInTopUnitTime;
-    public static volatile SingularAttribute<AttendanceEmployeeConfig,String> employeeName;
-    public static volatile SingularAttribute<AttendanceEmployeeConfig,String> employeeNumber;
-    public static volatile SingularAttribute<AttendanceEmployeeConfig,String> id;
-    public static volatile SingularAttribute<AttendanceEmployeeConfig,String> topUnitName;
-    public static volatile SingularAttribute<AttendanceEmployeeConfig,String> topUnitOu;
-    public static volatile SingularAttribute<AttendanceEmployeeConfig,String> unitName;
-    public static volatile SingularAttribute<AttendanceEmployeeConfig,String> unitOu;
-}

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

@@ -1,41 +0,0 @@
-/** 
- *  Generated by OpenJPA MetaModel Generator Tool.
-**/
-
-package com.x.attendance.entity;
-
-import com.x.base.core.entity.SliceJpaObject_;
-import java.lang.Boolean;
-import java.lang.Long;
-import java.lang.String;
-import java.util.Date;
-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="Thu Dec 27 11:39:25 CST 2018")
-public class AttendanceImportFileInfo_ extends SliceJpaObject_  {
-    public static volatile SingularAttribute<AttendanceImportFileInfo,String> creatorUid;
-    public static volatile SingularAttribute<AttendanceImportFileInfo,String> currentProcessName;
-    public static volatile SingularAttribute<AttendanceImportFileInfo,String> dataContent;
-    public static volatile SingularAttribute<AttendanceImportFileInfo,String> description;
-    public static volatile SingularAttribute<AttendanceImportFileInfo,Date> endDate;
-    public static volatile SingularAttribute<AttendanceImportFileInfo,String> errorContent;
-    public static volatile SingularAttribute<AttendanceImportFileInfo,String> extension;
-    public static volatile SingularAttribute<AttendanceImportFileInfo,byte[]> fileBody;
-    public static volatile SingularAttribute<AttendanceImportFileInfo,String> fileName;
-    public static volatile SingularAttribute<AttendanceImportFileInfo,String> fileStatus;
-    public static volatile SingularAttribute<AttendanceImportFileInfo,String> id;
-    public static volatile SingularAttribute<AttendanceImportFileInfo,Date> lastUpdateTime;
-    public static volatile SingularAttribute<AttendanceImportFileInfo,Long> length;
-    public static volatile SingularAttribute<AttendanceImportFileInfo,String> name;
-    public static volatile SingularAttribute<AttendanceImportFileInfo,Long> processCount;
-    public static volatile SingularAttribute<AttendanceImportFileInfo,Boolean> processing;
-    public static volatile SingularAttribute<AttendanceImportFileInfo,Long> recordTotle;
-    public static volatile SingularAttribute<AttendanceImportFileInfo,Long> rowCount;
-    public static volatile SingularAttribute<AttendanceImportFileInfo,String> site;
-    public static volatile SingularAttribute<AttendanceImportFileInfo,Date> startDate;
-    public static volatile SingularAttribute<AttendanceImportFileInfo,String> tempFilePath;
-    public static volatile SingularAttribute<AttendanceImportFileInfo,Boolean> validateOk;
-}

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

@@ -1,25 +0,0 @@
-/** 
- *  Generated by OpenJPA MetaModel Generator Tool.
-**/
-
-package com.x.attendance.entity;
-
-import com.x.base.core.entity.SliceJpaObject_;
-import java.lang.String;
-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="Thu Dec 27 11:39:25 CST 2018")
-public class AttendanceScheduleSetting_ extends SliceJpaObject_  {
-    public static volatile SingularAttribute<AttendanceScheduleSetting,String> absenceStartTime;
-    public static volatile SingularAttribute<AttendanceScheduleSetting,String> id;
-    public static volatile SingularAttribute<AttendanceScheduleSetting,String> lateStartTime;
-    public static volatile SingularAttribute<AttendanceScheduleSetting,String> leaveEarlyStartTime;
-    public static volatile SingularAttribute<AttendanceScheduleSetting,String> offDutyTime;
-    public static volatile SingularAttribute<AttendanceScheduleSetting,String> onDutyTime;
-    public static volatile SingularAttribute<AttendanceScheduleSetting,String> topUnitName;
-    public static volatile SingularAttribute<AttendanceScheduleSetting,String> unitName;
-    public static volatile SingularAttribute<AttendanceScheduleSetting,String> unitOu;
-}

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

@@ -1,31 +0,0 @@
-/** 
- *  Generated by OpenJPA MetaModel Generator Tool.
-**/
-
-package com.x.attendance.entity;
-
-import com.x.base.core.entity.SliceJpaObject_;
-import java.lang.Double;
-import java.lang.String;
-import java.util.Date;
-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="Thu Dec 27 11:39:25 CST 2018")
-public class AttendanceSelfHoliday_ extends SliceJpaObject_  {
-    public static volatile SingularAttribute<AttendanceSelfHoliday,String> description;
-    public static volatile SingularAttribute<AttendanceSelfHoliday,String> docId;
-    public static volatile SingularAttribute<AttendanceSelfHoliday,String> employeeName;
-    public static volatile SingularAttribute<AttendanceSelfHoliday,String> employeeNumber;
-    public static volatile SingularAttribute<AttendanceSelfHoliday,Date> endTime;
-    public static volatile SingularAttribute<AttendanceSelfHoliday,String> id;
-    public static volatile SingularAttribute<AttendanceSelfHoliday,Double> leaveDayNumber;
-    public static volatile SingularAttribute<AttendanceSelfHoliday,String> leaveType;
-    public static volatile SingularAttribute<AttendanceSelfHoliday,Date> startTime;
-    public static volatile SingularAttribute<AttendanceSelfHoliday,String> topUnitName;
-    public static volatile SingularAttribute<AttendanceSelfHoliday,String> topUnitOu;
-    public static volatile SingularAttribute<AttendanceSelfHoliday,String> unitName;
-    public static volatile SingularAttribute<AttendanceSelfHoliday,String> unitOu;
-}

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

@@ -1,27 +0,0 @@
-/** 
- *  Generated by OpenJPA MetaModel Generator Tool.
-**/
-
-package com.x.attendance.entity;
-
-import com.x.base.core.entity.SliceJpaObject_;
-import java.lang.Boolean;
-import java.lang.Integer;
-import java.lang.String;
-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="Thu Dec 27 11:39:25 CST 2018")
-public class AttendanceSetting_ extends SliceJpaObject_  {
-    public static volatile SingularAttribute<AttendanceSetting,String> configCode;
-    public static volatile SingularAttribute<AttendanceSetting,String> configName;
-    public static volatile SingularAttribute<AttendanceSetting,String> configValue;
-    public static volatile SingularAttribute<AttendanceSetting,String> description;
-    public static volatile SingularAttribute<AttendanceSetting,String> id;
-    public static volatile SingularAttribute<AttendanceSetting,Boolean> isMultiple;
-    public static volatile SingularAttribute<AttendanceSetting,Integer> orderNumber;
-    public static volatile SingularAttribute<AttendanceSetting,String> selectContent;
-    public static volatile SingularAttribute<AttendanceSetting,String> valueType;
-}

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

@@ -1,27 +0,0 @@
-/** 
- *  Generated by OpenJPA MetaModel Generator Tool.
-**/
-
-package com.x.attendance.entity;
-
-import com.x.base.core.entity.SliceJpaObject_;
-import java.lang.String;
-import java.util.Date;
-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="Thu Dec 27 11:39:25 CST 2018")
-public class AttendanceStatisticRequireLog_ extends SliceJpaObject_  {
-    public static volatile SingularAttribute<AttendanceStatisticRequireLog,String> description;
-    public static volatile SingularAttribute<AttendanceStatisticRequireLog,String> id;
-    public static volatile SingularAttribute<AttendanceStatisticRequireLog,String> processStatus;
-    public static volatile SingularAttribute<AttendanceStatisticRequireLog,Date> processTime;
-    public static volatile SingularAttribute<AttendanceStatisticRequireLog,String> statisticDay;
-    public static volatile SingularAttribute<AttendanceStatisticRequireLog,String> statisticKey;
-    public static volatile SingularAttribute<AttendanceStatisticRequireLog,String> statisticMonth;
-    public static volatile SingularAttribute<AttendanceStatisticRequireLog,String> statisticName;
-    public static volatile SingularAttribute<AttendanceStatisticRequireLog,String> statisticType;
-    public static volatile SingularAttribute<AttendanceStatisticRequireLog,String> statisticYear;
-}

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

@@ -1,27 +0,0 @@
-/** 
- *  Generated by OpenJPA MetaModel Generator Tool.
-**/
-
-package com.x.attendance.entity;
-
-import com.x.base.core.entity.SliceJpaObject_;
-import java.lang.String;
-import java.util.Date;
-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="Thu Dec 27 11:39:25 CST 2018")
-public class AttendanceStatisticalCycle_ extends SliceJpaObject_  {
-    public static volatile SingularAttribute<AttendanceStatisticalCycle,Date> cycleEndDate;
-    public static volatile SingularAttribute<AttendanceStatisticalCycle,String> cycleEndDateString;
-    public static volatile SingularAttribute<AttendanceStatisticalCycle,String> cycleMonth;
-    public static volatile SingularAttribute<AttendanceStatisticalCycle,Date> cycleStartDate;
-    public static volatile SingularAttribute<AttendanceStatisticalCycle,String> cycleStartDateString;
-    public static volatile SingularAttribute<AttendanceStatisticalCycle,String> cycleYear;
-    public static volatile SingularAttribute<AttendanceStatisticalCycle,String> description;
-    public static volatile SingularAttribute<AttendanceStatisticalCycle,String> id;
-    public static volatile SingularAttribute<AttendanceStatisticalCycle,String> topUnitName;
-    public static volatile SingularAttribute<AttendanceStatisticalCycle,String> unitName;
-}

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

@@ -1,23 +0,0 @@
-/** 
- *  Generated by OpenJPA MetaModel Generator Tool.
-**/
-
-package com.x.attendance.entity;
-
-import com.x.base.core.entity.SliceJpaObject_;
-import java.lang.String;
-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="Thu Dec 27 11:39:25 CST 2018")
-public class AttendanceWorkDayConfig_ extends SliceJpaObject_  {
-    public static volatile SingularAttribute<AttendanceWorkDayConfig,String> configDate;
-    public static volatile SingularAttribute<AttendanceWorkDayConfig,String> configMonth;
-    public static volatile SingularAttribute<AttendanceWorkDayConfig,String> configName;
-    public static volatile SingularAttribute<AttendanceWorkDayConfig,String> configType;
-    public static volatile SingularAttribute<AttendanceWorkDayConfig,String> configYear;
-    public static volatile SingularAttribute<AttendanceWorkDayConfig,String> description;
-    public static volatile SingularAttribute<AttendanceWorkDayConfig,String> id;
-}

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

@@ -1,25 +0,0 @@
-/** 
- *  Generated by OpenJPA MetaModel Generator Tool.
-**/
-
-package com.x.attendance.entity;
-
-import com.x.base.core.entity.SliceJpaObject_;
-import java.lang.Integer;
-import java.lang.String;
-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="Thu Dec 27 11:39:25 CST 2018")
-public class AttendanceWorkPlace_ extends SliceJpaObject_  {
-    public static volatile SingularAttribute<AttendanceWorkPlace,String> creator;
-    public static volatile SingularAttribute<AttendanceWorkPlace,String> description;
-    public static volatile SingularAttribute<AttendanceWorkPlace,Integer> errorRange;
-    public static volatile SingularAttribute<AttendanceWorkPlace,String> id;
-    public static volatile SingularAttribute<AttendanceWorkPlace,String> latitude;
-    public static volatile SingularAttribute<AttendanceWorkPlace,String> longitude;
-    public static volatile SingularAttribute<AttendanceWorkPlace,String> placeAlias;
-    public static volatile SingularAttribute<AttendanceWorkPlace,String> placeName;
-}

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

@@ -1,34 +0,0 @@
-/** 
- *  Generated by OpenJPA MetaModel Generator Tool.
-**/
-
-package com.x.attendance.entity;
-
-import com.x.base.core.entity.SliceJpaObject_;
-import java.lang.Double;
-import java.lang.Long;
-import java.lang.String;
-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="Thu Dec 27 11:39:25 CST 2018")
-public class StatisticPersonForMonth_ extends SliceJpaObject_  {
-    public static volatile SingularAttribute<StatisticPersonForMonth,Long> abNormalDutyCount;
-    public static volatile SingularAttribute<StatisticPersonForMonth,Double> absenceDayCount;
-    public static volatile SingularAttribute<StatisticPersonForMonth,String> employeeName;
-    public static volatile SingularAttribute<StatisticPersonForMonth,String> id;
-    public static volatile SingularAttribute<StatisticPersonForMonth,Long> lackOfTimeCount;
-    public static volatile SingularAttribute<StatisticPersonForMonth,Long> lateTimes;
-    public static volatile SingularAttribute<StatisticPersonForMonth,Long> leaveEarlyTimes;
-    public static volatile SingularAttribute<StatisticPersonForMonth,Long> offDutyTimes;
-    public static volatile SingularAttribute<StatisticPersonForMonth,Double> onDutyDayCount;
-    public static volatile SingularAttribute<StatisticPersonForMonth,Long> onDutyTimes;
-    public static volatile SingularAttribute<StatisticPersonForMonth,Double> onSelfHolidayCount;
-    public static volatile SingularAttribute<StatisticPersonForMonth,String> statisticMonth;
-    public static volatile SingularAttribute<StatisticPersonForMonth,String> statisticYear;
-    public static volatile SingularAttribute<StatisticPersonForMonth,String> topUnitName;
-    public static volatile SingularAttribute<StatisticPersonForMonth,String> unitName;
-    public static volatile SingularAttribute<StatisticPersonForMonth,Double> workDayCount;
-}

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

@@ -1,33 +0,0 @@
-/** 
- *  Generated by OpenJPA MetaModel Generator Tool.
-**/
-
-package com.x.attendance.entity;
-
-import com.x.base.core.entity.SliceJpaObject_;
-import java.lang.Double;
-import java.lang.Long;
-import java.lang.String;
-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="Thu Dec 27 11:39:25 CST 2018")
-public class StatisticTopUnitForDay_ extends SliceJpaObject_  {
-    public static volatile SingularAttribute<StatisticTopUnitForDay,Long> abNormalDutyCount;
-    public static volatile SingularAttribute<StatisticTopUnitForDay,Double> absenceDayCount;
-    public static volatile SingularAttribute<StatisticTopUnitForDay,Double> employeeCount;
-    public static volatile SingularAttribute<StatisticTopUnitForDay,String> id;
-    public static volatile SingularAttribute<StatisticTopUnitForDay,Long> lackOfTimeCount;
-    public static volatile SingularAttribute<StatisticTopUnitForDay,Long> lateCount;
-    public static volatile SingularAttribute<StatisticTopUnitForDay,Long> leaveEarlyCount;
-    public static volatile SingularAttribute<StatisticTopUnitForDay,Long> offDutyCount;
-    public static volatile SingularAttribute<StatisticTopUnitForDay,Long> onDutyCount;
-    public static volatile SingularAttribute<StatisticTopUnitForDay,Double> onDutyEmployeeCount;
-    public static volatile SingularAttribute<StatisticTopUnitForDay,Double> onSelfHolidayEmployeeCount;
-    public static volatile SingularAttribute<StatisticTopUnitForDay,String> statisticDate;
-    public static volatile SingularAttribute<StatisticTopUnitForDay,String> statisticMonth;
-    public static volatile SingularAttribute<StatisticTopUnitForDay,String> statisticYear;
-    public static volatile SingularAttribute<StatisticTopUnitForDay,String> topUnitName;
-}

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

@@ -1,32 +0,0 @@
-/** 
- *  Generated by OpenJPA MetaModel Generator Tool.
-**/
-
-package com.x.attendance.entity;
-
-import com.x.base.core.entity.SliceJpaObject_;
-import java.lang.Double;
-import java.lang.Long;
-import java.lang.String;
-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="Thu Dec 27 11:39:25 CST 2018")
-public class StatisticTopUnitForMonth_ extends SliceJpaObject_  {
-    public static volatile SingularAttribute<StatisticTopUnitForMonth,Long> abNormalDutyCount;
-    public static volatile SingularAttribute<StatisticTopUnitForMonth,Double> absenceDayCount;
-    public static volatile SingularAttribute<StatisticTopUnitForMonth,Double> employeeCount;
-    public static volatile SingularAttribute<StatisticTopUnitForMonth,String> id;
-    public static volatile SingularAttribute<StatisticTopUnitForMonth,Long> lackOfTimeCount;
-    public static volatile SingularAttribute<StatisticTopUnitForMonth,Long> lateCount;
-    public static volatile SingularAttribute<StatisticTopUnitForMonth,Long> leaveEarlyCount;
-    public static volatile SingularAttribute<StatisticTopUnitForMonth,Long> offDutyCount;
-    public static volatile SingularAttribute<StatisticTopUnitForMonth,Long> onDutyCount;
-    public static volatile SingularAttribute<StatisticTopUnitForMonth,Double> onDutyEmployeeCount;
-    public static volatile SingularAttribute<StatisticTopUnitForMonth,Double> onSelfHolidayCount;
-    public static volatile SingularAttribute<StatisticTopUnitForMonth,String> statisticMonth;
-    public static volatile SingularAttribute<StatisticTopUnitForMonth,String> statisticYear;
-    public static volatile SingularAttribute<StatisticTopUnitForMonth,String> topUnitName;
-}

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

@@ -1,34 +0,0 @@
-/** 
- *  Generated by OpenJPA MetaModel Generator Tool.
-**/
-
-package com.x.attendance.entity;
-
-import com.x.base.core.entity.SliceJpaObject_;
-import java.lang.Double;
-import java.lang.Long;
-import java.lang.String;
-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="Thu Dec 27 11:39:25 CST 2018")
-public class StatisticUnitForDay_ extends SliceJpaObject_  {
-    public static volatile SingularAttribute<StatisticUnitForDay,Long> abNormalDutyCount;
-    public static volatile SingularAttribute<StatisticUnitForDay,Double> absenceDayCount;
-    public static volatile SingularAttribute<StatisticUnitForDay,Double> employeeCount;
-    public static volatile SingularAttribute<StatisticUnitForDay,String> id;
-    public static volatile SingularAttribute<StatisticUnitForDay,Long> lackOfTimeCount;
-    public static volatile SingularAttribute<StatisticUnitForDay,Long> lateCount;
-    public static volatile SingularAttribute<StatisticUnitForDay,Long> leaveEarlyCount;
-    public static volatile SingularAttribute<StatisticUnitForDay,Long> offDutyCount;
-    public static volatile SingularAttribute<StatisticUnitForDay,Long> onDutyCount;
-    public static volatile SingularAttribute<StatisticUnitForDay,Double> onDutyEmployeeCount;
-    public static volatile SingularAttribute<StatisticUnitForDay,Double> onSelfHolidayEmployeeCount;
-    public static volatile SingularAttribute<StatisticUnitForDay,String> statisticDate;
-    public static volatile SingularAttribute<StatisticUnitForDay,String> statisticMonth;
-    public static volatile SingularAttribute<StatisticUnitForDay,String> statisticYear;
-    public static volatile SingularAttribute<StatisticUnitForDay,String> topUnitName;
-    public static volatile SingularAttribute<StatisticUnitForDay,String> unitName;
-}

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

@@ -1,33 +0,0 @@
-/** 
- *  Generated by OpenJPA MetaModel Generator Tool.
-**/
-
-package com.x.attendance.entity;
-
-import com.x.base.core.entity.SliceJpaObject_;
-import java.lang.Double;
-import java.lang.Long;
-import java.lang.String;
-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="Thu Dec 27 11:39:25 CST 2018")
-public class StatisticUnitForMonth_ extends SliceJpaObject_  {
-    public static volatile SingularAttribute<StatisticUnitForMonth,Long> abNormalDutyCount;
-    public static volatile SingularAttribute<StatisticUnitForMonth,Double> absenceDayCount;
-    public static volatile SingularAttribute<StatisticUnitForMonth,Double> employeeCount;
-    public static volatile SingularAttribute<StatisticUnitForMonth,String> id;
-    public static volatile SingularAttribute<StatisticUnitForMonth,Long> lackOfTimeCount;
-    public static volatile SingularAttribute<StatisticUnitForMonth,Long> lateCount;
-    public static volatile SingularAttribute<StatisticUnitForMonth,Long> leaveEarlyCount;
-    public static volatile SingularAttribute<StatisticUnitForMonth,Long> offDutyCount;
-    public static volatile SingularAttribute<StatisticUnitForMonth,Long> onDutyCount;
-    public static volatile SingularAttribute<StatisticUnitForMonth,Double> onDutyEmployeeCount;
-    public static volatile SingularAttribute<StatisticUnitForMonth,Double> onSelfHolidayCount;
-    public static volatile SingularAttribute<StatisticUnitForMonth,String> statisticMonth;
-    public static volatile SingularAttribute<StatisticUnitForMonth,String> statisticYear;
-    public static volatile SingularAttribute<StatisticUnitForMonth,String> topUnitName;
-    public static volatile SingularAttribute<StatisticUnitForMonth,String> unitName;
-}

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

@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<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.attendance.entity.AttendanceDetailMobile</class>
-    <class>com.x.attendance.entity.AttendanceStatisticalCycle</class>
-    <class>com.x.attendance.entity.StatisticTopUnitForMonth</class>
-    <class>com.x.attendance.entity.AttendanceAdmin</class>
-    <class>com.x.attendance.entity.AttendanceSetting</class>
-    <class>com.x.attendance.entity.AttendanceWorkDayConfig</class>
-    <class>com.x.attendance.entity.StatisticUnitForMonth</class>
-    <class>com.x.attendance.entity.AttendanceImportFileInfo</class>
-    <class>com.x.attendance.entity.AttendanceEmployeeConfig</class>
-    <class>com.x.attendance.entity.AttendanceSelfHoliday</class>
-    <class>com.x.base.core.entity.StorageObject</class>
-    <class>com.x.base.core.entity.JpaObject</class>
-    <class>com.x.attendance.entity.StatisticTopUnitForDay</class>
-    <class>com.x.attendance.entity.AttendanceDetail</class>
-    <class>com.x.attendance.entity.StatisticPersonForMonth</class>
-    <class>com.x.attendance.entity.AttendanceStatisticRequireLog</class>
-    <class>com.x.attendance.entity.AttendanceWorkPlace</class>
-    <class>com.x.base.core.entity.SliceJpaObject</class>
-    <class>com.x.attendance.entity.StatisticUnitForDay</class>
-    <class>com.x.attendance.entity.AttendanceAppealInfo</class>
-    <class>com.x.attendance.entity.AttendanceScheduleSetting</class>
-  </persistence-unit>
-</persistence>

o2server/x_base_core_project/.classpath

@@ -1,176 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
-		<attributes>
-			<attribute name="test" value="true"/>
-			<attribute name="optional" value="true"/>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
-		<attributes>
-			<attribute name="test" value="true"/>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="src" output="target/classes" path="src/main/java">
-		<attributes>
-			<attribute name="optional" value="true"/>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="var" path="M2_REPO/javax/activation/activation/1.1/activation-1.1.jar" sourcepath="M2_REPO/javax/activation/activation/1.1/activation-1.1-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/javax/servlet/javax.servlet-api/3.1.0/javax.servlet-api-3.1.0.jar" sourcepath="M2_REPO/javax/servlet/javax.servlet-api/3.1.0/javax.servlet-api-3.1.0-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/javax/annotation/javax.annotation-api/1.2/javax.annotation-api-1.2.jar" sourcepath="M2_REPO/javax/annotation/javax.annotation-api/1.2/javax.annotation-api-1.2-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/javax/ws/rs/javax.ws.rs-api/2.1/javax.ws.rs-api-2.1.jar" sourcepath="M2_REPO/javax/ws/rs/javax.ws.rs-api/2.1/javax.ws.rs-api-2.1-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/javax/validation/validation-api/1.1.0.Final/validation-api-1.1.0.Final.jar" sourcepath="M2_REPO/javax/validation/validation-api/1.1.0.Final/validation-api-1.1.0.Final-sources.jar"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="var" path="M2_REPO/javax/javaee-api/7.0/javaee-api-7.0.jar" sourcepath="M2_REPO/javax/javaee-api/7.0/javaee-api-7.0-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/com/sun/mail/javax.mail/1.5.0/javax.mail-1.5.0.jar" sourcepath="M2_REPO/com/sun/mail/javax.mail/1.5.0/javax.mail-1.5.0-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/com/google/code/gson/gson/2.8.5/gson-2.8.5.jar" sourcepath="M2_REPO/com/google/code/gson/gson/2.8.5/gson-2.8.5-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/apache/openjpa/openjpa/3.0.0/openjpa-3.0.0.jar" sourcepath="M2_REPO/org/apache/openjpa/openjpa/3.0.0/openjpa-3.0.0-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/commons-collections/commons-collections/3.2.2/commons-collections-3.2.2.jar" sourcepath="M2_REPO/commons-collections/commons-collections/3.2.2/commons-collections-3.2.2-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/net/sourceforge/serp/serp/1.15.1/serp-1.15.1.jar" sourcepath="M2_REPO/net/sourceforge/serp/serp/1.15.1/serp-1.15.1-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/apache/geronimo/specs/geronimo-jms_1.1_spec/1.1.1/geronimo-jms_1.1_spec-1.1.1.jar" sourcepath="M2_REPO/org/apache/geronimo/specs/geronimo-jms_1.1_spec/1.1.1/geronimo-jms_1.1_spec-1.1.1-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/apache/geronimo/specs/geronimo-jta_1.1_spec/1.1.1/geronimo-jta_1.1_spec-1.1.1.jar" sourcepath="M2_REPO/org/apache/geronimo/specs/geronimo-jta_1.1_spec/1.1.1/geronimo-jta_1.1_spec-1.1.1-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/commons-pool/commons-pool/1.6/commons-pool-1.6.jar" sourcepath="M2_REPO/commons-pool/commons-pool/1.6/commons-pool-1.6-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/apache/xbean/xbean-asm6-shaded/4.8/xbean-asm6-shaded-4.8.jar" sourcepath="M2_REPO/org/apache/xbean/xbean-asm6-shaded/4.8/xbean-asm6-shaded-4.8-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/apache/geronimo/specs/geronimo-jpa_2.1_spec/1.0-alpha-1/geronimo-jpa_2.1_spec-1.0-alpha-1.jar" sourcepath="M2_REPO/org/apache/geronimo/specs/geronimo-jpa_2.1_spec/1.0-alpha-1/geronimo-jpa_2.1_spec-1.0-alpha-1-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/apache/commons/commons-lang3/3.8/commons-lang3-3.8.jar" sourcepath="M2_REPO/org/apache/commons/commons-lang3/3.8/commons-lang3-3.8-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/commons-cli/commons-cli/1.4/commons-cli-1.4.jar" sourcepath="M2_REPO/commons-cli/commons-cli/1.4/commons-cli-1.4-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/commons-beanutils/commons-beanutils/1.9.3/commons-beanutils-1.9.3.jar" sourcepath="M2_REPO/commons-beanutils/commons-beanutils/1.9.3/commons-beanutils-1.9.3-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.2/commons-logging-1.2.jar" sourcepath="M2_REPO/commons-logging/commons-logging/1.2/commons-logging-1.2-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/commons-net/commons-net/3.6/commons-net-3.6.jar" sourcepath="M2_REPO/commons-net/commons-net/3.6/commons-net-3.6-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/apache/commons/commons-math3/3.6.1/commons-math3-3.6.1.jar" sourcepath="M2_REPO/org/apache/commons/commons-math3/3.6.1/commons-math3-3.6.1-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/apache/commons/commons-collections4/4.1/commons-collections4-4.1.jar" sourcepath="M2_REPO/org/apache/commons/commons-collections4/4.1/commons-collections4-4.1-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/commons-codec/commons-codec/1.11/commons-codec-1.11.jar" sourcepath="M2_REPO/commons-codec/commons-codec/1.11/commons-codec-1.11-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/commons-io/commons-io/2.6/commons-io-2.6.jar" sourcepath="M2_REPO/commons-io/commons-io/2.6/commons-io-2.6-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/apache/commons/commons-vfs2/2.2/commons-vfs2-2.2.jar" sourcepath="M2_REPO/org/apache/commons/commons-vfs2/2.2/commons-vfs2-2.2-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/eclipse/jetty/jetty-server/9.3.25.v20180904/jetty-server-9.3.25.v20180904.jar" sourcepath="M2_REPO/org/eclipse/jetty/jetty-server/9.3.25.v20180904/jetty-server-9.3.25.v20180904-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/eclipse/jetty/jetty-http/9.3.25.v20180904/jetty-http-9.3.25.v20180904.jar" sourcepath="M2_REPO/org/eclipse/jetty/jetty-http/9.3.25.v20180904/jetty-http-9.3.25.v20180904-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/eclipse/jetty/jetty-util/9.3.25.v20180904/jetty-util-9.3.25.v20180904.jar" sourcepath="M2_REPO/org/eclipse/jetty/jetty-util/9.3.25.v20180904/jetty-util-9.3.25.v20180904-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/eclipse/jetty/jetty-io/9.3.25.v20180904/jetty-io-9.3.25.v20180904.jar" sourcepath="M2_REPO/org/eclipse/jetty/jetty-io/9.3.25.v20180904/jetty-io-9.3.25.v20180904-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/eclipse/jetty/jetty-deploy/9.3.25.v20180904/jetty-deploy-9.3.25.v20180904.jar" sourcepath="M2_REPO/org/eclipse/jetty/jetty-deploy/9.3.25.v20180904/jetty-deploy-9.3.25.v20180904-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/eclipse/jetty/jetty-webapp/9.3.25.v20180904/jetty-webapp-9.3.25.v20180904.jar" sourcepath="M2_REPO/org/eclipse/jetty/jetty-webapp/9.3.25.v20180904/jetty-webapp-9.3.25.v20180904-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/eclipse/jetty/jetty-xml/9.3.25.v20180904/jetty-xml-9.3.25.v20180904.jar" sourcepath="M2_REPO/org/eclipse/jetty/jetty-xml/9.3.25.v20180904/jetty-xml-9.3.25.v20180904-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/eclipse/jetty/jetty-servlet/9.3.25.v20180904/jetty-servlet-9.3.25.v20180904.jar" sourcepath="M2_REPO/org/eclipse/jetty/jetty-servlet/9.3.25.v20180904/jetty-servlet-9.3.25.v20180904-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/eclipse/jetty/jetty-security/9.3.25.v20180904/jetty-security-9.3.25.v20180904.jar" sourcepath="M2_REPO/org/eclipse/jetty/jetty-security/9.3.25.v20180904/jetty-security-9.3.25.v20180904-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/eclipse/jetty/jetty-annotations/9.3.25.v20180904/jetty-annotations-9.3.25.v20180904.jar" sourcepath="M2_REPO/org/eclipse/jetty/jetty-annotations/9.3.25.v20180904/jetty-annotations-9.3.25.v20180904-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/eclipse/jetty/jetty-plus/9.3.25.v20180904/jetty-plus-9.3.25.v20180904.jar" sourcepath="M2_REPO/org/eclipse/jetty/jetty-plus/9.3.25.v20180904/jetty-plus-9.3.25.v20180904-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/eclipse/jetty/jetty-jndi/9.3.25.v20180904/jetty-jndi-9.3.25.v20180904.jar" sourcepath="M2_REPO/org/eclipse/jetty/jetty-jndi/9.3.25.v20180904/jetty-jndi-9.3.25.v20180904-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/ow2/asm/asm/6.0/asm-6.0.jar" sourcepath="M2_REPO/org/ow2/asm/asm/6.0/asm-6.0-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/ow2/asm/asm-commons/6.0/asm-commons-6.0.jar" sourcepath="M2_REPO/org/ow2/asm/asm-commons/6.0/asm-commons-6.0-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/ow2/asm/asm-tree/6.0/asm-tree-6.0.jar" sourcepath="M2_REPO/org/ow2/asm/asm-tree/6.0/asm-tree-6.0-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/com/google/zxing/core/3.3.3/core-3.3.3.jar" sourcepath="M2_REPO/com/google/zxing/core/3.3.3/core-3.3.3-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/apache/ftpserver/ftpserver-core/1.1.1/ftpserver-core-1.1.1.jar" sourcepath="M2_REPO/org/apache/ftpserver/ftpserver-core/1.1.1/ftpserver-core-1.1.1-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/apache/ftpserver/ftplet-api/1.1.1/ftplet-api-1.1.1.jar" sourcepath="M2_REPO/org/apache/ftpserver/ftplet-api/1.1.1/ftplet-api-1.1.1-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-api/1.7.25/slf4j-api-1.7.25.jar" sourcepath="M2_REPO/org/slf4j/slf4j-api/1.7.25/slf4j-api-1.7.25-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/apache/mina/mina-core/2.0.16/mina-core-2.0.16.jar" sourcepath="M2_REPO/org/apache/mina/mina-core/2.0.16/mina-core-2.0.16-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/apache/cxf/cxf-core/3.2.7/cxf-core-3.2.7.jar" sourcepath="M2_REPO/org/apache/cxf/cxf-core/3.2.7/cxf-core-3.2.7-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/com/fasterxml/woodstox/woodstox-core/5.0.3/woodstox-core-5.0.3.jar" sourcepath="M2_REPO/com/fasterxml/woodstox/woodstox-core/5.0.3/woodstox-core-5.0.3-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/codehaus/woodstox/stax2-api/3.1.4/stax2-api-3.1.4.jar" sourcepath="M2_REPO/org/codehaus/woodstox/stax2-api/3.1.4/stax2-api-3.1.4-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/apache/ws/xmlschema/xmlschema-core/2.2.3/xmlschema-core-2.2.3.jar" sourcepath="M2_REPO/org/apache/ws/xmlschema/xmlschema-core/2.2.3/xmlschema-core-2.2.3-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/apache/cxf/cxf-rt-bindings-soap/3.2.7/cxf-rt-bindings-soap-3.2.7.jar" sourcepath="M2_REPO/org/apache/cxf/cxf-rt-bindings-soap/3.2.7/cxf-rt-bindings-soap-3.2.7-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/apache/cxf/cxf-rt-wsdl/3.2.7/cxf-rt-wsdl-3.2.7.jar" sourcepath="M2_REPO/org/apache/cxf/cxf-rt-wsdl/3.2.7/cxf-rt-wsdl-3.2.7-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/wsdl4j/wsdl4j/1.6.3/wsdl4j-1.6.3.jar" sourcepath="M2_REPO/wsdl4j/wsdl4j/1.6.3/wsdl4j-1.6.3-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/apache/cxf/cxf-rt-databinding-jaxb/3.2.7/cxf-rt-databinding-jaxb-3.2.7.jar" sourcepath="M2_REPO/org/apache/cxf/cxf-rt-databinding-jaxb/3.2.7/cxf-rt-databinding-jaxb-3.2.7-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/apache/cxf/cxf-rt-frontend-jaxws/3.2.7/cxf-rt-frontend-jaxws-3.2.7.jar" sourcepath="M2_REPO/org/apache/cxf/cxf-rt-frontend-jaxws/3.2.7/cxf-rt-frontend-jaxws-3.2.7-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/xml-resolver/xml-resolver/1.2/xml-resolver-1.2.jar" sourcepath="M2_REPO/xml-resolver/xml-resolver/1.2/xml-resolver-1.2-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/apache/cxf/cxf-rt-bindings-xml/3.2.7/cxf-rt-bindings-xml-3.2.7.jar" sourcepath="M2_REPO/org/apache/cxf/cxf-rt-bindings-xml/3.2.7/cxf-rt-bindings-xml-3.2.7-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/apache/cxf/cxf-rt-frontend-simple/3.2.7/cxf-rt-frontend-simple-3.2.7.jar" sourcepath="M2_REPO/org/apache/cxf/cxf-rt-frontend-simple/3.2.7/cxf-rt-frontend-simple-3.2.7-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/apache/cxf/cxf-rt-ws-addr/3.2.7/cxf-rt-ws-addr-3.2.7.jar" sourcepath="M2_REPO/org/apache/cxf/cxf-rt-ws-addr/3.2.7/cxf-rt-ws-addr-3.2.7-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/apache/cxf/cxf-rt-ws-policy/3.2.7/cxf-rt-ws-policy-3.2.7.jar" sourcepath="M2_REPO/org/apache/cxf/cxf-rt-ws-policy/3.2.7/cxf-rt-ws-policy-3.2.7-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/apache/neethi/neethi/3.1.1/neethi-3.1.1.jar" sourcepath="M2_REPO/org/apache/neethi/neethi/3.1.1/neethi-3.1.1-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/apache/cxf/cxf-rt-transports-http/3.2.7/cxf-rt-transports-http-3.2.7.jar" sourcepath="M2_REPO/org/apache/cxf/cxf-rt-transports-http/3.2.7/cxf-rt-transports-http-3.2.7-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/apache/poi/poi/3.17/poi-3.17.jar" sourcepath="M2_REPO/org/apache/poi/poi/3.17/poi-3.17-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/apache/poi/poi-ooxml/3.17/poi-ooxml-3.17.jar" sourcepath="M2_REPO/org/apache/poi/poi-ooxml/3.17/poi-ooxml-3.17-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/apache/poi/poi-ooxml-schemas/3.17/poi-ooxml-schemas-3.17.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/apache/xmlbeans/xmlbeans/2.6.0/xmlbeans-2.6.0.jar"/>
-	<classpathentry kind="var" path="M2_REPO/stax/stax-api/1.0.1/stax-api-1.0.1.jar"/>
-	<classpathentry kind="var" path="M2_REPO/com/github/virtuald/curvesapi/1.04/curvesapi-1.04.jar" sourcepath="M2_REPO/com/github/virtuald/curvesapi/1.04/curvesapi-1.04-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/apache/poi/poi-scratchpad/3.17/poi-scratchpad-3.17.jar" sourcepath="M2_REPO/org/apache/poi/poi-scratchpad/3.17/poi-scratchpad-3.17-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/fr/opensagres/xdocreport/fr.opensagres.poi.xwpf.converter.core/2.0.1/fr.opensagres.poi.xwpf.converter.core-2.0.1.jar" sourcepath="M2_REPO/fr/opensagres/xdocreport/fr.opensagres.poi.xwpf.converter.core/2.0.1/fr.opensagres.poi.xwpf.converter.core-2.0.1-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/apache/poi/ooxml-schemas/1.3/ooxml-schemas-1.3.jar" sourcepath="M2_REPO/org/apache/poi/ooxml-schemas/1.3/ooxml-schemas-1.3-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/fr/opensagres/xdocreport/fr.opensagres.poi.xwpf.converter.xhtml/2.0.1/fr.opensagres.poi.xwpf.converter.xhtml-2.0.1.jar" sourcepath="M2_REPO/fr/opensagres/xdocreport/fr.opensagres.poi.xwpf.converter.xhtml/2.0.1/fr.opensagres.poi.xwpf.converter.xhtml-2.0.1-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/fr/opensagres/xdocreport/fr.opensagres.xdocreport.core/2.0.1/fr.opensagres.xdocreport.core-2.0.1.jar" sourcepath="M2_REPO/fr/opensagres/xdocreport/fr.opensagres.xdocreport.core/2.0.1/fr.opensagres.xdocreport.core-2.0.1-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/apache/tika/tika-core/1.19.1/tika-core-1.19.1.jar" sourcepath="M2_REPO/org/apache/tika/tika-core/1.19.1/tika-core-1.19.1-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/apache/pdfbox/pdfbox/2.0.13/pdfbox-2.0.13.jar" sourcepath="M2_REPO/org/apache/pdfbox/pdfbox/2.0.13/pdfbox-2.0.13-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/apache/pdfbox/fontbox/2.0.13/fontbox-2.0.13.jar" sourcepath="M2_REPO/org/apache/pdfbox/fontbox/2.0.13/fontbox-2.0.13-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/net/sourceforge/tess4j/tess4j/4.3.0/tess4j-4.3.0.jar" sourcepath="M2_REPO/net/sourceforge/tess4j/tess4j/4.3.0/tess4j-4.3.0-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/net/java/dev/jna/jna/4.1.0/jna-4.1.0.jar" sourcepath="M2_REPO/net/java/dev/jna/jna/4.1.0/jna-4.1.0-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/com/github/jai-imageio/jai-imageio-core/1.4.0/jai-imageio-core-1.4.0.jar" sourcepath="M2_REPO/com/github/jai-imageio/jai-imageio-core/1.4.0/jai-imageio-core-1.4.0-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/ghost4j/ghost4j/1.0.1/ghost4j-1.0.1.jar" sourcepath="M2_REPO/org/ghost4j/ghost4j/1.0.1/ghost4j-1.0.1-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.17/log4j-1.2.17.jar" sourcepath="M2_REPO/log4j/log4j/1.2.17/log4j-1.2.17-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/apache/xmlgraphics/xmlgraphics-commons/1.4/xmlgraphics-commons-1.4.jar" sourcepath="M2_REPO/org/apache/xmlgraphics/xmlgraphics-commons/1.4/xmlgraphics-commons-1.4-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/com/lowagie/itext/2.1.7/itext-2.1.7.jar" sourcepath="M2_REPO/com/lowagie/itext/2.1.7/itext-2.1.7-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/apache/pdfbox/pdfbox-tools/2.0.12/pdfbox-tools-2.0.12.jar" sourcepath="M2_REPO/org/apache/pdfbox/pdfbox-tools/2.0.12/pdfbox-tools-2.0.12-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/apache/pdfbox/pdfbox-debugger/2.0.12/pdfbox-debugger-2.0.12.jar" sourcepath="M2_REPO/org/apache/pdfbox/pdfbox-debugger/2.0.12/pdfbox-debugger-2.0.12-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/apache/pdfbox/jbig2-imageio/3.0.2/jbig2-imageio-3.0.2.jar" sourcepath="M2_REPO/org/apache/pdfbox/jbig2-imageio/3.0.2/jbig2-imageio-3.0.2-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/net/sourceforge/lept4j/lept4j/1.10.0/lept4j-1.10.0.jar" sourcepath="M2_REPO/net/sourceforge/lept4j/lept4j/1.10.0/lept4j-1.10.0-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/jboss/jboss-vfs/3.2.14.Final/jboss-vfs-3.2.14.Final.jar" sourcepath="M2_REPO/org/jboss/jboss-vfs/3.2.14.Final/jboss-vfs-3.2.14.Final-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/jboss/logging/jboss-logging/3.1.4.GA/jboss-logging-3.1.4.GA.jar" sourcepath="M2_REPO/org/jboss/logging/jboss-logging/3.1.4.GA/jboss-logging-3.1.4.GA-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/ch/qos/logback/logback-classic/1.2.3/logback-classic-1.2.3.jar" sourcepath="M2_REPO/ch/qos/logback/logback-classic/1.2.3/logback-classic-1.2.3-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/ch/qos/logback/logback-core/1.2.3/logback-core-1.2.3.jar" sourcepath="M2_REPO/ch/qos/logback/logback-core/1.2.3/logback-core-1.2.3-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/slf4j/jul-to-slf4j/1.7.25/jul-to-slf4j-1.7.25.jar" sourcepath="M2_REPO/org/slf4j/jul-to-slf4j/1.7.25/jul-to-slf4j-1.7.25-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/slf4j/jcl-over-slf4j/1.7.25/jcl-over-slf4j-1.7.25.jar" sourcepath="M2_REPO/org/slf4j/jcl-over-slf4j/1.7.25/jcl-over-slf4j-1.7.25-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/slf4j/log4j-over-slf4j/1.7.25/log4j-over-slf4j-1.7.25.jar" sourcepath="M2_REPO/org/slf4j/log4j-over-slf4j/1.7.25/log4j-over-slf4j-1.7.25-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/apache/httpcomponents/httpclient/4.5.6/httpclient-4.5.6.jar" sourcepath="M2_REPO/org/apache/httpcomponents/httpclient/4.5.6/httpclient-4.5.6-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/apache/httpcomponents/httpcore/4.4.10/httpcore-4.4.10.jar" sourcepath="M2_REPO/org/apache/httpcomponents/httpcore/4.4.10/httpcore-4.4.10-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/apache/httpcomponents/httpmime/4.5.6/httpmime-4.5.6.jar" sourcepath="M2_REPO/org/apache/httpcomponents/httpmime/4.5.6/httpmime-4.5.6-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/io/github/lukehutch/fast-classpath-scanner/3.1.13/fast-classpath-scanner-3.1.13.jar" sourcepath="M2_REPO/io/github/lukehutch/fast-classpath-scanner/3.1.13/fast-classpath-scanner-3.1.13-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/apache/ant/ant/1.10.5/ant-1.10.5.jar" sourcepath="M2_REPO/org/apache/ant/ant/1.10.5/ant-1.10.5-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/apache/ant/ant-launcher/1.10.5/ant-launcher-1.10.5.jar" sourcepath="M2_REPO/org/apache/ant/ant-launcher/1.10.5/ant-launcher-1.10.5-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/glassfish/jersey/core/jersey-server/2.27/jersey-server-2.27.jar" sourcepath="M2_REPO/org/glassfish/jersey/core/jersey-server/2.27/jersey-server-2.27-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/glassfish/jersey/core/jersey-common/2.27/jersey-common-2.27.jar" sourcepath="M2_REPO/org/glassfish/jersey/core/jersey-common/2.27/jersey-common-2.27-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/glassfish/hk2/external/javax.inject/2.5.0-b42/javax.inject-2.5.0-b42.jar" sourcepath="M2_REPO/org/glassfish/hk2/external/javax.inject/2.5.0-b42/javax.inject-2.5.0-b42-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/glassfish/hk2/osgi-resource-locator/1.0.1/osgi-resource-locator-1.0.1.jar" sourcepath="M2_REPO/org/glassfish/hk2/osgi-resource-locator/1.0.1/osgi-resource-locator-1.0.1-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/glassfish/jersey/core/jersey-client/2.27/jersey-client-2.27.jar" sourcepath="M2_REPO/org/glassfish/jersey/core/jersey-client/2.27/jersey-client-2.27-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/glassfish/jersey/media/jersey-media-jaxb/2.27/jersey-media-jaxb-2.27.jar" sourcepath="M2_REPO/org/glassfish/jersey/media/jersey-media-jaxb/2.27/jersey-media-jaxb-2.27-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/glassfish/jersey/media/jersey-media-multipart/2.27/jersey-media-multipart-2.27.jar" sourcepath="M2_REPO/org/glassfish/jersey/media/jersey-media-multipart/2.27/jersey-media-multipart-2.27-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/jvnet/mimepull/mimepull/1.9.6/mimepull-1.9.6.jar" sourcepath="M2_REPO/org/jvnet/mimepull/mimepull/1.9.6/mimepull-1.9.6-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/dom4j/dom4j/1.6.1/dom4j-1.6.1.jar" sourcepath="M2_REPO/dom4j/dom4j/1.6.1/dom4j-1.6.1-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.jar" sourcepath="M2_REPO/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/net/sf/ehcache/ehcache/2.10.6/ehcache-2.10.6.jar" sourcepath="M2_REPO/net/sf/ehcache/ehcache/2.10.6/ehcache-2.10.6-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/com/alibaba/druid/1.1.12/druid-1.1.12.jar" sourcepath="M2_REPO/com/alibaba/druid/1.1.12/druid-1.1.12-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-simple/1.7.25/slf4j-simple-1.7.25.jar" sourcepath="M2_REPO/org/slf4j/slf4j-simple/1.7.25/slf4j-simple-1.7.25-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/junit/junit/4.12/junit-4.12.jar" sourcepath="M2_REPO/junit/junit/4.12/junit-4.12-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar" sourcepath="M2_REPO/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/quartz-scheduler/quartz/2.3.0/quartz-2.3.0.jar" sourcepath="M2_REPO/org/quartz-scheduler/quartz/2.3.0/quartz-2.3.0-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/com/mchange/c3p0/0.9.5.2/c3p0-0.9.5.2.jar" sourcepath="M2_REPO/com/mchange/c3p0/0.9.5.2/c3p0-0.9.5.2-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/com/mchange/mchange-commons-java/0.2.11/mchange-commons-java-0.2.11.jar" sourcepath="M2_REPO/com/mchange/mchange-commons-java/0.2.11/mchange-commons-java-0.2.11-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/com/zaxxer/HikariCP-java6/2.3.13/HikariCP-java6-2.3.13.jar" sourcepath="M2_REPO/com/zaxxer/HikariCP-java6/2.3.13/HikariCP-java6-2.3.13-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/imgscalr/imgscalr-lib/4.2/imgscalr-lib-4.2.jar" sourcepath="M2_REPO/org/imgscalr/imgscalr-lib/4.2/imgscalr-lib-4.2-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-model/3.0/maven-model-3.0.jar" sourcepath="M2_REPO/org/apache/maven/maven-model/3.0/maven-model-3.0-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/codehaus/plexus/plexus-utils/2.0.4/plexus-utils-2.0.4.jar" sourcepath="M2_REPO/org/codehaus/plexus/plexus-utils/2.0.4/plexus-utils-2.0.4-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/com/github/stuxuhai/jpinyin/1.1.8/jpinyin-1.1.8.jar" sourcepath="M2_REPO/com/github/stuxuhai/jpinyin/1.1.8/jpinyin-1.1.8-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/com/jcraft/jsch/0.1.55/jsch-0.1.55.jar" sourcepath="M2_REPO/com/jcraft/jsch/0.1.55/jsch-0.1.55-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/com/hankcs/hanlp/portable-1.7.0/hanlp-portable-1.7.0.jar" sourcepath="M2_REPO/com/hankcs/hanlp/portable-1.7.0/hanlp-portable-1.7.0-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/de/vandermeer/asciitable/0.3.2/asciitable-0.3.2.jar" sourcepath="M2_REPO/de/vandermeer/asciitable/0.3.2/asciitable-0.3.2-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/de/vandermeer/ascii-utf-themes/0.0.1/ascii-utf-themes-0.0.1.jar" sourcepath="M2_REPO/de/vandermeer/ascii-utf-themes/0.0.1/ascii-utf-themes-0.0.1-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/de/vandermeer/skb-interfaces/0.0.1/skb-interfaces-0.0.1.jar" sourcepath="M2_REPO/de/vandermeer/skb-interfaces/0.0.1/skb-interfaces-0.0.1-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/antlr/ST4/4.0.8/ST4-4.0.8.jar" sourcepath="M2_REPO/org/antlr/ST4/4.0.8/ST4-4.0.8-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/antlr/antlr-runtime/3.5.2/antlr-runtime-3.5.2.jar" sourcepath="M2_REPO/org/antlr/antlr-runtime/3.5.2/antlr-runtime-3.5.2-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/antlr/antlr4/4.5.1/antlr4-4.5.1.jar" sourcepath="M2_REPO/org/antlr/antlr4/4.5.1/antlr4-4.5.1-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/de/vandermeer/char-translation/0.0.2/char-translation-0.0.2.jar" sourcepath="M2_REPO/de/vandermeer/char-translation/0.0.2/char-translation-0.0.2-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/com/h2database/h2/1.4.197/h2-1.4.197.jar" sourcepath="M2_REPO/com/h2database/h2/1.4.197/h2-1.4.197-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/hyperic/sigar/1.6.4/sigar-1.6.4.jar"/>
-	<classpathentry kind="lib" path="D:/O2/o2oa/o2server/commons/ext/ical4j-2.2.0.jar"/>
-	<classpathentry kind="lib" path="D:/O2/o2oa/o2server/commons/ext/checkpasswordstrength.jar"/>
-	<classpathentry kind="lib" path="D:/O2/o2oa/o2server/commons/ext/neuroph-core-2.94.jar"/>
-	<classpathentry kind="lib" path="D:/O2/o2oa/o2server/commons/ext/simplecaptcha-1.2.1.jar"/>
-	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="output" path="target/classes"/>
-</classpath>

o2server/x_base_core_project/src/main/java/com/x/base/core/container/EntityManagerContainer.java

@@ -974,6 +974,46 @@ public class EntityManagerContainer extends EntityManagerContainerBasic {
 		return list;
 	}
 
+	public <T extends JpaObject> List<T> fetchEuqalOrIsMember(Class<T> clz, String equalAttribute, Object equalValue,
+			String isMemberAttribute, Object isMemberValue) throws Exception {
+		List<T> os = this.fetchEuqalOrIsMember(clz, JpaObject.singularAttributeField(clz, true, true), equalAttribute,
+				equalValue, isMemberAttribute, isMemberValue);
+		return os;
+	}
+
+	public <T extends JpaObject, W extends GsonPropertyObject> List<W> fetchEuqalOrIsMember(Class<T> clz,
+			WrapCopier<T, W> copier, String equalAttribute, Object equalValue, String isMemberAttribute,
+			Object isMemberValue) throws Exception {
+		List<T> os = this.fetchEuqalOrIsMember(clz, copier.getCopyFields(), equalAttribute, equalValue,
+				isMemberAttribute, isMemberValue);
+		return copier.copy(os);
+	}
+
+	public <T extends JpaObject> List<T> fetchEuqalOrIsMember(Class<T> clz, List<String> attributes,
+			String equalAttribute, Object equalValue, String isMemberAttribute, Object isMemberValue) throws Exception {
+		List<T> list = new ArrayList<>();
+		List<String> fields = ListTools.trim(attributes, true, true, JpaObject.id_FIELDNAME);
+		EntityManager em = this.get(clz);
+		CriteriaBuilder cb = em.getCriteriaBuilder();
+		CriteriaQuery<Tuple> cq = cb.createQuery(Tuple.class);
+		Root<T> root = cq.from(clz);
+		List<Selection<?>> selections = new ArrayList<>();
+		for (String str : fields) {
+			selections.add(root.get(str));
+		}
+		Predicate p = cb.equal(root.get(equalAttribute), equalValue);
+		p = cb.or(p, cb.isMember(isMemberValue, root.get(isMemberAttribute)));
+		cq.multiselect(selections).where(p);
+		for (Tuple o : em.createQuery(cq).getResultList()) {
+			T t = clz.newInstance();
+			for (int i = 0; i < fields.size(); i++) {
+				PropertyUtils.setProperty(t, fields.get(i), o.get(selections.get(i)));
+			}
+			list.add(t);
+		}
+		return list;
+	}
+
 	public <T extends JpaObject> Integer delete(Class<T> clz, Collection<String> ids) throws Exception {
 		int i = 0;
 		if (!ids.isEmpty()) {

o2server/x_base_core_project/src/main/java/com/x/base/core/container/EntityManagerContainerBasic.java

@@ -12,7 +12,6 @@ import javax.persistence.FlushModeType;
 
 import com.x.base.core.container.factory.EntityManagerContainerFactory;
 import com.x.base.core.entity.JpaObject;
-import com.x.base.core.entity.StringValueMap;
 
 public abstract class EntityManagerContainerBasic implements AutoCloseable {
 
@@ -125,9 +124,6 @@ public abstract class EntityManagerContainerBasic implements AutoCloseable {
 				return FieldType.booleanValueList;
 			}
 		}
-		if (StringValueMap.class.isAssignableFrom(field.getType())) {
-			return FieldType.stringValueMap;
-		}
 		if (Map.class.isAssignableFrom(field.getType())) {
 			ParameterizedType parameterized = (ParameterizedType) field.getGenericType();
 			Class<?> actualClass = (Class<?>) parameterized.getActualTypeArguments()[1];

o2server/x_base_core_project/src/main/java/com/x/base/core/container/factory/SlicePropertiesBuilder.java

@@ -8,6 +8,7 @@ import org.apache.commons.lang3.StringUtils;
 
 import com.alibaba.druid.pool.DruidDataSource;
 import com.x.base.core.container.FactorDistributionPolicy;
+import com.x.base.core.entity.JpaObject;
 import com.x.base.core.project.config.DataMapping;
 
 public class SlicePropertiesBuilder {
@@ -21,23 +22,23 @@ public class SlicePropertiesBuilder {
 	public static String driver_dm = "dm.jdbc.driver.DmDriver";
 	public static String driver_sqlserver = "com.microsoft.sqlserver.jdbc.SQLServerDriver";
 	/** 避免db2在aix版本和lwl版本字段长度不一致的问题 */
-	private static String dictionary_db2 = "db2(createPrimaryKeys=false,characterColumnSize=255,maxColumnNameLength=128,maxIndexNameLength=128,maxConstraintNameLength=128)";
-	private static String dictionary_oracle = "oracle(maxTableNameLength=128,maxColumnNameLength=128,maxIndexNameLength=128,maxConstraintNameLength=128,maxEmbeddedClobSize=104857600)";
-	private static String dictionary_mysql = "mysql(clobTypeName=LONGTEXT,blobTypeName=LONGBLOB,createPrimaryKeys=false,maxIndexesPerTable=64)";
-	private static String dictionary_postgresql = "postgres";
-	private static String dictionary_informix = "informix";
-	private static String dictionary_h2 = "org.apache.openjpa.jdbc.sql.H2Dictionary";
-	private static String dictionary_dm = "com.x.base.core.openjpa.jdbc.sql.DMDictionary";
-	private static String dictionary_sqlserver = "sqlserver(schemaCase=preserve)";
+	public static String dictionary_db2 = "db2(createPrimaryKeys=false,characterColumnSize=255,maxColumnNameLength=128,maxIndexNameLength=128,maxConstraintNameLength=128)";
+	public static String dictionary_oracle = "oracle(maxTableNameLength=128,maxColumnNameLength=128,maxIndexNameLength=128,maxConstraintNameLength=128,maxEmbeddedClobSize=104857600)";
+	public static String dictionary_mysql = "mysql(clobTypeName=LONGTEXT,blobTypeName=LONGBLOB,createPrimaryKeys=false,maxIndexesPerTable=64)";
+	public static String dictionary_postgresql = "postgres";
+	public static String dictionary_informix = "informix";
+	public static String dictionary_h2 = "org.apache.openjpa.jdbc.sql.H2Dictionary";
+	public static String dictionary_dm = "com.x.base.core.openjpa.jdbc.sql.DMDictionary";
+	public static String dictionary_sqlserver = "sqlserver(schemaCase=preserve)";
 
-	private static String validationQuery_db2 = "select 1 from sysibm.sysdummy1";
-	private static String validationQuery_oracle = "select 1 from dual";
-	private static String validationQuery_mysql = "select 1";
-	private static String validationQuery_postgresql = "select 1";
-	private static String validationQuery_informix = "select 1";
-	private static String validationQuery_h2 = "select 1";
-	private static String validationQuery_dm = "select getdate()";
-	private static String validationQuery_sqlserver = "select 1";
+	public static String validationQuery_db2 = "select 1 from sysibm.sysdummy1";
+	public static String validationQuery_oracle = "select 1 from dual";
+	public static String validationQuery_mysql = "select 1";
+	public static String validationQuery_postgresql = "select 1";
+	public static String validationQuery_informix = "select 1";
+	public static String validationQuery_h2 = "select 1";
+	public static String validationQuery_dm = "select getdate()";
+	public static String validationQuery_sqlserver = "select 1";
 
 	public static Map<String, String> getPropertiesDBCP(List<DataMapping> list) throws Exception {
 		try {
@@ -51,13 +52,13 @@ public class SlicePropertiesBuilder {
 			 * 如果是DB2 添加 Schema,mysql 不需要Schema 如果用了Schema H2数据库就会报错说没有Schema
 			 */
 			if (StringUtils.equals(determineDBDictionary(list.get(0)), dictionary_db2)) {
-				properties.put("openjpa.jdbc.Schema", "x");
+				properties.put("openjpa.jdbc.Schema", JpaObject.default_schema);
 			}
 			if (StringUtils.equals(determineDBDictionary(list.get(0)), dictionary_informix)) {
-				properties.put("openjpa.jdbc.Schema", "x");
+				properties.put("openjpa.jdbc.Schema", JpaObject.default_schema);
 			}
 			if (StringUtils.equals(determineDBDictionary(list.get(0)), dictionary_dm)) {
-				properties.put("openjpa.jdbc.Schema", "x");
+				properties.put("openjpa.jdbc.Schema", JpaObject.default_schema);
 			}
 			properties.put("openjpa.slice.Lenient", "false");
 			// properties.put("openjpa.Multithreaded", "true");
@@ -132,39 +133,6 @@ public class SlicePropertiesBuilder {
 		}
 	}
 
-	// /* 使用DBCP连接池时产生的属性 */
-	// protected static String getConnectionPropertiesDBCP(DataMapping dataMapping)
-	// throws Exception {
-	// try {
-	// String str = "MaxActive=5, MaxIdle=1, MinIdle=0, MaxWait=10000, Username=" +
-	// dataMapping.getUsername()
-	// + ", Password=" + dataMapping.getPassword() + ", TestOnBorrow=true";
-	// if (StringUtils.equals(determineDBDictionary(dataMapping), dictionary_db2)) {
-	// str += ", driverClassName=" + driver_db2 + ", url=" + dataMapping.getUrl();
-	// } else if (StringUtils.equals(determineDBDictionary(dataMapping),
-	// dictionary_mysql)) {
-	// String url = dataMapping.getUrl();
-	// // url += "?autoReconnect=true";
-	// str += ", driverClassName=" + driver_mysql + ", url=" + url;
-	// } else if (StringUtils.equals(determineDBDictionary(dataMapping),
-	// dictionary_postgresql)) {
-	// String url = dataMapping.getUrl();
-	// str += ", driverClassName=" + driver_postgresql + ", url=" + url;
-	// } else if (StringUtils.equals(determineDBDictionary(dataMapping),
-	// dictionary_informix)) {
-	// String url = dataMapping.getUrl();
-	// str += ", driverClassName=" + driver_informix + ", url=" + url;
-	// } else if (StringUtils.equals(determineDBDictionary(dataMapping),
-	// dictionary_h2)) {
-	// String url = dataMapping.getUrl();
-	// str += ", driverClassName=" + driver_h2 + ", url=" + url;
-	// }
-	// return str;
-	// } catch (Exception e) {
-	// throw new Exception("can not create connection properites", e);
-	// }
-	// }
-
 	/* 使用DBCP2连接池时产生的属性 */
 	protected static String getConnectionPropertiesDBCP2(DataMapping dataMapping) throws Exception {
 		try {

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

@@ -1,24 +0,0 @@
-/** 
- *  Generated by OpenJPA MetaModel Generator Tool.
-**/
-
-package com.x.base.core.entity;
-
-import java.lang.Boolean;
-import java.lang.String;
-import java.util.Date;
-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="Fri Dec 28 16:39:13 CST 2018")
-public class JpaObject_ {
-    public static volatile SingularAttribute<JpaObject,Date> createTime;
-    public static volatile SingularAttribute<JpaObject,Boolean> scratchBoolean;
-    public static volatile SingularAttribute<JpaObject,Date> scratchDate;
-    public static volatile SingularAttribute<JpaObject,Date> scratchInteger;
-    public static volatile SingularAttribute<JpaObject,String> scratchString;
-    public static volatile SingularAttribute<JpaObject,String> sequence;
-    public static volatile SingularAttribute<JpaObject,Date> updateTime;
-}

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

@@ -1,16 +0,0 @@
-/** 
- *  Generated by OpenJPA MetaModel Generator Tool.
-**/
-
-package com.x.base.core.entity;
-
-import java.lang.Integer;
-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="Fri Dec 28 16:39:13 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

@@ -1,13 +0,0 @@
-/** 
- *  Generated by OpenJPA MetaModel Generator Tool.
-**/
-
-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="Fri Dec 28 16:39:13 CST 2018")
-public class StorageObject_ extends SliceJpaObject_  {
-}

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

@@ -1,81 +0,0 @@
-package com.x.base.core.entity;
-
-import java.util.LinkedHashMap;
-
-import org.apache.commons.lang3.BooleanUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.lang3.math.NumberUtils;
-
-public class StringValueMap extends LinkedHashMap<String, String> {
-
-	private static final long serialVersionUID = -2383150323755835614L;
-
-	public String getString(String key) {
-		return this.get(key);
-	}
-
-	public String getString(String key, String defaultValue) {
-		return this.getOrDefault(key, defaultValue);
-	}
-
-	public Double getDouble(String key) {
-		String str = this.get(key);
-		if (!NumberUtils.isParsable(str)) {
-			return null;
-		}
-		return NumberUtils.toDouble(str);
-	}
-
-	public Double getDouble(String key, Double defaultValue) {
-		String str = this.get(key);
-		if (!NumberUtils.isParsable(str)) {
-			return defaultValue;
-		}
-		return NumberUtils.toDouble(str);
-	}
-
-	public Integer getInteger(String key) {
-		String str = this.get(key);
-		if (!NumberUtils.isParsable(str)) {
-			return null;
-		}
-		return NumberUtils.toInt(str);
-	}
-
-	public Integer getInteger(String key, Integer defaultValue) {
-		String str = this.get(key);
-		if (!NumberUtils.isParsable(str)) {
-			return defaultValue;
-		}
-		return NumberUtils.toInt(str);
-	}
-
-	public Long getLong(String key) {
-		String str = this.get(key);
-		if (!NumberUtils.isParsable(str)) {
-			return null;
-		}
-		return NumberUtils.toLong(str);
-	}
-
-	public Long getLong(String key, Long defaultValue) {
-		String str = this.get(key);
-		if (!NumberUtils.isParsable(str)) {
-			return defaultValue;
-		}
-		return NumberUtils.toLong(str);
-	}
-
-	public Boolean getBoolean(String key) {
-		String str = this.get(key);
-		return BooleanUtils.toBooleanObject(str);
-	}
-
-	public Boolean getBoolean(String key, Boolean defaultValue) {
-		String str = this.get(key);
-		if (StringUtils.isEmpty(str)) {
-			return defaultValue;
-		}
-		return BooleanUtils.toBooleanObject(str);
-	}
-}

o2server/x_base_core_project/src/main/java/com/x/base/core/project/annotation/Describe.java

@@ -43,6 +43,8 @@ import com.google.gson.JsonElement;
 import com.x.base.core.project.bean.WrapCopier;
 import com.x.base.core.project.gson.XGsonBuilder;
 import com.x.base.core.project.jaxrs.StandardJaxrsAction;
+import com.x.base.core.project.logger.Logger;
+import com.x.base.core.project.logger.LoggerFactory;
 import com.x.base.core.project.tools.DefaultCharset;
 import com.x.base.core.project.tools.ListTools;
 
@@ -51,6 +53,8 @@ import io.github.lukehutch.fastclasspathscanner.scanner.ScanResult;
 
 public class Describe {
 
+	private static Logger logger = LoggerFactory.getLogger(Describe.class);
+
 	public static void main(String[] args) {
 		Describe describe = new Describe();
 		describe.scan(args[0], args[1]);
@@ -176,13 +180,13 @@ public class Describe {
 			PathParam pathParam = o.getAnnotation(PathParam.class);
 			QueryParam queryParam = o.getAnnotation(QueryParam.class);
 			if (null != formDataParam) {
-				jaxrsMethod.getFormParameters().add(this.jaxrsFormDataParameter(o));
+				jaxrsMethod.getFormParameters().add(this.jaxrsFormDataParameter(clz, method, o));
 			} else if (null != formParam) {
-				jaxrsMethod.getFormParameters().add(this.jaxrsFormParameter(o));
+				jaxrsMethod.getFormParameters().add(this.jaxrsFormParameter(clz, method, o));
 			} else if (null != queryParam) {
-				jaxrsMethod.getQueryParameters().add(this.jaxrsQueryParameter(o));
+				jaxrsMethod.getQueryParameters().add(this.jaxrsQueryParameter(clz, method, o));
 			} else if (null != pathParam) {
-				jaxrsMethod.getPathParameters().add(this.jaxrsPathParameter(o));
+				jaxrsMethod.getPathParameters().add(this.jaxrsPathParameter(clz, method, o));
 			}
 		}
 		jaxrsMethod.setFormParameters(jaxrsMethod.getFormParameters().stream().filter(Objects::nonNull)
@@ -197,7 +201,7 @@ public class Describe {
 		return jaxrsMethod;
 	}
 
-	private JaxrsFormParameter jaxrsFormDataParameter(Parameter parameter) {
+	private JaxrsFormParameter jaxrsFormDataParameter(Class<?> clz, Method method, Parameter parameter) {
 		JaxrsParameterDescribe jaxrsParameterDescribe = parameter.getAnnotation(JaxrsParameterDescribe.class);
 		FormDataParam formDataParam = parameter.getAnnotation(FormDataParam.class);
 		if (StringUtils.equalsIgnoreCase("file", formDataParam.value())) {
@@ -209,7 +213,8 @@ public class Describe {
 				if (null != jaxrsParameterDescribe) {
 					o.setDescription(jaxrsParameterDescribe.value());
 				} else {
-					System.err.println("[" + formDataParam.value() + "], 未设置JaxrsParameterDescribe");
+					logger.print("类: {}, 方法: {} ,未设置参数 {} 的JaxrsParameterDescribe.", clz.getName(), method.getName(),
+							formDataParam.value());
 					o.setDescription("");
 				}
 				return o;
@@ -221,7 +226,8 @@ public class Describe {
 			if (null != jaxrsParameterDescribe) {
 				o.setDescription(jaxrsParameterDescribe.value());
 			} else {
-				System.err.println("[" + formDataParam.value() + "], 未设置JaxrsParameterDescribe");
+				logger.print("类: {}, 方法: {} ,未设置参数 {} 的JaxrsParameterDescribe.", clz.getName(), method.getName(),
+						formDataParam.value());
 				o.setDescription("");
 			}
 			return o;
@@ -229,7 +235,7 @@ public class Describe {
 		return null;
 	}
 
-	private JaxrsFormParameter jaxrsFormParameter(Parameter parameter) {
+	private JaxrsFormParameter jaxrsFormParameter(Class<?> clz, Method method, Parameter parameter) {
 		JaxrsParameterDescribe jaxrsParameterDescribe = parameter.getAnnotation(JaxrsParameterDescribe.class);
 		FormParam formParam = parameter.getAnnotation(FormParam.class);
 		JaxrsFormParameter o = new JaxrsFormParameter();
@@ -238,20 +244,22 @@ public class Describe {
 		if (null != jaxrsParameterDescribe) {
 			o.setDescription(jaxrsParameterDescribe.value());
 		} else {
-			System.err.println("[" + formParam.value() + "], 未设置JaxrsParameterDescribe");
+			logger.print("类: {}, 方法: {} ,未设置参数 {} 的JaxrsParameterDescribe.", clz.getName(), method.getName(),
+					formParam.value());
 			o.setDescription("");
 		}
 		return o;
 	}
 
-	private JaxrsQueryParameter jaxrsQueryParameter(Parameter parameter) {
+	private JaxrsQueryParameter jaxrsQueryParameter(Class<?> clz, Method method, Parameter parameter) {
 		JaxrsParameterDescribe jaxrsParameterDescribe = parameter.getAnnotation(JaxrsParameterDescribe.class);
 		QueryParam queryParam = parameter.getAnnotation(QueryParam.class);
 		JaxrsQueryParameter o = new JaxrsQueryParameter();
 		if (null != jaxrsParameterDescribe) {
 			o.setDescription(jaxrsParameterDescribe.value());
 		} else {
-			System.err.println("[" + queryParam.value() + "], 未设置JaxrsParameterDescribe");
+			logger.print("类: {}, 方法: {} ,未设置参数 {} 的JaxrsParameterDescribe.", clz.getName(), method.getName(),
+					queryParam.value());
 			o.setDescription("");
 		}
 		o.setName(queryParam.value());
@@ -259,7 +267,7 @@ public class Describe {
 		return o;
 	}
 
-	private JaxrsPathParameter jaxrsPathParameter(Parameter parameter) throws Exception {
+	private JaxrsPathParameter jaxrsPathParameter(Class<?> clz, Method method, Parameter parameter) throws Exception {
 		JaxrsParameterDescribe jaxrsParameterDescribe = parameter.getAnnotation(JaxrsParameterDescribe.class);
 		PathParam pathParam = parameter.getAnnotation(PathParam.class);
 		JaxrsPathParameter o = new JaxrsPathParameter();
@@ -267,7 +275,8 @@ public class Describe {
 		if (null != jaxrsParameterDescribe) {
 			o.setDescription(jaxrsParameterDescribe.value());
 		} else {
-			System.err.println("[" + pathParam.value() + "], 未设置JaxrsParameterDescribe");
+			logger.print("类: {}, 方法: {} ,未设置参数 {} 的JaxrsParameterDescribe.", clz.getName(), method.getName(),
+					pathParam.value());
 			o.setDescription("");
 		}
 		o.setType(this.getJaxrsParameterType(parameter));

o2server/x_base_core_project/src/main/java/com/x/base/core/project/config/Dingding.java

@@ -20,8 +20,11 @@ public class Dingding extends ConfigObject {
 	@FieldDescribe("agentId")
 	private String agentId;
 
-//	@FieldDescribe("钉钉corpSecret")
-//	private String corpSecret;
+	@FieldDescribe("应用的key,唯一标识")
+	private String appKey;
+
+	@FieldDescribe("应用的密钥")
+	private String appSecret;
 
 	@FieldDescribe("组织同步cron,默认每10分钟同步一次.")
 	private String syncCron;
@@ -35,12 +38,6 @@ public class Dingding extends ConfigObject {
 	@FieldDescribe("是否启用消息推送")
 	private Boolean messageEnable;
 
-	@FieldDescribe("应用的key,唯一标识")
-	private String appKey;
-
-	@FieldDescribe("应用的密钥")
-	private String appSecret;
-
 	public static Dingding defaultInstance() {
 		return new Dingding();
 	}

o2server/x_base_core_project/src/main/java/com/x/base/core/project/config/Node.java

@@ -9,6 +9,7 @@ import com.x.base.core.project.tools.DateTools;
 public class Node extends ConfigObject {
 
 	public static final Integer default_nodeAgentPort = 20010;
+	public static final String default_banner = "O2OA";
 	public static final Integer default_logSize = 14;
 
 	public static Node defaultInstance() {
@@ -63,6 +64,8 @@ public class Node extends ConfigObject {
 	private Boolean nodeAgentEncrypt;
 	@FieldDescribe("是否使用快速应用部署")
 	private Boolean quickStartWebApp;
+	@FieldDescribe("服务器控制台启动标识")
+	private String banner;
 
 	public String getLogLevel() {
 		// "trace", "debug", "info", "warn", "error" or "off"
@@ -83,6 +86,10 @@ public class Node extends ConfigObject {
 		}
 	}
 
+	public String getBanner() {
+		return StringUtils.isBlank(this.banner) ? default_banner : this.banner;
+	}
+
 	public Integer logSize() {
 		if ((this.logSize != null) && (this.logSize > 0)) {
 			return this.logSize;

o2server/x_base_core_project/src/main/java/com/x/base/core/project/config/Query.java

@@ -1,6 +1,8 @@
 package com.x.base.core.project.config;
 
 import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
 
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang3.BooleanUtils;
@@ -52,6 +54,15 @@ public class Query extends ConfigObject {
 	@FieldDescribe("tess使用语言.")
 	private String tessLanguage = "chi_sim";
 
+//	@FieldDescribe("可使用搜索人员.")
+//	private List<String> searchPeople = new ArrayList<>();
+//
+//	@FieldDescribe("可使用搜索群组.")
+//	private List<String> searchGroups = new ArrayList<>();
+//
+//	@FieldDescribe("可使用角色.")
+//	private List<String> searchRoles = new ArrayList<>();
+
 	public static final Boolean default_extractOffice = true;
 	public static final Boolean default_extractPdf = true;
 	public static final Boolean default_extractText = true;
@@ -90,6 +101,18 @@ public class Query extends ConfigObject {
 		return this.crawlWorkCompleted == null ? new CrawlWorkCompleted() : this.crawlWorkCompleted;
 	}
 
+//	public List<String> getSearchPeople() {
+//		return searchPeople == null ? new ArrayList<String>() : this.searchPeople;
+//	}
+//
+//	public List<String> getSearchGroups() {
+//		return searchGroups == null ? new ArrayList<String>() : this.searchGroups;
+//	}
+//
+//	public List<String> getSearchRoles() {
+//		return searchRoles == null ? new ArrayList<String>() : this.searchRoles;
+//	}
+
 	public void save() throws Exception {
 		File file = new File(Config.base(), Config.PATH_CONFIG_QUERY);
 		FileUtils.write(file, XGsonBuilder.toJson(this), DefaultCharset.charset);
@@ -280,4 +303,16 @@ public class Query extends ConfigObject {
 		this.tessLanguage = tessLanguage;
 	}
 
+//	public void setSearchPeople(List<String> searchPeople) {
+//		this.searchPeople = searchPeople;
+//	}
+//
+//	public void setSearchGroups(List<String> searchGroups) {
+//		this.searchGroups = searchGroups;
+//	}
+//
+//	public void setSearchRoles(List<String> searchRoles) {
+//		this.searchRoles = searchRoles;
+//	}
+
 }

o2server/x_base_core_project/src/main/java/com/x/base/core/project/jaxrs/ResponseFactory.java

@@ -1,11 +1,13 @@
 package com.x.base.core.project.jaxrs;
 
 import javax.ws.rs.core.CacheControl;
+import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 
 import com.x.base.core.project.exception.CallbackPromptException;
 import com.x.base.core.project.http.ActionResult;
 import com.x.base.core.project.http.CacheControlFactory;
+import com.x.base.core.project.http.HttpMediaType;
 import com.x.base.core.project.tools.DefaultCharset;
 
 public class ResponseFactory {
@@ -31,7 +33,8 @@ public class ResponseFactory {
 						.header(Content_Type, wo.getContentType()).header(Accept_Ranges, "bytes").build();
 			} else if ((null != result.getData()) && (result.getData() instanceof WoText)) {
 				WoText wo = (WoText) result.getData();
-				return Response.ok(wo.getText()).cacheControl(defaultCacheControl).build();
+				return Response.ok(wo.getText()).cacheControl(defaultCacheControl).type(HttpMediaType.TEXT_PLAIN_UTF_8)
+						.build();
 			} else if ((null != result.getData()) && (result.getData() instanceof WoCallback)) {
 				return Response.ok(callback((WoCallback) result.getData())).cacheControl(defaultCacheControl).build();
 			} else {

o2server/x_base_core_project/src/main/java/com/x/base/core/project/organization/OrganizationDefinition.java

@@ -46,6 +46,8 @@ public class OrganizationDefinition {
 
 	public final static String MessageManager = "MessageManager";
 
+	public final static String SearchPrivilege = "SearchPrivilege";
+
 	public final static String RoleDefinitionSuffix = "SystemRole";
 
 	public final static Pattern person_distinguishedName_pattern = Pattern.compile("^(\\S+)\\@(\\S+)\\@P$");
@@ -66,17 +68,7 @@ public class OrganizationDefinition {
 
 	public final static Pattern distinguishedName_pattern = Pattern.compile("^(\\S+)\\@(\\S+)\\@(P|PA|G|R|I|U|UA|UD)$");
 
-	// public static String isName(String distinguishedName) {
-	//
-	// if (StringUtils.contains(distinguishedName, "@")) {
-	// return StringUtils.substringBefore(distinguishedName, "@");
-	// }
-	// return distinguishedName;
-	//
-	// }
-
 	public static String name(String distinguishedName) {
-
 		if (StringUtils.contains(distinguishedName, "@")) {
 			return StringUtils.substringBefore(distinguishedName, "@");
 		}

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

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<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.base.core.entity.SliceJpaObject</class>
-    <class>com.x.base.core.entity.StorageObject</class>
-  </persistence-unit>
-</persistence>

o2server/x_bbs_assemble_control/src/main/resources/META-INF/x_persistence.xml

@@ -1,124 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<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="com.x.bbs.entity.BBSConfigSetting" transaction-type="RESOURCE_LOCAL">
-    <provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider>
-    <class>com.x.base.core.entity.SliceJpaObject</class>
-    <class>com.x.base.core.entity.JpaObject</class>
-    <class>com.x.bbs.entity.BBSConfigSetting</class>
-    <properties/>
-  </persistence-unit>
-  <persistence-unit name="com.x.bbs.entity.BBSForumInfo" transaction-type="RESOURCE_LOCAL">
-    <provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider>
-    <class>com.x.bbs.entity.BBSForumInfo</class>
-    <class>com.x.base.core.entity.SliceJpaObject</class>
-    <class>com.x.base.core.entity.JpaObject</class>
-    <properties/>
-  </persistence-unit>
-  <persistence-unit name="com.x.bbs.entity.BBSOperationRecord" transaction-type="RESOURCE_LOCAL">
-    <provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider>
-    <class>com.x.base.core.entity.SliceJpaObject</class>
-    <class>com.x.base.core.entity.JpaObject</class>
-    <class>com.x.bbs.entity.BBSOperationRecord</class>
-    <properties/>
-  </persistence-unit>
-  <persistence-unit name="com.x.bbs.entity.BBSPermissionInfo" transaction-type="RESOURCE_LOCAL">
-    <provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider>
-    <class>com.x.base.core.entity.SliceJpaObject</class>
-    <class>com.x.base.core.entity.JpaObject</class>
-    <class>com.x.bbs.entity.BBSPermissionInfo</class>
-    <properties/>
-  </persistence-unit>
-  <persistence-unit name="com.x.bbs.entity.BBSPermissionRole" transaction-type="RESOURCE_LOCAL">
-    <provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider>
-    <class>com.x.base.core.entity.SliceJpaObject</class>
-    <class>com.x.base.core.entity.JpaObject</class>
-    <class>com.x.bbs.entity.BBSPermissionRole</class>
-    <properties/>
-  </persistence-unit>
-  <persistence-unit name="com.x.bbs.entity.BBSReplyInfo" transaction-type="RESOURCE_LOCAL">
-    <provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider>
-    <class>com.x.base.core.entity.SliceJpaObject</class>
-    <class>com.x.base.core.entity.JpaObject</class>
-    <class>com.x.bbs.entity.BBSReplyInfo</class>
-    <properties/>
-  </persistence-unit>
-  <persistence-unit name="com.x.bbs.entity.BBSRoleInfo" transaction-type="RESOURCE_LOCAL">
-    <provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider>
-    <class>com.x.base.core.entity.SliceJpaObject</class>
-    <class>com.x.base.core.entity.JpaObject</class>
-    <class>com.x.bbs.entity.BBSRoleInfo</class>
-    <properties/>
-  </persistence-unit>
-  <persistence-unit name="com.x.bbs.entity.BBSSectionInfo" transaction-type="RESOURCE_LOCAL">
-    <provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider>
-    <class>com.x.base.core.entity.SliceJpaObject</class>
-    <class>com.x.base.core.entity.JpaObject</class>
-    <class>com.x.bbs.entity.BBSSectionInfo</class>
-    <properties/>
-  </persistence-unit>
-  <persistence-unit name="com.x.bbs.entity.BBSSubjectAttachment" transaction-type="RESOURCE_LOCAL">
-    <provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider>
-    <class>com.x.bbs.entity.BBSSubjectAttachment</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>
-    <properties/>
-  </persistence-unit>
-  <persistence-unit name="com.x.bbs.entity.BBSSubjectContent" transaction-type="RESOURCE_LOCAL">
-    <provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider>
-    <class>com.x.base.core.entity.SliceJpaObject</class>
-    <class>com.x.base.core.entity.JpaObject</class>
-    <class>com.x.bbs.entity.BBSSubjectContent</class>
-    <properties/>
-  </persistence-unit>
-  <persistence-unit name="com.x.bbs.entity.BBSSubjectInfo" transaction-type="RESOURCE_LOCAL">
-    <provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider>
-    <class>com.x.base.core.entity.SliceJpaObject</class>
-    <class>com.x.base.core.entity.JpaObject</class>
-    <class>com.x.bbs.entity.BBSSubjectInfo</class>
-    <properties/>
-  </persistence-unit>
-  <persistence-unit name="com.x.bbs.entity.BBSSubjectVoteResult" transaction-type="RESOURCE_LOCAL">
-    <provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider>
-    <class>com.x.base.core.entity.SliceJpaObject</class>
-    <class>com.x.base.core.entity.JpaObject</class>
-    <class>com.x.bbs.entity.BBSSubjectVoteResult</class>
-    <properties/>
-  </persistence-unit>
-  <persistence-unit name="com.x.bbs.entity.BBSUserInfo" transaction-type="RESOURCE_LOCAL">
-    <provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider>
-    <class>com.x.bbs.entity.BBSUserInfo</class>
-    <class>com.x.base.core.entity.SliceJpaObject</class>
-    <class>com.x.base.core.entity.JpaObject</class>
-    <properties/>
-  </persistence-unit>
-  <persistence-unit name="com.x.bbs.entity.BBSUserRole" transaction-type="RESOURCE_LOCAL">
-    <provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider>
-    <class>com.x.base.core.entity.SliceJpaObject</class>
-    <class>com.x.base.core.entity.JpaObject</class>
-    <class>com.x.bbs.entity.BBSUserRole</class>
-    <properties/>
-  </persistence-unit>
-  <persistence-unit name="com.x.bbs.entity.BBSVoteOption" transaction-type="RESOURCE_LOCAL">
-    <provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider>
-    <class>com.x.base.core.entity.SliceJpaObject</class>
-    <class>com.x.base.core.entity.JpaObject</class>
-    <class>com.x.bbs.entity.BBSVoteOption</class>
-    <properties/>
-  </persistence-unit>
-  <persistence-unit name="com.x.bbs.entity.BBSVoteOptionGroup" transaction-type="RESOURCE_LOCAL">
-    <provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider>
-    <class>com.x.bbs.entity.BBSVoteOptionGroup</class>
-    <class>com.x.base.core.entity.SliceJpaObject</class>
-    <class>com.x.base.core.entity.JpaObject</class>
-    <properties/>
-  </persistence-unit>
-  <persistence-unit name="com.x.bbs.entity.BBSVoteRecord" transaction-type="RESOURCE_LOCAL">
-    <provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider>
-    <class>com.x.base.core.entity.SliceJpaObject</class>
-    <class>com.x.base.core.entity.JpaObject</class>
-    <class>com.x.bbs.entity.BBSVoteRecord</class>
-    <properties/>
-  </persistence-unit>
-</persistence>

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

@@ -1,27 +0,0 @@
-/** 
- *  Generated by OpenJPA MetaModel Generator Tool.
-**/
-
-package com.x.bbs.entity;
-
-import com.x.base.core.entity.SliceJpaObject_;
-import java.lang.Boolean;
-import java.lang.Integer;
-import java.lang.String;
-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="Thu Dec 27 11:39:47 CST 2018")
-public class BBSConfigSetting_ extends SliceJpaObject_  {
-    public static volatile SingularAttribute<BBSConfigSetting,String> configCode;
-    public static volatile SingularAttribute<BBSConfigSetting,String> configName;
-    public static volatile SingularAttribute<BBSConfigSetting,String> configValue;
-    public static volatile SingularAttribute<BBSConfigSetting,String> description;
-    public static volatile SingularAttribute<BBSConfigSetting,String> id;
-    public static volatile SingularAttribute<BBSConfigSetting,Boolean> isMultiple;
-    public static volatile SingularAttribute<BBSConfigSetting,Integer> orderNumber;
-    public static volatile SingularAttribute<BBSConfigSetting,String> selectContent;
-    public static volatile SingularAttribute<BBSConfigSetting,String> valueType;
-}

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

@@ -1,44 +0,0 @@
-/** 
- *  Generated by OpenJPA MetaModel Generator Tool.
-**/
-
-package com.x.bbs.entity;
-
-import com.x.base.core.entity.SliceJpaObject_;
-import java.lang.Boolean;
-import java.lang.Integer;
-import java.lang.Long;
-import java.lang.String;
-import javax.persistence.metamodel.ListAttribute;
-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="Thu Dec 27 11:39:47 CST 2018")
-public class BBSForumInfo_ extends SliceJpaObject_  {
-    public static volatile SingularAttribute<BBSForumInfo,String> creatorName;
-    public static volatile SingularAttribute<BBSForumInfo,String> forumColor;
-    public static volatile SingularAttribute<BBSForumInfo,String> forumIndexStyle;
-    public static volatile ListAttribute<BBSForumInfo,String> forumManagerList;
-    public static volatile SingularAttribute<BBSForumInfo,String> forumName;
-    public static volatile SingularAttribute<BBSForumInfo,String> forumNotice;
-    public static volatile SingularAttribute<BBSForumInfo,String> forumStatus;
-    public static volatile SingularAttribute<BBSForumInfo,String> forumVisible;
-    public static volatile SingularAttribute<BBSForumInfo,String> id;
-    public static volatile SingularAttribute<BBSForumInfo,String> indexListStyle;
-    public static volatile SingularAttribute<BBSForumInfo,Boolean> indexRecommendable;
-    public static volatile SingularAttribute<BBSForumInfo,Integer> orderNumber;
-    public static volatile SingularAttribute<BBSForumInfo,Boolean> replyNeedAudit;
-    public static volatile SingularAttribute<BBSForumInfo,String> replyPublishAble;
-    public static volatile SingularAttribute<BBSForumInfo,Long> replyTotal;
-    public static volatile SingularAttribute<BBSForumInfo,Long> replyTotalToday;
-    public static volatile SingularAttribute<BBSForumInfo,Boolean> sectionCreateAble;
-    public static volatile SingularAttribute<BBSForumInfo,Long> sectionTotal;
-    public static volatile SingularAttribute<BBSForumInfo,Boolean> subjectNeedAudit;
-    public static volatile SingularAttribute<BBSForumInfo,String> subjectPublishAble;
-    public static volatile SingularAttribute<BBSForumInfo,Long> subjectTotal;
-    public static volatile SingularAttribute<BBSForumInfo,Long> subjectTotalToday;
-    public static volatile SingularAttribute<BBSForumInfo,String> subjectType;
-    public static volatile SingularAttribute<BBSForumInfo,String> typeCategory;
-}

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

@@ -1,32 +0,0 @@
-/** 
- *  Generated by OpenJPA MetaModel Generator Tool.
-**/
-
-package com.x.bbs.entity;
-
-import com.x.base.core.entity.SliceJpaObject_;
-import java.lang.String;
-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="Thu Dec 27 11:39:47 CST 2018")
-public class BBSOperationRecord_ extends SliceJpaObject_  {
-    public static volatile SingularAttribute<BBSOperationRecord,String> forumId;
-    public static volatile SingularAttribute<BBSOperationRecord,String> forumName;
-    public static volatile SingularAttribute<BBSOperationRecord,String> hostIp;
-    public static volatile SingularAttribute<BBSOperationRecord,String> hostname;
-    public static volatile SingularAttribute<BBSOperationRecord,String> id;
-    public static volatile SingularAttribute<BBSOperationRecord,String> mainSectionId;
-    public static volatile SingularAttribute<BBSOperationRecord,String> mainSectionName;
-    public static volatile SingularAttribute<BBSOperationRecord,String> objectId;
-    public static volatile SingularAttribute<BBSOperationRecord,String> objectName;
-    public static volatile SingularAttribute<BBSOperationRecord,String> objectType;
-    public static volatile SingularAttribute<BBSOperationRecord,String> operatorName;
-    public static volatile SingularAttribute<BBSOperationRecord,String> optType;
-    public static volatile SingularAttribute<BBSOperationRecord,String> sectionId;
-    public static volatile SingularAttribute<BBSOperationRecord,String> sectionName;
-    public static volatile SingularAttribute<BBSOperationRecord,String> subjectId;
-    public static volatile SingularAttribute<BBSOperationRecord,String> title;
-}

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

@@ -1,30 +0,0 @@
-/** 
- *  Generated by OpenJPA MetaModel Generator Tool.
-**/
-
-package com.x.bbs.entity;
-
-import com.x.base.core.entity.SliceJpaObject_;
-import java.lang.Integer;
-import java.lang.String;
-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="Thu Dec 27 11:39:47 CST 2018")
-public class BBSPermissionInfo_ extends SliceJpaObject_  {
-    public static volatile SingularAttribute<BBSPermissionInfo,String> description;
-    public static volatile SingularAttribute<BBSPermissionInfo,String> forumId;
-    public static volatile SingularAttribute<BBSPermissionInfo,String> forumName;
-    public static volatile SingularAttribute<BBSPermissionInfo,String> id;
-    public static volatile SingularAttribute<BBSPermissionInfo,String> mainSectionId;
-    public static volatile SingularAttribute<BBSPermissionInfo,String> mainSectionName;
-    public static volatile SingularAttribute<BBSPermissionInfo,Integer> orderNumber;
-    public static volatile SingularAttribute<BBSPermissionInfo,String> permissionCode;
-    public static volatile SingularAttribute<BBSPermissionInfo,String> permissionFunction;
-    public static volatile SingularAttribute<BBSPermissionInfo,String> permissionName;
-    public static volatile SingularAttribute<BBSPermissionInfo,String> permissionType;
-    public static volatile SingularAttribute<BBSPermissionInfo,String> sectionId;
-    public static volatile SingularAttribute<BBSPermissionInfo,String> sectionName;
-}

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

@@ -1,32 +0,0 @@
-/** 
- *  Generated by OpenJPA MetaModel Generator Tool.
-**/
-
-package com.x.bbs.entity;
-
-import com.x.base.core.entity.SliceJpaObject_;
-import java.lang.Integer;
-import java.lang.String;
-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="Thu Dec 27 11:39:47 CST 2018")
-public class BBSPermissionRole_ extends SliceJpaObject_  {
-    public static volatile SingularAttribute<BBSPermissionRole,String> description;
-    public static volatile SingularAttribute<BBSPermissionRole,String> forumId;
-    public static volatile SingularAttribute<BBSPermissionRole,String> forumName;
-    public static volatile SingularAttribute<BBSPermissionRole,String> id;
-    public static volatile SingularAttribute<BBSPermissionRole,String> mainSectionId;
-    public static volatile SingularAttribute<BBSPermissionRole,String> mainSectionName;
-    public static volatile SingularAttribute<BBSPermissionRole,Integer> orderNumber;
-    public static volatile SingularAttribute<BBSPermissionRole,String> permissionCode;
-    public static volatile SingularAttribute<BBSPermissionRole,String> permissionName;
-    public static volatile SingularAttribute<BBSPermissionRole,String> permissionType;
-    public static volatile SingularAttribute<BBSPermissionRole,String> roleCode;
-    public static volatile SingularAttribute<BBSPermissionRole,String> roleId;
-    public static volatile SingularAttribute<BBSPermissionRole,String> roleName;
-    public static volatile SingularAttribute<BBSPermissionRole,String> sectionId;
-    public static volatile SingularAttribute<BBSPermissionRole,String> sectionName;
-}

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

@@ -1,36 +0,0 @@
-/** 
- *  Generated by OpenJPA MetaModel Generator Tool.
-**/
-
-package com.x.bbs.entity;
-
-import com.x.base.core.entity.SliceJpaObject_;
-import java.lang.Integer;
-import java.lang.String;
-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="Thu Dec 27 11:39:47 CST 2018")
-public class BBSReplyInfo_ extends SliceJpaObject_  {
-    public static volatile SingularAttribute<BBSReplyInfo,String> auditorName;
-    public static volatile SingularAttribute<BBSReplyInfo,String> content;
-    public static volatile SingularAttribute<BBSReplyInfo,String> creatorName;
-    public static volatile SingularAttribute<BBSReplyInfo,String> forumId;
-    public static volatile SingularAttribute<BBSReplyInfo,String> forumName;
-    public static volatile SingularAttribute<BBSReplyInfo,String> hostIp;
-    public static volatile SingularAttribute<BBSReplyInfo,String> id;
-    public static volatile SingularAttribute<BBSReplyInfo,String> machineName;
-    public static volatile SingularAttribute<BBSReplyInfo,String> mainSectionId;
-    public static volatile SingularAttribute<BBSReplyInfo,String> mainSectionName;
-    public static volatile SingularAttribute<BBSReplyInfo,Integer> orderNumber;
-    public static volatile SingularAttribute<BBSReplyInfo,String> parentId;
-    public static volatile SingularAttribute<BBSReplyInfo,String> picId;
-    public static volatile SingularAttribute<BBSReplyInfo,String> replyAuditStatus;
-    public static volatile SingularAttribute<BBSReplyInfo,String> sectionId;
-    public static volatile SingularAttribute<BBSReplyInfo,String> sectionName;
-    public static volatile SingularAttribute<BBSReplyInfo,String> subjectId;
-    public static volatile SingularAttribute<BBSReplyInfo,String> systemType;
-    public static volatile SingularAttribute<BBSReplyInfo,String> title;
-}

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

@@ -1,30 +0,0 @@
-/** 
- *  Generated by OpenJPA MetaModel Generator Tool.
-**/
-
-package com.x.bbs.entity;
-
-import com.x.base.core.entity.SliceJpaObject_;
-import java.lang.Integer;
-import java.lang.String;
-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="Thu Dec 27 11:39:47 CST 2018")
-public class BBSRoleInfo_ extends SliceJpaObject_  {
-    public static volatile SingularAttribute<BBSRoleInfo,String> creatorName;
-    public static volatile SingularAttribute<BBSRoleInfo,String> description;
-    public static volatile SingularAttribute<BBSRoleInfo,String> forumId;
-    public static volatile SingularAttribute<BBSRoleInfo,String> forumName;
-    public static volatile SingularAttribute<BBSRoleInfo,String> id;
-    public static volatile SingularAttribute<BBSRoleInfo,String> mainSectionId;
-    public static volatile SingularAttribute<BBSRoleInfo,String> mainSectionName;
-    public static volatile SingularAttribute<BBSRoleInfo,Integer> orderNumber;
-    public static volatile SingularAttribute<BBSRoleInfo,String> roleCode;
-    public static volatile SingularAttribute<BBSRoleInfo,String> roleName;
-    public static volatile SingularAttribute<BBSRoleInfo,String> roleType;
-    public static volatile SingularAttribute<BBSRoleInfo,String> sectionId;
-    public static volatile SingularAttribute<BBSRoleInfo,String> sectionName;
-}

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

@@ -1,47 +0,0 @@
-/** 
- *  Generated by OpenJPA MetaModel Generator Tool.
-**/
-
-package com.x.bbs.entity;
-
-import com.x.base.core.entity.SliceJpaObject_;
-import java.lang.Boolean;
-import java.lang.Integer;
-import java.lang.Long;
-import java.lang.String;
-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="Thu Dec 27 11:39:47 CST 2018")
-public class BBSSectionInfo_ extends SliceJpaObject_  {
-    public static volatile SingularAttribute<BBSSectionInfo,String> creatorName;
-    public static volatile SingularAttribute<BBSSectionInfo,String> forumId;
-    public static volatile SingularAttribute<BBSSectionInfo,String> forumName;
-    public static volatile SingularAttribute<BBSSectionInfo,String> icon;
-    public static volatile SingularAttribute<BBSSectionInfo,String> id;
-    public static volatile SingularAttribute<BBSSectionInfo,Boolean> indexRecommendable;
-    public static volatile SingularAttribute<BBSSectionInfo,String> mainSectionId;
-    public static volatile SingularAttribute<BBSSectionInfo,String> mainSectionName;
-    public static volatile SingularAttribute<BBSSectionInfo,String> moderatorNames;
-    public static volatile SingularAttribute<BBSSectionInfo,Integer> orderNumber;
-    public static volatile SingularAttribute<BBSSectionInfo,Boolean> replyNeedAudit;
-    public static volatile SingularAttribute<BBSSectionInfo,String> replyPublishAble;
-    public static volatile SingularAttribute<BBSSectionInfo,Long> replyTotal;
-    public static volatile SingularAttribute<BBSSectionInfo,Long> replyTotalToday;
-    public static volatile SingularAttribute<BBSSectionInfo,String> sectionDescription;
-    public static volatile SingularAttribute<BBSSectionInfo,String> sectionLevel;
-    public static volatile SingularAttribute<BBSSectionInfo,String> sectionName;
-    public static volatile SingularAttribute<BBSSectionInfo,String> sectionNotice;
-    public static volatile SingularAttribute<BBSSectionInfo,String> sectionStatus;
-    public static volatile SingularAttribute<BBSSectionInfo,String> sectionType;
-    public static volatile SingularAttribute<BBSSectionInfo,String> sectionVisible;
-    public static volatile SingularAttribute<BBSSectionInfo,Boolean> subSectionCreateAble;
-    public static volatile SingularAttribute<BBSSectionInfo,Boolean> subjectNeedAudit;
-    public static volatile SingularAttribute<BBSSectionInfo,String> subjectPublishAble;
-    public static volatile SingularAttribute<BBSSectionInfo,Long> subjectTotal;
-    public static volatile SingularAttribute<BBSSectionInfo,Long> subjectTotalToday;
-    public static volatile SingularAttribute<BBSSectionInfo,String> subjectType;
-    public static volatile SingularAttribute<BBSSectionInfo,String> typeCategory;
-}

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

@@ -1,38 +0,0 @@
-/** 
- *  Generated by OpenJPA MetaModel Generator Tool.
-**/
-
-package com.x.bbs.entity;
-
-import com.x.base.core.entity.StorageObject_;
-import java.lang.Long;
-import java.lang.String;
-import java.util.Date;
-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="Thu Dec 27 11:39:47 CST 2018")
-public class BBSSubjectAttachment_ extends StorageObject_  {
-    public static volatile SingularAttribute<BBSSubjectAttachment,String> creatorUid;
-    public static volatile SingularAttribute<BBSSubjectAttachment,String> description;
-    public static volatile SingularAttribute<BBSSubjectAttachment,String> extension;
-    public static volatile SingularAttribute<BBSSubjectAttachment,String> fileHost;
-    public static volatile SingularAttribute<BBSSubjectAttachment,String> fileName;
-    public static volatile SingularAttribute<BBSSubjectAttachment,String> filePath;
-    public static volatile SingularAttribute<BBSSubjectAttachment,String> forumId;
-    public static volatile SingularAttribute<BBSSubjectAttachment,String> forumName;
-    public static volatile SingularAttribute<BBSSubjectAttachment,String> id;
-    public static volatile SingularAttribute<BBSSubjectAttachment,Date> lastUpdateTime;
-    public static volatile SingularAttribute<BBSSubjectAttachment,Long> length;
-    public static volatile SingularAttribute<BBSSubjectAttachment,String> mainSectionId;
-    public static volatile SingularAttribute<BBSSubjectAttachment,String> mainSectionName;
-    public static volatile SingularAttribute<BBSSubjectAttachment,String> name;
-    public static volatile SingularAttribute<BBSSubjectAttachment,String> sectionId;
-    public static volatile SingularAttribute<BBSSubjectAttachment,String> sectionName;
-    public static volatile SingularAttribute<BBSSubjectAttachment,String> site;
-    public static volatile SingularAttribute<BBSSubjectAttachment,String> storage;
-    public static volatile SingularAttribute<BBSSubjectAttachment,String> subjectId;
-    public static volatile SingularAttribute<BBSSubjectAttachment,String> title;
-}

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

@@ -1,18 +0,0 @@
-/** 
- *  Generated by OpenJPA MetaModel Generator Tool.
-**/
-
-package com.x.bbs.entity;
-
-import com.x.base.core.entity.SliceJpaObject_;
-import java.lang.String;
-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="Thu Dec 27 11:39:47 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

@@ -1,74 +0,0 @@
-/** 
- *  Generated by OpenJPA MetaModel Generator Tool.
-**/
-
-package com.x.bbs.entity;
-
-import com.x.base.core.entity.SliceJpaObject_;
-import java.lang.Boolean;
-import java.lang.Integer;
-import java.lang.Long;
-import java.lang.String;
-import java.util.Date;
-import javax.persistence.metamodel.ListAttribute;
-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="Thu Dec 27 11:39:47 CST 2018")
-public class BBSSubjectInfo_ extends SliceJpaObject_  {
-    public static volatile SingularAttribute<BBSSubjectInfo,String> acceptReplyId;
-    public static volatile ListAttribute<BBSSubjectInfo,String> attachmentList;
-    public static volatile SingularAttribute<BBSSubjectInfo,String> auditorName;
-    public static volatile SingularAttribute<BBSSubjectInfo,String> bBSIndexSetterName;
-    public static volatile SingularAttribute<BBSSubjectInfo,Date> bBSIndexSetterTime;
-    public static volatile SingularAttribute<BBSSubjectInfo,String> creatorName;
-    public static volatile SingularAttribute<BBSSubjectInfo,String> forumId;
-    public static volatile SingularAttribute<BBSSubjectInfo,String> forumIndexSetterName;
-    public static volatile SingularAttribute<BBSSubjectInfo,Date> forumIndexSetterTime;
-    public static volatile SingularAttribute<BBSSubjectInfo,String> forumName;
-    public static volatile SingularAttribute<BBSSubjectInfo,String> hostIp;
-    public static volatile SingularAttribute<BBSSubjectInfo,Long> hot;
-    public static volatile SingularAttribute<BBSSubjectInfo,String> id;
-    public static volatile SingularAttribute<BBSSubjectInfo,Boolean> isCompleted;
-    public static volatile SingularAttribute<BBSSubjectInfo,Boolean> isCreamSubject;
-    public static volatile SingularAttribute<BBSSubjectInfo,Boolean> isOriginalSubject;
-    public static volatile SingularAttribute<BBSSubjectInfo,Boolean> isRecommendSubject;
-    public static volatile SingularAttribute<BBSSubjectInfo,Boolean> isTopSubject;
-    public static volatile SingularAttribute<BBSSubjectInfo,String> latestReplyId;
-    public static volatile SingularAttribute<BBSSubjectInfo,Date> latestReplyTime;
-    public static volatile SingularAttribute<BBSSubjectInfo,String> latestReplyUser;
-    public static volatile SingularAttribute<BBSSubjectInfo,String> machineName;
-    public static volatile SingularAttribute<BBSSubjectInfo,String> mainSectionId;
-    public static volatile SingularAttribute<BBSSubjectInfo,String> mainSectionName;
-    public static volatile SingularAttribute<BBSSubjectInfo,Integer> orderNumber;
-    public static volatile SingularAttribute<BBSSubjectInfo,String> originalSetterName;
-    public static volatile SingularAttribute<BBSSubjectInfo,Date> originalSetterTime;
-    public static volatile SingularAttribute<BBSSubjectInfo,String> picId;
-    public static volatile SingularAttribute<BBSSubjectInfo,Date> recommendTime;
-    public static volatile SingularAttribute<BBSSubjectInfo,Boolean> recommendToBBSIndex;
-    public static volatile SingularAttribute<BBSSubjectInfo,Boolean> recommendToForumIndex;
-    public static volatile SingularAttribute<BBSSubjectInfo,String> recommendorName;
-    public static volatile SingularAttribute<BBSSubjectInfo,Long> replyTotal;
-    public static volatile SingularAttribute<BBSSubjectInfo,String> screamSetterName;
-    public static volatile SingularAttribute<BBSSubjectInfo,Date> screamSetterTime;
-    public static volatile SingularAttribute<BBSSubjectInfo,String> sectionId;
-    public static volatile SingularAttribute<BBSSubjectInfo,String> sectionName;
-    public static volatile SingularAttribute<BBSSubjectInfo,Boolean> stopReply;
-    public static volatile SingularAttribute<BBSSubjectInfo,String> subjectAuditStatus;
-    public static volatile SingularAttribute<BBSSubjectInfo,String> subjectStatus;
-    public static volatile SingularAttribute<BBSSubjectInfo,String> summary;
-    public static volatile SingularAttribute<BBSSubjectInfo,String> systemType;
-    public static volatile SingularAttribute<BBSSubjectInfo,String> title;
-    public static volatile SingularAttribute<BBSSubjectInfo,Boolean> topToBBS;
-    public static volatile SingularAttribute<BBSSubjectInfo,Boolean> topToForum;
-    public static volatile SingularAttribute<BBSSubjectInfo,Boolean> topToMainSection;
-    public static volatile SingularAttribute<BBSSubjectInfo,Boolean> topToSection;
-    public static volatile SingularAttribute<BBSSubjectInfo,String> type;
-    public static volatile SingularAttribute<BBSSubjectInfo,String> typeCategory;
-    public static volatile SingularAttribute<BBSSubjectInfo,Long> viewTotal;
-    public static volatile SingularAttribute<BBSSubjectInfo,Date> voteLimitTime;
-    public static volatile SingularAttribute<BBSSubjectInfo,Boolean> votePersonVisible;
-    public static volatile SingularAttribute<BBSSubjectInfo,Boolean> voteResultVisible;
-}

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

@@ -1,21 +0,0 @@
-/** 
- *  Generated by OpenJPA MetaModel Generator Tool.
-**/
-
-package com.x.bbs.entity;
-
-import com.x.base.core.entity.SliceJpaObject_;
-import java.lang.String;
-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="Thu Dec 27 11:39:47 CST 2018")
-public class BBSSubjectVoteResult_ extends SliceJpaObject_  {
-    public static volatile SingularAttribute<BBSSubjectVoteResult,String> forumId;
-    public static volatile SingularAttribute<BBSSubjectVoteResult,String> id;
-    public static volatile SingularAttribute<BBSSubjectVoteResult,String> mainSectionId;
-    public static volatile SingularAttribute<BBSSubjectVoteResult,String> sectionId;
-    public static volatile SingularAttribute<BBSSubjectVoteResult,String> statisticContent;
-}

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

@@ -1,42 +0,0 @@
-/** 
- *  Generated by OpenJPA MetaModel Generator Tool.
-**/
-
-package com.x.bbs.entity;
-
-import com.x.base.core.entity.SliceJpaObject_;
-import java.lang.Boolean;
-import java.lang.Integer;
-import java.lang.Long;
-import java.lang.String;
-import java.util.Date;
-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="Thu Dec 27 11:39:47 CST 2018")
-public class BBSUserInfo_ extends SliceJpaObject_  {
-    public static volatile SingularAttribute<BBSUserInfo,String> cardId;
-    public static volatile SingularAttribute<BBSUserInfo,Long> creamCount;
-    public static volatile SingularAttribute<BBSUserInfo,Long> credit;
-    public static volatile SingularAttribute<BBSUserInfo,Long> fansCount;
-    public static volatile SingularAttribute<BBSUserInfo,String> id;
-    public static volatile SingularAttribute<BBSUserInfo,Date> lastOperationTime;
-    public static volatile SingularAttribute<BBSUserInfo,Date> lastVisitTime;
-    public static volatile SingularAttribute<BBSUserInfo,String> mobile;
-    public static volatile SingularAttribute<BBSUserInfo,String> nickName;
-    public static volatile SingularAttribute<BBSUserInfo,Boolean> online;
-    public static volatile SingularAttribute<BBSUserInfo,Integer> orderNumber;
-    public static volatile SingularAttribute<BBSUserInfo,Long> originalCount;
-    public static volatile SingularAttribute<BBSUserInfo,String> permissionContent;
-    public static volatile SingularAttribute<BBSUserInfo,Long> popularity;
-    public static volatile SingularAttribute<BBSUserInfo,Long> replyCount;
-    public static volatile SingularAttribute<BBSUserInfo,Long> replyCountToday;
-    public static volatile SingularAttribute<BBSUserInfo,Integer> sex;
-    public static volatile SingularAttribute<BBSUserInfo,String> signContent;
-    public static volatile SingularAttribute<BBSUserInfo,Long> subjectCount;
-    public static volatile SingularAttribute<BBSUserInfo,Long> subjectCountToday;
-    public static volatile SingularAttribute<BBSUserInfo,String> userName;
-    public static volatile SingularAttribute<BBSUserInfo,String> userStatus;
-}

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

@@ -1,30 +0,0 @@
-/** 
- *  Generated by OpenJPA MetaModel Generator Tool.
-**/
-
-package com.x.bbs.entity;
-
-import com.x.base.core.entity.SliceJpaObject_;
-import java.lang.Integer;
-import java.lang.String;
-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="Thu Dec 27 11:39:47 CST 2018")
-public class BBSUserRole_ extends SliceJpaObject_  {
-    public static volatile SingularAttribute<BBSUserRole,String> forumId;
-    public static volatile SingularAttribute<BBSUserRole,String> id;
-    public static volatile SingularAttribute<BBSUserRole,String> mainSectionId;
-    public static volatile SingularAttribute<BBSUserRole,String> objectName;
-    public static volatile SingularAttribute<BBSUserRole,String> objectType;
-    public static volatile SingularAttribute<BBSUserRole,Integer> orderNumber;
-    public static volatile SingularAttribute<BBSUserRole,String> roleCode;
-    public static volatile SingularAttribute<BBSUserRole,String> roleId;
-    public static volatile SingularAttribute<BBSUserRole,String> roleName;
-    public static volatile SingularAttribute<BBSUserRole,String> sectionId;
-    public static volatile SingularAttribute<BBSUserRole,String> topUnitName;
-    public static volatile SingularAttribute<BBSUserRole,String> uniqueId;
-    public static volatile SingularAttribute<BBSUserRole,String> unitName;
-}

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

@@ -1,26 +0,0 @@
-/** 
- *  Generated by OpenJPA MetaModel Generator Tool.
-**/
-
-package com.x.bbs.entity;
-
-import com.x.base.core.entity.SliceJpaObject_;
-import java.lang.Integer;
-import java.lang.String;
-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="Thu Dec 27 11:39:47 CST 2018")
-public class BBSVoteOptionGroup_ extends SliceJpaObject_  {
-    public static volatile SingularAttribute<BBSVoteOptionGroup,String> creatorName;
-    public static volatile SingularAttribute<BBSVoteOptionGroup,String> forumId;
-    public static volatile SingularAttribute<BBSVoteOptionGroup,String> groupName;
-    public static volatile SingularAttribute<BBSVoteOptionGroup,String> id;
-    public static volatile SingularAttribute<BBSVoteOptionGroup,String> mainSectionId;
-    public static volatile SingularAttribute<BBSVoteOptionGroup,Integer> orderNumber;
-    public static volatile SingularAttribute<BBSVoteOptionGroup,String> sectionId;
-    public static volatile SingularAttribute<BBSVoteOptionGroup,String> subjectId;
-    public static volatile SingularAttribute<BBSVoteOptionGroup,Integer> voteChooseCount;
-}

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

@@ -1,29 +0,0 @@
-/** 
- *  Generated by OpenJPA MetaModel Generator Tool.
-**/
-
-package com.x.bbs.entity;
-
-import com.x.base.core.entity.SliceJpaObject_;
-import java.lang.Integer;
-import java.lang.String;
-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="Thu Dec 27 11:39:47 CST 2018")
-public class BBSVoteOption_ extends SliceJpaObject_  {
-    public static volatile SingularAttribute<BBSVoteOption,Integer> chooseCount;
-    public static volatile SingularAttribute<BBSVoteOption,String> creatorName;
-    public static volatile SingularAttribute<BBSVoteOption,String> forumId;
-    public static volatile SingularAttribute<BBSVoteOption,String> id;
-    public static volatile SingularAttribute<BBSVoteOption,String> mainSectionId;
-    public static volatile SingularAttribute<BBSVoteOption,String> optionContentType;
-    public static volatile SingularAttribute<BBSVoteOption,String> optionGroupId;
-    public static volatile SingularAttribute<BBSVoteOption,String> optionPictureId;
-    public static volatile SingularAttribute<BBSVoteOption,String> optionTextContent;
-    public static volatile SingularAttribute<BBSVoteOption,Integer> orderNumber;
-    public static volatile SingularAttribute<BBSVoteOption,String> sectionId;
-    public static volatile SingularAttribute<BBSVoteOption,String> subjectId;
-}

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

@@ -1,24 +0,0 @@
-/** 
- *  Generated by OpenJPA MetaModel Generator Tool.
-**/
-
-package com.x.bbs.entity;
-
-import com.x.base.core.entity.SliceJpaObject_;
-import java.lang.String;
-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="Thu Dec 27 11:39:47 CST 2018")
-public class BBSVoteRecord_ extends SliceJpaObject_  {
-    public static volatile SingularAttribute<BBSVoteRecord,String> forumId;
-    public static volatile SingularAttribute<BBSVoteRecord,String> id;
-    public static volatile SingularAttribute<BBSVoteRecord,String> mainSectionId;
-    public static volatile SingularAttribute<BBSVoteRecord,String> optionId;
-    public static volatile SingularAttribute<BBSVoteRecord,String> optionValue;
-    public static volatile SingularAttribute<BBSVoteRecord,String> sectionId;
-    public static volatile SingularAttribute<BBSVoteRecord,String> subjectId;
-    public static volatile SingularAttribute<BBSVoteRecord,String> votorName;
-}

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

@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<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.bbs.entity.BBSConfigSetting</class>
-    <class>com.x.bbs.entity.BBSPermissionInfo</class>
-    <class>com.x.bbs.entity.BBSSubjectInfo</class>
-    <class>com.x.bbs.entity.BBSVoteOptionGroup</class>
-    <class>com.x.bbs.entity.BBSSubjectAttachment</class>
-    <class>com.x.bbs.entity.BBSSubjectVoteResult</class>
-    <class>com.x.bbs.entity.BBSReplyInfo</class>
-    <class>com.x.bbs.entity.BBSPermissionRole</class>
-    <class>com.x.bbs.entity.BBSSectionInfo</class>
-    <class>com.x.base.core.entity.StorageObject</class>
-    <class>com.x.base.core.entity.JpaObject</class>
-    <class>com.x.bbs.entity.BBSVoteOption</class>
-    <class>com.x.bbs.entity.BBSOperationRecord</class>
-    <class>com.x.bbs.entity.BBSUserRole</class>
-    <class>com.x.bbs.entity.BBSSubjectContent</class>
-    <class>com.x.bbs.entity.BBSUserInfo</class>
-    <class>com.x.base.core.entity.SliceJpaObject</class>
-    <class>com.x.bbs.entity.BBSVoteRecord</class>
-    <class>com.x.bbs.entity.BBSForumInfo</class>
-    <class>com.x.bbs.entity.BBSRoleInfo</class>
-  </persistence-unit>
-</persistence>

o2server/x_calendar_assemble_control/src/main/resources/META-INF/x_persistence.xml

@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<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="com.x.calendar.core.entity.Calendar" transaction-type="RESOURCE_LOCAL">
-    <provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider>
-    <class>com.x.calendar.core.entity.Calendar</class>
-    <class>com.x.base.core.entity.SliceJpaObject</class>
-    <class>com.x.base.core.entity.JpaObject</class>
-    <properties/>
-  </persistence-unit>
-  <persistence-unit name="com.x.calendar.core.entity.Calendar_Event" transaction-type="RESOURCE_LOCAL">
-    <provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider>
-    <class>com.x.base.core.entity.SliceJpaObject</class>
-    <class>com.x.base.core.entity.JpaObject</class>
-    <class>com.x.calendar.core.entity.Calendar_Event</class>
-    <properties/>
-  </persistence-unit>
-  <persistence-unit name="com.x.calendar.core.entity.Calendar_EventRepeatMaster" transaction-type="RESOURCE_LOCAL">
-    <provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider>
-    <class>com.x.calendar.core.entity.Calendar_EventRepeatMaster</class>
-    <class>com.x.base.core.entity.SliceJpaObject</class>
-    <class>com.x.base.core.entity.JpaObject</class>
-    <properties/>
-  </persistence-unit>
-  <persistence-unit name="com.x.calendar.core.entity.Calendar_Setting" transaction-type="RESOURCE_LOCAL">
-    <provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider>
-    <class>com.x.base.core.entity.SliceJpaObject</class>
-    <class>com.x.base.core.entity.JpaObject</class>
-    <class>com.x.calendar.core.entity.Calendar_Setting</class>
-    <properties/>
-  </persistence-unit>
-  <persistence-unit name="com.x.calendar.core.entity.Calendar_SettingLobValue" transaction-type="RESOURCE_LOCAL">
-    <provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider>
-    <class>com.x.base.core.entity.SliceJpaObject</class>
-    <class>com.x.base.core.entity.JpaObject</class>
-    <class>com.x.calendar.core.entity.Calendar_SettingLobValue</class>
-    <properties/>
-  </persistence-unit>
-</persistence>

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

@@ -1,36 +0,0 @@
-/** 
- *  Generated by OpenJPA MetaModel Generator Tool.
-**/
-
-package com.x.calendar.core.entity;
-
-import com.x.base.core.entity.SliceJpaObject_;
-import java.lang.Boolean;
-import java.lang.String;
-import javax.persistence.metamodel.ListAttribute;
-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="Thu Dec 27 11:39:53 CST 2018")
-public class Calendar_ extends SliceJpaObject_  {
-    public static volatile SingularAttribute<Calendar,String> color;
-    public static volatile SingularAttribute<Calendar,String> createor;
-    public static volatile SingularAttribute<Calendar,String> description;
-    public static volatile ListAttribute<Calendar,String> followers;
-    public static volatile SingularAttribute<Calendar,String> id;
-    public static volatile SingularAttribute<Calendar,Boolean> isPublic;
-    public static volatile ListAttribute<Calendar,String> manageablePersonList;
-    public static volatile SingularAttribute<Calendar,String> name;
-    public static volatile ListAttribute<Calendar,String> publishableGroupList;
-    public static volatile ListAttribute<Calendar,String> publishablePersonList;
-    public static volatile ListAttribute<Calendar,String> publishableUnitList;
-    public static volatile SingularAttribute<Calendar,String> source;
-    public static volatile SingularAttribute<Calendar,String> status;
-    public static volatile SingularAttribute<Calendar,String> target;
-    public static volatile SingularAttribute<Calendar,String> type;
-    public static volatile ListAttribute<Calendar,String> viewableGroupList;
-    public static volatile ListAttribute<Calendar,String> viewablePersonList;
-    public static volatile ListAttribute<Calendar,String> viewableUnitList;
-}

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

@@ -1,54 +0,0 @@
-/** 
- *  Generated by OpenJPA MetaModel Generator Tool.
-**/
-
-package com.x.calendar.core.entity;
-
-import com.x.base.core.entity.SliceJpaObject_;
-import java.lang.Boolean;
-import java.lang.Integer;
-import java.lang.String;
-import java.util.Date;
-import javax.persistence.metamodel.ListAttribute;
-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="Thu Dec 27 11:39:53 CST 2018")
-public class Calendar_EventRepeatMaster_ extends SliceJpaObject_  {
-    public static volatile SingularAttribute<Calendar_EventRepeatMaster,Boolean> alarm;
-    public static volatile SingularAttribute<Calendar_EventRepeatMaster,Date> alarmTime;
-    public static volatile SingularAttribute<Calendar_EventRepeatMaster,String> calendarId;
-    public static volatile SingularAttribute<Calendar_EventRepeatMaster,String> color;
-    public static volatile SingularAttribute<Calendar_EventRepeatMaster,String> comment;
-    public static volatile SingularAttribute<Calendar_EventRepeatMaster,String> createPerson;
-    public static volatile ListAttribute<Calendar_EventRepeatMaster,String> createdMonthList;
-    public static volatile SingularAttribute<Calendar_EventRepeatMaster,Integer> daysOfDuration;
-    public static volatile SingularAttribute<Calendar_EventRepeatMaster,Date> endTime;
-    public static volatile SingularAttribute<Calendar_EventRepeatMaster,String> eventType;
-    public static volatile SingularAttribute<Calendar_EventRepeatMaster,String> id;
-    public static volatile SingularAttribute<Calendar_EventRepeatMaster,Boolean> isAllDayEvent;
-    public static volatile SingularAttribute<Calendar_EventRepeatMaster,Boolean> isPublic;
-    public static volatile SingularAttribute<Calendar_EventRepeatMaster,String> latitude;
-    public static volatile SingularAttribute<Calendar_EventRepeatMaster,String> locationName;
-    public static volatile SingularAttribute<Calendar_EventRepeatMaster,String> longitude;
-    public static volatile ListAttribute<Calendar_EventRepeatMaster,String> manageablePersonList;
-    public static volatile ListAttribute<Calendar_EventRepeatMaster,String> participants;
-    public static volatile SingularAttribute<Calendar_EventRepeatMaster,String> recurrenceExc;
-    public static volatile SingularAttribute<Calendar_EventRepeatMaster,String> recurrenceRule;
-    public static volatile SingularAttribute<Calendar_EventRepeatMaster,Date> recurrenceStartTime;
-    public static volatile SingularAttribute<Calendar_EventRepeatMaster,String> repeatStatus;
-    public static volatile SingularAttribute<Calendar_EventRepeatMaster,String> source;
-    public static volatile SingularAttribute<Calendar_EventRepeatMaster,Date> startTime;
-    public static volatile SingularAttribute<Calendar_EventRepeatMaster,String> targetType;
-    public static volatile SingularAttribute<Calendar_EventRepeatMaster,String> title;
-    public static volatile SingularAttribute<Calendar_EventRepeatMaster,String> updatePerson;
-    public static volatile SingularAttribute<Calendar_EventRepeatMaster,String> valarmTime_config;
-    public static volatile SingularAttribute<Calendar_EventRepeatMaster,String> valarm_Summary;
-    public static volatile SingularAttribute<Calendar_EventRepeatMaster,String> valarm_description;
-    public static volatile SingularAttribute<Calendar_EventRepeatMaster,String> valarm_mailto;
-    public static volatile ListAttribute<Calendar_EventRepeatMaster,String> viewableGroupList;
-    public static volatile ListAttribute<Calendar_EventRepeatMaster,String> viewablePersonList;
-    public static volatile ListAttribute<Calendar_EventRepeatMaster,String> viewableUnitList;
-}

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

@@ -1,56 +0,0 @@
-/** 
- *  Generated by OpenJPA MetaModel Generator Tool.
-**/
-
-package com.x.calendar.core.entity;
-
-import com.x.base.core.entity.SliceJpaObject_;
-import java.lang.Boolean;
-import java.lang.Integer;
-import java.lang.String;
-import java.util.Date;
-import javax.persistence.metamodel.ListAttribute;
-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="Thu Dec 27 11:39:53 CST 2018")
-public class Calendar_Event_ extends SliceJpaObject_  {
-    public static volatile SingularAttribute<Calendar_Event,Boolean> alarm;
-    public static volatile SingularAttribute<Calendar_Event,Boolean> alarmAlready;
-    public static volatile SingularAttribute<Calendar_Event,Date> alarmTime;
-    public static volatile SingularAttribute<Calendar_Event,String> bundle;
-    public static volatile SingularAttribute<Calendar_Event,String> calendarId;
-    public static volatile SingularAttribute<Calendar_Event,String> color;
-    public static volatile SingularAttribute<Calendar_Event,String> comment;
-    public static volatile SingularAttribute<Calendar_Event,String> createPerson;
-    public static volatile SingularAttribute<Calendar_Event,Integer> daysOfDuration;
-    public static volatile SingularAttribute<Calendar_Event,Date> endTime;
-    public static volatile SingularAttribute<Calendar_Event,String> endTimeStr;
-    public static volatile SingularAttribute<Calendar_Event,String> eventType;
-    public static volatile SingularAttribute<Calendar_Event,String> id;
-    public static volatile SingularAttribute<Calendar_Event,Boolean> isAllDayEvent;
-    public static volatile SingularAttribute<Calendar_Event,Boolean> isPublic;
-    public static volatile SingularAttribute<Calendar_Event,String> latitude;
-    public static volatile SingularAttribute<Calendar_Event,String> locationName;
-    public static volatile SingularAttribute<Calendar_Event,String> longitude;
-    public static volatile ListAttribute<Calendar_Event,String> manageablePersonList;
-    public static volatile ListAttribute<Calendar_Event,String> participants;
-    public static volatile SingularAttribute<Calendar_Event,String> recurrenceExc;
-    public static volatile SingularAttribute<Calendar_Event,String> recurrenceRule;
-    public static volatile SingularAttribute<Calendar_Event,String> repeatMasterId;
-    public static volatile SingularAttribute<Calendar_Event,String> source;
-    public static volatile SingularAttribute<Calendar_Event,Date> startTime;
-    public static volatile SingularAttribute<Calendar_Event,String> startTimeStr;
-    public static volatile SingularAttribute<Calendar_Event,String> targetType;
-    public static volatile SingularAttribute<Calendar_Event,String> title;
-    public static volatile SingularAttribute<Calendar_Event,String> updatePerson;
-    public static volatile SingularAttribute<Calendar_Event,String> valarmTime_config;
-    public static volatile SingularAttribute<Calendar_Event,String> valarm_Summary;
-    public static volatile SingularAttribute<Calendar_Event,String> valarm_description;
-    public static volatile SingularAttribute<Calendar_Event,String> valarm_mailto;
-    public static volatile ListAttribute<Calendar_Event,String> viewableGroupList;
-    public static volatile ListAttribute<Calendar_Event,String> viewablePersonList;
-    public static volatile ListAttribute<Calendar_Event,String> viewableUnitList;
-}

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

@@ -1,18 +0,0 @@
-/** 
- *  Generated by OpenJPA MetaModel Generator Tool.
-**/
-
-package com.x.calendar.core.entity;
-
-import com.x.base.core.entity.SliceJpaObject_;
-import java.lang.String;
-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="Thu Dec 27 11:39:53 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

@@ -1,28 +0,0 @@
-/** 
- *  Generated by OpenJPA MetaModel Generator Tool.
-**/
-
-package com.x.calendar.core.entity;
-
-import com.x.base.core.entity.SliceJpaObject_;
-import java.lang.Boolean;
-import java.lang.Integer;
-import java.lang.String;
-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="Thu Dec 27 11:39:53 CST 2018")
-public class Calendar_Setting_ extends SliceJpaObject_  {
-    public static volatile SingularAttribute<Calendar_Setting,String> configCode;
-    public static volatile SingularAttribute<Calendar_Setting,String> configName;
-    public static volatile SingularAttribute<Calendar_Setting,String> configValue;
-    public static volatile SingularAttribute<Calendar_Setting,String> description;
-    public static volatile SingularAttribute<Calendar_Setting,String> id;
-    public static volatile SingularAttribute<Calendar_Setting,Boolean> isLob;
-    public static volatile SingularAttribute<Calendar_Setting,Boolean> isMultiple;
-    public static volatile SingularAttribute<Calendar_Setting,Integer> orderNumber;
-    public static volatile SingularAttribute<Calendar_Setting,String> selectContent;
-    public static volatile SingularAttribute<Calendar_Setting,String> valueType;
-}

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

@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<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_SettingLobValue</class>
-    <class>com.x.base.core.entity.JpaObject</class>
-    <class>com.x.calendar.core.entity.Calendar</class>
-    <class>com.x.calendar.core.entity.Calendar_Event</class>
-    <class>com.x.calendar.core.entity.Calendar_EventRepeatMaster</class>
-    <class>com.x.base.core.entity.SliceJpaObject</class>
-    <class>com.x.base.core.entity.StorageObject</class>
-    <class>com.x.calendar.core.entity.Calendar_Setting</class>
-  </persistence-unit>
-</persistence>

o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/document/ActionPublish.java

@@ -11,6 +11,7 @@ import com.google.gson.JsonElement;
 import com.x.base.core.container.EntityManagerContainer;
 import com.x.base.core.container.factory.EntityManagerContainerFactory;
 import com.x.base.core.entity.JpaObject;
+import com.x.base.core.project.annotation.FieldDescribe;
 import com.x.base.core.project.bean.WrapCopier;
 import com.x.base.core.project.bean.WrapCopierFactory;
 import com.x.base.core.project.cache.ApplicationCache;
@@ -173,15 +174,16 @@ public class ActionPublish extends BaseAction {
 		}
 
 		//将读者以及作者信息持久化到数据库中
-		try {
-			documentInfoServiceAdv.refreshDocumentPermission( id, wi.getReaderList(), wi.getAuthorList() );
-		} catch (Exception e) {
-			check = false;
-			Exception exception = new ExceptionDocumentInfoProcess(e, "系统在核对文档访问管理权限信息时发生异常！");
-			result.error(exception);
-			logger.error(e, effectivePerson, request, null);
+		if( !wi.getSkipPermission() ) {
+			try {
+				documentInfoServiceAdv.refreshDocumentPermission( id, wi.getReaderList(), wi.getAuthorList() );
+			} catch (Exception e) {
+				check = false;
+				Exception exception = new ExceptionDocumentInfoProcess(e, "系统在核对文档访问管理权限信息时发生异常！");
+				result.error(exception);
+				logger.error(e, effectivePerson, request, null);
+			}
 		}
-
 		ApplicationCache.notify(Document.class);
 
 		return result;
@@ -193,24 +195,44 @@ public class ActionPublish extends BaseAction {
 		
 		public static WrapCopier<Wi, Document> copier = WrapCopierFactory.wi( Wi.class, Document.class, null, JpaObject.FieldsUnmodify );
 		
+		@FieldDescribe( "文档操作者身份." )
 		private String identity = null;
 		
+		@FieldDescribe( "数据的路径列表." )
 		private String[] dataPaths = null;
 		
+		@FieldDescribe( "启动流程的JobId." )
 		private String wf_jobId = null;
 		
+		@FieldDescribe( "启动流程的WorkId." )
 		private String wf_workId = null;
 		
+		@FieldDescribe( "启动流程的附件列表." )
 		private String[] wf_attachmentIds = null;	
 		
+		@FieldDescribe( "文档数据." )
 		private Map<?, ?> docData = null;
 		
+		@FieldDescribe( "文档读者." )
 		private List<PermissionInfo> readerList = null;
 		
+		@FieldDescribe( "文档编辑者." )
 		private List<PermissionInfo> authorList = null;
 		
+		@FieldDescribe( "图片列表." )
 		private List<String> cloudPictures = null;
 		
+		@FieldDescribe( "不修改权限（跳过权限设置，保留原来的设置）." )
+		private Boolean skipPermission  = false;
+		
+		public Boolean getSkipPermission() {
+			return skipPermission;
+		}
+
+		public void setSkipPermission(Boolean skipPermission) {
+			this.skipPermission = skipPermission;
+		}
+
 		public String getIdentity() {
 			return identity;
 		}

o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/document/ActionPublishContent.java

@@ -13,6 +13,7 @@ import com.google.gson.JsonElement;
 import com.x.base.core.container.EntityManagerContainer;
 import com.x.base.core.container.factory.EntityManagerContainerFactory;
 import com.x.base.core.entity.JpaObject;
+import com.x.base.core.project.annotation.FieldDescribe;
 import com.x.base.core.project.bean.WrapCopier;
 import com.x.base.core.project.bean.WrapCopierFactory;
 import com.x.base.core.project.cache.ApplicationCache;
@@ -28,7 +29,6 @@ import com.x.cms.core.entity.CategoryInfo;
 import com.x.cms.core.entity.Document;
 import com.x.cms.core.entity.FileInfo;
 import com.x.cms.core.entity.element.Form;
-import com.x.cms.core.entity.tools.LogUtil;
 
 /**
  * 直接发布文档内容
@@ -315,7 +315,7 @@ public class ActionPublishContent extends BaseAction {
 			}
 		}
 
-		if (check) {
+		if ( check && !wi.getSkipPermission() ) {
 			//将读者以及作者信息持久化到数据库中
 			try {
 				documentInfoServiceAdv.refreshDocumentPermission( document.getId(), wi.getReaderList(), wi.getAuthorList() );
@@ -339,24 +339,44 @@ public class ActionPublishContent extends BaseAction {
 		
 		public static WrapCopier<Wi, Document> copier = WrapCopierFactory.wi( Wi.class, Document.class, null, JpaObject.FieldsUnmodify);
 
+		@FieldDescribe( "文档操作者身份." )
 		private String identity = null;
 		
+		@FieldDescribe( "数据的路径列表." )
 		private String[] dataPaths = null;
 		
+		@FieldDescribe( "启动流程的JobId." )
 		private String wf_jobId = null;
 		
+		@FieldDescribe( "启动流程的WorkId." )
 		private String wf_workId = null;
 		
+		@FieldDescribe( "启动流程的附件列表." )
 		private String[] wf_attachmentIds = null;	
 		
+		@FieldDescribe( "文档数据." )
 		private Map<?, ?> docData = null;
 		
+		@FieldDescribe( "文档读者." )
 		private List<PermissionInfo> readerList = null;
 		
+		@FieldDescribe( "文档编辑者." )
 		private List<PermissionInfo> authorList = null;
 		
+		@FieldDescribe( "图片列表." )
 		private List<String> cloudPictures = null;
 		
+		@FieldDescribe( "不修改权限（跳过权限设置，保留原来的设置）." )
+		private Boolean skipPermission  = false;		
+		
+		public Boolean getSkipPermission() {
+			return skipPermission;
+		}
+
+		public void setSkipPermission(Boolean skipPermission) {
+			this.skipPermission = skipPermission;
+		}
+
 		public String getIdentity() {
 			return identity;
 		}

o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/document/ActionPublishContentByWorkFlow.java

@@ -18,6 +18,7 @@ import com.x.base.core.container.EntityManagerContainer;
 import com.x.base.core.container.factory.EntityManagerContainerFactory;
 import com.x.base.core.entity.JpaObject;
 import com.x.base.core.entity.annotation.CheckPersistType;
+import com.x.base.core.project.annotation.FieldDescribe;
 import com.x.base.core.project.bean.WrapCopier;
 import com.x.base.core.project.bean.WrapCopierFactory;
 import com.x.base.core.project.cache.ApplicationCache;
@@ -354,7 +355,7 @@ public class ActionPublishContentByWorkFlow extends BaseAction {
 			}
 		}
 
-		if (check) {
+		if ( check && !wi.getSkipPermission() ) {
 			//将读者以及作者信息持久化到数据库中
 			try {
 				documentInfoServiceAdv.refreshDocumentPermission( document.getId(), wi.getReaderList(), wi.getAuthorList() );
@@ -412,24 +413,44 @@ public static class Wi extends Document {
 		
 		public static WrapCopier<Wi, Document> copier = WrapCopierFactory.wi( Wi.class, Document.class, null, JpaObject.FieldsUnmodify);
 
+		@FieldDescribe( "文档操作者身份." )
 		private String identity = null;
 		
+		@FieldDescribe( "数据的路径列表." )
 		private String[] dataPaths = null;
 		
+		@FieldDescribe( "启动流程的JobId." )
 		private String wf_jobId = null;
 		
+		@FieldDescribe( "启动流程的WorkId." )
 		private String wf_workId = null;
 		
+		@FieldDescribe( "启动流程的附件列表." )
 		private String[] wf_attachmentIds = null;	
 		
+		@FieldDescribe( "文档数据." )
 		private Map<?, ?> docData = null;
 		
+		@FieldDescribe( "文档读者." )
 		private List<PermissionInfo> readerList = null;
 		
+		@FieldDescribe( "文档编辑者." )
 		private List<PermissionInfo> authorList = null;
 		
+		@FieldDescribe( "图片列表." )
 		private List<String> cloudPictures = null;
 		
+		@FieldDescribe( "不修改权限（跳过权限设置，保留原来的设置）." )
+		private Boolean skipPermission  = false;	
+		
+		public Boolean getSkipPermission() {
+			return skipPermission;
+		}
+
+		public void setSkipPermission(Boolean skipPermission) {
+			this.skipPermission = skipPermission;
+		}
+
 		public String getIdentity() {
 			return identity;
 		}

o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/document/ActionSave.java

@@ -322,7 +322,7 @@ public class ActionSave extends BaseAction {
 		
 		if (check) {
 			// 如果是已经发布的文档，需要限时再计算一次文档权限
-			if ( "published".equals( document.getDocStatus()) ) {
+			if ( "published".equals( document.getDocStatus()) && !wi.getSkipPermission()  ) {
 				//将读者以及作者信息持久化到数据库中
 				try {
 					documentInfoServiceAdv.refreshDocumentPermission( document.getId(), wi.getReaderList(), wi.getAuthorList() );
@@ -370,6 +370,9 @@ public class ActionSave extends BaseAction {
 		@FieldDescribe( "图片列表." )
 		private List<String> cloudPictures = null;
 		
+		@FieldDescribe( "不修改权限（跳过权限设置，保留原来的设置）." )
+		private Boolean skipPermission  = false;
+		
 		public String getIdentity() {
 			return identity;
 		}
@@ -445,6 +448,13 @@ public class ActionSave extends BaseAction {
 			this.cloudPictures = cloudPictures;
 		}
 
+		public Boolean getSkipPermission() {
+			return skipPermission;
+		}
+
+		public void setSkipPermission(Boolean skipPermission) {
+			this.skipPermission = skipPermission;
+		}
 	}
 
 	public static class Wo extends WoId {

o2server/x_cms_assemble_control/src/main/resources/META-INF/x_persistence.xml

@@ -1,174 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<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="com.x.cms.core.entity.AppCategoryAdmin" transaction-type="RESOURCE_LOCAL">
-    <provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider>
-    <class>com.x.cms.core.entity.AppCategoryAdmin</class>
-    <class>com.x.base.core.entity.JpaObject</class>
-    <class>com.x.base.core.entity.SliceJpaObject</class>
-    <properties/>
-  </persistence-unit>
-  <persistence-unit name="com.x.cms.core.entity.AppCategoryPermission" transaction-type="RESOURCE_LOCAL">
-    <provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider>
-    <class>com.x.base.core.entity.JpaObject</class>
-    <class>com.x.cms.core.entity.AppCategoryPermission</class>
-    <class>com.x.base.core.entity.SliceJpaObject</class>
-    <properties/>
-  </persistence-unit>
-  <persistence-unit name="com.x.cms.core.entity.AppInfo" transaction-type="RESOURCE_LOCAL">
-    <provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider>
-    <class>com.x.cms.core.entity.AppInfo</class>
-    <class>com.x.base.core.entity.JpaObject</class>
-    <class>com.x.base.core.entity.SliceJpaObject</class>
-    <properties/>
-  </persistence-unit>
-  <persistence-unit name="com.x.cms.core.entity.CategoryExt" transaction-type="RESOURCE_LOCAL">
-    <provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider>
-    <class>com.x.cms.core.entity.CategoryExt</class>
-    <class>com.x.base.core.entity.JpaObject</class>
-    <class>com.x.base.core.entity.SliceJpaObject</class>
-    <properties/>
-  </persistence-unit>
-  <persistence-unit name="com.x.cms.core.entity.CategoryInfo" transaction-type="RESOURCE_LOCAL">
-    <provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider>
-    <class>com.x.cms.core.entity.CategoryInfo</class>
-    <class>com.x.base.core.entity.JpaObject</class>
-    <class>com.x.base.core.entity.SliceJpaObject</class>
-    <properties/>
-  </persistence-unit>
-  <persistence-unit name="com.x.cms.core.entity.Document" transaction-type="RESOURCE_LOCAL">
-    <provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider>
-    <class>com.x.cms.core.entity.Document</class>
-    <class>com.x.base.core.entity.JpaObject</class>
-    <class>com.x.base.core.entity.SliceJpaObject</class>
-    <properties/>
-  </persistence-unit>
-  <persistence-unit name="com.x.cms.core.entity.DocumentPermission" transaction-type="RESOURCE_LOCAL">
-    <provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider>
-    <class>com.x.base.core.entity.JpaObject</class>
-    <class>com.x.cms.core.entity.DocumentPermission</class>
-    <class>com.x.base.core.entity.SliceJpaObject</class>
-    <properties/>
-  </persistence-unit>
-  <persistence-unit name="com.x.cms.core.entity.DocumentViewRecord" transaction-type="RESOURCE_LOCAL">
-    <provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider>
-    <class>com.x.cms.core.entity.DocumentViewRecord</class>
-    <class>com.x.base.core.entity.JpaObject</class>
-    <class>com.x.base.core.entity.SliceJpaObject</class>
-    <properties/>
-  </persistence-unit>
-  <persistence-unit name="com.x.cms.core.entity.FileInfo" transaction-type="RESOURCE_LOCAL">
-    <provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider>
-    <class>com.x.cms.core.entity.FileInfo</class>
-    <class>com.x.base.core.entity.StorageObject</class>
-    <class>com.x.base.core.entity.JpaObject</class>
-    <class>com.x.base.core.entity.SliceJpaObject</class>
-    <properties/>
-  </persistence-unit>
-  <persistence-unit name="com.x.cms.core.entity.Log" transaction-type="RESOURCE_LOCAL">
-    <provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider>
-    <class>com.x.cms.core.entity.Log</class>
-    <class>com.x.base.core.entity.JpaObject</class>
-    <class>com.x.base.core.entity.SliceJpaObject</class>
-    <properties/>
-  </persistence-unit>
-  <persistence-unit name="com.x.cms.core.entity.Review" transaction-type="RESOURCE_LOCAL">
-    <provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider>
-    <class>com.x.base.core.entity.JpaObject</class>
-    <class>com.x.cms.core.entity.Review</class>
-    <class>com.x.base.core.entity.SliceJpaObject</class>
-    <properties/>
-  </persistence-unit>
-  <persistence-unit name="com.x.cms.core.entity.element.AppDict" transaction-type="RESOURCE_LOCAL">
-    <provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider>
-    <class>com.x.base.core.entity.JpaObject</class>
-    <class>com.x.base.core.entity.SliceJpaObject</class>
-    <class>com.x.cms.core.entity.element.AppDict</class>
-    <properties/>
-  </persistence-unit>
-  <persistence-unit name="com.x.cms.core.entity.element.AppDictItem" transaction-type="RESOURCE_LOCAL">
-    <provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider>
-    <class>com.x.base.core.entity.JpaObject</class>
-    <class>com.x.cms.core.entity.element.AppDictItem</class>
-    <class>com.x.base.core.entity.SliceJpaObject</class>
-    <properties/>
-  </persistence-unit>
-  <persistence-unit name="com.x.cms.core.entity.element.Form" transaction-type="RESOURCE_LOCAL">
-    <provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider>
-    <class>com.x.cms.core.entity.element.Form</class>
-    <class>com.x.base.core.entity.JpaObject</class>
-    <class>com.x.base.core.entity.SliceJpaObject</class>
-    <properties/>
-  </persistence-unit>
-  <persistence-unit name="com.x.cms.core.entity.element.FormField" transaction-type="RESOURCE_LOCAL">
-    <provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider>
-    <class>com.x.cms.core.entity.element.FormField</class>
-    <class>com.x.base.core.entity.JpaObject</class>
-    <class>com.x.base.core.entity.SliceJpaObject</class>
-    <properties/>
-  </persistence-unit>
-  <persistence-unit name="com.x.cms.core.entity.element.QueryView" transaction-type="RESOURCE_LOCAL">
-    <provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider>
-    <class>com.x.base.core.entity.JpaObject</class>
-    <class>com.x.cms.core.entity.element.QueryView</class>
-    <class>com.x.base.core.entity.SliceJpaObject</class>
-    <properties/>
-  </persistence-unit>
-  <persistence-unit name="com.x.cms.core.entity.element.Script" transaction-type="RESOURCE_LOCAL">
-    <provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider>
-    <class>com.x.cms.core.entity.element.Script</class>
-    <class>com.x.base.core.entity.JpaObject</class>
-    <class>com.x.base.core.entity.SliceJpaObject</class>
-    <properties/>
-  </persistence-unit>
-  <persistence-unit name="com.x.cms.core.entity.element.TemplateForm" transaction-type="RESOURCE_LOCAL">
-    <provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider>
-    <class>com.x.cms.core.entity.element.TemplateForm</class>
-    <class>com.x.base.core.entity.JpaObject</class>
-    <class>com.x.base.core.entity.SliceJpaObject</class>
-    <properties/>
-  </persistence-unit>
-  <persistence-unit name="com.x.cms.core.entity.element.View" transaction-type="RESOURCE_LOCAL">
-    <provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider>
-    <class>com.x.cms.core.entity.element.View</class>
-    <class>com.x.base.core.entity.JpaObject</class>
-    <class>com.x.base.core.entity.SliceJpaObject</class>
-    <properties/>
-  </persistence-unit>
-  <persistence-unit name="com.x.cms.core.entity.element.ViewCategory" transaction-type="RESOURCE_LOCAL">
-    <provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider>
-    <class>com.x.base.core.entity.JpaObject</class>
-    <class>com.x.base.core.entity.SliceJpaObject</class>
-    <class>com.x.cms.core.entity.element.ViewCategory</class>
-    <properties/>
-  </persistence-unit>
-  <persistence-unit name="com.x.cms.core.entity.element.ViewFieldConfig" transaction-type="RESOURCE_LOCAL">
-    <provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider>
-    <class>com.x.cms.core.entity.element.ViewFieldConfig</class>
-    <class>com.x.base.core.entity.JpaObject</class>
-    <class>com.x.base.core.entity.SliceJpaObject</class>
-    <properties/>
-  </persistence-unit>
-  <persistence-unit name="com.x.processplatform.core.entity.content.Attachment" transaction-type="RESOURCE_LOCAL">
-    <provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider>
-    <class>com.x.processplatform.core.entity.content.Attachment</class>
-    <class>com.x.base.core.entity.StorageObject</class>
-    <class>com.x.base.core.entity.JpaObject</class>
-    <class>com.x.base.core.entity.SliceJpaObject</class>
-    <properties/>
-  </persistence-unit>
-  <persistence-unit name="com.x.query.core.entity.Item" transaction-type="RESOURCE_LOCAL">
-    <provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider>
-    <class>com.x.query.core.entity.Item</class>
-    <class>com.x.base.core.entity.JpaObject</class>
-    <class>com.x.base.core.entity.SliceJpaObject</class>
-    <properties/>
-  </persistence-unit>
-  <persistence-unit name="com.x.query.core.entity.View" transaction-type="RESOURCE_LOCAL">
-    <provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider>
-    <class>com.x.query.core.entity.View</class>
-    <class>com.x.base.core.entity.JpaObject</class>
-    <class>com.x.base.core.entity.SliceJpaObject</class>
-    <properties/>
-  </persistence-unit>
-</persistence>

o2server/x_cms_assemble_control/src/main/webapp/describe/describe.json

@@ -10086,6 +10086,76 @@
           "formParameters": [],
           "queryParameters": [],
           "ins": [
+            {
+              "name": "identity",
+              "type": "String",
+              "isCollection": false,
+              "description": "文档操作者身份.",
+              "isBaseType": true
+            },
+            {
+              "name": "dataPaths",
+              "type": "String[]",
+              "isCollection": false,
+              "description": "数据的路径列表.",
+              "isBaseType": true
+            },
+            {
+              "name": "wf_jobId",
+              "type": "String",
+              "isCollection": false,
+              "description": "启动流程的JobId.",
+              "isBaseType": true
+            },
+            {
+              "name": "wf_workId",
+              "type": "String",
+              "isCollection": false,
+              "description": "启动流程的WorkId.",
+              "isBaseType": true
+            },
+            {
+              "name": "wf_attachmentIds",
+              "type": "String[]",
+              "isCollection": false,
+              "description": "启动流程的附件列表.",
+              "isBaseType": true
+            },
+            {
+              "name": "docData",
+              "type": "Map\u003c?,?\u003e",
+              "isCollection": false,
+              "description": "文档数据.",
+              "isBaseType": false
+            },
+            {
+              "name": "readerList",
+              "type": "List\u003cPermissionInfo\u003e",
+              "isCollection": true,
+              "description": "文档读者.",
+              "isBaseType": false
+            },
+            {
+              "name": "authorList",
+              "type": "List\u003cPermissionInfo\u003e",
+              "isCollection": true,
+              "description": "文档编辑者.",
+              "isBaseType": false
+            },
+            {
+              "name": "cloudPictures",
+              "type": "List\u003cString\u003e",
+              "isCollection": true,
+              "description": "图片列表.",
+              "isBaseType": true
+            },
+            {
+              "name": "skipPermission",
+              "type": "Boolean",
+              "isCollection": false,
+              "description": "不修改权限（跳过权限设置，保留原来的设置）.",
+              "isBaseType": true
+            },
             {
               "name": "summary",
               "type": "String",
@@ -10354,6 +10424,76 @@
           "formParameters": [],
           "queryParameters": [],
           "ins": [
+            {
+              "name": "identity",
+              "type": "String",
+              "isCollection": false,
+              "description": "文档操作者身份.",
+              "isBaseType": true
+            },
+            {
+              "name": "dataPaths",
+              "type": "String[]",
+              "isCollection": false,
+              "description": "数据的路径列表.",
+              "isBaseType": true
+            },
+            {
+              "name": "wf_jobId",
+              "type": "String",
+              "isCollection": false,
+              "description": "启动流程的JobId.",
+              "isBaseType": true
+            },
+            {
+              "name": "wf_workId",
+              "type": "String",
+              "isCollection": false,
+              "description": "启动流程的WorkId.",
+              "isBaseType": true
+            },
+            {
+              "name": "wf_attachmentIds",
+              "type": "String[]",
+              "isCollection": false,
+              "description": "启动流程的附件列表.",
+              "isBaseType": true
+            },
+            {
+              "name": "docData",
+              "type": "Map\u003c?,?\u003e",
+              "isCollection": false,
+              "description": "文档数据.",
+              "isBaseType": false
+            },
+            {
+              "name": "readerList",
+              "type": "List\u003cPermissionInfo\u003e",
+              "isCollection": true,
+              "description": "文档读者.",
+              "isBaseType": false
+            },
+            {
+              "name": "authorList",
+              "type": "List\u003cPermissionInfo\u003e",
+              "isCollection": true,
+              "description": "文档编辑者.",
+              "isBaseType": false
+            },
+            {
+              "name": "cloudPictures",
+              "type": "List\u003cString\u003e",
+              "isCollection": true,
+              "description": "图片列表.",
+              "isBaseType": true
+            },
+            {
+              "name": "skipPermission",
+              "type": "Boolean",
+              "isCollection": false,
+              "description": "不修改权限（跳过权限设置，保留原来的设置）.",
+              "isBaseType": true
+            },
             {
               "name": "summary",
               "type": "String",
@@ -10657,6 +10797,13 @@
               "description": "图片列表.",
               "isBaseType": true
             },
+            {
+              "name": "skipPermission",
+              "type": "Boolean",
+              "isCollection": false,
+              "description": "不修改权限（跳过权限设置，保留原来的设置）.",
+              "isBaseType": true
+            },
             {
               "name": "summary",
               "type": "String",

o2server/x_cms_assemble_control/src/main/webapp/describe/sources/com/x/cms/assemble/control/jaxrs/document/ActionPublish.java

@@ -11,6 +11,7 @@ import com.google.gson.JsonElement;
 import com.x.base.core.container.EntityManagerContainer;
 import com.x.base.core.container.factory.EntityManagerContainerFactory;
 import com.x.base.core.entity.JpaObject;
+import com.x.base.core.project.annotation.FieldDescribe;
 import com.x.base.core.project.bean.WrapCopier;
 import com.x.base.core.project.bean.WrapCopierFactory;
 import com.x.base.core.project.cache.ApplicationCache;
@@ -173,15 +174,16 @@ public class ActionPublish extends BaseAction {
 		}
 
 		//将读者以及作者信息持久化到数据库中
-		try {
-			documentInfoServiceAdv.refreshDocumentPermission( id, wi.getReaderList(), wi.getAuthorList() );
-		} catch (Exception e) {
-			check = false;
-			Exception exception = new ExceptionDocumentInfoProcess(e, "系统在核对文档访问管理权限信息时发生异常！");
-			result.error(exception);
-			logger.error(e, effectivePerson, request, null);
+		if( !wi.getSkipPermission() ) {
+			try {
+				documentInfoServiceAdv.refreshDocumentPermission( id, wi.getReaderList(), wi.getAuthorList() );
+			} catch (Exception e) {
+				check = false;
+				Exception exception = new ExceptionDocumentInfoProcess(e, "系统在核对文档访问管理权限信息时发生异常！");
+				result.error(exception);
+				logger.error(e, effectivePerson, request, null);
+			}
 		}
-
 		ApplicationCache.notify(Document.class);
 
 		return result;
@@ -193,24 +195,44 @@ public class ActionPublish extends BaseAction {
 		
 		public static WrapCopier<Wi, Document> copier = WrapCopierFactory.wi( Wi.class, Document.class, null, JpaObject.FieldsUnmodify );
 		
+		@FieldDescribe( "文档操作者身份." )
 		private String identity = null;
 		
+		@FieldDescribe( "数据的路径列表." )
 		private String[] dataPaths = null;
 		
+		@FieldDescribe( "启动流程的JobId." )
 		private String wf_jobId = null;
 		
+		@FieldDescribe( "启动流程的WorkId." )
 		private String wf_workId = null;
 		
+		@FieldDescribe( "启动流程的附件列表." )
 		private String[] wf_attachmentIds = null;	
 		
+		@FieldDescribe( "文档数据." )
 		private Map<?, ?> docData = null;
 		
+		@FieldDescribe( "文档读者." )
 		private List<PermissionInfo> readerList = null;
 		
+		@FieldDescribe( "文档编辑者." )
 		private List<PermissionInfo> authorList = null;
 		
+		@FieldDescribe( "图片列表." )
 		private List<String> cloudPictures = null;
 		
+		@FieldDescribe( "不修改权限（跳过权限设置，保留原来的设置）." )
+		private Boolean skipPermission  = false;
+		
+		public Boolean getSkipPermission() {
+			return skipPermission;
+		}
+
+		public void setSkipPermission(Boolean skipPermission) {
+			this.skipPermission = skipPermission;
+		}
+
 		public String getIdentity() {
 			return identity;
 		}

o2server/x_cms_assemble_control/src/main/webapp/describe/sources/com/x/cms/assemble/control/jaxrs/document/ActionPublishContent.java

@@ -13,6 +13,7 @@ import com.google.gson.JsonElement;
 import com.x.base.core.container.EntityManagerContainer;
 import com.x.base.core.container.factory.EntityManagerContainerFactory;
 import com.x.base.core.entity.JpaObject;
+import com.x.base.core.project.annotation.FieldDescribe;
 import com.x.base.core.project.bean.WrapCopier;
 import com.x.base.core.project.bean.WrapCopierFactory;
 import com.x.base.core.project.cache.ApplicationCache;
@@ -28,7 +29,6 @@ import com.x.cms.core.entity.CategoryInfo;
 import com.x.cms.core.entity.Document;
 import com.x.cms.core.entity.FileInfo;
 import com.x.cms.core.entity.element.Form;
-import com.x.cms.core.entity.tools.LogUtil;
 
 /**
  * 直接发布文档内容
@@ -315,7 +315,7 @@ public class ActionPublishContent extends BaseAction {
 			}
 		}
 
-		if (check) {
+		if ( check && !wi.getSkipPermission() ) {
 			//将读者以及作者信息持久化到数据库中
 			try {
 				documentInfoServiceAdv.refreshDocumentPermission( document.getId(), wi.getReaderList(), wi.getAuthorList() );
@@ -339,24 +339,44 @@ public class ActionPublishContent extends BaseAction {
 		
 		public static WrapCopier<Wi, Document> copier = WrapCopierFactory.wi( Wi.class, Document.class, null, JpaObject.FieldsUnmodify);
 
+		@FieldDescribe( "文档操作者身份." )
 		private String identity = null;
 		
+		@FieldDescribe( "数据的路径列表." )
 		private String[] dataPaths = null;
 		
+		@FieldDescribe( "启动流程的JobId." )
 		private String wf_jobId = null;
 		
+		@FieldDescribe( "启动流程的WorkId." )
 		private String wf_workId = null;
 		
+		@FieldDescribe( "启动流程的附件列表." )
 		private String[] wf_attachmentIds = null;	
 		
+		@FieldDescribe( "文档数据." )
 		private Map<?, ?> docData = null;
 		
+		@FieldDescribe( "文档读者." )
 		private List<PermissionInfo> readerList = null;
 		
+		@FieldDescribe( "文档编辑者." )
 		private List<PermissionInfo> authorList = null;
 		
+		@FieldDescribe( "图片列表." )
 		private List<String> cloudPictures = null;
 		
+		@FieldDescribe( "不修改权限（跳过权限设置，保留原来的设置）." )
+		private Boolean skipPermission  = false;		
+		
+		public Boolean getSkipPermission() {
+			return skipPermission;
+		}
+
+		public void setSkipPermission(Boolean skipPermission) {
+			this.skipPermission = skipPermission;
+		}
+
 		public String getIdentity() {
 			return identity;
 		}

o2server/x_cms_assemble_control/src/main/webapp/describe/sources/com/x/cms/assemble/control/jaxrs/document/ActionPublishContentByWorkFlow.java

@@ -18,6 +18,7 @@ import com.x.base.core.container.EntityManagerContainer;
 import com.x.base.core.container.factory.EntityManagerContainerFactory;
 import com.x.base.core.entity.JpaObject;
 import com.x.base.core.entity.annotation.CheckPersistType;
+import com.x.base.core.project.annotation.FieldDescribe;
 import com.x.base.core.project.bean.WrapCopier;
 import com.x.base.core.project.bean.WrapCopierFactory;
 import com.x.base.core.project.cache.ApplicationCache;
@@ -354,7 +355,7 @@ public class ActionPublishContentByWorkFlow extends BaseAction {
 			}
 		}
 
-		if (check) {
+		if ( check && !wi.getSkipPermission() ) {
 			//将读者以及作者信息持久化到数据库中
 			try {
 				documentInfoServiceAdv.refreshDocumentPermission( document.getId(), wi.getReaderList(), wi.getAuthorList() );
@@ -412,24 +413,44 @@ public static class Wi extends Document {
 		
 		public static WrapCopier<Wi, Document> copier = WrapCopierFactory.wi( Wi.class, Document.class, null, JpaObject.FieldsUnmodify);
 
+		@FieldDescribe( "文档操作者身份." )
 		private String identity = null;
 		
+		@FieldDescribe( "数据的路径列表." )
 		private String[] dataPaths = null;
 		
+		@FieldDescribe( "启动流程的JobId." )
 		private String wf_jobId = null;
 		
+		@FieldDescribe( "启动流程的WorkId." )
 		private String wf_workId = null;
 		
+		@FieldDescribe( "启动流程的附件列表." )
 		private String[] wf_attachmentIds = null;	
 		
+		@FieldDescribe( "文档数据." )
 		private Map<?, ?> docData = null;
 		
+		@FieldDescribe( "文档读者." )
 		private List<PermissionInfo> readerList = null;
 		
+		@FieldDescribe( "文档编辑者." )
 		private List<PermissionInfo> authorList = null;
 		
+		@FieldDescribe( "图片列表." )
 		private List<String> cloudPictures = null;
 		
+		@FieldDescribe( "不修改权限（跳过权限设置，保留原来的设置）." )
+		private Boolean skipPermission  = false;	
+		
+		public Boolean getSkipPermission() {
+			return skipPermission;
+		}
+
+		public void setSkipPermission(Boolean skipPermission) {
+			this.skipPermission = skipPermission;
+		}
+
 		public String getIdentity() {
 			return identity;
 		}

o2server/x_cms_assemble_control/src/main/webapp/describe/sources/com/x/cms/assemble/control/jaxrs/document/ActionSave.java

@@ -322,7 +322,7 @@ public class ActionSave extends BaseAction {
 		
 		if (check) {
 			// 如果是已经发布的文档，需要限时再计算一次文档权限
-			if ( "published".equals( document.getDocStatus()) ) {
+			if ( "published".equals( document.getDocStatus()) && !wi.getSkipPermission()  ) {
 				//将读者以及作者信息持久化到数据库中
 				try {
 					documentInfoServiceAdv.refreshDocumentPermission( document.getId(), wi.getReaderList(), wi.getAuthorList() );
@@ -370,6 +370,9 @@ public class ActionSave extends BaseAction {
 		@FieldDescribe( "图片列表." )
 		private List<String> cloudPictures = null;
 		
+		@FieldDescribe( "不修改权限（跳过权限设置，保留原来的设置）." )
+		private Boolean skipPermission  = false;
+		
 		public String getIdentity() {
 			return identity;
 		}
@@ -445,6 +448,13 @@ public class ActionSave extends BaseAction {
 			this.cloudPictures = cloudPictures;
 		}
 
+		public Boolean getSkipPermission() {
+			return skipPermission;
+		}
+
+		public void setSkipPermission(Boolean skipPermission) {
+			this.skipPermission = skipPermission;
+		}
 	}
 
 	public static class Wo extends WoId {

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

@@ -1,25 +0,0 @@
-/** 
- *  Generated by OpenJPA MetaModel Generator Tool.
-**/
-
-package com.x.cms.core.entity;
-
-import com.x.base.core.entity.SliceJpaObject_;
-import java.lang.String;
-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="Thu Dec 27 11:40:05 CST 2018")
-public class AppCategoryAdmin_ extends SliceJpaObject_  {
-    public static volatile SingularAttribute<AppCategoryAdmin,String> adminLevel;
-    public static volatile SingularAttribute<AppCategoryAdmin,String> adminName;
-    public static volatile SingularAttribute<AppCategoryAdmin,String> adminUid;
-    public static volatile SingularAttribute<AppCategoryAdmin,String> creatorUid;
-    public static volatile SingularAttribute<AppCategoryAdmin,String> description;
-    public static volatile SingularAttribute<AppCategoryAdmin,String> id;
-    public static volatile SingularAttribute<AppCategoryAdmin,String> objectId;
-    public static volatile SingularAttribute<AppCategoryAdmin,String> objectName;
-    public static volatile SingularAttribute<AppCategoryAdmin,String> objectType;
-}

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

@@ -1,27 +0,0 @@
-/** 
- *  Generated by OpenJPA MetaModel Generator Tool.
-**/
-
-package com.x.cms.core.entity;
-
-import com.x.base.core.entity.SliceJpaObject_;
-import java.lang.String;
-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="Thu Dec 27 11:40:05 CST 2018")
-public class AppCategoryPermission_ extends SliceJpaObject_  {
-    public static volatile SingularAttribute<AppCategoryPermission,String> appId;
-    public static volatile SingularAttribute<AppCategoryPermission,String> creatorUid;
-    public static volatile SingularAttribute<AppCategoryPermission,String> description;
-    public static volatile SingularAttribute<AppCategoryPermission,String> id;
-    public static volatile SingularAttribute<AppCategoryPermission,String> objectId;
-    public static volatile SingularAttribute<AppCategoryPermission,String> objectName;
-    public static volatile SingularAttribute<AppCategoryPermission,String> objectType;
-    public static volatile SingularAttribute<AppCategoryPermission,String> permission;
-    public static volatile SingularAttribute<AppCategoryPermission,String> usedObjectCode;
-    public static volatile SingularAttribute<AppCategoryPermission,String> usedObjectName;
-    public static volatile SingularAttribute<AppCategoryPermission,String> usedObjectType;
-}

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

@@ -1,44 +0,0 @@
-/** 
- *  Generated by OpenJPA MetaModel Generator Tool.
-**/
-
-package com.x.cms.core.entity;
-
-import com.x.base.core.entity.SliceJpaObject_;
-import java.lang.Boolean;
-import java.lang.String;
-import javax.persistence.metamodel.ListAttribute;
-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="Thu Dec 27 11:40:05 CST 2018")
-public class AppInfo_ extends SliceJpaObject_  {
-    public static volatile SingularAttribute<AppInfo,Boolean> allPeoplePublish;
-    public static volatile SingularAttribute<AppInfo,Boolean> allPeopleView;
-    public static volatile SingularAttribute<AppInfo,String> appAlias;
-    public static volatile SingularAttribute<AppInfo,String> appIcon;
-    public static volatile SingularAttribute<AppInfo,String> appInfoSeq;
-    public static volatile SingularAttribute<AppInfo,String> appMemo;
-    public static volatile SingularAttribute<AppInfo,String> appName;
-    public static volatile ListAttribute<AppInfo,String> categoryList;
-    public static volatile SingularAttribute<AppInfo,String> creatorIdentity;
-    public static volatile SingularAttribute<AppInfo,String> creatorPerson;
-    public static volatile SingularAttribute<AppInfo,String> creatorTopUnitName;
-    public static volatile SingularAttribute<AppInfo,String> creatorUnitName;
-    public static volatile SingularAttribute<AppInfo,String> description;
-    public static volatile SingularAttribute<AppInfo,String> documentType;
-    public static volatile SingularAttribute<AppInfo,String> iconColor;
-    public static volatile SingularAttribute<AppInfo,String> id;
-    public static volatile ListAttribute<AppInfo,String> manageableGroupList;
-    public static volatile ListAttribute<AppInfo,String> manageablePersonList;
-    public static volatile ListAttribute<AppInfo,String> manageableUnitList;
-    public static volatile ListAttribute<AppInfo,String> publishableGroupList;
-    public static volatile ListAttribute<AppInfo,String> publishablePersonList;
-    public static volatile ListAttribute<AppInfo,String> publishableUnitList;
-    public static volatile SingularAttribute<AppInfo,Boolean> reviewed;
-    public static volatile ListAttribute<AppInfo,String> viewableGroupList;
-    public static volatile ListAttribute<AppInfo,String> viewablePersonList;
-    public static volatile ListAttribute<AppInfo,String> viewableUnitList;
-}

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

@@ -1,18 +0,0 @@
-/** 
- *  Generated by OpenJPA MetaModel Generator Tool.
-**/
-
-package com.x.cms.core.entity;
-
-import com.x.base.core.entity.SliceJpaObject_;
-import java.lang.String;
-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="Thu Dec 27 11:40:05 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

@@ -1,59 +0,0 @@
-/** 
- *  Generated by OpenJPA MetaModel Generator Tool.
-**/
-
-package com.x.cms.core.entity;
-
-import com.x.base.core.entity.SliceJpaObject_;
-import java.lang.Boolean;
-import java.lang.String;
-import javax.persistence.metamodel.ListAttribute;
-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="Thu Dec 27 11:40:05 CST 2018")
-public class CategoryInfo_ extends SliceJpaObject_  {
-    public static volatile SingularAttribute<CategoryInfo,Boolean> allPeoplePublish;
-    public static volatile SingularAttribute<CategoryInfo,Boolean> allPeopleView;
-    public static volatile SingularAttribute<CategoryInfo,String> appId;
-    public static volatile SingularAttribute<CategoryInfo,String> appName;
-    public static volatile SingularAttribute<CategoryInfo,String> categoryAlias;
-    public static volatile SingularAttribute<CategoryInfo,String> categoryIcon;
-    public static volatile SingularAttribute<CategoryInfo,String> categoryMemo;
-    public static volatile SingularAttribute<CategoryInfo,String> categoryName;
-    public static volatile SingularAttribute<CategoryInfo,String> categorySeq;
-    public static volatile SingularAttribute<CategoryInfo,String> creatorIdentity;
-    public static volatile SingularAttribute<CategoryInfo,String> creatorPerson;
-    public static volatile SingularAttribute<CategoryInfo,String> creatorTopUnitName;
-    public static volatile SingularAttribute<CategoryInfo,String> creatorUnitName;
-    public static volatile SingularAttribute<CategoryInfo,String> defaultViewId;
-    public static volatile SingularAttribute<CategoryInfo,String> defaultViewName;
-    public static volatile SingularAttribute<CategoryInfo,String> description;
-    public static volatile SingularAttribute<CategoryInfo,String> documentType;
-    public static volatile SingularAttribute<CategoryInfo,String> formId;
-    public static volatile SingularAttribute<CategoryInfo,String> formName;
-    public static volatile SingularAttribute<CategoryInfo,String> id;
-    public static volatile SingularAttribute<CategoryInfo,String> importViewAppId;
-    public static volatile SingularAttribute<CategoryInfo,String> importViewId;
-    public static volatile SingularAttribute<CategoryInfo,String> importViewName;
-    public static volatile ListAttribute<CategoryInfo,String> manageableGroupList;
-    public static volatile ListAttribute<CategoryInfo,String> manageablePersonList;
-    public static volatile ListAttribute<CategoryInfo,String> manageableUnitList;
-    public static volatile SingularAttribute<CategoryInfo,String> parentId;
-    public static volatile ListAttribute<CategoryInfo,String> publishableGroupList;
-    public static volatile ListAttribute<CategoryInfo,String> publishablePersonList;
-    public static volatile ListAttribute<CategoryInfo,String> publishableUnitList;
-    public static volatile SingularAttribute<CategoryInfo,String> readFormId;
-    public static volatile SingularAttribute<CategoryInfo,String> readFormName;
-    public static volatile SingularAttribute<CategoryInfo,Boolean> reviewed;
-    public static volatile ListAttribute<CategoryInfo,String> viewableGroupList;
-    public static volatile ListAttribute<CategoryInfo,String> viewablePersonList;
-    public static volatile ListAttribute<CategoryInfo,String> viewableUnitList;
-    public static volatile SingularAttribute<CategoryInfo,String> workflowAppId;
-    public static volatile SingularAttribute<CategoryInfo,String> workflowAppName;
-    public static volatile SingularAttribute<CategoryInfo,String> workflowFlag;
-    public static volatile SingularAttribute<CategoryInfo,String> workflowName;
-    public static volatile SingularAttribute<CategoryInfo,String> workflowType;
-}

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

@@ -1,34 +0,0 @@
-/** 
- *  Generated by OpenJPA MetaModel Generator Tool.
-**/
-
-package com.x.cms.core.entity;
-
-import com.x.base.core.entity.SliceJpaObject_;
-import java.lang.String;
-import java.util.Date;
-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="Thu Dec 27 11:40:05 CST 2018")
-public class DocumentPermission_ extends SliceJpaObject_  {
-    public static volatile SingularAttribute<DocumentPermission,String> appId;
-    public static volatile SingularAttribute<DocumentPermission,String> appName;
-    public static volatile SingularAttribute<DocumentPermission,String> categoryAlias;
-    public static volatile SingularAttribute<DocumentPermission,String> categoryId;
-    public static volatile SingularAttribute<DocumentPermission,String> categoryName;
-    public static volatile SingularAttribute<DocumentPermission,Date> docCreateDate;
-    public static volatile SingularAttribute<DocumentPermission,String> documentId;
-    public static volatile SingularAttribute<DocumentPermission,String> documentStatus;
-    public static volatile SingularAttribute<DocumentPermission,String> id;
-    public static volatile SingularAttribute<DocumentPermission,String> permission;
-    public static volatile SingularAttribute<DocumentPermission,String> permissionObjectCode;
-    public static volatile SingularAttribute<DocumentPermission,String> permissionObjectName;
-    public static volatile SingularAttribute<DocumentPermission,String> permissionObjectType;
-    public static volatile SingularAttribute<DocumentPermission,Date> publishDate;
-    public static volatile SingularAttribute<DocumentPermission,String> publisher;
-    public static volatile SingularAttribute<DocumentPermission,String> title;
-    public static volatile SingularAttribute<DocumentPermission,String> updateFlag;
-}

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

@@ -1,30 +0,0 @@
-/** 
- *  Generated by OpenJPA MetaModel Generator Tool.
-**/
-
-package com.x.cms.core.entity;
-
-import com.x.base.core.entity.SliceJpaObject_;
-import java.lang.Integer;
-import java.lang.String;
-import java.util.Date;
-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="Thu Dec 27 11:40:05 CST 2018")
-public class DocumentViewRecord_ extends SliceJpaObject_  {
-    public static volatile SingularAttribute<DocumentViewRecord,String> appId;
-    public static volatile SingularAttribute<DocumentViewRecord,String> appName;
-    public static volatile SingularAttribute<DocumentViewRecord,String> categoryId;
-    public static volatile SingularAttribute<DocumentViewRecord,String> categoryName;
-    public static volatile SingularAttribute<DocumentViewRecord,String> documentId;
-    public static volatile SingularAttribute<DocumentViewRecord,String> id;
-    public static volatile SingularAttribute<DocumentViewRecord,Date> lastViewTime;
-    public static volatile SingularAttribute<DocumentViewRecord,String> title;
-    public static volatile SingularAttribute<DocumentViewRecord,Integer> viewCount;
-    public static volatile SingularAttribute<DocumentViewRecord,String> viewerName;
-    public static volatile SingularAttribute<DocumentViewRecord,String> viewerTopUnitName;
-    public static volatile SingularAttribute<DocumentViewRecord,String> viewerUnitName;
-}

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

@@ -1,52 +0,0 @@
-/** 
- *  Generated by OpenJPA MetaModel Generator Tool.
-**/
-
-package com.x.cms.core.entity;
-
-import com.x.base.core.entity.SliceJpaObject_;
-import java.lang.Boolean;
-import java.lang.Long;
-import java.lang.String;
-import java.util.Date;
-import javax.persistence.metamodel.ListAttribute;
-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="Thu Dec 27 11:40:05 CST 2018")
-public class Document_ extends SliceJpaObject_  {
-    public static volatile SingularAttribute<Document,String> appId;
-    public static volatile SingularAttribute<Document,String> appName;
-    public static volatile ListAttribute<Document,String> authorGroupList;
-    public static volatile ListAttribute<Document,String> authorPersonList;
-    public static volatile ListAttribute<Document,String> authorUnitList;
-    public static volatile SingularAttribute<Document,String> categoryAlias;
-    public static volatile SingularAttribute<Document,String> categoryId;
-    public static volatile SingularAttribute<Document,String> categoryName;
-    public static volatile SingularAttribute<Document,String> creatorIdentity;
-    public static volatile SingularAttribute<Document,String> creatorPerson;
-    public static volatile SingularAttribute<Document,String> creatorTopUnitName;
-    public static volatile SingularAttribute<Document,String> creatorUnitName;
-    public static volatile SingularAttribute<Document,String> description;
-    public static volatile SingularAttribute<Document,String> docStatus;
-    public static volatile SingularAttribute<Document,String> documentType;
-    public static volatile SingularAttribute<Document,String> form;
-    public static volatile SingularAttribute<Document,String> formName;
-    public static volatile SingularAttribute<Document,Boolean> hasIndexPic;
-    public static volatile SingularAttribute<Document,String> id;
-    public static volatile SingularAttribute<Document,String> importBatchName;
-    public static volatile ListAttribute<Document,String> managerList;
-    public static volatile ListAttribute<Document,String> pictureList;
-    public static volatile SingularAttribute<Document,Date> publishTime;
-    public static volatile SingularAttribute<Document,String> readFormId;
-    public static volatile SingularAttribute<Document,String> readFormName;
-    public static volatile ListAttribute<Document,String> readGroupList;
-    public static volatile ListAttribute<Document,String> readPersonList;
-    public static volatile ListAttribute<Document,String> readUnitList;
-    public static volatile SingularAttribute<Document,Boolean> reviewed;
-    public static volatile SingularAttribute<Document,String> summary;
-    public static volatile SingularAttribute<Document,String> title;
-    public static volatile SingularAttribute<Document,Long> viewCount;
-}

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

@@ -1,38 +0,0 @@
-/** 
- *  Generated by OpenJPA MetaModel Generator Tool.
-**/
-
-package com.x.cms.core.entity;
-
-import com.x.base.core.entity.StorageObject_;
-import java.lang.Integer;
-import java.lang.Long;
-import java.lang.String;
-import java.util.Date;
-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="Thu Dec 27 11:40:05 CST 2018")
-public class FileInfo_ extends StorageObject_  {
-    public static volatile SingularAttribute<FileInfo,String> appId;
-    public static volatile SingularAttribute<FileInfo,String> categoryId;
-    public static volatile SingularAttribute<FileInfo,String> cloudId;
-    public static volatile SingularAttribute<FileInfo,String> creatorUid;
-    public static volatile SingularAttribute<FileInfo,String> description;
-    public static volatile SingularAttribute<FileInfo,String> documentId;
-    public static volatile SingularAttribute<FileInfo,String> extension;
-    public static volatile SingularAttribute<FileInfo,String> fileExtType;
-    public static volatile SingularAttribute<FileInfo,String> fileHost;
-    public static volatile SingularAttribute<FileInfo,String> fileName;
-    public static volatile SingularAttribute<FileInfo,String> filePath;
-    public static volatile SingularAttribute<FileInfo,String> fileType;
-    public static volatile SingularAttribute<FileInfo,String> id;
-    public static volatile SingularAttribute<FileInfo,Date> lastUpdateTime;
-    public static volatile SingularAttribute<FileInfo,Long> length;
-    public static volatile SingularAttribute<FileInfo,String> name;
-    public static volatile SingularAttribute<FileInfo,Integer> seqNumber;
-    public static volatile SingularAttribute<FileInfo,String> site;
-    public static volatile SingularAttribute<FileInfo,String> storage;
-}

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

@@ -1,26 +0,0 @@
-/** 
- *  Generated by OpenJPA MetaModel Generator Tool.
-**/
-
-package com.x.cms.core.entity;
-
-import com.x.base.core.entity.SliceJpaObject_;
-import java.lang.String;
-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="Thu Dec 27 11:40:05 CST 2018")
-public class Log_ extends SliceJpaObject_  {
-    public static volatile SingularAttribute<Log,String> appId;
-    public static volatile SingularAttribute<Log,String> categoryId;
-    public static volatile SingularAttribute<Log,String> description;
-    public static volatile SingularAttribute<Log,String> documentId;
-    public static volatile SingularAttribute<Log,String> fileId;
-    public static volatile SingularAttribute<Log,String> id;
-    public static volatile SingularAttribute<Log,String> operationLevel;
-    public static volatile SingularAttribute<Log,String> operationType;
-    public static volatile SingularAttribute<Log,String> operatorName;
-    public static volatile SingularAttribute<Log,String> operatorUid;
-}

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

@@ -1,35 +0,0 @@
-/** 
- *  Generated by OpenJPA MetaModel Generator Tool.
-**/
-
-package com.x.cms.core.entity;
-
-import com.x.base.core.entity.SliceJpaObject_;
-import java.lang.Boolean;
-import java.lang.String;
-import java.util.Date;
-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="Thu Dec 27 11:40:05 CST 2018")
-public class Review_ extends SliceJpaObject_  {
-    public static volatile SingularAttribute<Review,String> appAlias;
-    public static volatile SingularAttribute<Review,String> appId;
-    public static volatile SingularAttribute<Review,String> appName;
-    public static volatile SingularAttribute<Review,String> categoryAlias;
-    public static volatile SingularAttribute<Review,String> categoryId;
-    public static volatile SingularAttribute<Review,String> categoryName;
-    public static volatile SingularAttribute<Review,String> creatorIdentity;
-    public static volatile SingularAttribute<Review,String> creatorPerson;
-    public static volatile SingularAttribute<Review,String> creatorUnit;
-    public static volatile SingularAttribute<Review,String> documentId;
-    public static volatile SingularAttribute<Review,String> id;
-    public static volatile SingularAttribute<Review,Boolean> isPublic;
-    public static volatile SingularAttribute<Review,Date> publishTime;
-    public static volatile SingularAttribute<Review,String> publishTimeMonth;
-    public static volatile SingularAttribute<Review,String> readerName;
-    public static volatile SingularAttribute<Review,String> readerType;
-    public static volatile SingularAttribute<Review,String> title;
-}

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

@@ -1,54 +0,0 @@
-/** 
- *  Generated by OpenJPA MetaModel Generator Tool.
-**/
-
-package com.x.cms.core.entity.element;
-
-import com.x.base.core.entity.SliceJpaObject_;
-import com.x.base.core.entity.dataitem.ItemCategory;
-import com.x.base.core.entity.dataitem.ItemPrimitiveType;
-import com.x.base.core.entity.dataitem.ItemStringValueType;
-import com.x.base.core.entity.dataitem.ItemType;
-import java.lang.Boolean;
-import java.lang.Double;
-import java.lang.Integer;
-import java.lang.String;
-import java.util.Date;
-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="Thu Dec 27 11:40:05 CST 2018")
-public class AppDictItem_ extends SliceJpaObject_  {
-    public static volatile SingularAttribute<AppDictItem,String> appId;
-    public static volatile SingularAttribute<AppDictItem,Boolean> booleanValue;
-    public static volatile SingularAttribute<AppDictItem,String> bundle;
-    public static volatile SingularAttribute<AppDictItem,Date> dateTimeValue;
-    public static volatile SingularAttribute<AppDictItem,Date> dateValue;
-    public static volatile SingularAttribute<AppDictItem,String> id;
-    public static volatile SingularAttribute<AppDictItem,ItemCategory> itemCategory;
-    public static volatile SingularAttribute<AppDictItem,ItemPrimitiveType> itemPrimitiveType;
-    public static volatile SingularAttribute<AppDictItem,ItemStringValueType> itemStringValueType;
-    public static volatile SingularAttribute<AppDictItem,ItemType> itemType;
-    public static volatile SingularAttribute<AppDictItem,Double> numberValue;
-    public static volatile SingularAttribute<AppDictItem,String> path0;
-    public static volatile SingularAttribute<AppDictItem,Integer> path0Location;
-    public static volatile SingularAttribute<AppDictItem,String> path1;
-    public static volatile SingularAttribute<AppDictItem,Integer> path1Location;
-    public static volatile SingularAttribute<AppDictItem,String> path2;
-    public static volatile SingularAttribute<AppDictItem,Integer> path2Location;
-    public static volatile SingularAttribute<AppDictItem,String> path3;
-    public static volatile SingularAttribute<AppDictItem,Integer> path3Location;
-    public static volatile SingularAttribute<AppDictItem,String> path4;
-    public static volatile SingularAttribute<AppDictItem,Integer> path4Location;
-    public static volatile SingularAttribute<AppDictItem,String> path5;
-    public static volatile SingularAttribute<AppDictItem,Integer> path5Location;
-    public static volatile SingularAttribute<AppDictItem,String> path6;
-    public static volatile SingularAttribute<AppDictItem,Integer> path6Location;
-    public static volatile SingularAttribute<AppDictItem,String> path7;
-    public static volatile SingularAttribute<AppDictItem,Integer> path7Location;
-    public static volatile SingularAttribute<AppDictItem,String> stringLongValue;
-    public static volatile SingularAttribute<AppDictItem,String> stringShortValue;
-    public static volatile SingularAttribute<AppDictItem,Date> timeValue;
-}

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

@@ -1,22 +0,0 @@
-/** 
- *  Generated by OpenJPA MetaModel Generator Tool.
-**/
-
-package com.x.cms.core.entity.element;
-
-import com.x.base.core.entity.SliceJpaObject_;
-import java.lang.String;
-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="Thu Dec 27 11:40:05 CST 2018")
-public class AppDict_ extends SliceJpaObject_  {
-    public static volatile SingularAttribute<AppDict,String> alias;
-    public static volatile SingularAttribute<AppDict,String> appId;
-    public static volatile SingularAttribute<AppDict,String> creatorUid;
-    public static volatile SingularAttribute<AppDict,String> description;
-    public static volatile SingularAttribute<AppDict,String> id;
-    public static volatile SingularAttribute<AppDict,String> name;
-}

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

@@ -1,21 +0,0 @@
-/** 
- *  Generated by OpenJPA MetaModel Generator Tool.
-**/
-
-package com.x.cms.core.entity.element;
-
-import com.x.base.core.entity.SliceJpaObject_;
-import java.lang.String;
-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="Thu Dec 27 11:40:05 CST 2018")
-public class FormField_ extends SliceJpaObject_  {
-    public static volatile SingularAttribute<FormField,String> appId;
-    public static volatile SingularAttribute<FormField,String> dataType;
-    public static volatile SingularAttribute<FormField,String> form;
-    public static volatile SingularAttribute<FormField,String> id;
-    public static volatile SingularAttribute<FormField,String> name;
-}

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

@@ -1,24 +0,0 @@
-/** 
- *  Generated by OpenJPA MetaModel Generator Tool.
-**/
-
-package com.x.cms.core.entity.element;
-
-import com.x.base.core.entity.SliceJpaObject_;
-import java.lang.String;
-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="Thu Dec 27 11:40:05 CST 2018")
-public class Form_ extends SliceJpaObject_  {
-    public static volatile SingularAttribute<Form,String> alias;
-    public static volatile SingularAttribute<Form,String> appId;
-    public static volatile SingularAttribute<Form,String> data;
-    public static volatile SingularAttribute<Form,String> description;
-    public static volatile SingularAttribute<Form,String> editor;
-    public static volatile SingularAttribute<Form,String> id;
-    public static volatile SingularAttribute<Form,String> mobileData;
-    public static volatile SingularAttribute<Form,String> name;
-}

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

@@ -1,44 +0,0 @@
-/** 
- *  Generated by OpenJPA MetaModel Generator Tool.
-**/
-
-package com.x.cms.core.entity.element;
-
-import com.x.base.core.entity.SliceJpaObject_;
-import java.lang.Boolean;
-import java.lang.Integer;
-import java.lang.String;
-import java.util.Date;
-import javax.persistence.metamodel.ListAttribute;
-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="Thu Dec 27 11:40:05 CST 2018")
-public class QueryView_ extends SliceJpaObject_  {
-    public static volatile SingularAttribute<QueryView,String> afterCalculateGridScriptText;
-    public static volatile SingularAttribute<QueryView,String> afterGridScriptText;
-    public static volatile SingularAttribute<QueryView,String> afterGroupGridScriptText;
-    public static volatile SingularAttribute<QueryView,String> alias;
-    public static volatile SingularAttribute<QueryView,String> appId;
-    public static volatile SingularAttribute<QueryView,String> appName;
-    public static volatile ListAttribute<QueryView,String> availableIdentityList;
-    public static volatile ListAttribute<QueryView,String> availablePersonList;
-    public static volatile ListAttribute<QueryView,String> availableUnitList;
-    public static volatile SingularAttribute<QueryView,String> code;
-    public static volatile ListAttribute<QueryView,String> controllerList;
-    public static volatile SingularAttribute<QueryView,String> creatorPerson;
-    public static volatile SingularAttribute<QueryView,String> data;
-    public static volatile SingularAttribute<QueryView,String> description;
-    public static volatile SingularAttribute<QueryView,Boolean> display;
-    public static volatile SingularAttribute<QueryView,String> icon;
-    public static volatile SingularAttribute<QueryView,String> id;
-    public static volatile SingularAttribute<QueryView,String> lastUpdatePerson;
-    public static volatile SingularAttribute<QueryView,Date> lastUpdateTime;
-    public static volatile SingularAttribute<QueryView,String> layout;
-    public static volatile SingularAttribute<QueryView,String> name;
-    public static volatile SingularAttribute<QueryView,Boolean> timingEnable;
-    public static volatile SingularAttribute<QueryView,Integer> timingInterval;
-    public static volatile SingularAttribute<QueryView,Integer> timingTouch;
-}

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

@@ -1,30 +0,0 @@
-/** 
- *  Generated by OpenJPA MetaModel Generator Tool.
-**/
-
-package com.x.cms.core.entity.element;
-
-import com.x.base.core.entity.SliceJpaObject_;
-import java.lang.Boolean;
-import java.lang.String;
-import java.util.Date;
-import javax.persistence.metamodel.ListAttribute;
-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="Thu Dec 27 11:40:05 CST 2018")
-public class Script_ extends SliceJpaObject_  {
-    public static volatile SingularAttribute<Script,String> alias;
-    public static volatile SingularAttribute<Script,String> appId;
-    public static volatile SingularAttribute<Script,String> creatorPerson;
-    public static volatile ListAttribute<Script,String> dependScriptList;
-    public static volatile SingularAttribute<Script,String> description;
-    public static volatile SingularAttribute<Script,String> id;
-    public static volatile SingularAttribute<Script,String> lastUpdatePerson;
-    public static volatile SingularAttribute<Script,Date> lastUpdateTime;
-    public static volatile SingularAttribute<Script,String> name;
-    public static volatile SingularAttribute<Script,String> text;
-    public static volatile SingularAttribute<Script,Boolean> validated;
-}

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

@@ -1,25 +0,0 @@
-/** 
- *  Generated by OpenJPA MetaModel Generator Tool.
-**/
-
-package com.x.cms.core.entity.element;
-
-import com.x.base.core.entity.SliceJpaObject_;
-import java.lang.String;
-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="Thu Dec 27 11:40:05 CST 2018")
-public class TemplateForm_ extends SliceJpaObject_  {
-    public static volatile SingularAttribute<TemplateForm,String> alias;
-    public static volatile SingularAttribute<TemplateForm,String> category;
-    public static volatile SingularAttribute<TemplateForm,String> data;
-    public static volatile SingularAttribute<TemplateForm,String> description;
-    public static volatile SingularAttribute<TemplateForm,String> icon;
-    public static volatile SingularAttribute<TemplateForm,String> id;
-    public static volatile SingularAttribute<TemplateForm,String> mobileData;
-    public static volatile SingularAttribute<TemplateForm,String> name;
-    public static volatile SingularAttribute<TemplateForm,String> outline;
-}

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

@@ -1,20 +0,0 @@
-/** 
- *  Generated by OpenJPA MetaModel Generator Tool.
-**/
-
-package com.x.cms.core.entity.element;
-
-import com.x.base.core.entity.SliceJpaObject_;
-import java.lang.String;
-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="Thu Dec 27 11:40:05 CST 2018")
-public class ViewCategory_ extends SliceJpaObject_  {
-    public static volatile SingularAttribute<ViewCategory,String> categoryId;
-    public static volatile SingularAttribute<ViewCategory,String> editor;
-    public static volatile SingularAttribute<ViewCategory,String> id;
-    public static volatile SingularAttribute<ViewCategory,String> viewId;
-}

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

@@ -1,24 +0,0 @@
-/** 
- *  Generated by OpenJPA MetaModel Generator Tool.
-**/
-
-package com.x.cms.core.entity.element;
-
-import com.x.base.core.entity.SliceJpaObject_;
-import java.lang.Integer;
-import java.lang.String;
-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="Thu Dec 27 11:40:05 CST 2018")
-public class ViewFieldConfig_ extends SliceJpaObject_  {
-    public static volatile SingularAttribute<ViewFieldConfig,String> description;
-    public static volatile SingularAttribute<ViewFieldConfig,String> editor;
-    public static volatile SingularAttribute<ViewFieldConfig,String> fieldName;
-    public static volatile SingularAttribute<ViewFieldConfig,String> fieldTitle;
-    public static volatile SingularAttribute<ViewFieldConfig,String> id;
-    public static volatile SingularAttribute<ViewFieldConfig,Integer> showSequence;
-    public static volatile SingularAttribute<ViewFieldConfig,String> viewId;
-}

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

@@ -1,31 +0,0 @@
-/** 
- *  Generated by OpenJPA MetaModel Generator Tool.
-**/
-
-package com.x.cms.core.entity.element;
-
-import com.x.base.core.entity.SliceJpaObject_;
-import java.lang.Integer;
-import java.lang.String;
-import javax.persistence.metamodel.ListAttribute;
-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="Thu Dec 27 11:40:05 CST 2018")
-public class View_ extends SliceJpaObject_  {
-    public static volatile SingularAttribute<View,String> alias;
-    public static volatile SingularAttribute<View,String> appId;
-    public static volatile SingularAttribute<View,String> content;
-    public static volatile SingularAttribute<View,String> description;
-    public static volatile SingularAttribute<View,String> editor;
-    public static volatile ListAttribute<View,String> fieldConfigList;
-    public static volatile SingularAttribute<View,String> formId;
-    public static volatile SingularAttribute<View,String> id;
-    public static volatile SingularAttribute<View,String> name;
-    public static volatile SingularAttribute<View,String> orderField;
-    public static volatile SingularAttribute<View,String> orderFieldType;
-    public static volatile SingularAttribute<View,String> orderType;
-    public static volatile SingularAttribute<View,Integer> pageSize;
-}

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

@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<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.AppCategoryPermission</class>
-    <class>com.x.cms.core.entity.FileInfo</class>
-    <class>com.x.cms.core.entity.element.Form</class>
-    <class>com.x.cms.core.entity.DocumentPermission</class>
-    <class>com.x.cms.core.entity.Log</class>
-    <class>com.x.cms.core.entity.element.QueryView</class>
-    <class>com.x.cms.core.entity.CategoryExt</class>
-    <class>com.x.cms.core.entity.AppInfo</class>
-    <class>com.x.cms.core.entity.Document</class>
-    <class>com.x.cms.core.entity.element.View</class>
-    <class>com.x.base.core.entity.StorageObject</class>
-    <class>com.x.cms.core.entity.element.ViewCategory</class>
-    <class>com.x.cms.core.entity.element.ViewFieldConfig</class>
-    <class>com.x.base.core.entity.JpaObject</class>
-    <class>com.x.cms.core.entity.element.AppDictItem</class>
-    <class>com.x.cms.core.entity.AppCategoryAdmin</class>
-    <class>com.x.cms.core.entity.element.AppDict</class>
-    <class>com.x.cms.core.entity.DocumentViewRecord</class>
-    <class>com.x.cms.core.entity.Review</class>
-    <class>com.x.cms.core.entity.element.Script</class>
-    <class>com.x.base.core.entity.SliceJpaObject</class>
-    <class>com.x.cms.core.entity.element.FormField</class>
-    <class>com.x.cms.core.entity.element.TemplateForm</class>
-    <class>com.x.cms.core.entity.CategoryInfo</class>
-  </persistence-unit>
-</persistence>

o2server/x_collaboration_assemble_websocket/src/main/resources/META-INF/x_persistence.xml

@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<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="com.x.collaboration.core.entity.Dialog" transaction-type="RESOURCE_LOCAL">
-    <provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider>
-    <class>com.x.collaboration.core.entity.Dialog</class>
-    <class>com.x.base.core.entity.JpaObject</class>
-    <class>com.x.base.core.entity.SliceJpaObject</class>
-    <properties/>
-  </persistence-unit>
-  <persistence-unit name="com.x.collaboration.core.entity.Notification" transaction-type="RESOURCE_LOCAL">
-    <provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider>
-    <class>com.x.base.core.entity.JpaObject</class>
-    <class>com.x.base.core.entity.SliceJpaObject</class>
-    <class>com.x.collaboration.core.entity.Notification</class>
-    <properties/>
-  </persistence-unit>
-  <persistence-unit name="com.x.collaboration.core.entity.SMSMessage" transaction-type="RESOURCE_LOCAL">
-    <provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider>
-    <class>com.x.base.core.entity.JpaObject</class>
-    <class>com.x.base.core.entity.SliceJpaObject</class>
-    <class>com.x.collaboration.core.entity.SMSMessage</class>
-    <properties/>
-  </persistence-unit>
-  <persistence-unit name="com.x.collaboration.core.entity.Talk" transaction-type="RESOURCE_LOCAL">
-    <provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider>
-    <class>com.x.base.core.entity.JpaObject</class>
-    <class>com.x.collaboration.core.entity.Talk</class>
-    <class>com.x.base.core.entity.SliceJpaObject</class>
-    <properties/>
-  </persistence-unit>
-</persistence>

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

@@ -1,22 +0,0 @@
-/** 
- *  Generated by OpenJPA MetaModel Generator Tool.
-**/
-
-package com.x.collaboration.core.entity;
-
-import com.x.base.core.entity.SliceJpaObject_;
-import java.lang.Boolean;
-import java.lang.String;
-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="Thu Dec 27 11:40:15 CST 2018")
-public class Dialog_ extends SliceJpaObject_  {
-    public static volatile SingularAttribute<Dialog,Boolean> arrived;
-    public static volatile SingularAttribute<Dialog,String> body;
-    public static volatile SingularAttribute<Dialog,String> from;
-    public static volatile SingularAttribute<Dialog,String> id;
-    public static volatile SingularAttribute<Dialog,String> person;
-}

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

@@ -1,19 +0,0 @@
-/** 
- *  Generated by OpenJPA MetaModel Generator Tool.
-**/
-
-package com.x.collaboration.core.entity;
-
-import com.x.base.core.entity.SliceJpaObject_;
-import java.lang.String;
-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="Thu Dec 27 11:40:15 CST 2018")
-public class Notification_ extends SliceJpaObject_  {
-    public static volatile SingularAttribute<Notification,String> body;
-    public static volatile SingularAttribute<Notification,String> id;
-    public static volatile SingularAttribute<Notification,String> person;
-}

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

@@ -1,20 +0,0 @@
-/** 
- *  Generated by OpenJPA MetaModel Generator Tool.
-**/
-
-package com.x.collaboration.core.entity;
-
-import com.x.base.core.entity.SliceJpaObject_;
-import java.lang.String;
-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="Thu Dec 27 11:40:15 CST 2018")
-public class SMSMessage_ extends SliceJpaObject_  {
-    public static volatile SingularAttribute<SMSMessage,String> id;
-    public static volatile SingularAttribute<SMSMessage,String> message;
-    public static volatile SingularAttribute<SMSMessage,String> mobile;
-    public static volatile SingularAttribute<SMSMessage,String> person;
-}

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

@@ -1,22 +0,0 @@
-/** 
- *  Generated by OpenJPA MetaModel Generator Tool.
-**/
-
-package com.x.collaboration.core.entity;
-
-import com.x.base.core.entity.SliceJpaObject_;
-import java.lang.Boolean;
-import java.lang.String;
-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="Thu Dec 27 11:40:15 CST 2018")
-public class Talk_ extends SliceJpaObject_  {
-    public static volatile SingularAttribute<Talk,Boolean> arrived;
-    public static volatile SingularAttribute<Talk,String> body;
-    public static volatile SingularAttribute<Talk,String> from;
-    public static volatile SingularAttribute<Talk,String> id;
-    public static volatile SingularAttribute<Talk,String> person;
-}

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

@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<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.collaboration.core.entity.Dialog</class>
-    <class>com.x.base.core.entity.JpaObject</class>
-    <class>com.x.collaboration.core.entity.Talk</class>
-    <class>com.x.base.core.entity.SliceJpaObject</class>
-    <class>com.x.collaboration.core.entity.SMSMessage</class>
-    <class>com.x.base.core.entity.StorageObject</class>
-    <class>com.x.collaboration.core.entity.Notification</class>
-  </persistence-unit>
-</persistence>

o2server/x_collaboration_service_message/src/main/resources/META-INF/x_persistence.xml

@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<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"/>