diff --git a/o2server/.settings/org.eclipse.core.resources.prefs b/o2server/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 99f26c0203a7844de00dbfc56e6a35d8ed3c022c..0000000000000000000000000000000000000000
--- a/o2server/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-encoding/<project>=UTF-8
diff --git a/o2server/.settings/org.eclipse.m2e.core.prefs b/o2server/.settings/org.eclipse.m2e.core.prefs
deleted file mode 100644
index f897a7f1cb2389f85fe6381425d29f0a9866fb65..0000000000000000000000000000000000000000
--- a/o2server/.settings/org.eclipse.m2e.core.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-activeProfiles=
-eclipse.preferences.version=1
-resolveWorkspaceProjects=true
-version=1
diff --git a/o2server/x_build_and_scratch/.gitignore b/o2server/x_build_and_scratch/.gitignore
deleted file mode 100644
index 2b9643134ef6e4020d45328dfee6504a38ea6ef2..0000000000000000000000000000000000000000
--- a/o2server/x_build_and_scratch/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-.classpath
-.project
-/.settings/
-/target/
diff --git a/o2server/x_build_and_scratch/lib/huawei/cloud-java-sdk-smn-2.0.2.jar b/o2server/x_build_and_scratch/lib/huawei/cloud-java-sdk-smn-2.0.2.jar
deleted file mode 100644
index 099d39912161931657a2f63d61ea171ccdff5336..0000000000000000000000000000000000000000
Binary files a/o2server/x_build_and_scratch/lib/huawei/cloud-java-sdk-smn-2.0.2.jar and /dev/null differ
diff --git a/o2server/x_build_and_scratch/lib/huawei/esdk-obs-java-2.1.21.jar b/o2server/x_build_and_scratch/lib/huawei/esdk-obs-java-2.1.21.jar
deleted file mode 100644
index ed4f1c03c6c563678a92668a06dc52d9d4af59e7..0000000000000000000000000000000000000000
Binary files a/o2server/x_build_and_scratch/lib/huawei/esdk-obs-java-2.1.21.jar and /dev/null differ
diff --git a/o2server/x_build_and_scratch/lib/huawei/java-xmlbuilder-1.2.jar b/o2server/x_build_and_scratch/lib/huawei/java-xmlbuilder-1.2.jar
deleted file mode 100644
index 0975d0802813fdcffe8e3bbb4ce262608a1e0259..0000000000000000000000000000000000000000
Binary files a/o2server/x_build_and_scratch/lib/huawei/java-xmlbuilder-1.2.jar and /dev/null differ
diff --git a/o2server/x_build_and_scratch/lib/java/tools.jar b/o2server/x_build_and_scratch/lib/java/tools.jar
deleted file mode 100644
index eda2f4b94af70a91ed7be571f464de4ce8b6943a..0000000000000000000000000000000000000000
Binary files a/o2server/x_build_and_scratch/lib/java/tools.jar and /dev/null differ
diff --git a/o2server/x_build_and_scratch/lib/sftp/jsch-0.1.53.jar b/o2server/x_build_and_scratch/lib/sftp/jsch-0.1.53.jar
deleted file mode 100644
index 0910bd4b256b1cbfc3c4b82b8e959236224c224a..0000000000000000000000000000000000000000
Binary files a/o2server/x_build_and_scratch/lib/sftp/jsch-0.1.53.jar and /dev/null differ
diff --git a/o2server/x_build_and_scratch/pom.xml b/o2server/x_build_and_scratch/pom.xml
deleted file mode 100644
index 3835c664f36c45e078fd4d42a4337d885c500b70..0000000000000000000000000000000000000000
--- a/o2server/x_build_and_scratch/pom.xml
+++ /dev/null
@@ -1,112 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>o2oa</groupId>
-		<artifactId>o2server</artifactId>
-		<version>4.0.5</version>
-	</parent>
-	<artifactId>x_build_and_scratch</artifactId>
-	<packaging>pom</packaging>
-	<dependencies>
-		<dependency>
-			<groupId>o2oa</groupId>
-			<artifactId>x_base_core_project</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>o2oa</groupId>
-			<artifactId>x_attendance_core_entity</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>o2oa</groupId>
-			<artifactId>x_bbs_core_entity</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>o2oa</groupId>
-			<artifactId>x_calendar_core_entity</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>o2oa</groupId>
-			<artifactId>x_cms_core_entity</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>o2oa</groupId>
-			<artifactId>x_collaboration_core_entity</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>o2oa</groupId>
-			<artifactId>x_component_core_entity</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>o2oa</groupId>
-			<artifactId>x_file_core_entity</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>o2oa</groupId>
-			<artifactId>x_general_core_entity</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>o2oa</groupId>
-			<artifactId>x_hotpic_core_entity</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>o2oa</groupId>
-			<artifactId>x_meeting_core_entity</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>o2oa</groupId>
-			<artifactId>x_message_core_entity</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>o2oa</groupId>
-			<artifactId>x_mind_core_entity</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>o2oa</groupId>
-			<artifactId>x_okr_core_entity</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>o2oa</groupId>
-			<artifactId>x_organization_core_entity</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>o2oa</groupId>
-			<artifactId>x_portal_core_entity</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>o2oa</groupId>
-			<artifactId>x_organization_core_entity</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>o2oa</groupId>
-			<artifactId>x_processplatform_core_entity</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>o2oa</groupId>
-			<artifactId>x_query_core_entity</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>o2oa</groupId>
-			<artifactId>x_report_core_entity</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>o2oa</groupId>
-			<artifactId>x_strategydeploy_core_entity</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>o2oa</groupId>
-			<artifactId>x_collaboration_core_message</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>o2oa</groupId>
-			<artifactId>x_organization_core_express</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>o2oa</groupId>
-			<artifactId>x_query_core_express</artifactId>
-		</dependency>
-	</dependencies>
-	<build>
-	</build>
-</project>
\ No newline at end of file
diff --git a/o2server/x_build_and_scratch/script/publish_version.xml b/o2server/x_build_and_scratch/script/publish_version.xml
deleted file mode 100644
index 88fba1847f5d37a8aff873cbabadadd1af11e6aa..0000000000000000000000000000000000000000
--- a/o2server/x_build_and_scratch/script/publish_version.xml
+++ /dev/null
@@ -1,212 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project basedir="." name="main" default="default">
-	<basename property="project" file="${basedir}" />
-	<dirname property="applicationserver.dir" file="${basedir}../" />
-	<dirname property="code.dir" file="${basedir}../../" />
-	<property file="${applicationserver.dir}/a_build/build.properties" />
-	<include file="${applicationserver.dir}/a_build/build_common.xml" as="common" />
-
-	<tstamp>
-		<format property="VERSION" pattern="yyyyMMddHHmmss" locale="zh-cn" />
-	</tstamp>
-
-	<property name="publishDir" location="D:/versions" />
-
-	<property name="updateDir" location="D:/o2collect/servers/webServer/o2server/update" />
-
-	<target name="default" depends="publish" />
-
-	<target name="prepareSource">
-		<delete dir="dist/o2server" />
-		<mkdir dir="dist/o2server" />
-		<mkdir dir="versions" />
-		<copy todir="dist/o2server/commons/">
-			<fileset dir="D:/o2server/commons/" />
-		</copy>
-		<copy todir="dist/o2server/config/sample">
-			<fileset dir="D:/o2server/config/sample" />
-		</copy>
-		<copy todir="dist/o2server/local/sample">
-			<fileset dir="D:/o2server/local/sample" />
-		</copy>
-		<mkdir dir="dist/o2server/servers/centerServer/webapps" />
-		<mkdir dir="dist/o2server/servers/centerServer/work" />
-		<mkdir dir="dist/o2server/servers/applicationServer/webapps" />
-		<mkdir dir="dist/o2server/servers/applicationServer/work" />
-		<copy todir="dist/o2server/servers/webServer/">
-			<fileset dir="D:/o2server/servers/webServer/">
-				<exclude name="**/.svn/" />
-				<exclude name="**/Thumbs.db" />
-				<exclude name="**/*.bak" />
-				<exclude name="**/*.temp" />
-				<exclude name="**/*.tmp" />
-				<exclude name="**/~*" />
-				<exclude name="**/*.log" />
-				<exclude name="**/*.js" />
-				<exclude name="**/*.zip" />
-				<exclude name="**/*.7z" />
-			</fileset>
-		</copy>
-		<copy todir="dist/o2server/servers/webServer/">
-			<fileset dir="D:/o2server/servers/webServer/">
-				<!--include name="**/*.min.js" /-->
-				<include name="**/*.min.js" />
-			</fileset>
-		</copy>
-		<copy todir="dist/o2server/servers/webServer/x_desktop">
-			<fileset dir="D:/o2server/servers/webServer/x_desktop">
-				<include name="**/*.js" />
-			</fileset>
-		</copy>
-		<copy todir="dist/o2server/store/">
-			<fileset dir="D:/o2server/store/">
-				<exclude name="**/x_crm_assemble_control.war" />
-				<exclude name="**/x_crm_core_entity-4.0.0.jar" />
-			</fileset>
-		</copy>
-		<copy todir="dist/o2server">
-			<fileset dir="D:/o2server/">
-				<include name="console.jar" />
-				<include name="index.html" />
-			</fileset>
-		</copy>
-		<echo message="${VERSION}" file="dist/o2server/version.o2" append="false" />
-	</target>
-
-	<target name="publish" depends="prepareSource">
-		<mkdir dir="${updateDir}" />
-		<mkdir dir="${publishDir}" />
-		<copy todir="dist/o2server">
-			<fileset dir="D:/o2server/">
-				<include name="start_windows.bat" />
-				<include name="start_linux.sh" />
-				<include name="start_aix.sh" />
-				<include name="start_macos.sh" />
-				<include name="stop_windows.bat" />
-				<include name="stop_linux.sh" />
-				<include name="stop_aix.sh" />
-				<include name="stop_macos.sh" />
-				<include name="console_windows.bat" />
-				<include name="console_linux.sh" />
-				<include name="console_aix.sh" />
-				<include name="console_macos.sh" />
-			</fileset>
-		</copy>
-		<zip encoding="utf-8" destfile="${publishDir}/${VERSION}.zip" update="false">
-			<zipfileset dir="dist/o2server/" filemode="777" dirmode="777" encoding="utf-8" prefix="o2server" />
-		</zip>
-		<echo message="version:${VERSION}" file="${publishDir}/${VERSION}.txt" append="false" />
-		<echo message="http://collect.o2oa.net:20060/o2server/update/${VERSION}.zip" file="${publishDir}/${VERSION}.url" append="false" />
-		<delete file="dist/o2server/start_windows.bat" />
-		<delete file="dist/o2server/start_linux.sh" />
-		<delete file="dist/o2server/start_aix.sh" />
-		<delete file="dist/o2server/start_macos.sh" />
-		<delete file="dist/o2server/stop_windows.bat" />
-		<delete file="dist/o2server/stop_linux.sh" />
-		<delete file="dist/o2server/stop_aix.sh" />
-		<delete file="dist/o2server/stop_macos.sh" />
-		<delete file="dist/o2server/console_windows.bat" />
-		<delete file="dist/o2server/console_linux.sh" />
-		<delete file="dist/o2server/console_aix.sh" />
-		<delete file="dist/o2server/console_macos.sh" />
-		<!--windows-->
-		<delete dir="dist/o2server/jvm" />
-		<mkdir dir="dist/o2server/jvm" />
-		<copy todir="dist/o2server/jvm/windows">
-			<fileset dir="D:/o2server/jvm/windows" />
-		</copy>
-		<copy todir="dist/o2server">
-			<fileset dir="D:/o2server/">
-				<include name="start_windows.bat" />
-				<include name="stop_windows.bat" />
-				<include name="console_windows.bat" />
-			</fileset>
-		</copy>
-		<zip encoding="utf-8" destfile="${publishDir}/o2server_${VERSION}_windows.zip" update="false">
-			<zipfileset dir="dist/o2server/" filemode="777" dirmode="777" encoding="utf-8" prefix="o2server" />
-		</zip>
-		<!--linux-->
-		<delete dir="dist/o2server/jvm" />
-		<mkdir dir="dist/o2server/jvm" />
-		<copy todir="dist/o2server/jvm/linux">
-			<fileset dir="D:/o2server/jvm/linux" />
-		</copy>
-		<delete file="dist/o2server/start_windows.bat" />
-		<delete file="dist/o2server/stop_windows.bat" />
-		<delete file="dist/o2server/console_windows.bat" />
-		<copy todir="dist/o2server">
-			<fileset dir="D:/o2server/">
-				<include name="start_linux.sh" />
-				<include name="stop_linux.sh" />
-				<include name="console_linux.sh" />
-			</fileset>
-		</copy>
-		<zip encoding="utf-8" destfile="${publishDir}/o2server_${VERSION}_linux.zip" update="false">
-			<zipfileset dir="dist/o2server/" filemode="777" dirmode="777" encoding="utf-8" prefix="o2server" />
-		</zip>
-		<!--macos-->
-		<delete dir="dist/o2server/jvm" />
-		<mkdir dir="dist/o2server/jvm" />
-		<copy todir="dist/o2server/jvm/macos">
-			<fileset dir="D:/o2server/jvm/macos" />
-		</copy>
-		<delete file="dist/o2server/start_linux.sh" />
-		<delete file="dist/o2server/stop_linux.sh" />
-		<delete file="dist/o2server/console_linux.sh" />
-		<copy todir="dist/o2server">
-			<fileset dir="D:/o2server/">
-				<include name="start_macos.sh" />
-				<include name="stop_macos.sh" />
-				<include name="console_macos.sh" />
-			</fileset>
-		</copy>
-		<mkdir dir="${publishDir}" />
-		<zip encoding="utf-8" destfile="${publishDir}/o2server_${VERSION}_macos.zip" update="false">
-			<zipfileset dir="dist/o2server/" filemode="777" dirmode="777" encoding="utf-8" prefix="o2server" />
-		</zip>
-		<!--aix-->
-		<delete dir="dist/o2server/jvm" />
-		<mkdir dir="dist/o2server/jvm" />
-		<copy todir="dist/o2server/jvm/aix">
-			<fileset dir="D:/o2server/jvm/aix" />
-		</copy>
-		<delete file="dist/o2server/start_macos.sh" />
-		<delete file="dist/o2server/stop_macos.sh" />
-		<delete file="dist/o2server/console_macos.sh" />
-		<copy todir="dist/o2server">
-			<fileset dir="D:/o2server/">
-				<include name="aix_linux.sh" />
-				<include name="aix_linux.sh" />
-				<include name="aix_linux.sh" />
-			</fileset>
-		</copy>
-		<zip encoding="utf-8" destfile="${publishDir}/o2server_${VERSION}_aix.zip" update="false">
-			<zipfileset dir="dist/o2server/" filemode="777" dirmode="777" encoding="utf-8" prefix="o2server" />
-		</zip>
-		<java classname="o2.a.build.publish.Publish">
-			<classpath refid="project.classpath" />
-			<classpath path="classes" />
-			<arg value="${VERSION}" />
-			<arg value="${publishDir}" />
-		</java>
-	</target>
-
-	<target name="upload">
-		<java classname="o2.a.build.publish.Publish">
-			<classpath refid="project.classpath" />
-			<classpath path="classes" />
-			<arg value="${VERSION}" />
-			<arg value="${publishDir}" />
-		</java>
-	</target>
-
-	<target name="test">
-		<java classname="o2.a.build.publish.Publish">
-			<classpath refid="project.classpath" />
-			<classpath path="classes" />
-			<arg value="${VERSION}" />
-			<arg value="${publishDir}" />
-		</java>
-	</target>
-
-</project>
\ No newline at end of file
diff --git a/o2server/x_build_and_scratch/src/main/java/com/x/build/and/scratch/manifest/ManifestCfgCreator.java b/o2server/x_build_and_scratch/src/main/java/com/x/build/and/scratch/manifest/ManifestCfgCreator.java
deleted file mode 100644
index cae14b1995dacd1cf40c601cc52c9c769a451c7c..0000000000000000000000000000000000000000
--- a/o2server/x_build_and_scratch/src/main/java/com/x/build/and/scratch/manifest/ManifestCfgCreator.java
+++ /dev/null
@@ -1,79 +0,0 @@
-package com.x.build.and.scratch.manifest;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.stream.Collectors;
-
-import org.apache.commons.io.FileUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.junit.Test;
-
-import com.x.base.core.project.tools.FileTools;
-
-public class ManifestCfgCreator {
-
-	public static void main(String[] args) throws Exception {
-		ManifestCfgCreator creator = new ManifestCfgCreator();
-		creator.commonsExt();
-		creator.storeJars();
-		creator.store();
-	}
-
-	@Test
-	public void store() throws Exception {
-		File dir = new File(FileTools.parent(FileTools.parent(new File("./"))), "store");
-		if ((!dir.exists()) || (!dir.isDirectory())) {
-			throw new Exception("error");
-		}
-		List<String> names = new ArrayList<>();
-		for (File o : dir.listFiles()) {
-			if ((!StringUtils.equals(o.getName(), "manifest.cfg")) && (!StringUtils.equals(o.getName(), "jars"))) {
-				if (StringUtils.isNotEmpty(o.getName())) {
-					names.add(o.getName());
-				}
-			}
-		}
-		names = names.stream().sorted().collect(Collectors.toList());
-		File file = new File(dir, "manifest.cfg");
-		FileUtils.writeLines(file, names);
-	}
-
-	@Test
-	public void storeJars() throws Exception {
-		File dir = new File(FileTools.parent(FileTools.parent(new File("./"))), "store/jars");
-		if ((!dir.exists()) || (!dir.isDirectory())) {
-			throw new Exception("error");
-		}
-		List<String> names = new ArrayList<>();
-		for (File o : dir.listFiles()) {
-			if (!StringUtils.equals(o.getName(), "manifest.cfg")) {
-				if (StringUtils.isNotEmpty(o.getName())) {
-					names.add(o.getName());
-				}
-			}
-		}
-		names = names.stream().sorted().collect(Collectors.toList());
-		File file = new File(dir, "manifest.cfg");
-		FileUtils.writeLines(file, names);
-	}
-
-	@Test
-	public void commonsExt() throws Exception {
-		File dir = new File(FileTools.parent(FileTools.parent(new File("./"))), "commons/ext");
-		if ((!dir.exists()) || (!dir.isDirectory())) {
-			throw new Exception("error");
-		}
-		List<String> names = new ArrayList<>();
-		for (File o : dir.listFiles()) {
-			if (!StringUtils.equals(o.getName(), "manifest.cfg")) {
-				if (StringUtils.isNotEmpty(o.getName())) {
-					names.add(o.getName());
-				}
-			}
-		}
-		names = names.stream().sorted().collect(Collectors.toList());
-		File file = new File(dir, "manifest.cfg");
-		FileUtils.writeLines(file, names);
-	}
-}
\ No newline at end of file
diff --git a/o2server/x_build_and_scratch/src/main/resources/pom_template_assemble.xml b/o2server/x_build_and_scratch/src/main/resources/pom_template_assemble.xml
deleted file mode 100644
index 3715251621dbb598a2816626de776d88aff8d94b..0000000000000000000000000000000000000000
--- a/o2server/x_build_and_scratch/src/main/resources/pom_template_assemble.xml
+++ /dev/null
@@ -1,128 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>o2oa</groupId>
-		<artifactId>o2server</artifactId>
-		<version>4.0.5</version>
-	</parent>
-	<artifactId>x_processplatform_assemble_designer</artifactId>
-	<dependencies>
-		<dependency>
-			<groupId>org.imgscalr</groupId>
-			<artifactId>imgscalr-lib</artifactId>
-			<version>4.2</version>
-		</dependency>
-		<dependency>
-			<groupId>com.sun</groupId>
-			<artifactId>tools</artifactId>
-			<version>1.5.0</version>
-			<scope>system</scope>
-			<systemPath>${basedir}/../o2server_build_and_scratch/lib/java/tools.jar</systemPath>
-		</dependency>
-		<dependency>
-			<groupId>o2oa.o2server</groupId>
-			<artifactId>x_base_core_project</artifactId>
-			<version>${version}</version>
-			<scope>system</scope>
-			<systemPath>${basedir}/../store/jars/x_base_core_project.jar</systemPath>
-		</dependency>
-		<dependency>
-			<groupId>o2oa.o2server</groupId>
-			<artifactId>x_query_core_entity</artifactId>
-			<version>${version}</version>
-			<scope>system</scope>
-			<systemPath>${basedir}/../store/jars/x_query_core_entity.jar</systemPath>
-		</dependency>
-		<dependency>
-			<groupId>o2oa.o2server</groupId>
-			<artifactId>x_processplatform_core_entity</artifactId>
-			<version>${version}</version>
-			<scope>system</scope>
-			<systemPath>${basedir}/../store/jars/x_processplatform_core_entity.jar</systemPath>
-		</dependency>
-		<dependency>
-			<groupId>o2oa.o2server</groupId>
-			<artifactId>x_organization_core_express</artifactId>
-			<version>${version}</version>
-			<scope>system</scope>
-			<systemPath>${basedir}/../store/jars/x_organization_core_express.jar</systemPath>
-		</dependency>
-		<dependency>
-			<groupId>o2oa.o2server</groupId>
-			<artifactId>x_organization_core_entity</artifactId>
-			<version>${version}</version>
-			<scope>system</scope>
-			<systemPath>${basedir}/../store/jars/x_organization_core_entity.jar</systemPath>
-		</dependency>
-	</dependencies>
-
-	<build>
-		<defaultGoal>package</defaultGoal>
-		<plugins>
-			<plugin>
-				<artifactId>maven-antrun-plugin</artifactId>
-				<version>1.7</version>
-				<dependencies>
-					<dependency>
-						<groupId>com.sun</groupId>
-						<artifactId>tools</artifactId>
-						<version>1.5.0</version>
-						<scope>system</scope>
-						<systemPath>${basedir}/../o2server_build_and_scratch/lib/java/tools.jar</systemPath>
-					</dependency>
-				</dependencies>
-				<executions>
-					<execution>
-						<id>createEnhancePersistenceXml</id>
-						<phase>generate-sources</phase>
-						<configuration>
-							<target>
-								<ant antfile="../build_common.xml">
-									<target name="createPersistenceXml" />
-								</ant>
-							</target>
-						</configuration>
-						<goals>
-							<goal>run</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<artifactId>maven-resources-plugin</artifactId>
-				<version>3.1.0</version>
-				<executions>
-					<execution>
-						<id>copy-resources</id>
-						<phase>verify</phase>
-						<goals>
-							<goal>copy-resources</goal>
-						</goals>
-						<configuration>
-							<outputDirectory>../store/</outputDirectory>
-							<resources>
-								<resource>
-									<directory>target</directory>
-									<includes>
-										<include>*.war</include>
-									</includes>
-								</resource>
-							</resources>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<artifactId>maven-war-plugin</artifactId>
-				<version>3.2.2</version>
-				<configuration>
-					<packagingExcludes>WEB-INF/lib/*.jar</packagingExcludes>
-				</configuration>
-			</plugin>
-		</plugins>
-
-	</build>
-	<packaging>war</packaging>
-</project>
\ No newline at end of file
diff --git a/o2server/x_build_and_scratch/src/main/resources/pom_template_core.xml b/o2server/x_build_and_scratch/src/main/resources/pom_template_core.xml
deleted file mode 100644
index 16996eb5ffa182cacb389b7c9b9055762124f922..0000000000000000000000000000000000000000
--- a/o2server/x_build_and_scratch/src/main/resources/pom_template_core.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>o2oa</groupId>
-		<artifactId>o2server</artifactId>
-		<version>4.0.5</version>
-	</parent>
-	<artifactId>o2server_build_and_scratch</artifactId>
-	<dependencies>
-		<dependency>
-			<groupId>com.sun</groupId>
-			<artifactId>tools</artifactId>
-			<version>1.5.0</version>
-			<scope>system</scope>
-			<systemPath>${basedir}/../o2server_build_and_scratch/lib/java/tools.jar</systemPath>
-		</dependency>
-		<dependency>
-			<groupId>o2oa.o2server</groupId>
-			<artifactId>x_base_core_project</artifactId>
-			<version>${version}</version>
-			<scope>system</scope>
-			<systemPath>${basedir}/../store/jars/x_base_core_project.jar</systemPath>
-		</dependency>
-	</dependencies>
-	<build>
-	</build>
-</project>
\ No newline at end of file
diff --git a/o2server/x_build_and_scratch/src/main/resources/pom_template_service.xml b/o2server/x_build_and_scratch/src/main/resources/pom_template_service.xml
deleted file mode 100644
index 3715251621dbb598a2816626de776d88aff8d94b..0000000000000000000000000000000000000000
--- a/o2server/x_build_and_scratch/src/main/resources/pom_template_service.xml
+++ /dev/null
@@ -1,128 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>o2oa</groupId>
-		<artifactId>o2server</artifactId>
-		<version>4.0.5</version>
-	</parent>
-	<artifactId>x_processplatform_assemble_designer</artifactId>
-	<dependencies>
-		<dependency>
-			<groupId>org.imgscalr</groupId>
-			<artifactId>imgscalr-lib</artifactId>
-			<version>4.2</version>
-		</dependency>
-		<dependency>
-			<groupId>com.sun</groupId>
-			<artifactId>tools</artifactId>
-			<version>1.5.0</version>
-			<scope>system</scope>
-			<systemPath>${basedir}/../o2server_build_and_scratch/lib/java/tools.jar</systemPath>
-		</dependency>
-		<dependency>
-			<groupId>o2oa.o2server</groupId>
-			<artifactId>x_base_core_project</artifactId>
-			<version>${version}</version>
-			<scope>system</scope>
-			<systemPath>${basedir}/../store/jars/x_base_core_project.jar</systemPath>
-		</dependency>
-		<dependency>
-			<groupId>o2oa.o2server</groupId>
-			<artifactId>x_query_core_entity</artifactId>
-			<version>${version}</version>
-			<scope>system</scope>
-			<systemPath>${basedir}/../store/jars/x_query_core_entity.jar</systemPath>
-		</dependency>
-		<dependency>
-			<groupId>o2oa.o2server</groupId>
-			<artifactId>x_processplatform_core_entity</artifactId>
-			<version>${version}</version>
-			<scope>system</scope>
-			<systemPath>${basedir}/../store/jars/x_processplatform_core_entity.jar</systemPath>
-		</dependency>
-		<dependency>
-			<groupId>o2oa.o2server</groupId>
-			<artifactId>x_organization_core_express</artifactId>
-			<version>${version}</version>
-			<scope>system</scope>
-			<systemPath>${basedir}/../store/jars/x_organization_core_express.jar</systemPath>
-		</dependency>
-		<dependency>
-			<groupId>o2oa.o2server</groupId>
-			<artifactId>x_organization_core_entity</artifactId>
-			<version>${version}</version>
-			<scope>system</scope>
-			<systemPath>${basedir}/../store/jars/x_organization_core_entity.jar</systemPath>
-		</dependency>
-	</dependencies>
-
-	<build>
-		<defaultGoal>package</defaultGoal>
-		<plugins>
-			<plugin>
-				<artifactId>maven-antrun-plugin</artifactId>
-				<version>1.7</version>
-				<dependencies>
-					<dependency>
-						<groupId>com.sun</groupId>
-						<artifactId>tools</artifactId>
-						<version>1.5.0</version>
-						<scope>system</scope>
-						<systemPath>${basedir}/../o2server_build_and_scratch/lib/java/tools.jar</systemPath>
-					</dependency>
-				</dependencies>
-				<executions>
-					<execution>
-						<id>createEnhancePersistenceXml</id>
-						<phase>generate-sources</phase>
-						<configuration>
-							<target>
-								<ant antfile="../build_common.xml">
-									<target name="createPersistenceXml" />
-								</ant>
-							</target>
-						</configuration>
-						<goals>
-							<goal>run</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<artifactId>maven-resources-plugin</artifactId>
-				<version>3.1.0</version>
-				<executions>
-					<execution>
-						<id>copy-resources</id>
-						<phase>verify</phase>
-						<goals>
-							<goal>copy-resources</goal>
-						</goals>
-						<configuration>
-							<outputDirectory>../store/</outputDirectory>
-							<resources>
-								<resource>
-									<directory>target</directory>
-									<includes>
-										<include>*.war</include>
-									</includes>
-								</resource>
-							</resources>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<artifactId>maven-war-plugin</artifactId>
-				<version>3.2.2</version>
-				<configuration>
-					<packagingExcludes>WEB-INF/lib/*.jar</packagingExcludes>
-				</configuration>
-			</plugin>
-		</plugins>
-
-	</build>
-	<packaging>war</packaging>
-</project>
\ No newline at end of file
diff --git a/o2server/x_build_and_scratch/src/test/java/test/bluetooth/TestClient.java b/o2server/x_build_and_scratch/src/test/java/test/bluetooth/TestClient.java
deleted file mode 100644
index 398514882dcc7271eaacb6c82fd334261bbe503a..0000000000000000000000000000000000000000
--- a/o2server/x_build_and_scratch/src/test/java/test/bluetooth/TestClient.java
+++ /dev/null
@@ -1,6 +0,0 @@
-package test.bluetooth;
-
-public class TestClient {
-
-}
-
diff --git a/o2server/x_build_and_scratch/src/test/java/test/o2/a/build/TestClient.java b/o2server/x_build_and_scratch/src/test/java/test/o2/a/build/TestClient.java
deleted file mode 100644
index 8af960cb35277c016676d3e6c8f2f0cb6f5584a2..0000000000000000000000000000000000000000
--- a/o2server/x_build_and_scratch/src/test/java/test/o2/a/build/TestClient.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package test.o2.a.build;
-
-import org.junit.Test;
-
-import com.x.base.core.project.tools.Crypto;
-
-public class TestClient {
-
-	@Test
-	public void test() throws Exception {
-		String key = "12366dev";
-		String value = "YHf4fX6-AP2HGgNijGHDWmsY6EbeJJhQjSZFfQrWh1HzSoe6Nt0X7YqABjb2f-GI";
-
-		System.out.println(Crypto.decrypt(value, key));
-	}
-}