diff --git a/o2server/x_base_core_project/src/main/java/com/x/base/core/project/config/Config.java b/o2server/x_base_core_project/src/main/java/com/x/base/core/project/config/Config.java index 3af1be37bfb8c120584d1042bb801f35262f748c..1021cc05700207e7cbbc2aa8f98766d85155938b 100644 --- a/o2server/x_base_core_project/src/main/java/com/x/base/core/project/config/Config.java +++ b/o2server/x_base_core_project/src/main/java/com/x/base/core/project/config/Config.java @@ -67,6 +67,7 @@ public class Config { public static final String DIR_COMMONS = "commons"; public static final String DIR_COMMONS_EXT = "commons/ext"; public static final String DIR_CONFIG = "config"; + public static final String DIR_CONFIGSAMPLE = "configSample"; public static final String DIR_CUSTOM = "custom"; public static final String DIR_CUSTOM_JARS = "custom/jars"; public static final String DIR_DYNAMIC = "dynamic"; @@ -77,11 +78,14 @@ public class Config { public static final String DIR_JVM_MACOS = "jvm/macos"; public static final String DIR_JVM_WINDOWS = "jvm/windows"; public static final String DIR_LOCAL = "local"; + public static final String DIR_LOCAL_BACKUP = "local/backup"; + public static final String DIR_LOCAL_UPDATE = "local/update"; public static final String DIR_LOCAL_TEMP = "local/temp"; public static final String DIR_LOCAL_TEMP_CLASSES = "local/temp/classes"; public static final String DIR_LOCAL_TEMP_DYNAMIC = "local/temp/dynamic"; public static final String DIR_LOCAL_TEMP_DYNAMIC_SRC = "local/temp/dynamic/src"; public static final String DIR_LOCAL_TEMP_DYNAMIC_TARGET = "local/temp/dynamic/target"; + public static final String DIR_LOCALSAMPLE = "localSample"; public static final String DIR_LOGS = "logs"; public static final String DIR_SERVERS = "servers"; public static final String DIR_SERVERS_APPLICATIONSERVER = "servers/applicationServer"; @@ -109,6 +113,10 @@ public class Config { return new File(base(), DIR_CONFIG); } + public static File dir_configSample() throws Exception { + return new File(base(), DIR_CONFIGSAMPLE); + } + public static File dir_custom() throws Exception { return dir_custom(true); } @@ -169,6 +177,38 @@ public class Config { return new File(base(), DIR_LOCAL); } + public static File dir_local_backup() throws Exception { + return new File(base(), DIR_LOCAL_BACKUP); + } + + public static File dir_local_backup(boolean force) throws Exception { + File dir = new File(base(), DIR_LOCAL_BACKUP); + if (force) { + if ((!dir.exists()) || dir.isFile()) { + FileUtils.forceMkdir(dir); + } + } + return dir; + } + + public static File dir_local_update() throws Exception { + return new File(base(), DIR_LOCAL_UPDATE); + } + + public static File dir_local_update(boolean force) throws Exception { + File dir = new File(base(), DIR_LOCAL_UPDATE); + if (force) { + if ((!dir.exists()) || dir.isFile()) { + FileUtils.forceMkdir(dir); + } + } + return dir; + } + + public static File dir_localSample() throws Exception { + return new File(base(), DIR_LOCALSAMPLE); + } + public static File dir_local_temp() throws Exception { return new File(base(), DIR_LOCAL_TEMP); } diff --git a/o2server/x_base_core_project/src/main/java/com/x/base/core/project/x_query_assemble_designer.java b/o2server/x_base_core_project/src/main/java/com/x/base/core/project/x_query_assemble_designer.java index 4bd2429d8b3f86cb384d494bb7aa7947c6df6899..53a66ae697bb21770f4774398182656da225d7fe 100644 --- a/o2server/x_base_core_project/src/main/java/com/x/base/core/project/x_query_assemble_designer.java +++ b/o2server/x_base_core_project/src/main/java/com/x/base/core/project/x_query_assemble_designer.java @@ -21,7 +21,8 @@ public class x_query_assemble_designer extends AssembleA { dependency.containerEntities.add("com.x.query.core.entity.neural.InValue"); dependency.containerEntities.add("com.x.query.core.entity.neural.OutValue"); dependency.containerEntities.add("com.x.query.core.entity.neural.Model"); - dependency.containerEntities.add("com.x.query.core.entity.schema.*"); + dependency.containerEntities.add("com.x.query.core.entity.schema.Table"); + dependency.containerEntities.add("com.x.query.core.entity.schema.Statement"); dependency.containerEntities.add("com.x.processplatform.core.entity.content.Review"); dependency.containerEntities.add("com.x.processplatform.core.entity.content.Work"); dependency.containerEntities.add("com.x.processplatform.core.entity.content.WorkCompleted"); diff --git a/o2server/x_base_core_project/src/main/java/com/x/base/core/project/x_query_assemble_surface.java b/o2server/x_base_core_project/src/main/java/com/x/base/core/project/x_query_assemble_surface.java index bb0f7dcf000cc72a5682dbe6df11fb18024714df..01eff3b65fce679144483906395337fe4a86f867 100644 --- a/o2server/x_base_core_project/src/main/java/com/x/base/core/project/x_query_assemble_surface.java +++ b/o2server/x_base_core_project/src/main/java/com/x/base/core/project/x_query_assemble_surface.java @@ -23,7 +23,8 @@ public class x_query_assemble_surface extends AssembleA { dependency.containerEntities.add("com.x.query.core.entity.neural.InValue"); dependency.containerEntities.add("com.x.query.core.entity.neural.OutValue"); dependency.containerEntities.add("com.x.query.core.entity.neural.Model"); - dependency.containerEntities.add("com.x.query.core.entity.schema.*"); + dependency.containerEntities.add("com.x.query.core.entity.schema.Table"); + dependency.containerEntities.add("com.x.query.core.entity.schema.Statement"); dependency.containerEntities.add("com.x.processplatform.core.entity.content.Review"); dependency.containerEntities.add("com.x.processplatform.core.entity.content.Work"); dependency.containerEntities.add("com.x.processplatform.core.entity.content.WorkCompleted"); @@ -40,5 +41,6 @@ public class x_query_assemble_surface extends AssembleA { dependency.storeJars.add(x_processplatform_core_entity.class.getSimpleName()); dependency.storeJars.add(x_cms_core_entity.class.getSimpleName()); dependency.storeJars.add(x_query_core_express.class.getSimpleName()); + dependency.dynamicJars.add("x_query_dynamic_entity"); } }