clean up

o2server/x_build/.gitignore

@@ -1,4 +0,0 @@
-.classpath
-.project
-/.settings/
-/target/

o2server/x_build/deploy_o2server.xml

@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project basedir="." name="main" default="default">
-	<basename property="project" file="${basedir}" />
-	<dirname property="o2server.dir" file="${basedir}../" />
-	<target name="default">
-		<copy todir="D:/o2server/commons">
-			<fileset dir="${o2server.dir}/commons">
-				<exclude name="**/.settings" />
-				<exclude name="**/.classpath" />
-				<exclude name="**/.project" />
-				<exclude name="**/.gitignore" />
-			</fileset>
-		</copy>
-	</target>
-	<copy todir="D:/o2server/store">
-		<fileset dir="${o2server.dir}/store">
-			<exclude name="**/.settings" />
-			<exclude name="**/.classpath" />
-			<exclude name="**/.project" />
-			<exclude name="**/.gitignore" />
-		</fileset>
-	</copy>
-	<copy todir="D:/o2server/configSample">
-		<fileset dir="${o2server.dir}/configSample">
-			<exclude name="**/.settings" />
-			<exclude name="**/.classpath" />
-			<exclude name="**/.project" />
-			<exclude name="**/.gitignore" />
-		</fileset>
-	</copy>
-	<copy todir="D:/o2server/localSample">
-		<fileset dir="${o2server.dir}/localSample">
-			<exclude name="**/.settings" />
-			<exclude name="**/.classpath" />
-			<exclude name="**/.project" />
-			<exclude name="**/.gitignore" />
-		</fileset>
-	</copy>
-	<copy todir="D:/o2server">
-		<fileset dir="${o2server.dir}">
-			<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" />
-			<include name="console.jar" />
-			<include name="index.html" />
-		</fileset>
-	</copy>
-</project>

o2server/x_build/gitHub.xml

@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project basedir="." name="main" default="toGitHub">
-	<basename property="project" file="${basedir}" />
-	<dirname property="o2server.dir" file="${basedir}../" />
-	<dirname property="o2oa.dir" file="${basedir}../../" />
-	<property name="git.dir" location="D:/GitHub/o2oa/o2server" />
-
-	<path id="project.classpath">
-		<pathelement location="src/main/java" />
-		<pathelement location="src/main/resources" />
-		<pathelement location="target/classes" />
-		<fileset dir="${o2server.dir}/commons/ext">
-			<include name="**/*.jar" />
-		</fileset>
-		<fileset dir="${o2server.dir}/store/jars">
-			<include name="*.jar" />
-		</fileset>
-	</path>
-
-	<target name="toGitHub">
-		<java classname="com.x.build.SyncToGitHubDirectory">
-			<classpath refid="project.classpath" />
-			<arg value="${o2server.dir}" />
-			<arg value="${git.dir}" />
-		</java>
-	</target>
-</project>

o2server/x_build/git_archive.bat

@@ -1,3 +0,0 @@
-cd d:/github/o2oa
-
-git archive --format zip --output "d:/src.zip" master

o2server/x_build/gulpfile.js

@@ -1,435 +0,0 @@
-var gulp = require('gulp'),
-//var deleted = require('gulp-deleted');
-    del = require('del'),
-    uglify = require('gulp-tm-uglify'),
-    rename = require('gulp-rename'),
-    changed = require('gulp-changed'),
-    gulpif = require('gulp-if'),
-    minimist = require('minimist'),
-    ftp = require('gulp-ftp'),
-    sftp = require('gulp-sftp'),
-    JSFtp = require('jsftp'),
-    gutil = require('gulp-util'),
-    fs = require("fs");
-var assetRev = require('gulp-tm-asset-rev');
-
-var apps = [
-    {"folder": "o2_lib",                                    "tasks": ["move", "clean"]},
-    {"folder": "o2_core",                                   "tasks": ["move", "min", "clean", "watch"]},
-    {"folder": "x_component_ANN",                           "tasks": ["move", "min", "clean", "watch"]},
-    {"folder": "x_component_AppCenter",                     "tasks": ["move", "min", "clean", "watch"]},
-    {"folder": "x_component_AppMarket",                     "tasks": ["move", "min", "clean", "watch"]},
-    {"folder": "x_component_Attendance",                    "tasks": ["move", "min", "clean", "watch"]},
-    {"folder": "x_component_BAM",                           "tasks": ["move", "min", "clean", "watch"]},
-    {"folder": "x_component_Calendar",                      "tasks": ["move", "min", "clean", "watch"]},
-    {"folder": "x_component_Chat",                          "tasks": ["move", "min", "clean", "watch"]},
-    {"folder": "x_component_cms_Column",                    "tasks": ["move", "min", "clean", "watch"]},
-    {"folder": "x_component_cms_ColumnManager",             "tasks": ["move", "min", "clean", "watch"]},
-    {"folder": "x_component_cms_DictionaryDesigner",        "tasks": ["move", "min", "clean", "watch"]},
-    {"folder": "x_component_cms_Document",                  "tasks": ["move", "min", "clean", "watch"]},
-    {"folder": "x_component_cms_FormDesigner",              "tasks": ["move", "min", "clean", "watch"]},
-    {"folder": "x_component_cms_Index",                     "tasks": ["move", "min", "clean", "watch"]},
-    {"folder": "x_component_cms_Module",                    "tasks": ["move", "min", "clean", "watch"]},
-    {"folder": "x_component_cms_QueryViewDesigner",         "tasks": ["move", "min", "clean", "watch"]},
-    {"folder": "x_component_cms_ScriptDesigner",            "tasks": ["move", "min", "clean", "watch"]},
-    {"folder": "x_component_cms_ViewDesigner",              "tasks": ["move", "min", "clean", "watch"]},
-    {"folder": "x_component_cms_Xform",                     "tasks": ["move", "min", "clean", "watch"]},
-    {"folder": "x_component_Collect",                       "tasks": ["move", "min", "clean", "watch"]},
-    {"folder": "x_component_Common",                        "tasks": ["move", "min", "clean", "watch"]},
-    {"folder": "x_component_Console",                       "tasks": ["move", "min", "clean", "watch"]},
-    {"folder": "x_component_ControlPanel",                  "tasks": ["move", "min", "clean", "watch"]},
-    {"folder": "x_component_CRM",                           "tasks": ["move", "min", "clean", "watch"]},
-    {"folder": "x_component_Deployment",                    "tasks": ["move", "min", "clean", "watch"]},
-    {"folder": "x_component_DesignCenter",                  "tasks": ["move", "min", "clean", "watch"]},
-    {"folder": "x_component_Empty",                         "tasks": ["move", "min", "clean", "watch"]},
-    {"folder": "x_component_Execution",                     "tasks": ["move", "min", "clean", "watch"]},
-    {"folder": "x_component_ExeManager",                    "tasks": ["move", "min", "clean", "watch"]},
-    {"folder": "x_component_FaceSet",                       "tasks": ["move", "min", "clean", "watch"]},
-    {"folder": "x_component_File",                          "tasks": ["move", "min", "clean", "watch"]},
-    {"folder": "x_component_Forum",                         "tasks": ["move", "min", "clean", "watch"]},
-    {"folder": "x_component_ForumCategory",                 "tasks": ["move", "min", "clean", "watch"]},
-    {"folder": "x_component_ForumDocument",                 "tasks": ["move", "min", "clean", "watch"]},
-    {"folder": "x_component_ForumPerson",                   "tasks": ["move", "min", "clean", "watch"]},
-    {"folder": "x_component_ForumSearch",                   "tasks": ["move", "min", "clean", "watch"]},
-    {"folder": "x_component_ForumSection",                  "tasks": ["move", "min", "clean", "watch"]},
-    {"folder": "x_component_HotArticle",                    "tasks": ["move", "min", "clean", "watch"]},
-    {"folder": "x_component_IM",                            "tasks": ["move", "min", "clean", "watch"]},
-    {"folder": "x_component_LogViewer",                     "tasks": ["move", "min", "clean", "watch"]},
-    {"folder": "x_component_Meeting",                       "tasks": ["move", "min", "clean", "watch"]},
-    {"folder": "x_component_Message",                       "tasks": ["move", "min", "clean", "watch"]},
-    {"folder": "x_component_Minder",                        "tasks": ["move", "min", "clean", "watch"]},
-    {"folder": "x_component_MinderEditor",                  "tasks": ["move", "min", "clean", "watch"]},
-    {"folder": "x_component_Note",                          "tasks": ["move", "min", "clean", "watch"]},
-    {"folder": "x_component_OKR",                           "tasks": ["move", "min", "clean", "watch"]},
-    {"folder": "x_component_OnlineMeeting",                 "tasks": ["move", "min", "clean", "watch"]},
-    {"folder": "x_component_OnlineMeetingRoom",             "tasks": ["move", "min", "clean", "watch"]},
-    {"folder": "x_component_Org",                           "tasks": ["move", "min", "clean", "watch"]},
-    {"folder": "x_component_portal_PageDesigner",           "tasks": ["move", "min", "clean", "watch"]},
-    {"folder": "x_component_portal_Portal",                 "tasks": ["move", "min", "clean", "watch"]},
-    {"folder": "x_component_portal_PortalExplorer",         "tasks": ["move", "min", "clean", "watch"]},
-    {"folder": "x_component_portal_PortalManager",          "tasks": ["move", "min", "clean", "watch"]},
-    {"folder": "x_component_portal_ScriptDesigner",         "tasks": ["move", "min", "clean", "watch"]},
-    {"folder": "x_component_portal_WidgetDesigner",         "tasks": ["move", "min", "clean", "watch"]},
-    {"folder": "x_component_process_Application",           "tasks": ["move", "min", "clean", "watch"]},
-    {"folder": "x_component_process_ApplicationExplorer",   "tasks": ["move", "min", "clean", "watch"]},
-    {"folder": "x_component_process_DictionaryDesigner",    "tasks": ["move", "min", "clean", "watch"]},
-    {"folder": "x_component_process_FormDesigner",          "tasks": ["move", "min", "clean", "watch"]},
-    {"folder": "x_component_process_ProcessDesigner",       "tasks": ["move", "min", "clean", "watch"]},
-    {"folder": "x_component_process_ProcessManager",        "tasks": ["move", "min", "clean", "watch"]},
-    {"folder": "x_component_process_ScriptDesigner",        "tasks": ["move", "min", "clean", "watch"]},
-    {"folder": "x_component_process_StatDesigner",          "tasks": ["move", "min", "clean", "watch"]},
-    {"folder": "x_component_process_TaskCenter",            "tasks": ["move", "min", "clean", "watch"]},
-    {"folder": "x_component_process_ViewDesigner",          "tasks": ["move", "min", "clean", "watch"]},
-    {"folder": "x_component_process_Work",                  "tasks": ["move", "min", "clean", "watch"]},
-    {"folder": "x_component_process_Xform",                 "tasks": ["move", "min", "clean", "watch"]},
-    {"folder": "x_component_Profile",                       "tasks": ["move", "min", "clean", "watch"]},
-    {"folder": "x_component_query_Query",                   "tasks": ["move", "min", "clean", "watch"]},
-    {"folder": "x_component_query_QueryExplorer",           "tasks": ["move", "min", "clean", "watch"]},
-    {"folder": "x_component_query_QueryManager",            "tasks": ["move", "min", "clean", "watch"]},
-    {"folder": "x_component_query_StatDesigner",            "tasks": ["move", "min", "clean", "watch"]},
-    {"folder": "x_component_query_ViewDesigner",            "tasks": ["move", "min", "clean", "watch"]},
-    {"folder": "x_component_query_TableDesigner",           "tasks": ["move", "min", "clean", "watch"]},
-    {"folder": "x_component_query_StatementDesigner",       "tasks": ["move", "min", "clean", "watch"]},
-    {"folder": "x_component_Report",                        "tasks": ["move", "min", "clean", "watch"]},
-    {"folder": "x_component_ReportDocument",                "tasks": ["move", "min", "clean", "watch"]},
-    {"folder": "x_component_ReportMinder",                  "tasks": ["move", "min", "clean", "watch"]},
-    {"folder": "x_component_ScriptEditor",                  "tasks": ["move", "min", "clean", "watch"]},
-    {"folder": "x_component_Search",                        "tasks": ["move", "min", "clean", "watch"]},
-    {"folder": "x_component_SelecterTest",                  "tasks": ["move", "min", "clean", "watch"]},
-    {"folder": "x_component_Selector",                      "tasks": ["move", "min", "clean", "watch"]},
-    {"folder": "x_component_service_AgentDesigner",         "tasks": ["move", "min", "clean", "watch"]},
-    {"folder": "x_component_service_InvokeDesigner",        "tasks": ["move", "min", "clean", "watch"]},
-    {"folder": "x_component_service_ServiceManager",        "tasks": ["move", "min", "clean", "watch"]},
-    {"folder": "x_component_Setting",                       "tasks": ["move", "min", "clean", "watch"]},
-    {"folder": "x_component_SmartOfficeRoom",               "tasks": ["move", "min", "clean", "watch"]},
-    {"folder": "x_component_Snake",                         "tasks": ["move", "min", "clean", "watch"]},
-    {"folder": "x_component_Strategy",                      "tasks": ["move", "min", "clean", "watch"]},
-    {"folder": "x_component_Template",                      "tasks": ["move", "min", "clean", "watch"]},
-    {"folder": "x_component_Weixin",                        "tasks": ["move", "min", "clean", "watch"]},
-    {"folder": "x_desktop",                                 "tasks": ["move", "min", "clean", "watch"]}
-];
-
-var sourcePrefix = '../../o2web/';
-var destDir = 'target/o2server/servers/webServer/';
-
-var uploadOptions = {
-    'location': 'E:/o2server/servers/webServer/',
-    'host': '',
-    'user': '',
-    'pass': '',
-    "remotePath": "/"
-};
-var options = minimist(process.argv.slice(2), {//upload: local ftp or sftp
-    string: ["upload", "location", "host", "user", "pass", "port", "remotePath"]
-});
-options.upload = options.upload || "";
-options.location = options.location || uploadOptions.location;
-options.host = options.host || uploadOptions.host;
-options.user = options.user || uploadOptions.user;
-options.pass = options.pass || uploadOptions.pass;
-options.port = options.port || 0;
-options.remotePath = options.remotePath || uploadOptions.remotePath;
-
-
-var minTasks = [];
-var moveTasks = [];
-var watchTasks = [];
-var cleanTasks = [];
-
-function getMinTask(path){
-    return function(){
-        var src = sourcePrefix+'source/'+path+'/**/*.js';
-        var dest = destDir+path+'/';
-        return gulp.src(src)
-            .pipe(changed(dest))
-            .pipe(uglify())
-            .pipe(rename({ extname: '.min.js' }))
-            .pipe(gulpif((options.upload=='local'&&options.location!=''), gulp.dest(options.location+path+'/')))
-            .pipe(gulpif((options.upload=='ftp'&&options.host!=''), ftp({
-                host: options.host,
-                user: options.user || 'anonymous',
-                pass: options.pass || '@anonymous',
-                port: options.port || 21,
-                remotePath: (options.remotePath || '/')+path
-            })))
-            .pipe(gulpif((options.upload=='sftp'&&options.host!=''), ftp({
-                host: options.host,
-                user: options.user || 'anonymous',
-                pass: options.pass || null,
-                port: options.port || 22,
-                remotePath: (options.remotePath || '/')+path
-            })))
-            .pipe(gulp.dest(dest))
-            .pipe(gutil.noop());
-    }
-}
-function getMoveTask(path){
-    return function(){
-        var src = sourcePrefix+'source/'+path+'/**/*';
-        var dest = destDir+path+'/';
-        return gulp.src(src)
-            .pipe(changed(dest))
-            .pipe(gulpif((options.upload=='local'&&options.location!=''), gulp.dest(options.location+path+'/')))
-            .pipe(gulpif((options.upload=='ftp'&&options.host!=''), ftp({
-                host: options.host,
-                user: options.user || 'anonymous',
-                pass: options.pass || '@anonymous',
-                port: options.port || 21,
-                remotePath: (options.remotePath || '/')+path
-            })))
-            .pipe(gulpif((options.upload=='sftp'&&options.host!=''), ftp({
-                host: options.host,
-                user: options.user || 'anonymous',
-                pass: options.pass || null,
-                port: options.port || 22,
-                remotePath: (options.remotePath || '/')+path
-            })))
-            .pipe(gulp.dest(dest))
-            .pipe(gutil.noop());
-    }
-}
-
-function getCleanTask(path){
-    return function(cb){
-        var dest = destDir+path+'/';
-        del(dest, cb);
-    }
-}
-
-function cleanRemoteFtp(f, cb){
-    var file = options.remotePath+f;
-
-    var ftp = new JSFtp({
-        host: options.host,
-        user: options.user || 'anonymous',
-        pass: options.pass || null,
-        port: options.port || 21
-    });
-
-    ftp.raw('dele '+file, function(err) {
-        if (err){ cb(); return; }
-        if (file.substring(file.length-3).toLowerCase()==".js"){
-            file = file.replace('.js', ".min.js");
-            ftp.raw('dele '+file, function(err) {
-                if (err){ cb(); return; }
-
-                if (file.indexOf("/")!=-1){
-                    var p = file.substring(0, file.lastIndexOf("/"));
-                    ftp.raw('rmd '+p, function(err) {
-                        if (err){ cb(); return; }
-
-                        ftp.raw.quit();
-                        cb();
-                    });
-                }
-
-            });
-        }else{
-            if (file.indexOf("/")!=-1){
-                var pPath = file.substring(0, file.lastIndexOf("/"));
-                ftp.raw('rmd '+pPath, function(err) {
-                    if (err){ cb(); return; }
-                    ftp.raw.quit();
-                    cb();
-                });
-            }
-        }
-    });
-}
-function cleanRemoteLocal(f, cb){
-    var file = options.location+f;
-    del(file, {force: true, dryRun: true}, function(){
-        if (file.substring(file.length-3).toLowerCase()==".js"){
-            var minfile = file.replace('.js', ".min.js");
-            del(minfile, {force: true, dryRun: true}, function(){
-                var p = file.substring(0, file.lastIndexOf("/"));
-                fs.rmdir(p,function(err){
-                    if(err){}
-                    cb();
-                })
-            });
-        }else{
-            var p = file.substring(0, file.lastIndexOf("/"));
-            fs.rmdir(p,function(err){
-                if(err){}
-                cb();
-            })
-        }
-    });
-}
-
-function getCleanRemoteTask(path){
-    return function(cb){
-        if (options.upload){
-            var file = path.replace(/\\/g, "/");
-            file = file.substring(file.indexOf("source/")+7);
-
-            if (options.upload=='local'&&options.location!='') cleanRemoteLocal(file, cb);
-            if (options.upload=='ftp'&&options.host!='') cleanRemoteFtp(file, cb);
-        }else{
-            if (cb) cb();
-        }
-    }
-}
-function getWatchTask(path, min){
-    return function(cb){
-        var moveTask = "move:"+path;
-        var minTask = "min:"+path;
-        var cleanTask = "clean:"+path;
-        if (min) gulp.watch('source/'+path+'/**/*.js', {"events": ['add','change']}, gulp.parallel(minTask));
-        gulp.watch('source/'+path+'/**/*', {"events": ['addDir', 'add','change']},  gulp.parallel(moveTask));
-
-        // gulp.watch('source/'+path+'/**/*', {"events": ['unlinkDir']},  function(file){
-        //     console.log("into unlinkDir watch ......."+file);
-        // });
-
-
-        watcher = gulp.watch('source/'+path+'/**/*', {delay:500});
-        watcher.on('unlink', function(file, stats){
-            console.log("into unlink watch ......."+file);
-            gulp.task("cleanRemote", getCleanRemoteTask(file))
-            gulp.series(gulp.parallel(cleanTask, "cleanRemote"), gulp.parallel(minTask, moveTask))();
-        });
-        // watcher.on('unlinkDir', function(file, stats){
-        //     console.log("into unlinkDir watch ......."+file);
-        //     // gulp.task("cleanRemoteDir", getCleanRemoteTask(file))
-        //     // gulp.series(gulp.parallel(cleanTask, "cleanRemoteDir"), gulp.parallel(minTask, moveTask))();
-        // });
-    }
-}
-
-apps.map(function(app){
-    var taskName = "";
-    if (app.tasks.indexOf("min")!==-1){
-        taskName = "min:"+app.folder;
-        minTasks.push(taskName);
-        gulp.task(taskName, getMinTask(app.folder));
-    }
-    if (app.tasks.indexOf("move")!==-1){
-        taskName = "move:"+app.folder;
-        moveTasks.push(taskName);
-        gulp.task(taskName, getMoveTask(app.folder));
-    }
-    if (app.tasks.indexOf("clean")!==-1){
-        taskName = "clean:"+app.folder;
-        cleanTasks.push(taskName);
-        gulp.task(taskName, getCleanTask(app.folder));
-    }
-    if (app.tasks.indexOf("watch")!==-1){
-        taskName = "watch:"+app.folder;
-        watchTasks.push(taskName);
-        gulp.task(taskName, getWatchTask(app.folder, (app.tasks.indexOf("min")!==-1)));
-    }
-
-    if (app.tasks.indexOf("min")!==-1 && app.tasks.indexOf("move")!==-1){
-        gulp.task(app.folder, gulp.parallel("min:"+app.folder, "move:"+app.folder));
-    }else if (app.tasks.indexOf("min")==-1 && app.tasks.indexOf("move")!==-1){
-        gulp.task(app.folder, gulp.parallel("move:"+app.folder));
-    }else if (app.tasks.indexOf("min")!==-1 && app.tasks.indexOf("move")==-1){
-        gulp.task(app.folder, gulp.parallel("min:"+app.folder));
-    }
-
-
-})
-
-gulp.task("index", function(){
-	var src = [sourcePrefix+'source/favicon.ico', sourcePrefix+'source/index.html'];
-	return gulp.src(src)
-			.pipe(changed(destDir))
-            .pipe(gulpif((options.upload=='local'&&options.location!=''), gulp.dest(options.location+'/')))
-            .pipe(gulpif((options.upload=='ftp'&&options.host!=''), ftp({
-                host: options.host,
-                user: options.user || 'anonymous',
-                pass: options.pass || '@anonymous',
-                port: options.port || 21,
-                remotePath: (options.remotePath || '/')
-            })))
-            .pipe(gulpif((options.upload=='sftp'&&options.host!=''), ftp({
-                host: options.host,
-                user: options.user || 'anonymous',
-                pass: options.pass || null,
-                port: options.port || 22,
-                remotePath: (options.remotePath || '/')
-            })))
-            .pipe(gulp.dest(destDir))
-            .pipe(gutil.noop());
-});
-
-//gulp.task("default", gulp.parallel(minTasks, moveTasks, "index"));
-gulp.task("clean", gulp.series(cleanTasks));
-gulp.task("sync", gulp.series(
-    gulp.series(cleanTasks),
-    gulp.parallel(minTasks, moveTasks, "index")
-));
-gulp.task("watch", gulp.parallel(watchTasks));
-
-gulp.task("o2:new-v:html", function () {
-    var path = "x_desktop";
-    var src = sourcePrefix+'source/'+path+'/*.html';
-    var dest = destDir+'x_desktop/';
-    return gulp.src(src)
-        .pipe(assetRev())
-        .pipe(gulpif((options.upload=='local'&&options.location!=''), gulp.dest(options.location+path+'/')))
-        .pipe(gulpif((options.upload=='ftp'&&options.host!=''), ftp({
-            host: options.host,
-            user: options.user || 'anonymous',
-            pass: options.pass || '@anonymous',
-            port: options.port || 21,
-            remotePath: (options.remotePath || '/')+path
-        })))
-        .pipe(gulpif((options.upload=='sftp'&&options.host!=''), sftp({
-            host: options.host,
-            user: options.user || 'anonymous',
-            pass: options.pass || null,
-            port: options.port || 22,
-            remotePath: (options.remotePath || '/')+path
-        })))
-        .pipe(gulp.dest(dest))
-        .pipe(gutil.noop());
-
-});
-gulp.task("o2:new-v:o2", function () {
-    var path = "o2_core";
-    var src = sourcePrefix+'source/'+path+'/o2.js';
-    var dest = destDir+'o2_core/';
-    return gulp.src(src)
-        .pipe(assetRev())
-        .pipe(gulpif((options.upload=='local'&&options.location!=''), gulp.dest(options.location+path+'/')))
-        .pipe(gulpif((options.upload=='ftp'&&options.host!=''), ftp({
-            host: options.host,
-            user: options.user || 'anonymous',
-            pass: options.pass || '@anonymous',
-            port: options.port || 21,
-            remotePath: (options.remotePath || '/')+path
-        })))
-        .pipe(gulpif((options.upload=='sftp'&&options.host!=''), sftp({
-            host: options.host,
-            user: options.user || 'anonymous',
-            pass: options.pass || null,
-            port: options.port || 22,
-            remotePath: (options.remotePath || '/')+path
-        })))
-        .pipe(gulp.dest(dest))
-        .pipe(uglify())
-        .pipe(rename({ extname: '.min.js' }))
-        .pipe(gulpif((options.upload=='local'&&options.location!=''), gulp.dest(options.location+path+'/')))
-        .pipe(gulpif((options.upload=='ftp'&&options.host!=''), ftp({
-            host: options.host,
-            user: options.user || 'anonymous',
-            pass: options.pass || '@anonymous',
-            port: options.port || 21,
-            remotePath: (options.remotePath || '/')+path
-        })))
-        .pipe(gulpif((options.upload=='sftp'&&options.host!=''), sftp({
-            host: options.host,
-            user: options.user || 'anonymous',
-            pass: options.pass || null,
-            port: options.port || 22,
-            remotePath: (options.remotePath || '/')+path
-        })))
-        .pipe(gulp.dest(dest))
-        .pipe(gutil.noop());
-});
-gulp.task("o2:new-v", gulp.parallel("o2:new-v:o2", "o2:new-v:html"));
-
-gulp.task("default", gulp.series("clean", gulp.parallel(minTasks, moveTasks, 'index'), "o2:new-v"));

o2server/x_build/package-lock.json

@@ -1,45 +0,0 @@
-{
-  "name": "o2oa_web",
-  "version": "1.1.7",
-  "description": "a javascript library",
-  "main": "o2.js",
-  "scripts": {
-    "test": "gulp",
-    "report-coverage": "codecov"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/huqi1980/o2oa_client_web.git"
-  },
-  "keywords": [
-    "oa",
-    "office",
-    "workflow",
-    "process",
-    "cms",
-    "bpm",
-    "portal"
-  ],
-  "author": "Tommy-O2OA",
-  "license": "AGPL-3.0",
-  "bugs": {
-    "url": "https://github.com/huqi1980/o2oa_client_web/issues"
-  },
-  "homepage": "https://github.com/huqi1980/o2oa_client_web#readme",
-  "devDependencies": {
-    "gulp": "^4.0.0",
-    "gulp-tm-asset-rev": "0.0.16",
-    "gulp-changed": "^3.2.0",
-    "gulp-deleted": "0.0.2",
-    "gulp-ftp": "^1.1.0",
-    "gulp-if": "^2.0.2",
-    "gulp-rename": "^1.4.0",
-    "gulp-sftp": "^0.1.5",
-    "gulp-tm-uglify": "^3.0.1",
-    "karma": "^3.1.4",
-    "karma-jasmine": "^2.0.1",
-    "karma-phantomjs-launcher": "^1.0.4",
-    "merge-stream": "^1.0.1",
-    "minimist": "^1.2.0"
-  }
-}

o2server/x_build/package.json

@@ -1,45 +0,0 @@
-{
-  "name": "o2oa_web",
-  "version": "1.1.7",
-  "description": "a javascript library",
-  "main": "o2.js",
-  "scripts": {
-    "test": "gulp",
-    "report-coverage": "codecov"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/huqi1980/o2oa_client_web.git"
-  },
-  "keywords": [
-    "oa",
-    "office",
-    "workflow",
-    "process",
-    "cms",
-    "bpm",
-    "portal"
-  ],
-  "author": "Tommy-O2OA",
-  "license": "AGPL-3.0",
-  "bugs": {
-    "url": "https://github.com/huqi1980/o2oa_client_web/issues"
-  },
-  "homepage": "https://github.com/huqi1980/o2oa_client_web#readme",
-  "devDependencies": {
-    "gulp": "^4.0.0",
-    "gulp-tm-asset-rev": "0.0.16",
-    "gulp-changed": "^3.2.0",
-    "gulp-deleted": "0.0.2",
-    "gulp-ftp": "^1.1.0",
-    "gulp-if": "^2.0.2",
-    "gulp-rename": "^1.4.0",
-    "gulp-sftp": "^0.1.5",
-    "gulp-tm-uglify": "^3.0.1",
-    "karma": "^3.1.4",
-    "karma-jasmine": "^2.0.1",
-    "karma-phantomjs-launcher": "^1.0.4",
-    "merge-stream": "^1.0.1",
-    "minimist": "^1.2.0"
-  }
-}

o2server/x_build/src/main/java/com/x/build/CheckEntity.java

@@ -1,276 +0,0 @@
-package com.x.build;
-
-import java.lang.reflect.Field;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-import javax.persistence.Column;
-import javax.persistence.EnumType;
-import javax.persistence.Enumerated;
-import javax.persistence.Index;
-import javax.persistence.Lob;
-import javax.persistence.Table;
-import javax.persistence.UniqueConstraint;
-
-import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.lang3.reflect.FieldUtils;
-import org.apache.openjpa.persistence.jdbc.ContainerTable;
-import org.junit.Test;
-
-import com.x.base.core.entity.JpaObject;
-import com.x.base.core.entity.annotation.ContainerEntity;
-import com.x.base.core.project.annotation.FieldDescribe;
-import com.x.base.core.project.annotation.Module;
-import com.x.base.core.project.gson.XGsonBuilder;
-
-import io.github.classgraph.ClassGraph;
-import io.github.classgraph.ClassInfo;
-import io.github.classgraph.ScanResult;
-
-public class CheckEntity {
-
-	/*
-	 * 检查数据库字段名是否是ColumnNamePrefix + fieldName
-	 */
-	@Test
-	public void checkColumnName() throws Exception {
-		try (ScanResult scanResult = new ClassGraph().enableAllInfo().scan()) {
-			List<ClassInfo> classInfos = scanResult.getClassesWithAnnotation(ContainerEntity.class.getName());
-			List<Class<?>> list = new ArrayList<>();
-			for (ClassInfo info : classInfos) {
-				list.add(Class.forName(info.getName()));
-			}
-			for (Class<?> cls : list) {
-				List<Field> fields = FieldUtils.getAllFieldsList(cls);
-				for (Field field : fields) {
-					Column col = field.getAnnotation(Column.class);
-					if (null != col) {
-						if (StringUtils.equals(JpaObject.ColumnNamePrefix + field.getName(), col.name())) {
-							// System.out.println(cls + ":" + field.getName() + ":" + col.name() + ":" +
-							// col.length());
-						} else {
-							System.err.println(cls + ":" + field.getName() + ":" + col.name() + ":" + col.length());
-						}
-					}
-				}
-			}
-		}
-	}
-
-	/*
-	 * 检查是否有将Lob类型字段增加索引
-	 */
-	@Test
-	public void checkLobIndex() throws Exception {
-		try (ScanResult scanResult = new ClassGraph().enableAllInfo().scan()) {
-			List<ClassInfo> classInfos = scanResult.getClassesWithAnnotation(ContainerEntity.class.getName());
-			List<Class<?>> list = new ArrayList<>();
-			for (ClassInfo info : classInfos) {
-				list.add(Class.forName(info.getName()));
-			}
-			for (Class<?> cls : list) {
-				List<Field> fields = FieldUtils.getAllFieldsList(cls);
-				for (Field field : fields) {
-					Lob lob = field.getAnnotation(Lob.class);
-					Index index = field.getAnnotation(Index.class);
-					if ((null != lob) && (null != index)) {
-						System.err.println(cls + ":" + field.getName());
-					} else {
-						// System.out.println(cls + ":" + field.getName() ;
-					}
-				}
-			}
-		}
-	}
-
-	/*
-	 * 检查是否有将Lob类型字段增加索引
-	 * 
-	 * @FieldDescribe("群组的个人成员.存放个人 ID.")
-	 * 
-	 * @PersistentCollection(fetch = FetchType.EAGER)
-	 * 
-	 * @OrderColumn(name = ORDERCOLUMNCOLUMN)
-	 * 
-	 * @ContainerTable(name = TABLE + ContainerTableNameMiddle +
-	 * personList_FIELDNAME, joinIndex = @Index(name = TABLE + IndexNameMiddle +
-	 * personList_FIELDNAME + JoinIndexNameSuffix))
-	 * 
-	 * @ElementColumn(length = JpaObject.length_id, name = ColumnNamePrefix +
-	 * personList_FIELDNAME)
-	 * 
-	 * @ElementIndex(name = TABLE + IndexNameMiddle + personList_FIELDNAME +
-	 * ElementIndexNameSuffix)
-	 * 
-	 * @CheckPersist(allowEmpty = true, citationExists = @CitationExist(type =
-	 * Person.class)) private List<String> personList;
-	 */
-	@Test
-	public void checkListFieldContainerTableName() throws Exception {
-		try (ScanResult scanResult = new ClassGraph().enableAllInfo().scan()) {
-			List<ClassInfo> classInfos = scanResult.getClassesWithAnnotation(ContainerEntity.class.getName());
-			List<Class<?>> list = new ArrayList<>();
-			for (ClassInfo info : classInfos) {
-				list.add(Class.forName(info.getName()));
-			}
-			for (Class<?> cls : list) {
-				List<Field> fields = FieldUtils.getAllFieldsList(cls);
-				for (Field field : fields) {
-					if (List.class.isAssignableFrom(field.getType())) {
-						ContainerTable containerTable = field.getAnnotation(ContainerTable.class);
-						if (null != containerTable) {
-							String name = FieldUtils.readStaticField(cls, "TABLE", true).toString()
-									+ JpaObject.ContainerTableNameMiddle + field.getName();
-							if (!StringUtils.equals(name, containerTable.name())) {
-								System.err.println(cls.getName() + ":" + field.getName());
-							}
-						}
-					}
-				}
-			}
-		}
-	}
-
-	/*
-	 * 检查是否将@FieldDescribe注解到static字段上,如果是意味着上下行搞错了
-	 */
-	@Test
-	public void checkFieldDescribeOnStatic() throws Exception {
-		try (ScanResult scanResult = new ClassGraph().enableAllInfo().scan()) {
-			List<ClassInfo> classInfos = scanResult.getClassesWithAnnotation(ContainerEntity.class.getName());
-			List<Class<?>> list = new ArrayList<>();
-			for (ClassInfo info : classInfos) {
-				list.add(Class.forName(info.getName()));
-			}
-			for (Class<?> cls : list) {
-				List<Field> fields = FieldUtils.getFieldsListWithAnnotation(cls, FieldDescribe.class);
-				for (Field field : fields) {
-					if (java.lang.reflect.Modifier.isStatic(field.getModifiers())) {
-						System.out.println(cls + ":" + field.getName());
-					}
-				}
-			}
-		}
-	}
-
-	/*
-	 * 检查约束名中的table名称和entity类中的TABLE名称是否一致
-	 */
-	@Test
-	public void checkTableNameUniqueConstraintName() throws Exception {
-		try (ScanResult scanResult = new ClassGraph().enableAllInfo().scan()) {
-			List<ClassInfo> classInfos = scanResult.getClassesWithAnnotation(ContainerEntity.class.getName());
-			List<Class<?>> list = new ArrayList<>();
-			for (ClassInfo info : classInfos) {
-				list.add(Class.forName(info.getName()));
-			}
-			for (Class<?> cls : list) {
-				Table table = cls.getAnnotation(Table.class);
-				String name = Objects.toString(FieldUtils.readStaticField(cls, "TABLE", true));
-				if (!StringUtils.equals(table.name(), name)) {
-					System.out.println("table name not match:" + cls);
-				}
-				for (UniqueConstraint u : table.uniqueConstraints()) {
-					if (!StringUtils.startsWith(u.name(), table.name())) {
-						System.out.println("uniqueConstraint name not match:" + cls);
-					}
-				}
-			}
-		}
-	}
-
-	/*
-	 * 检查类中是否有在createTime,updateTime和sequence上的索引,这几个索引已经用约束在类上了
-	 */
-	@Test
-	public void checkIdCreateTimeUpdateTimeSequenceIndex() throws Exception {
-		try (ScanResult scanResult = new ClassGraph().enableAllInfo().scan()) {
-			List<ClassInfo> classInfos = scanResult.getClassesWithAnnotation(ContainerEntity.class.getName());
-			List<Class<?>> list = new ArrayList<>();
-			for (ClassInfo info : classInfos) {
-				list.add(Class.forName(info.getName()));
-			}
-			for (Class<?> cls : list) {
-				Field idField = FieldUtils.getField(cls, JpaObject.id_FIELDNAME, true);
-				Field createTimeField = FieldUtils.getField(cls, JpaObject.createTime_FIELDNAME, true);
-				Field updateTimeField = FieldUtils.getField(cls, JpaObject.updateTime_FIELDNAME, true);
-				Field sequenceField = FieldUtils.getField(cls, JpaObject.sequence_FIELDNAME, true);
-				if ((null != idField.getAnnotation(Index.class)) || (null != createTimeField.getAnnotation(Index.class))
-						|| (null != updateTimeField.getAnnotation(Index.class))
-						|| (null != sequenceField.getAnnotation(Index.class))) {
-					System.out.println(cls.getName() + " has IdCreateTimeUpdateTimeSequenceIndex");
-				}
-			}
-		}
-	}
-
-	/*
-	 * 检查entity是否有重复的字段
-	 */
-	@Test
-	public void checkMutiField() throws Exception {
-		try (ScanResult scanResult = new ClassGraph().enableAllInfo().scan()) {
-			List<ClassInfo> classInfos = scanResult.getClassesWithAnnotation(ContainerEntity.class.getName());
-			List<Class<?>> list = new ArrayList<>();
-			for (ClassInfo info : classInfos) {
-				list.add(Class.forName(info.getName()));
-			}
-			for (Class<?> cls : list) {
-				Object o = cls.newInstance();
-				XGsonBuilder.toJson(o);
-			}
-		}
-	}
-
-	/*
-	 * 检查entity是否有重复的字段
-	 */
-	@Test
-	public void checkEnum() throws Exception {
-		try (ScanResult scanResult = new ClassGraph().enableAllInfo().scan()) {
-			List<ClassInfo> classInfos = scanResult.getClassesWithAnnotation(ContainerEntity.class.getName());
-			List<Class<?>> list = new ArrayList<>();
-			for (ClassInfo info : classInfos) {
-				list.add(Class.forName(info.getName()));
-			}
-			for (Class<?> cls : list) {
-				List<Field> fields = FieldUtils.getFieldsListWithAnnotation(cls, FieldDescribe.class);
-				for (Field field : fields) {
-					if (field.getType().isEnum()) {
-						Enumerated enumerated = field.getAnnotation(Enumerated.class);
-						Column column = field.getAnnotation(Column.class);
-						if (null == enumerated || (!Objects.equals(EnumType.STRING, enumerated.value()))
-								|| (null == column) || column.length() > 200) {
-							System.out.println(cls + ":" + field.getName());
-						}
-					}
-				}
-			}
-		}
-	}
-
-	/*
-	 * 检查entity是否有重复的字段
-	 */
-	@Test
-	public void checkContainerEntities() throws Exception {
-		try (ScanResult scanResult = new ClassGraph().enableAllInfo().scan()) {
-			List<ClassInfo> classInfos = scanResult.getClassesWithAnnotation(Module.class.getName());
-			List<Class<?>> list = new ArrayList<>();
-			for (ClassInfo info : classInfos) {
-				list.add(Class.forName(info.getName()));
-			}
-			for (Class<?> cls : list) {
-				List<String> containerEntities = (List<String>) FieldUtils.readStaticField(cls, "containerEntities");
-				for (String str : containerEntities) {
-					try {
-						Class clazz = Class.forName(str);
-					} catch (Exception e) {
-						System.out.println(cls.getName() + " error " + str);
-					}
-				}
-			}
-		}
-	}
-}

o2server/x_build/src/main/java/com/x/build/CopyJest.java

@@ -1,91 +0,0 @@
-package com.x.build;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-import org.apache.commons.io.FileUtils;
-import org.junit.Test;
-
-import com.x.base.core.project.annotation.Module;
-import com.x.base.core.project.annotation.ModuleType;
-
-import io.github.classgraph.ClassGraph;
-import io.github.classgraph.ClassInfo;
-import io.github.classgraph.ScanResult;
-
-public class CopyJest {
-
-	@Test
-	public void copyDescribeJs() throws Exception {
-		File root = new File(new File("").getAbsolutePath());
-		File template = new File(root, "jest/describe.js");
-		for (ClassInfo classInfo : this.list()) {
-			File dir = new File(root.getParent(), classInfo.getSimpleName());
-			File dest = new File(dir, "src/main/webapp/jest/describe.js");
-			System.out.println("copy to:" + dest.getAbsolutePath());
-			FileUtils.copyFile(template, dest);
-		}
-	}
-
-	@Test
-	public void copyJqueryJs() throws Exception {
-		File root = new File(new File("").getAbsolutePath());
-		File template = new File(root, "jest/jquery.min.js");
-		for (ClassInfo classInfo : this.list()) {
-			File dir = new File(root.getParent(), classInfo.getSimpleName());
-			File dest = new File(dir, "src/main/webapp/jest/jquery.min.js");
-			System.out.println("copy to:" + dest.getAbsolutePath());
-			FileUtils.copyFile(template, dest);
-		}
-	}
-
-	@Test
-	public void copylipboardJs() throws Exception {
-		File root = new File(new File("").getAbsolutePath());
-		File template = new File(root, "jest/clipboard.min.js");
-		for (ClassInfo classInfo : this.list()) {
-			File dir = new File(root.getParent(), classInfo.getSimpleName());
-			File dest = new File(dir, "src/main/webapp/jest/jquery.min.js");
-			System.out.println("copy to:" + dest.getAbsolutePath());
-			FileUtils.copyFile(template, dest);
-		}
-	}
-
-	@Test
-	public void copyIndexHtml() throws Exception {
-		File root = new File(new File("").getAbsolutePath());
-		File template = new File(root, "jest/index.html");
-		for (ClassInfo classInfo : this.list()) {
-			File dir = new File(root.getParent(), classInfo.getSimpleName());
-			File dest = new File(dir, "src/main/webapp/jest/index.html");
-			System.out.println("copy to:" + dest.getAbsolutePath());
-			FileUtils.copyFile(template, dest);
-		}
-	}
-
-	private List<ClassInfo> list() throws Exception {
-		try (ScanResult scanResult = new ClassGraph().enableAllInfo().scan()) {
-			List<ClassInfo> list = new ArrayList<>();
-			List<ClassInfo> classInfos = scanResult.getClassesWithAnnotation(Module.class.getName());
-			for (ClassInfo info : classInfos) {
-				Class<?> clz = Class.forName(info.getName());
-				Module module = clz.getAnnotation(Module.class);
-				if (Objects.equals(module.type(), ModuleType.ASSEMBLE)
-						|| Objects.equals(module.type(), ModuleType.SERVICE)) {
-					list.add(info);
-				}
-			}
-			return list;
-		}
-	}
-
-	@Test
-	public void test() throws Exception {
-		for (ClassInfo classInfo : this.list()) {
-			System.out.println(classInfo.getSimpleName());
-		}
-
-	}
-}

o2server/x_build/src/main/java/com/x/build/Publish.java

@@ -1,130 +0,0 @@
-package com.x.build;
-
-import java.io.File;
-import java.security.MessageDigest;
-import java.util.Date;
-import java.util.LinkedHashMap;
-
-import org.apache.commons.codec.binary.Hex;
-import org.apache.commons.io.FileUtils;
-import org.apache.commons.io.FilenameUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.junit.Test;
-
-import com.x.base.core.project.gson.XGsonBuilder;
-import com.x.base.core.project.tools.DateTools;
-
-public class Publish {
-
-	private static final String endPoint = "obs.cn-east-2.myhwclouds.com";
-
-	private static final String ak = "67CEL8RL5I3QP20IYBIE";
-
-	private static final String sk = "eyWMRgA2rxhZS4uPcZ4sFGX2T0wAercYgXRKcXEX";
-
-//	private static ObsClient obsClient;
-//
-//	private static String bucketName = "obs-o2public";
-
-	public static void main(String... args) throws Exception {
-		String version = args[0];
-		String dir = args[1];
-		Date now = new Date();
-		// File file_update = new File(dir, version + ".zip");
-		File file_windows = new File(dir, "o2server_" + version + "_windows.zip");
-		File file_linux = new File(dir, "o2server_" + version + "_linux.zip");
-		File file_macos = new File(dir, "o2server_" + version + "_macos.zip");
-		File file_aix = new File(dir, "o2server_" + version + "_aix.zip");
-		File file_neokylin_loongson = new File(dir, "o2server_" + version + "_neokylin_loongson.zip");
-		// File version_dir = new
-		// File("D:/download.o2oa.net/o2server/servers/webServer/download/versions");
-		// File update_dir = new File("D:/o2collect/servers/webServer/o2server/update");
-		// FileUtils.copyFile(file_update, new File(version_dir,
-		// file_update.getName()));
-//		FileUtils.copyFile(file_windows, new File(version_dir, file_windows.getName()));
-//		FileUtils.copyFile(file_linux, new File(version_dir, file_linux.getName()));
-//		FileUtils.copyFile(file_macos, new File(version_dir, file_macos.getName()));
-//		FileUtils.copyFile(file_aix, new File(version_dir, file_aix.getName()));
-
-//		LinkedHashMap<String, Object> map_update = new LinkedHashMap<>();
-//		map_update.put("version", version);
-//		map_update.put("size", file_update.length());
-//		map_update.put("url", "http://download.o2oa.net/download/versions/" + file_update.getName());
-
-//		FileUtils.write(new File(update_dir, FilenameUtils.getBaseName(file_update.getName()) + ".json"),
-//				XGsonBuilder.toJson(map_update), false);
-		LinkedHashMap<String, Object> map_windows = new LinkedHashMap<>();
-		LinkedHashMap<String, Object> map_linux = new LinkedHashMap<>();
-		LinkedHashMap<String, Object> map_macos = new LinkedHashMap<>();
-		LinkedHashMap<String, Object> map_aix = new LinkedHashMap<>();
-		LinkedHashMap<String, Object> map_neokylin_loongson = new LinkedHashMap<>();
-		map_windows.put("system", "windows");
-		map_windows.put("name", "o2server_" + version + "_windows");
-		map_windows.put("fileName", FilenameUtils.getName(file_windows.getName()));
-		map_windows.put("fileSize", file_windows.length() / 1024 / 1024 + "MB");
-		map_windows.put("updateTime", DateTools.format(now));
-		// map_windows.put("url", updateToObs(file_windows.getName(),
-		// file_windows.getParent()));
-		map_windows.put("url", "http://download.o2oa.net/download/" + file_windows.getName());
-		map_windows.put("sha256", sha256(file_windows));
-		map_linux.put("system", "linux");
-		map_linux.put("name", "o2server_" + version + "_linux");
-		map_linux.put("fileName", FilenameUtils.getName(file_linux.getName()));
-		map_linux.put("fileSize", file_linux.length() / 1024 / 1024 + "MB");
-		map_linux.put("updateTime", DateTools.format(now));
-		// map_linux.put("url", updateToObs(file_linux.getName(),
-		// file_linux.getParent()));
-		map_linux.put("url", "http://download.o2oa.net/download/" + file_linux.getName());
-		map_linux.put("sha256", sha256(file_linux));
-		map_macos.put("system", "macos");
-		map_macos.put("name", FilenameUtils.getBaseName(file_macos.getName()));
-		map_macos.put("fileName", FilenameUtils.getName(file_macos.getName()));
-		map_macos.put("fileSize", file_macos.length() / 1024 / 1024 + "MB");
-		map_macos.put("updateTime", DateTools.format(now));
-		// map_macos.put("url", updateToObs(file_macos.getName(),
-		// file_macos.getParent()));
-		map_macos.put("url", "http://download.o2oa.net/download/" + file_macos.getName());
-		map_macos.put("sha256", sha256(file_macos));
-		map_aix.put("system", "aix");
-		map_aix.put("name", FilenameUtils.getBaseName(file_aix.getName()));
-		map_aix.put("fileName", FilenameUtils.getName(file_aix.getName()));
-		map_aix.put("fileSize", file_aix.length() / 1024 / 1024 + "MB");
-		map_aix.put("updateTime", DateTools.format(now));
-		// map_aix.put("url", updateToObs(file_aix.getName(), file_aix.getParent()));
-		map_aix.put("url", "http://download.o2oa.net/download/" + file_aix.getName());
-		map_aix.put("sha256", sha256(file_aix));
-		map_neokylin_loongson.put("system", "neokylin_loongson");
-		map_neokylin_loongson.put("name", FilenameUtils.getBaseName(file_neokylin_loongson.getName()));
-		map_neokylin_loongson.put("fileName", FilenameUtils.getName(file_neokylin_loongson.getName()));
-		map_neokylin_loongson.put("fileSize", file_neokylin_loongson.length() / 1024 / 1024 + "MB");
-		map_neokylin_loongson.put("updateTime", DateTools.format(now));
-		// map_aix.put("url", updateToObs(file_aix.getName(), file_aix.getParent()));
-		map_neokylin_loongson.put("url", "http://download.o2oa.net/download/" + file_neokylin_loongson.getName());
-		map_neokylin_loongson.put("sha256", sha256(file_neokylin_loongson));
-		LinkedHashMap<String, Object> map = new LinkedHashMap<>();
-		map.put("windows", map_windows);
-		map.put("linux", map_linux);
-		map.put("macos", map_macos);
-		map.put("aix", map_aix);
-		map.put("neokylin_loongson", map_neokylin_loongson);
-		File file_download = new File("D:/download.o2oa.net/o2server/servers/webServer/download",
-				"download_preview.json");
-		FileUtils.writeStringToFile(file_download, XGsonBuilder.toJson(map));
-		File file_download_jsonp = new File("D:/download.o2oa.net/o2server/servers/webServer/download",
-				"download_preview.jsonp");
-		String jsonp = "callback(" + StringUtils.LF + XGsonBuilder.toJson(map) + StringUtils.LF + ")";
-		FileUtils.writeStringToFile(file_download_jsonp, jsonp);
-	}
-
-	private static String sha256(File file) throws Exception {
-		MessageDigest messageDigest;
-		messageDigest = MessageDigest.getInstance("SHA-256");
-		byte[] hash = messageDigest.digest(FileUtils.readFileToByteArray(file));
-		return Hex.encodeHexString(hash);
-	}
-
-	@Test
-	public void test1() throws Exception {
-		System.out.println(sha256(new File("d:/o2server_20180615160351_x86.zip")));
-	}
-}

o2server/x_build/src/main/java/com/x/build/SyncToGitHubDirectory.java

@@ -1,199 +0,0 @@
-package com.x.build;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.commons.io.FileUtils;
-import org.apache.commons.io.FilenameUtils;
-import org.apache.commons.io.filefilter.WildcardFileFilter;
-import org.junit.Test;
-
-import com.x.base.core.project.logger.Logger;
-import com.x.base.core.project.logger.LoggerFactory;
-
-public class SyncToGitHubDirectory {
-
-	private static Logger logger = LoggerFactory.getLogger(SyncToGitHubDirectory.class);
-
-	private static List<String> dirExcludes = new ArrayList<>();
-	private static List<String> dirIncludes = new ArrayList<>();
-	private static List<String> fileExcludes = new ArrayList<>();
-	private static List<String> fileIncludes = new ArrayList<>();
-
-	static {
-		dirExcludes.add("*/describe");
-		dirExcludes.add("*\\describe");
-		dirExcludes.add("*/target");
-		dirExcludes.add("*\\target");
-		dirExcludes.add("*/x_build_and_scratch");
-		dirExcludes.add("*\\x_build_and_scratch");
-		dirExcludes.add("*/.settings");
-		dirExcludes.add("*\\.settings");
-	}
-	static {
-		dirIncludes.add("*/src");
-		dirIncludes.add("*\\src");
-	}
-	static {
-		fileExcludes.add("*.class");
-		fileExcludes.add("*_.java");
-		fileExcludes.add("*/.classpath");
-		fileExcludes.add("*\\.classpath");
-		fileExcludes.add("*/.project");
-		fileExcludes.add("*\\.project");
-		fileExcludes.add("*/META-INF/persistence.xml");
-		fileExcludes.add("*\\META-INF\\persistence.xml");
-	}
-	static {
-		fileIncludes.add("*.java");
-		fileIncludes.add("*.json");
-		fileIncludes.add("*.xml");
-		fileIncludes.add("*/pom.xml");
-		fileIncludes.add("*\\pom.xml");
-	}
-
-	public static void main(String... args) throws Exception {
-		File source = new File(args[0]);
-		File target = new File(args[1]);
-		if ((!source.exists()) || (!source.isDirectory())) {
-			throw new Exception("源目录为空或者不是目录.");
-		}
-		if ((!target.exists()) || (!target.isDirectory())) {
-			throw new Exception("目标目录为空或者不是目录.");
-		}
-		List<File> sources = new ArrayList<>();
-		for (File f : source.listFiles()) {
-			if (f.isDirectory()) {
-				if (FilenameUtils.wildcardMatch(f.getName(), "x_*")
-						&& (!FilenameUtils.wildcardMatch(f.getName(), "x_build_and_scratch"))) {
-					sources.add(f);
-				}
-			}
-		}
-		for (File s : sources) {
-			File t = new File(target, s.getName());
-			FileUtils.forceMkdir(t);
-			logger.print("源目录: {}, 目标目录: {} 开始推送.", s.getAbsolutePath(), t.getAbsolutePath());
-			SyncToGitHubDirectory sync = new SyncToGitHubDirectory();
-			sync.synchronize(s, t);
-		}
-	}
-
-	private void synchronize(File source, File target) throws Exception {
-		int modify = 0;
-		for (File f : source.listFiles()) {
-			if (f.isDirectory()) {
-				File dir = this.dir(f, target);
-				if (dir.exists()) {
-					synchronize(f, dir);
-				}
-			} else {
-				modify += this.file(f, target);
-			}
-		}
-		this.clean(source, target);
-		logger.print("{} {} files modified.", source.getAbsolutePath(), modify);
-	}
-
-	private void clean(File source, File target) throws Exception {
-		if (!this.match(target)) {
-			logger.print("删除目录: {}.", target.getAbsolutePath());
-			FileUtils.forceDelete(target);
-		} else {
-			for (File t : target.listFiles()) {
-				if (t.isDirectory() && (!this.match(t))) {
-					logger.print("删除目录: {}.", t.getAbsolutePath());
-					FileUtils.forceDelete(t);
-					continue;
-				}
-				if (t.isFile() && (!this.match(t))) {
-					logger.print("删除文件: {}.", t.getAbsolutePath());
-					FileUtils.forceDelete(t);
-					continue;
-				}
-				File s = new File(source, t.getName());
-				if ((!s.exists()) || (t.isDirectory() != s.isDirectory())) {
-					FileUtils.forceDelete(t);
-				}
-			}
-		}
-	}
-
-	private File dir(File s, File target) throws Exception {
-		File t = new File(target, s.getName());
-		if (this.match(s)) {
-			logger.print("推送目录: {}.", s.getAbsolutePath());
-			if ((!t.exists()) || (!t.isDirectory())) {
-				FileUtils.forceMkdir(t);
-			}
-		} else {
-			logger.print("跳过推送目录: {}.", s.getAbsolutePath());
-		}
-		return t;
-	}
-
-	private int file(File s, File target) throws Exception {
-		if (this.match(s)) {
-			logger.print("推送文件: {}.", s.getAbsolutePath());
-			File t = new File(target, s.getName());
-			if ((!t.exists()) || t.isDirectory() || (t.lastModified() != s.lastModified())) {
-				FileUtils.copyFile(s, t, true);
-				return 1;
-			}
-		} else {
-			logger.print("跳过推送文件: {}.", s.getAbsolutePath());
-		}
-		return 0;
-	}
-
-	private boolean match(File file) {
-		if (file.isDirectory()) {
-			return this.dirMatch(file);
-		} else {
-			return this.fileMatch(file);
-		}
-	}
-
-	private boolean fileMatch(File file) {
-		for (String wildcard : fileExcludes) {
-			if (FilenameUtils.wildcardMatchOnSystem(file.getAbsolutePath(), wildcard)) {
-				return false;
-			}
-		}
-		for (String wildcard : fileIncludes) {
-			if (FilenameUtils.wildcardMatchOnSystem(file.getAbsolutePath(), wildcard)) {
-				return true;
-			}
-		}
-		return true;
-	}
-
-	private boolean dirMatch(File file) {
-		for (String wildcard : dirExcludes) {
-			if (FilenameUtils.wildcardMatchOnSystem(file.getAbsolutePath(), wildcard)) {
-				return false;
-			}
-		}
-		for (String wildcard : dirIncludes) {
-			if (FilenameUtils.wildcardMatchOnSystem(file.getAbsolutePath(), wildcard)) {
-				return true;
-			}
-		}
-		return true;
-	}
-
-	@Test
-	public void test1() {
-		File file = new File("E:\\bbb\\x_attendance_assemble_control\\.project");
-		System.out.println(FilenameUtils.wildcardMatchOnSystem(file.getAbsolutePath(), "*\\.project"));
-
-	}
-
-	@Test
-	public void test2() {
-		File file = new File("D:\\aaa\\2\\abc.java");
-		WildcardFileFilter filter = new WildcardFileFilter("*/2/*.java");
-		System.out.println(filter.accept(file));
-	}
-}

o2server/x_build/src/main/java/com/x/build/redeploy/Redeploy.java

@@ -1,135 +0,0 @@
-package com.x.build.redeploy;
-
-import java.io.File;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.Socket;
-import java.util.Date;
-
-import org.apache.commons.codec.binary.Base64;
-import org.apache.commons.io.FileUtils;
-import org.apache.commons.io.IOUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.junit.Test;
-
-import com.x.base.core.project.annotation.Module;
-import com.x.base.core.project.annotation.ModuleCategory;
-import com.x.base.core.project.annotation.ModuleType;
-import com.x.base.core.project.gson.XGsonBuilder;
-import com.x.base.core.project.tools.Crypto;
-import com.x.base.core.project.tools.DateTools;
-import com.x.base.core.project.tools.FileTools;
-
-import jersey.repackaged.com.google.common.base.Objects;
-
-public class Redeploy {
-
-	public static final String DEFAULT_PUBLIC_KEY = "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCWcVZIS57VeOUzi8c01WKvwJK9uRe6hrGTUYmF6J/pI6/UvCbdBWCoErbzsBZOElOH8Sqal3vsNMVLjPYClfoDyYDaUlakP3ldfnXJzAFJVVubF53KadG+fwnh9ZMvxdh7VXVqRL3IQBDwGgzX4rmSK+qkUJjc3OkrNJPB7LLD8QIDAQAB";
-	public static final String DEFAULT_PRIVATE_KEY = "MIICdQIBADANBgkqhkiG9w0BAQEFAASCAl8wggJbAgEAAoGBAJZxVkhLntV45TOLxzTVYq/Akr25F7qGsZNRiYXon+kjr9S8Jt0FYKgStvOwFk4SU4fxKpqXe+w0xUuM9gKV+gPJgNpSVqQ/eV1+dcnMAUlVW5sXncpp0b5/CeH1ky/F2HtVdWpEvchAEPAaDNfiuZIr6qRQmNzc6Ss0k8HsssPxAgMBAAECgYAWtRy05NUgm5Lc6Og0jVDL/mEnydxPBy2ectwzHh2k7wIHNi8XhUxFki2TMqzrM9Dv3/LySpMl4AE3mhs34LNPy6F+MwyF5X7j+2Y6MflJyeb9HNyT++viysQneoOEiOk3ghxF2/GPjpiEF79wSp+1YKTxRAyq7ypV3t35fGOOEQJBANLDPWl8b5c3lrcz/dTamMjHbVamEyX43yzQOphzkhYsz4pruATzTxU+z8/zPdEqHcWWV39CP3xu3EYNcAhxJW8CQQC2u7PF5Xb1xYRCsmIPssFxil64vvdUadSxl7GLAgjQ9ULyYWB24KObCEzLnPcT8Pf2Q0YQOixxa/78FuzmgbyfAkA7ZFFV/H7lugB6t+f7p24OhkRFep9CwBMD6dnZRBgSr6X8d8ZvfrD2Z7DgBMeSva+OEoOtlNmXExZ3lynO9zN5AkAVczEmIMp3DSl6XtAuAZC9kD2QODJ2QToLYsAfjiyUwsWKCC43piTuVOoW2KUUPSwOR1VZIEsJQWEcHGDQqhgHAkAeZ7a6dVRZFdBwKA0ADjYCufAW2cIYiVDQBJpgB+kiLQflusNOCBK0FT3lg8BdUSy2D253Ih6l3lbaM/4M7DFQ";
-
-	public static String redeploy(String server, Integer port, Class<?> cls, String publicKey) {
-		return redeploy(server, port, cls.getSimpleName(), publicKey);
-	}
-
-	public static String redeploy(String server, Integer port, String simpleName, String publicKey) {
-		String result = "";
-		try {
-			File file = find(simpleName);
-			byte[] bytes = FileUtils.readFileToByteArray(file);
-			CommandObject cmd = new CommandObject();
-			cmd.setCommand("redeploy:" + simpleName);
-			cmd.setBody(Base64.encodeBase64URLSafeString(bytes));
-			if (StringUtils.isNotEmpty(publicKey)) {
-				cmd.setCredential(Crypto.rsaEncrypt("o2@" + DateTools.format(new Date()), publicKey));
-			}
-			String json = XGsonBuilder.toJson(cmd);
-			try (Socket client = new Socket(server, port)) {
-				try (OutputStream outputStream = client.getOutputStream();
-						InputStream inputStream = client.getInputStream()) {
-					IOUtils.write(json, outputStream);
-					client.shutdownOutput();
-					result = IOUtils.toString(inputStream);
-					client.shutdownInput();
-				}
-			}
-		} catch (Exception e) {
-			result = e.getMessage();
-			e.printStackTrace();
-		}
-		return result;
-	}
-
-	private static File find(String simpleClassName) {
-		File dir = new File(FileTools.parent(FileTools.parent(new File("."))), "store");
-		File file = new File(dir, simpleClassName + ".war");
-		if (file.exists()) {
-			return file;
-		}
-		dir = new File(FileTools.parent(FileTools.parent(new File("."))), "store/jars");
-		file = new File(dir, simpleClassName + ".jar");
-		if (file.exists()) {
-			return file;
-		}
-		dir = new File(FileTools.parent(FileTools.parent(new File("."))), "custom");
-		file = new File(dir, simpleClassName + ".war");
-		if (file.exists()) {
-			return file;
-		}
-		dir = new File(FileTools.parent(FileTools.parent(new File("."))), "custom/jars");
-		file = new File(dir, simpleClassName + ".jar");
-		if (file.exists()) {
-			return file;
-		}
-		return null;
-	}
-
-	public static class CommandObject {
-
-		private String command;
-
-		private String body;
-
-		private String credential;
-
-		public String getCommand() {
-			return command;
-		}
-
-		public void setCommand(String command) {
-			this.command = command;
-		}
-
-		public String getBody() {
-			return body;
-		}
-
-		public void setBody(String body) {
-			this.body = body;
-		}
-
-		public String getCredential() {
-			return credential;
-		}
-
-		public void setCredential(String credential) {
-			this.credential = credential;
-		}
-
-	}
-
-	@Test
-	public void testRsaEncrypt() throws Exception {
-		File file = new File("D:/O2/code/store/x_query_assemble_surface.war");
-		byte[] bytes = FileUtils.readFileToByteArray(file);
-		CommandObject cmd = new CommandObject();
-		cmd.setCommand("redeploy:x_query_assemble_surface");
-		cmd.setBody(Base64.encodeBase64URLSafeString(bytes));
-		String json = XGsonBuilder.toJson(cmd);
-		System.out.println(json);
-		String en = Crypto.rsaEncrypt(json, DEFAULT_PUBLIC_KEY);
-		System.out.println(en);
-		String de = Crypto.rsaDecrypt(en, DEFAULT_PRIVATE_KEY);
-		System.out.println(de);
-	}
-
-}

o2server/x_build/src/main/java/com/x/build/redeploy/Redeploy_127_0_0_1.java

@@ -1,224 +0,0 @@
-package com.x.build.redeploy;
-
-import com.x.base.core.project.logger.Logger;
-import com.x.base.core.project.logger.LoggerFactory;
-import com.x.base.core.project.*;
-import org.junit.Test;
-
-public class Redeploy_127_0_0_1 {
-
-	private static Logger logger = LoggerFactory.getLogger(Redeploy_127_0_0_1.class);
-
-	public static final String HOST = "127.0.0.1";
-
-	public static Integer PORT = 20010;
-
-	@Test
-	public void x_hotpic_assemble_control() {
-		logger.print("result:{}",
-				Redeploy.redeploy(HOST, PORT, x_hotpic_assemble_control.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_file_assemble_control() {
-		logger.print("result:{}",
-				Redeploy.redeploy(HOST, PORT, x_file_assemble_control.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_cms_assemble_control() {
-		logger.print("result:{}",
-				Redeploy.redeploy(HOST, PORT, x_cms_assemble_control.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_cms_core_entity() {
-		logger.print("result:{}", Redeploy.redeploy(HOST, PORT, x_cms_core_entity.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_component_assemble_control() {
-		logger.print("result:{}",
-				Redeploy.redeploy(HOST, PORT, x_component_assemble_control.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_attendance_assemble_control() {
-		logger.print("result:{}",
-				Redeploy.redeploy(HOST, PORT, x_attendance_assemble_control.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_base_core_project() {
-		logger.print("result:{}",
-				Redeploy.redeploy(HOST, PORT, x_base_core_project.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_message_assemble_communicate() {
-		logger.print("result:{}",
-				Redeploy.redeploy(HOST, PORT, x_message_assemble_communicate.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_mind_assemble_control() {
-		logger.print("result:{}",
-				Redeploy.redeploy(HOST, PORT, x_mind_assemble_control.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_bbs_assemble_control() {
-		logger.print("result:{}",
-				Redeploy.redeploy(HOST, PORT, x_bbs_assemble_control.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_bbs_core_entity() {
-		logger.print("result:{}", Redeploy.redeploy(HOST, PORT, x_bbs_core_entity.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_calendar_assemble_control() {
-		logger.print("result:{}",
-				Redeploy.redeploy(HOST, PORT, x_calendar_assemble_control.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_calendar_core_entity() {
-		logger.print("result:{}",
-				Redeploy.redeploy(HOST, PORT, x_calendar_core_entity.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_okr_assemble_control() {
-		logger.print("result:{}",
-				Redeploy.redeploy(HOST, PORT, x_okr_assemble_control.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_okr_core_entity() {
-		logger.print("result:{}", Redeploy.redeploy(HOST, PORT, x_okr_core_entity.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_mind_core_entity() {
-		logger.print("result:{}", Redeploy.redeploy(HOST, PORT, x_mind_core_entity.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_query_assemble_surface() {
-		logger.print("result: {}.",
-				Redeploy.redeploy(HOST, PORT, x_query_assemble_surface.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_query_assemble_designer() {
-		logger.print("result:{}",
-				Redeploy.redeploy(HOST, PORT, x_query_assemble_designer.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_query_service_processing() {
-		logger.print("result: {}.",
-				Redeploy.redeploy(HOST, PORT, x_query_service_processing.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_processplatform_assemble_surface() {
-		logger.print("result: {}.",
-				Redeploy.redeploy(HOST, PORT, x_processplatform_assemble_surface.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_processplatform_assemble_designer() {
-		logger.print("result: {}.",
-				Redeploy.redeploy(HOST, PORT, x_processplatform_assemble_designer.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_processplatform_service_processing() {
-		logger.print("result:{}.",
-				Redeploy.redeploy(HOST, PORT, x_processplatform_service_processing.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_processplatform_core_entity() {
-		logger.print("result:{}.",
-				Redeploy.redeploy(HOST, PORT, x_processplatform_core_entity.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_meeting_assemble_control() {
-		logger.print("result:{}.",
-				Redeploy.redeploy(HOST, PORT, x_meeting_assemble_control.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_organization_assemble_control() {
-		logger.print("result:{}",
-				Redeploy.redeploy(HOST, PORT, x_organization_assemble_control.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_organization_assemble_authentication() {
-		logger.print("result:{}", Redeploy.redeploy(HOST, PORT, x_organization_assemble_authentication.class,
-				Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_organization_assemble_personal() {
-		logger.print("result:{}",
-				Redeploy.redeploy(HOST, PORT, x_organization_assemble_personal.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_portal_assemble_surface() {
-		logger.print("result:{}",
-				Redeploy.redeploy(HOST, PORT, x_portal_assemble_surface.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_program_center() {
-		logger.print("result:{}", Redeploy.redeploy(HOST, PORT, x_program_center.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_meeting_core_entity() {
-		logger.print("result:{}",
-				Redeploy.redeploy(HOST, PORT, x_meeting_core_entity.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
- 
-
-	@Test
-	public void x_wcrm_assemble_control() {
-		logger.print("result:{}.",
-				Redeploy.redeploy(HOST, PORT, "x_wcrm_assemble_control", Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_teamwork_assemble_control() {
-		logger.print("result:{}.",
-				Redeploy.redeploy(HOST, PORT, x_teamwork_assemble_control.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_teamwork_core_entity() {
-		logger.print("result:{}.",
-				Redeploy.redeploy(HOST, PORT, "x_teamwork_core_entity", Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-	
-	@Test
-	public void zoneland_unicom_bj_assemble_control() {
-		logger.print("result:{}.",
-				Redeploy.redeploy(HOST, PORT, "zoneland_unicom_bj_assemble_control", Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_file_core_entity() {
-		logger.print("result:{}.",
-				Redeploy.redeploy(HOST, PORT, "x_file_core_entity",Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-	
-
-}

o2server/x_build/src/main/java/com/x/build/redeploy/Redeploy_172_16_96_100.java

@@ -1,194 +0,0 @@
-package com.x.build.redeploy;
-
-import org.junit.Test;
-
-import com.x.base.core.project.x_attendance_assemble_control;
-import com.x.base.core.project.x_base_core_project;
-import com.x.base.core.project.x_bbs_assemble_control;
-import com.x.base.core.project.x_bbs_core_entity;
-import com.x.base.core.project.x_calendar_assemble_control;
-import com.x.base.core.project.x_calendar_core_entity;
-import com.x.base.core.project.x_cms_assemble_control;
-import com.x.base.core.project.x_cms_core_entity;
-import com.x.base.core.project.x_component_assemble_control;
-import com.x.base.core.project.x_file_assemble_control;
-import com.x.base.core.project.x_hotpic_assemble_control;
-import com.x.base.core.project.x_meeting_assemble_control;
-import com.x.base.core.project.x_message_assemble_communicate;
-import com.x.base.core.project.x_mind_assemble_control;
-import com.x.base.core.project.x_mind_core_entity;
-import com.x.base.core.project.x_okr_assemble_control;
-import com.x.base.core.project.x_okr_core_entity;
-import com.x.base.core.project.x_organization_assemble_authentication;
-import com.x.base.core.project.x_organization_assemble_control;
-import com.x.base.core.project.x_portal_assemble_surface;
-import com.x.base.core.project.x_processplatform_assemble_designer;
-import com.x.base.core.project.x_processplatform_assemble_surface;
-import com.x.base.core.project.x_processplatform_service_processing;
-import com.x.base.core.project.x_query_assemble_designer;
-import com.x.base.core.project.x_query_assemble_surface;
-import com.x.base.core.project.x_query_service_processing;
-import com.x.base.core.project.logger.Logger;
-import com.x.base.core.project.logger.LoggerFactory;
-
-public class Redeploy_172_16_96_100 {
-
-	private static Logger logger = LoggerFactory.getLogger(Redeploy_172_16_96_100.class);
-
-	public static final String HOST = "172.16.96.100";
-
-	public static Integer PORT = 20010;
-
-	@Test
-	public void x_hotpic_assemble_control() {
-		logger.print("result:{}",
-				Redeploy.redeploy(HOST, PORT, x_hotpic_assemble_control.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_file_assemble_control() {
-		logger.print("result:{}",
-				Redeploy.redeploy(HOST, PORT, x_file_assemble_control.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_cms_assemble_control() {
-		logger.print("result:{}",
-				Redeploy.redeploy(HOST, PORT, x_cms_assemble_control.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_cms_core_entity() {
-		logger.print("result:{}", Redeploy.redeploy(HOST, PORT, x_cms_core_entity.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_component_assemble_control() {
-		logger.print("result:{}",
-				Redeploy.redeploy(HOST, PORT, x_component_assemble_control.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_attendance_assemble_control() {
-		logger.print("result:{}",
-				Redeploy.redeploy(HOST, PORT, x_attendance_assemble_control.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_base_core_project() {
-		logger.print("result:{}",
-				Redeploy.redeploy(HOST, PORT, x_base_core_project.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_message_assemble_communicate() {
-		logger.print("result:{}",
-				Redeploy.redeploy(HOST, PORT, x_message_assemble_communicate.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_mind_assemble_control() {
-		logger.print("result:{}",
-				Redeploy.redeploy(HOST, PORT, x_mind_assemble_control.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_bbs_assemble_control() {
-		logger.print("result:{}",
-				Redeploy.redeploy(HOST, PORT, x_bbs_assemble_control.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_bbs_core_entity() {
-		logger.print("result:{}", Redeploy.redeploy(HOST, PORT, x_bbs_core_entity.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_calendar_assemble_control() {
-		logger.print("result:{}",
-				Redeploy.redeploy(HOST, PORT, x_calendar_assemble_control.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_calendar_core_entity() {
-		logger.print("result:{}",
-				Redeploy.redeploy(HOST, PORT, x_calendar_core_entity.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_okr_assemble_control() {
-		logger.print("result:{}",
-				Redeploy.redeploy(HOST, PORT, x_okr_assemble_control.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_okr_core_entity() {
-		logger.print("result:{}", Redeploy.redeploy(HOST, PORT, x_okr_core_entity.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_mind_core_entity() {
-		logger.print("result:{}", Redeploy.redeploy(HOST, PORT, x_mind_core_entity.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_query_assemble_surface() {
-		logger.print("result: {}.",
-				Redeploy.redeploy(HOST, PORT, x_query_assemble_surface.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_query_assemble_designer() {
-		logger.print("result:{}",
-				Redeploy.redeploy(HOST, PORT, x_query_assemble_designer.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_query_service_processing() {
-		logger.print("result: {}.",
-				Redeploy.redeploy(HOST, PORT, x_query_service_processing.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_processplatform_assemble_surface() {
-		logger.print("result: {}.",
-				Redeploy.redeploy(HOST, PORT, x_processplatform_assemble_surface.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_processplatform_assemble_designer() {
-		logger.print("result: {}.",
-				Redeploy.redeploy(HOST, PORT, x_processplatform_assemble_designer.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_processplatform_service_processing() {
-		logger.print("result:{}.",
-				Redeploy.redeploy(HOST, PORT, x_processplatform_service_processing.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_meeting_assemble_control() {
-		logger.print("result:{}.",
-				Redeploy.redeploy(HOST, PORT, x_meeting_assemble_control.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_organization_assemble_control() {
-		logger.print("result:{}",
-				Redeploy.redeploy(HOST, PORT, x_organization_assemble_control.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_organization_assemble_authentication() {
-		logger.print("result:{}", Redeploy.redeploy(HOST, PORT, x_organization_assemble_authentication.class,
-				Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_portal_assemble_surface() {
-		logger.print("result:{}",
-				Redeploy.redeploy(HOST, PORT, x_portal_assemble_surface.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-}

o2server/x_build/src/main/java/com/x/build/redeploy/Redeploy_172_16_97_5.java

@@ -1,194 +0,0 @@
-package com.x.build.redeploy;
-
-import org.junit.Test;
-
-import com.x.base.core.project.x_attendance_assemble_control;
-import com.x.base.core.project.x_base_core_project;
-import com.x.base.core.project.x_bbs_assemble_control;
-import com.x.base.core.project.x_bbs_core_entity;
-import com.x.base.core.project.x_calendar_assemble_control;
-import com.x.base.core.project.x_calendar_core_entity;
-import com.x.base.core.project.x_cms_assemble_control;
-import com.x.base.core.project.x_cms_core_entity;
-import com.x.base.core.project.x_component_assemble_control;
-import com.x.base.core.project.x_file_assemble_control;
-import com.x.base.core.project.x_hotpic_assemble_control;
-import com.x.base.core.project.x_meeting_assemble_control;
-import com.x.base.core.project.x_message_assemble_communicate;
-import com.x.base.core.project.x_mind_assemble_control;
-import com.x.base.core.project.x_mind_core_entity;
-import com.x.base.core.project.x_okr_assemble_control;
-import com.x.base.core.project.x_okr_core_entity;
-import com.x.base.core.project.x_organization_assemble_authentication;
-import com.x.base.core.project.x_organization_assemble_control;
-import com.x.base.core.project.x_portal_assemble_surface;
-import com.x.base.core.project.x_processplatform_assemble_designer;
-import com.x.base.core.project.x_processplatform_assemble_surface;
-import com.x.base.core.project.x_processplatform_service_processing;
-import com.x.base.core.project.x_query_assemble_designer;
-import com.x.base.core.project.x_query_assemble_surface;
-import com.x.base.core.project.x_query_service_processing;
-import com.x.base.core.project.logger.Logger;
-import com.x.base.core.project.logger.LoggerFactory;
-
-public class Redeploy_172_16_97_5 {
-
-	private static Logger logger = LoggerFactory.getLogger(Redeploy_172_16_97_5.class);
-
-	public static final String HOST = "172.16.97.5";
-
-	public static Integer PORT = 20010;
-
-	@Test
-	public void x_hotpic_assemble_control() {
-		logger.print("result:{}",
-				Redeploy.redeploy(HOST, PORT, x_hotpic_assemble_control.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_file_assemble_control() {
-		logger.print("result:{}",
-				Redeploy.redeploy(HOST, PORT, x_file_assemble_control.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_cms_assemble_control() {
-		logger.print("result:{}",
-				Redeploy.redeploy(HOST, PORT, x_cms_assemble_control.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_cms_core_entity() {
-		logger.print("result:{}", Redeploy.redeploy(HOST, PORT, x_cms_core_entity.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_component_assemble_control() {
-		logger.print("result:{}",
-				Redeploy.redeploy(HOST, PORT, x_component_assemble_control.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_attendance_assemble_control() {
-		logger.print("result:{}",
-				Redeploy.redeploy(HOST, PORT, x_attendance_assemble_control.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_base_core_project() {
-		logger.print("result:{}",
-				Redeploy.redeploy(HOST, PORT, x_base_core_project.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_message_assemble_communicate() {
-		logger.print("result:{}",
-				Redeploy.redeploy(HOST, PORT, x_message_assemble_communicate.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_mind_assemble_control() {
-		logger.print("result:{}",
-				Redeploy.redeploy(HOST, PORT, x_mind_assemble_control.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_bbs_assemble_control() {
-		logger.print("result:{}",
-				Redeploy.redeploy(HOST, PORT, x_bbs_assemble_control.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_bbs_core_entity() {
-		logger.print("result:{}", Redeploy.redeploy(HOST, PORT, x_bbs_core_entity.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_calendar_assemble_control() {
-		logger.print("result:{}",
-				Redeploy.redeploy(HOST, PORT, x_calendar_assemble_control.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_calendar_core_entity() {
-		logger.print("result:{}",
-				Redeploy.redeploy(HOST, PORT, x_calendar_core_entity.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_okr_assemble_control() {
-		logger.print("result:{}",
-				Redeploy.redeploy(HOST, PORT, x_okr_assemble_control.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_okr_core_entity() {
-		logger.print("result:{}", Redeploy.redeploy(HOST, PORT, x_okr_core_entity.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_mind_core_entity() {
-		logger.print("result:{}", Redeploy.redeploy(HOST, PORT, x_mind_core_entity.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_query_assemble_surface() {
-		logger.print("result: {}.",
-				Redeploy.redeploy(HOST, PORT, x_query_assemble_surface.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_query_assemble_designer() {
-		logger.print("result:{}",
-				Redeploy.redeploy(HOST, PORT, x_query_assemble_designer.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_query_service_processing() {
-		logger.print("result: {}.",
-				Redeploy.redeploy(HOST, PORT, x_query_service_processing.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_processplatform_assemble_surface() {
-		logger.print("result: {}.",
-				Redeploy.redeploy(HOST, PORT, x_processplatform_assemble_surface.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_processplatform_assemble_designer() {
-		logger.print("result: {}.",
-				Redeploy.redeploy(HOST, PORT, x_processplatform_assemble_designer.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_processplatform_service_processing() {
-		logger.print("result:{}.",
-				Redeploy.redeploy(HOST, PORT, x_processplatform_service_processing.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_meeting_assemble_control() {
-		logger.print("result:{}.",
-				Redeploy.redeploy(HOST, PORT, x_meeting_assemble_control.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_organization_assemble_control() {
-		logger.print("result:{}",
-				Redeploy.redeploy(HOST, PORT, x_organization_assemble_control.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_organization_assemble_authentication() {
-		logger.print("result:{}", Redeploy.redeploy(HOST, PORT, x_organization_assemble_authentication.class,
-				Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_portal_assemble_surface() {
-		logger.print("result:{}",
-				Redeploy.redeploy(HOST, PORT, x_portal_assemble_surface.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-}

o2server/x_build/src/main/java/com/x/build/redeploy/Redeploy_cx_o2oa_net.java

@@ -1,194 +0,0 @@
-package com.x.build.redeploy;
-
-import org.junit.Test;
-
-import com.x.base.core.project.x_attendance_assemble_control;
-import com.x.base.core.project.x_base_core_project;
-import com.x.base.core.project.x_bbs_assemble_control;
-import com.x.base.core.project.x_bbs_core_entity;
-import com.x.base.core.project.x_calendar_assemble_control;
-import com.x.base.core.project.x_calendar_core_entity;
-import com.x.base.core.project.x_cms_assemble_control;
-import com.x.base.core.project.x_cms_core_entity;
-import com.x.base.core.project.x_component_assemble_control;
-import com.x.base.core.project.x_file_assemble_control;
-import com.x.base.core.project.x_hotpic_assemble_control;
-import com.x.base.core.project.x_meeting_assemble_control;
-import com.x.base.core.project.x_message_assemble_communicate;
-import com.x.base.core.project.x_mind_assemble_control;
-import com.x.base.core.project.x_mind_core_entity;
-import com.x.base.core.project.x_okr_assemble_control;
-import com.x.base.core.project.x_okr_core_entity;
-import com.x.base.core.project.x_organization_assemble_authentication;
-import com.x.base.core.project.x_organization_assemble_control;
-import com.x.base.core.project.x_portal_assemble_surface;
-import com.x.base.core.project.x_processplatform_assemble_designer;
-import com.x.base.core.project.x_processplatform_assemble_surface;
-import com.x.base.core.project.x_processplatform_service_processing;
-import com.x.base.core.project.x_query_assemble_designer;
-import com.x.base.core.project.x_query_assemble_surface;
-import com.x.base.core.project.x_query_service_processing;
-import com.x.base.core.project.logger.Logger;
-import com.x.base.core.project.logger.LoggerFactory;
-
-public class Redeploy_cx_o2oa_net {
-
-	private static Logger logger = LoggerFactory.getLogger(Redeploy_cx_o2oa_net.class);
-
-	public static final String HOST = "xc.o2oa.net";
-
-	public static Integer PORT = 20010;
-
-	@Test
-	public void x_hotpic_assemble_control() {
-		logger.print("result:{}.",
-				Redeploy.redeploy(HOST, PORT, x_hotpic_assemble_control.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_file_assemble_control() {
-		logger.print("result:{}.",
-				Redeploy.redeploy(HOST, PORT, x_file_assemble_control.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_cms_assemble_control() {
-		logger.print("result:{}.",
-				Redeploy.redeploy(HOST, PORT, x_cms_assemble_control.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_cms_core_entity() {
-		logger.print("result:{}.", Redeploy.redeploy(HOST, PORT, x_cms_core_entity.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_component_assemble_control() {
-		logger.print("result:{}.",
-				Redeploy.redeploy(HOST, PORT, x_component_assemble_control.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_attendance_assemble_control() {
-		logger.print("result:{}.",
-				Redeploy.redeploy(HOST, PORT, x_attendance_assemble_control.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_base_core_project() {
-		logger.print("result:{}.",
-				Redeploy.redeploy(HOST, PORT, x_base_core_project.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_message_assemble_communicate() {
-		logger.print("result:{}.",
-				Redeploy.redeploy(HOST, PORT, x_message_assemble_communicate.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_mind_assemble_control() {
-		logger.print("result:{}.",
-				Redeploy.redeploy(HOST, PORT, x_mind_assemble_control.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_bbs_assemble_control() {
-		logger.print("result:{}.",
-				Redeploy.redeploy(HOST, PORT, x_bbs_assemble_control.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_bbs_core_entity() {
-		logger.print("result:{}.", Redeploy.redeploy(HOST, PORT, x_bbs_core_entity.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_calendar_assemble_control() {
-		logger.print("result:{}.",
-				Redeploy.redeploy(HOST, PORT, x_calendar_assemble_control.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_calendar_core_entity() {
-		logger.print("result:{}.",
-				Redeploy.redeploy(HOST, PORT, x_calendar_core_entity.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_okr_assemble_control() {
-		logger.print("result:{}.",
-				Redeploy.redeploy(HOST, PORT, x_okr_assemble_control.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_okr_core_entity() {
-		logger.print("result:{}.", Redeploy.redeploy(HOST, PORT, x_okr_core_entity.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_mind_core_entity() {
-		logger.print("result:{}.", Redeploy.redeploy(HOST, PORT, x_mind_core_entity.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_query_assemble_surface() {
-		logger.print("result: {}.",
-				Redeploy.redeploy(HOST, PORT, x_query_assemble_surface.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_query_assemble_designer() {
-		logger.print("result:{}.",
-				Redeploy.redeploy(HOST, PORT, x_query_assemble_designer.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_query_service_processing() {
-		logger.print("result: {}.",
-				Redeploy.redeploy(HOST, PORT, x_query_service_processing.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_processplatform_assemble_surface() {
-		logger.print("result: {}.",
-				Redeploy.redeploy(HOST, PORT, x_processplatform_assemble_surface.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_processplatform_assemble_designer() {
-		logger.print("result: {}.",
-				Redeploy.redeploy(HOST, PORT, x_processplatform_assemble_designer.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_processplatform_service_processing() {
-		logger.print("result:{}.",
-				Redeploy.redeploy(HOST, PORT, x_processplatform_service_processing.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_meeting_assemble_control() {
-		logger.print("result:{}.",
-				Redeploy.redeploy(HOST, PORT, x_meeting_assemble_control.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_organization_assemble_control() {
-		logger.print("result:{}.",
-				Redeploy.redeploy(HOST, PORT, x_organization_assemble_control.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_organization_assemble_authentication() {
-		logger.print("result:{}.", Redeploy.redeploy(HOST, PORT, x_organization_assemble_authentication.class,
-				Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_portal_assemble_surface() {
-		logger.print("result:{}.",
-				Redeploy.redeploy(HOST, PORT, x_portal_assemble_surface.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-}

o2server/x_build/src/main/java/com/x/build/redeploy/Redeploy_demo_o2oa_net.java

@@ -1,212 +0,0 @@
-package com.x.build.redeploy;
-
-import org.junit.Test;
-
-import com.x.base.core.project.x_attendance_assemble_control;
-import com.x.base.core.project.x_base_core_project;
-import com.x.base.core.project.x_bbs_assemble_control;
-import com.x.base.core.project.x_bbs_core_entity;
-import com.x.base.core.project.x_calendar_assemble_control;
-import com.x.base.core.project.x_calendar_core_entity;
-import com.x.base.core.project.x_cms_assemble_control;
-import com.x.base.core.project.x_cms_core_entity;
-import com.x.base.core.project.x_component_assemble_control;
-import com.x.base.core.project.x_file_assemble_control;
-import com.x.base.core.project.x_hotpic_assemble_control;
-import com.x.base.core.project.x_meeting_assemble_control;
-import com.x.base.core.project.x_message_assemble_communicate;
-import com.x.base.core.project.x_mind_assemble_control;
-import com.x.base.core.project.x_mind_core_entity;
-import com.x.base.core.project.x_okr_assemble_control;
-import com.x.base.core.project.x_okr_core_entity;
-import com.x.base.core.project.x_organization_assemble_authentication;
-import com.x.base.core.project.x_organization_assemble_control;
-import com.x.base.core.project.x_portal_assemble_surface;
-import com.x.base.core.project.x_processplatform_assemble_designer;
-import com.x.base.core.project.x_processplatform_assemble_surface;
-import com.x.base.core.project.x_processplatform_service_processing;
-import com.x.base.core.project.x_query_assemble_designer;
-import com.x.base.core.project.x_query_assemble_surface;
-import com.x.base.core.project.x_query_service_processing;
-import com.x.base.core.project.logger.Logger;
-import com.x.base.core.project.logger.LoggerFactory;
-
-public class Redeploy_demo_o2oa_net {
-
-	private static Logger logger = LoggerFactory.getLogger(Redeploy_demo_o2oa_net.class);
-
-	public static final String HOST = "114.116.106.38";
-
-	public static Integer PORT = 20010;
-
-	@Test
-	public void x_hotpic_assemble_control() {
-		logger.print("result:{}",
-				Redeploy.redeploy(HOST, PORT, x_hotpic_assemble_control.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_file_assemble_control() {
-		logger.print("result:{}",
-				Redeploy.redeploy(HOST, PORT, x_file_assemble_control.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-	
-	@Test
-	public void x_cms_assemble_control() {
-		logger.print("result:{}",
-				Redeploy.redeploy(HOST, PORT, x_cms_assemble_control.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_cms_core_entity() {
-		logger.print("result:{}", Redeploy.redeploy(HOST, PORT, x_cms_core_entity.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_component_assemble_control() {
-		logger.print("result:{}",
-				Redeploy.redeploy(HOST, PORT, x_component_assemble_control.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_attendance_assemble_control() {
-		logger.print("result:{}",
-				Redeploy.redeploy(HOST, PORT, x_attendance_assemble_control.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-//	@Test
-//	public void x_report_assemble_control() {
-//		logger.print("result:{}",
-//				Redeploy.redeploy(HOST, PORT, x_report_assemble_control.class, Redeploy.DEFAULT_PUBLIC_KEY));
-//	}
-
-	@Test
-	public void x_base_core_project() {
-		logger.print("result:{}",
-				Redeploy.redeploy(HOST, PORT, x_base_core_project.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-//	@Test
-//	public void x_report_core_entity() {
-//		logger.print("result:{}",
-//				Redeploy.redeploy(HOST, PORT, x_report_core_entity.class, Redeploy.DEFAULT_PUBLIC_KEY));
-//	}
-
-	@Test
-	public void x_message_assemble_communicate() {
-		logger.print("result:{}",
-				Redeploy.redeploy(HOST, PORT, x_message_assemble_communicate.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_mind_assemble_control() {
-		logger.print("result:{}",
-				Redeploy.redeploy(HOST, PORT, x_mind_assemble_control.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_bbs_assemble_control() {
-		logger.print("result:{}",
-				Redeploy.redeploy(HOST, PORT, x_bbs_assemble_control.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_bbs_core_entity() {
-		logger.print("result:{}", Redeploy.redeploy(HOST, PORT, x_bbs_core_entity.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_calendar_assemble_control() {
-		logger.print("result:{}",
-				Redeploy.redeploy(HOST, PORT, x_calendar_assemble_control.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_calendar_core_entity() {
-		logger.print("result:{}",
-				Redeploy.redeploy(HOST, PORT, x_calendar_core_entity.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_okr_assemble_control() {
-		logger.print("result:{}",
-				Redeploy.redeploy(HOST, PORT, x_okr_assemble_control.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_okr_core_entity() {
-		logger.print("result:{}", Redeploy.redeploy(HOST, PORT, x_okr_core_entity.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_mind_core_entity() {
-		logger.print("result:{}", Redeploy.redeploy(HOST, PORT, x_mind_core_entity.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_query_assemble_surface() {
-		logger.print("result: {}.",
-				Redeploy.redeploy(HOST, PORT, x_query_assemble_surface.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_query_assemble_designer() {
-		logger.print("result:{}",
-				Redeploy.redeploy(HOST, PORT, x_query_assemble_designer.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_query_service_processing() {
-		logger.print("result: {}.",
-				Redeploy.redeploy(HOST, PORT, x_query_service_processing.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_processplatform_assemble_surface() {
-		logger.print("result: {}.",
-				Redeploy.redeploy(HOST, PORT, x_processplatform_assemble_surface.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_processplatform_assemble_designer() {
-		logger.print("result: {}.",
-				Redeploy.redeploy(HOST, PORT, x_processplatform_assemble_designer.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_processplatform_service_processing() {
-		logger.print("result:{}",
-				Redeploy.redeploy(HOST, PORT, x_processplatform_service_processing.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_meeting_assemble_control() {
-		logger.print("result:{}",
-				Redeploy.redeploy(HOST, PORT, x_meeting_assemble_control.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_organization_assemble_control() {
-		logger.print("result:{}",
-				Redeploy.redeploy(HOST, PORT, x_organization_assemble_control.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_organization_assemble_authentication() {
-		logger.print("result:{}", Redeploy.redeploy(HOST, PORT, x_organization_assemble_authentication.class,
-				Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-//	@Test
-//	public void x_organization_assemble_custom() {
-//		logger.print("result:{}",
-//				Redeploy.redeploy(HOST, PORT, x_organization_assemble_custom.class, Redeploy.DEFAULT_PUBLIC_KEY));
-//	}
-
-	@Test
-	public void x_portal_assemble_surface() {
-		logger.print("result:{}",
-				Redeploy.redeploy(HOST, PORT, x_portal_assemble_surface.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-}

o2server/x_build/src/main/java/com/x/build/redeploy/Redeploy_dev10_o2oa_net.java

@@ -1,200 +0,0 @@
-package com.x.build.redeploy;
-
-import org.junit.Test;
-
-import com.x.base.core.project.x_attendance_assemble_control;
-import com.x.base.core.project.x_base_core_project;
-import com.x.base.core.project.x_bbs_assemble_control;
-import com.x.base.core.project.x_bbs_core_entity;
-import com.x.base.core.project.x_calendar_assemble_control;
-import com.x.base.core.project.x_calendar_core_entity;
-import com.x.base.core.project.x_cms_assemble_control;
-import com.x.base.core.project.x_cms_core_entity;
-import com.x.base.core.project.x_component_assemble_control;
-import com.x.base.core.project.x_file_assemble_control;
-import com.x.base.core.project.x_hotpic_assemble_control;
-import com.x.base.core.project.x_meeting_assemble_control;
-import com.x.base.core.project.x_message_assemble_communicate;
-import com.x.base.core.project.x_mind_assemble_control;
-import com.x.base.core.project.x_mind_core_entity;
-import com.x.base.core.project.x_okr_assemble_control;
-import com.x.base.core.project.x_okr_core_entity;
-import com.x.base.core.project.x_organization_assemble_authentication;
-import com.x.base.core.project.x_organization_assemble_control;
-import com.x.base.core.project.x_portal_assemble_surface;
-import com.x.base.core.project.x_processplatform_assemble_designer;
-import com.x.base.core.project.x_processplatform_assemble_surface;
-import com.x.base.core.project.x_processplatform_service_processing;
-import com.x.base.core.project.x_query_assemble_designer;
-import com.x.base.core.project.x_query_assemble_surface;
-import com.x.base.core.project.x_query_service_processing;
-import com.x.base.core.project.logger.Logger;
-import com.x.base.core.project.logger.LoggerFactory;
-
-public class Redeploy_dev10_o2oa_net {
-
-	private static Logger logger = LoggerFactory.getLogger(Redeploy_dev10_o2oa_net.class);
-
-	public static final String HOST = "dev10.o2oa.net";
-
-	public static Integer PORT = 20010;
-
-	@Test
-	public void x_hotpic_assemble_control() {
-		logger.print("result:{}",
-				Redeploy.redeploy(HOST, PORT, x_hotpic_assemble_control.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_file_assemble_control() {
-		logger.print("result:{}",
-				Redeploy.redeploy(HOST, PORT, x_file_assemble_control.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_cms_assemble_control() {
-		logger.print("result:{}",
-				Redeploy.redeploy(HOST, PORT, x_cms_assemble_control.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_cms_core_entity() {
-		logger.print("result:{}", Redeploy.redeploy(HOST, PORT, x_cms_core_entity.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_component_assemble_control() {
-		logger.print("result:{}",
-				Redeploy.redeploy(HOST, PORT, x_component_assemble_control.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_attendance_assemble_control() {
-		logger.print("result:{}",
-				Redeploy.redeploy(HOST, PORT, x_attendance_assemble_control.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_base_core_project() {
-		logger.print("result:{}",
-				Redeploy.redeploy(HOST, PORT, x_base_core_project.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_message_assemble_communicate() {
-		logger.print("result:{}",
-				Redeploy.redeploy(HOST, PORT, x_message_assemble_communicate.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_mind_assemble_control() {
-		logger.print("result:{}",
-				Redeploy.redeploy(HOST, PORT, x_mind_assemble_control.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_bbs_assemble_control() {
-		logger.print("result:{}",
-				Redeploy.redeploy(HOST, PORT, x_bbs_assemble_control.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_bbs_core_entity() {
-		logger.print("result:{}", Redeploy.redeploy(HOST, PORT, x_bbs_core_entity.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_calendar_assemble_control() {
-		logger.print("result:{}",
-				Redeploy.redeploy(HOST, PORT, x_calendar_assemble_control.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_calendar_core_entity() {
-		logger.print("result:{}",
-				Redeploy.redeploy(HOST, PORT, x_calendar_core_entity.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_okr_assemble_control() {
-		logger.print("result:{}",
-				Redeploy.redeploy(HOST, PORT, x_okr_assemble_control.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_okr_core_entity() {
-		logger.print("result:{}", Redeploy.redeploy(HOST, PORT, x_okr_core_entity.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_mind_core_entity() {
-		logger.print("result:{}", Redeploy.redeploy(HOST, PORT, x_mind_core_entity.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_query_assemble_surface() {
-		logger.print("result: {}.",
-				Redeploy.redeploy(HOST, PORT, x_query_assemble_surface.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_query_assemble_designer() {
-		logger.print("result:{}",
-				Redeploy.redeploy(HOST, PORT, x_query_assemble_designer.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_query_service_processing() {
-		logger.print("result: {}.",
-				Redeploy.redeploy(HOST, PORT, x_query_service_processing.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_processplatform_assemble_surface() {
-		logger.print("result: {}.",
-				Redeploy.redeploy(HOST, PORT, x_processplatform_assemble_surface.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_processplatform_assemble_designer() {
-		logger.print("result: {}.",
-				Redeploy.redeploy(HOST, PORT, x_processplatform_assemble_designer.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_processplatform_service_processing() {
-		logger.print("result:{}",
-				Redeploy.redeploy(HOST, PORT, x_processplatform_service_processing.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_meeting_assemble_control() {
-		logger.print("result:{}",
-				Redeploy.redeploy(HOST, PORT, x_meeting_assemble_control.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_organization_assemble_control() {
-		logger.print("result:{}",
-				Redeploy.redeploy(HOST, PORT, x_organization_assemble_control.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_organization_assemble_authentication() {
-		logger.print("result:{}", Redeploy.redeploy(HOST, PORT, x_organization_assemble_authentication.class,
-				Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-//	@Test
-//	public void x_organization_assemble_custom() {
-//		logger.print("result:{}",
-//				Redeploy.redeploy(HOST, PORT, x_organization_assemble_custom.class, Redeploy.DEFAULT_PUBLIC_KEY));
-//	}
-
-	@Test
-	public void x_portal_assemble_surface() {
-		logger.print("result:{}",
-				Redeploy.redeploy(HOST, PORT, x_portal_assemble_surface.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-}

o2server/x_build/src/main/java/com/x/build/redeploy/Redeploy_dev_o2oa_net.java

@@ -1,243 +0,0 @@
-package com.x.build.redeploy;
-
-import org.junit.Test;
-
-import com.x.base.core.project.x_attendance_assemble_control;
-import com.x.base.core.project.x_base_core_project;
-import com.x.base.core.project.x_bbs_assemble_control;
-import com.x.base.core.project.x_bbs_core_entity;
-import com.x.base.core.project.x_calendar_assemble_control;
-import com.x.base.core.project.x_calendar_core_entity;
-import com.x.base.core.project.x_cms_assemble_control;
-import com.x.base.core.project.x_cms_core_entity;
-import com.x.base.core.project.x_component_assemble_control;
-import com.x.base.core.project.x_file_assemble_control;
-import com.x.base.core.project.x_file_core_entity;
-import com.x.base.core.project.x_hotpic_assemble_control;
-import com.x.base.core.project.x_meeting_assemble_control;
-import com.x.base.core.project.x_message_assemble_communicate;
-import com.x.base.core.project.x_mind_assemble_control;
-import com.x.base.core.project.x_mind_core_entity;
-import com.x.base.core.project.x_okr_assemble_control;
-import com.x.base.core.project.x_okr_core_entity;
-import com.x.base.core.project.x_organization_assemble_authentication;
-import com.x.base.core.project.x_organization_assemble_control;
-import com.x.base.core.project.x_organization_assemble_express;
-import com.x.base.core.project.x_organization_core_entity;
-import com.x.base.core.project.x_portal_assemble_surface;
-import com.x.base.core.project.x_processplatform_assemble_designer;
-import com.x.base.core.project.x_processplatform_assemble_surface;
-import com.x.base.core.project.x_processplatform_service_processing;
-import com.x.base.core.project.x_query_assemble_designer;
-import com.x.base.core.project.x_query_assemble_surface;
-import com.x.base.core.project.x_query_core_express;
-import com.x.base.core.project.x_query_service_processing;
-import com.x.base.core.project.x_teamwork_assemble_control;
-import com.x.base.core.project.x_teamwork_core_entity;
-import com.x.base.core.project.logger.Logger;
-import com.x.base.core.project.logger.LoggerFactory;
-
-public class Redeploy_dev_o2oa_net {
-
-	private static Logger logger = LoggerFactory.getLogger(Redeploy_dev_o2oa_net.class);
-
-	public static final String HOST = "dev.o2oa.net";
-
-	public static Integer PORT = 20010;
-
-	@Test
-	public void x_hotpic_assemble_control() {
-		logger.print("result:{}.",
-				Redeploy.redeploy(HOST, PORT, x_hotpic_assemble_control.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_file_assemble_control() {
-		logger.print("result:{}.",
-				Redeploy.redeploy(HOST, PORT, x_file_assemble_control.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_file_core_entity() {
-		logger.print("result:{}.",
-				Redeploy.redeploy(HOST, PORT, x_file_core_entity.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_cms_assemble_control() {
-		logger.print("result:{}.",
-				Redeploy.redeploy(HOST, PORT, x_cms_assemble_control.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_cms_core_entity() {
-		logger.print("result:{}.", Redeploy.redeploy(HOST, PORT, x_cms_core_entity.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_component_assemble_control() {
-		logger.print("result:{}.",
-				Redeploy.redeploy(HOST, PORT, x_component_assemble_control.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_attendance_assemble_control() {
-		logger.print("result:{}.",
-				Redeploy.redeploy(HOST, PORT, x_attendance_assemble_control.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_base_core_project() {
-		logger.print("result:{}.",
-				Redeploy.redeploy(HOST, PORT, x_base_core_project.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_message_assemble_communicate() {
-		logger.print("result:{}.",
-				Redeploy.redeploy(HOST, PORT, x_message_assemble_communicate.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_mind_assemble_control() {
-		logger.print("result:{}.",
-				Redeploy.redeploy(HOST, PORT, x_mind_assemble_control.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_bbs_assemble_control() {
-		logger.print("result:{}.",
-				Redeploy.redeploy(HOST, PORT, x_bbs_assemble_control.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_bbs_core_entity() {
-		logger.print("result:{}.", Redeploy.redeploy(HOST, PORT, x_bbs_core_entity.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_calendar_assemble_control() {
-		logger.print("result:{}.",
-				Redeploy.redeploy(HOST, PORT, x_calendar_assemble_control.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_calendar_core_entity() {
-		logger.print("result:{}.",
-				Redeploy.redeploy(HOST, PORT, x_calendar_core_entity.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_okr_assemble_control() {
-		logger.print("result:{}.",
-				Redeploy.redeploy(HOST, PORT, x_okr_assemble_control.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_okr_core_entity() {
-		logger.print("result:{}.", Redeploy.redeploy(HOST, PORT, x_okr_core_entity.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_mind_core_entity() {
-		logger.print("result:{}.",
-				Redeploy.redeploy(HOST, PORT, x_mind_core_entity.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_query_assemble_surface() {
-		logger.print("result: {}.",
-				Redeploy.redeploy(HOST, PORT, x_query_assemble_surface.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_query_assemble_designer() {
-		logger.print("result:{}.",
-				Redeploy.redeploy(HOST, PORT, x_query_assemble_designer.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_query_service_processing() {
-		logger.print("result: {}.",
-				Redeploy.redeploy(HOST, PORT, x_query_service_processing.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-	
-	@Test
-	public void x_query_core_express() {
-		logger.print("result: {}.",
-				Redeploy.redeploy(HOST, PORT, x_query_core_express.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_processplatform_assemble_surface() {
-		logger.print("result: {}.",
-				Redeploy.redeploy(HOST, PORT, x_processplatform_assemble_surface.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_processplatform_assemble_designer() {
-		logger.print("result: {}.",
-				Redeploy.redeploy(HOST, PORT, x_processplatform_assemble_designer.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_processplatform_service_processing() {
-		logger.print("result:{}.",
-				Redeploy.redeploy(HOST, PORT, x_processplatform_service_processing.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_meeting_assemble_control() {
-		logger.print("result:{}.",
-				Redeploy.redeploy(HOST, PORT, x_meeting_assemble_control.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_organization_assemble_express() {
-		logger.print("result:{}.",
-				Redeploy.redeploy(HOST, PORT, x_organization_assemble_express.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_organization_assemble_control() {
-		logger.print("result:{}.",
-				Redeploy.redeploy(HOST, PORT, x_organization_assemble_control.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_organization_assemble_authentication() {
-		logger.print("result:{}.", Redeploy.redeploy(HOST, PORT, x_organization_assemble_authentication.class,
-				Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_portal_assemble_surface() {
-		logger.print("result:{}.",
-				Redeploy.redeploy(HOST, PORT, x_portal_assemble_surface.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_teamwork_assemble_control() {
-		logger.print("result:{}.",
-				Redeploy.redeploy(HOST, PORT, x_teamwork_assemble_control.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_teamwork_core_entity() {
-		logger.print("result:{}.",
-				Redeploy.redeploy(HOST, PORT, x_teamwork_core_entity.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_organization_core_entity() {
-		logger.print("result:{}.",
-				Redeploy.redeploy(HOST, PORT, x_organization_core_entity.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_wcrm_assemble_control() {
-		logger.print("result:{}.",
-				Redeploy.redeploy(HOST, PORT, "x_wcrm_assemble_control", Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-}

o2server/x_build/src/main/java/com/x/build/redeploy/Redeploy_poc_zoneland_net.java

@@ -1,201 +0,0 @@
-package com.x.build.redeploy;
-
-import org.junit.Test;
-
-import com.x.base.core.project.x_attendance_assemble_control;
-import com.x.base.core.project.x_base_core_project;
-import com.x.base.core.project.x_bbs_assemble_control;
-import com.x.base.core.project.x_bbs_core_entity;
-import com.x.base.core.project.x_calendar_assemble_control;
-import com.x.base.core.project.x_calendar_core_entity;
-import com.x.base.core.project.x_cms_assemble_control;
-import com.x.base.core.project.x_cms_core_entity;
-import com.x.base.core.project.x_component_assemble_control;
-import com.x.base.core.project.x_file_assemble_control;
-import com.x.base.core.project.x_hotpic_assemble_control;
-import com.x.base.core.project.x_meeting_assemble_control;
-import com.x.base.core.project.x_message_assemble_communicate;
-import com.x.base.core.project.x_mind_assemble_control;
-import com.x.base.core.project.x_mind_core_entity;
-import com.x.base.core.project.x_okr_assemble_control;
-import com.x.base.core.project.x_okr_core_entity;
-import com.x.base.core.project.x_organization_assemble_authentication;
-import com.x.base.core.project.x_organization_assemble_control;
-import com.x.base.core.project.x_portal_assemble_surface;
-import com.x.base.core.project.x_processplatform_assemble_designer;
-import com.x.base.core.project.x_processplatform_assemble_surface;
-import com.x.base.core.project.x_processplatform_service_processing;
-import com.x.base.core.project.x_query_assemble_designer;
-import com.x.base.core.project.x_query_assemble_surface;
-import com.x.base.core.project.x_query_core_express;
-import com.x.base.core.project.x_query_service_processing;
-import com.x.base.core.project.logger.Logger;
-import com.x.base.core.project.logger.LoggerFactory;
-
-public class Redeploy_poc_zoneland_net {
-
-	private static Logger logger = LoggerFactory.getLogger(Redeploy_poc_zoneland_net.class);
-
-	public static final String HOST = "poc.zoneland.net";
-
-	public static Integer PORT = 20010;
-
-	@Test
-	public void x_hotpic_assemble_control() {
-		logger.print("result:{}",
-				Redeploy.redeploy(HOST, PORT, x_hotpic_assemble_control.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_file_assemble_control() {
-		logger.print("result:{}",
-				Redeploy.redeploy(HOST, PORT, x_file_assemble_control.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_cms_assemble_control() {
-		logger.print("result:{}",
-				Redeploy.redeploy(HOST, PORT, x_cms_assemble_control.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_cms_core_entity() {
-		logger.print("result:{}", Redeploy.redeploy(HOST, PORT, x_cms_core_entity.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_component_assemble_control() {
-		logger.print("result:{}",
-				Redeploy.redeploy(HOST, PORT, x_component_assemble_control.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_attendance_assemble_control() {
-		logger.print("result:{}",
-				Redeploy.redeploy(HOST, PORT, x_attendance_assemble_control.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_base_core_project() {
-		logger.print("result:{}",
-				Redeploy.redeploy(HOST, PORT, x_base_core_project.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_message_assemble_communicate() {
-		logger.print("result:{}",
-				Redeploy.redeploy(HOST, PORT, x_message_assemble_communicate.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_mind_assemble_control() {
-		logger.print("result:{}",
-				Redeploy.redeploy(HOST, PORT, x_mind_assemble_control.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_bbs_assemble_control() {
-		logger.print("result:{}",
-				Redeploy.redeploy(HOST, PORT, x_bbs_assemble_control.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_bbs_core_entity() {
-		logger.print("result:{}", Redeploy.redeploy(HOST, PORT, x_bbs_core_entity.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_calendar_assemble_control() {
-		logger.print("result:{}",
-				Redeploy.redeploy(HOST, PORT, x_calendar_assemble_control.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_calendar_core_entity() {
-		logger.print("result:{}",
-				Redeploy.redeploy(HOST, PORT, x_calendar_core_entity.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_okr_assemble_control() {
-		logger.print("result:{}",
-				Redeploy.redeploy(HOST, PORT, x_okr_assemble_control.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_okr_core_entity() {
-		logger.print("result:{}", Redeploy.redeploy(HOST, PORT, x_okr_core_entity.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_mind_core_entity() {
-		logger.print("result:{}", Redeploy.redeploy(HOST, PORT, x_mind_core_entity.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_query_assemble_surface() {
-		logger.print("result: {}.",
-				Redeploy.redeploy(HOST, PORT, x_query_assemble_surface.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_query_assemble_designer() {
-		logger.print("result:{}",
-				Redeploy.redeploy(HOST, PORT, x_query_assemble_designer.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_query_service_processing() {
-		logger.print("result: {}.",
-				Redeploy.redeploy(HOST, PORT, x_query_service_processing.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_processplatform_assemble_surface() {
-		logger.print("result: {}.",
-				Redeploy.redeploy(HOST, PORT, x_processplatform_assemble_surface.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_processplatform_assemble_designer() {
-		logger.print("result: {}.",
-				Redeploy.redeploy(HOST, PORT, x_processplatform_assemble_designer.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_processplatform_service_processing() {
-		logger.print("result:{}",
-				Redeploy.redeploy(HOST, PORT, x_processplatform_service_processing.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_query_core_express() {
-		logger.print("result: {}.",
-				Redeploy.redeploy(HOST, PORT, x_query_core_express.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-	
-	@Test
-	public void x_meeting_assemble_control() {
-		logger.print("result:{}",
-				Redeploy.redeploy(HOST, PORT, x_meeting_assemble_control.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_organization_assemble_control() {
-		logger.print("result:{}",
-				Redeploy.redeploy(HOST, PORT, x_organization_assemble_control.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_organization_assemble_authentication() {
-		logger.print("result:{}", Redeploy.redeploy(HOST, PORT, x_organization_assemble_authentication.class,
-				Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-	@Test
-	public void x_portal_assemble_surface() {
-		logger.print("result:{}",
-				Redeploy.redeploy(HOST, PORT, x_portal_assemble_surface.class, Redeploy.DEFAULT_PUBLIC_KEY));
-	}
-
-}

o2server/x_build/src/main/java/com/x/build/redeploy/package-info.java

@@ -1,8 +0,0 @@
-/**
- * 
- */
-/**
- * @author zhour
- *
- */
-package com.x.build.redeploy;

o2server/x_build/src/main/resources/pom_template_assemble.xml

@@ -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>

o2server/x_build/src/main/resources/pom_template_core.xml

@@ -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>

o2server/x_build/src/main/resources/pom_template_service.xml

@@ -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>

o2server/x_build/version.xml

@@ -1,259 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project basedir="." name="main" default="default">
-	<basename property="project" file="${basedir}" />
-	<dirname property="o2server.dir" file="${basedir}../" />
-	<tstamp>
-		<format property="VERSION" pattern="yyyyMMddHHmmss" locale="zh-cn" />
-	</tstamp>
-
-	<path id="project.classpath">
-		<pathelement location="src/main/java" />
-		<pathelement location="src/main/resources" />
-		<pathelement location="target/classes" />
-		<fileset dir="${o2server.dir}/commons/ext">
-			<include name="**/*.jar" />
-		</fileset>
-		<fileset dir="${o2server.dir}/store/jars">
-			<include name="*.jar" />
-		</fileset>
-		<fileset dir="lib">
-			<include name="**/*.jar" />
-		</fileset>
-	</path>
-
-	<property name="TYPE" value="o2server" />
-	<property name="publish.dir" location="D:/download.o2oa.net/o2server/servers/webServer/download" />
-	<target name="default" depends="publish" />
-	<target name="prepareSource">
-		<delete dir="target/o2server" />
-		<mkdir dir="target/o2server" />
-		<mkdir dir="target/o2server/config" />
-		<mkdir dir="target/o2server/local" />
-		<mkdir dir="target/o2server/configSample" />
-		<mkdir dir="target/o2server/localSample" />
-		<mkdir dir="target/o2server/servers/webServer" />
-		<mkdir dir="target/o2server/servers/centerServer/webapps" />
-		<mkdir dir="target/o2server/servers/centerServer/work" />
-		<mkdir dir="target/o2server/servers/applicationServer/webapps" />
-		<mkdir dir="target/o2server/servers/applicationServer/work" />
-		<exec vmlauncher="false" executable="npm">
-			<arg line="install" />
-		</exec>
-		<exec vmlauncher="false" executable="npm">
-			<arg line="install -g gulp-cli" />
-		</exec>
-		<exec vmlauncher="false" executable="gulp" />
-		<copy todir="target/o2server/commons/">
-			<fileset dir="${o2server.dir}/commons/" />
-		</copy>
-		<copy todir="target/o2server/configSample">
-			<fileset dir="${o2server.dir}/configSample" />
-		</copy>
-		<copy todir="target/o2server/localSample">
-			<fileset dir="${o2server.dir}/localSample" />
-		</copy>
-		<copy todir="target/o2server/store/">
-			<fileset dir="${o2server.dir}/store/">
-				<exclude name="x_report_assemble_control.war" />
-				<exclude name="jars/x_report_core_entity.jar" />
-				<exclude name="x_strategydeploy_assemble_control.war" />
-				<exclude name="jars/x_strategydeploy_core_entity.jar" />
-			</fileset>
-		</copy>
-		<copy todir="target/o2server">
-			<fileset dir="${o2server.dir}">
-				<include name="console.jar" />
-				<include name="index.html" />
-			</fileset>
-		</copy>
-
-
-		<zip encoding="utf-8" destfile="target/o2server/src.zip" update="false">
-			<zipfileset dir="${o2server.dir}/x_base_core_project" filemode="777" dirmode="777" encoding="utf-8" includes="**/*.java" excludes="**/*_.java,src/test/**" prefix="x_base_core_project" />
-			<zipfileset dir="${o2server.dir}/x_attendance_assemble_control" filemode="777" dirmode="777" encoding="utf-8" includes="**/*.java" excludes="**/*_.java,src/test/**" prefix="x_attendance_assemble_control" />
-			<zipfileset dir="${o2server.dir}/x_attendance_core_entity" filemode="777" dirmode="777" encoding="utf-8" includes="**/*.java" excludes="**/*_.java,src/test/**" prefix="x_attendance_core_entity" />
-			<zipfileset dir="${o2server.dir}/x_bbs_core_entity" filemode="777" dirmode="777" encoding="utf-8" includes="**/*.java" excludes="**/*_.java,src/test/**" prefix="x_bbs_core_entity" />
-			<zipfileset dir="${o2server.dir}/x_calendar_core_entity" filemode="777" dirmode="777" encoding="utf-8" includes="**/*.java" excludes="**/*_.java,src/test/**" prefix="x_calendar_core_entity" />
-			<zipfileset dir="${o2server.dir}/x_cms_core_entity" filemode="777" dirmode="777" encoding="utf-8" includes="**/*.java" excludes="**/*_.java,src/test/**" prefix="x_cms_core_entity" />
-			<zipfileset dir="${o2server.dir}/x_component_core_entity" filemode="777" dirmode="777" encoding="utf-8" includes="**/*.java" excludes="**/*_.java,src/test/**" prefix="x_component_core_entity" />
-			<zipfileset dir="${o2server.dir}/x_file_core_entity" filemode="777" dirmode="777" encoding="utf-8" includes="**/*.java" excludes="**/*_.java,src/test/**" prefix="x_file_core_entity" />
-			<zipfileset dir="${o2server.dir}/x_general_core_entity" filemode="777" dirmode="777" encoding="utf-8" includes="**/*.java" excludes="**/*_.java,src/test/**" prefix="x_general_core_entity" />
-			<zipfileset dir="${o2server.dir}/x_hotpic_core_entity" filemode="777" dirmode="777" encoding="utf-8" includes="**/*.java" excludes="**/*_.java,src/test/**" prefix="x_hotpic_core_entity" />
-			<zipfileset dir="${o2server.dir}/x_jpush_core_entity" filemode="777" dirmode="777" encoding="utf-8" includes="**/*.java" excludes="**/*_.java,src/test/**" prefix="x_jpush_core_entity" />
-			<zipfileset dir="${o2server.dir}/x_meeting_core_entity" filemode="777" dirmode="777" encoding="utf-8" includes="**/*.java" excludes="**/*_.java,src/test/**" prefix="x_meeting_core_entity" />
-			<zipfileset dir="${o2server.dir}/x_message_core_entity" filemode="777" dirmode="777" encoding="utf-8" includes="**/*.java" excludes="**/*_.java,src/test/**" prefix="x_message_core_entity" />
-			<zipfileset dir="${o2server.dir}/x_mind_core_entity" filemode="777" dirmode="777" encoding="utf-8" includes="**/*.java" excludes="**/*_.java,src/test/**" prefix="x_mind_core_entity" />
-			<zipfileset dir="${o2server.dir}/x_okr_core_entity" filemode="777" dirmode="777" encoding="utf-8" includes="**/*.java" excludes="**/*_.java,src/test/**" prefix="x_okr_core_entity" />
-			<zipfileset dir="${o2server.dir}/x_organization_core_entity" filemode="777" dirmode="777" encoding="utf-8" includes="**/*.java" excludes="**/*_.java,src/test/**" prefix="x_organization_core_entity" />
-			<zipfileset dir="${o2server.dir}/x_portal_core_entity" filemode="777" dirmode="777" encoding="utf-8" includes="**/*.java" excludes="**/*_.java,src/test/**" prefix="x_portal_core_entity" />
-			<zipfileset dir="${o2server.dir}/x_processplatform_core_entity" filemode="777" dirmode="777" encoding="utf-8" includes="**/*.java" excludes="**/*_.java,src/test/**" prefix="x_processplatform_core_entity" />
-			<zipfileset dir="${o2server.dir}/x_query_core_entity" filemode="777" dirmode="777" encoding="utf-8" includes="**/*.java" excludes="**/*_.java,src/test/**" prefix="x_query_core_entity" />
-			<zipfileset dir="${o2server.dir}/x_program_center_core_entity" filemode="777" dirmode="777" encoding="utf-8" includes="**/*.java" excludes="**/*_.java,src/test/**" prefix="x_program_center_core_entity" />
-			<zipfileset dir="${o2server.dir}/x_organization_core_express" filemode="777" dirmode="777" encoding="utf-8" includes="**/*.java" excludes="**/*_.java,src/test/**" prefix="x_organization_core_express" />
-			<zipfileset dir="${o2server.dir}/x_query_core_express" filemode="777" dirmode="777" encoding="utf-8" includes="**/*.java" excludes="**/*_.java,src/test/**" prefix="x_query_core_express" />
-			<zipfileset dir="${o2server.dir}/x_bbs_assemble_control" filemode="777" dirmode="777" encoding="utf-8" includes="**/*.java" excludes="**/*_.java,src/test/**" prefix="x_bbs_assemble_control" />
-			<zipfileset dir="${o2server.dir}/x_calendar_assemble_control" filemode="777" dirmode="777" encoding="utf-8" includes="**/*.java" excludes="**/*_.java,src/test/**" prefix="x_calendar_assemble_control" />
-			<zipfileset dir="${o2server.dir}/x_cms_assemble_control" filemode="777" dirmode="777" encoding="utf-8" includes="**/*.java" excludes="**/*_.java,src/test/**" prefix="x_cms_assemble_control" />
-			<zipfileset dir="${o2server.dir}/x_component_assemble_control" filemode="777" dirmode="777" encoding="utf-8" includes="**/*.java" excludes="**/*_.java,src/test/**" prefix="x_component_assemble_control" />
-			<zipfileset dir="${o2server.dir}/x_file_assemble_control" filemode="777" dirmode="777" encoding="utf-8" includes="**/*.java" excludes="**/*_.java,src/test/**" prefix="x_file_assemble_control" />
-			<zipfileset dir="${o2server.dir}/x_general_assemble_control" filemode="777" dirmode="777" encoding="utf-8" includes="**/*.java" excludes="**/*_.java,src/test/**" prefix="x_general_assemble_control" />
-			<zipfileset dir="${o2server.dir}/x_hotpic_assemble_control" filemode="777" dirmode="777" encoding="utf-8" includes="**/*.java" excludes="**/*_.java,src/test/**" prefix="x_hotpic_assemble_control" />
-			<zipfileset dir="${o2server.dir}/x_meeting_assemble_control" filemode="777" dirmode="777" encoding="utf-8" includes="**/*.java" excludes="**/*_.java,src/test/**" prefix="x_meeting_assemble_control" />
-			<zipfileset dir="${o2server.dir}/x_message_assemble_communicate" filemode="777" dirmode="777" encoding="utf-8" includes="**/*.java" excludes="**/*_.java,src/test/**" prefix="x_message_assemble_communicate" />
-			<zipfileset dir="${o2server.dir}/x_mind_assemble_control" filemode="777" dirmode="777" encoding="utf-8" includes="**/*.java" excludes="**/*_.java,src/test/**" prefix="x_mind_assemble_control" />
-			<zipfileset dir="${o2server.dir}/x_okr_assemble_control" filemode="777" dirmode="777" encoding="utf-8" includes="**/*.java" excludes="**/*_.java,src/test/**" prefix="x_okr_assemble_control" />
-			<zipfileset dir="${o2server.dir}/x_organization_assemble_authentication" filemode="777" dirmode="777" encoding="utf-8" includes="**/*.java" excludes="**/*_.java,src/test/**" prefix="x_organization_assemble_authentication" />
-			<zipfileset dir="${o2server.dir}/x_organization_assemble_control" filemode="777" dirmode="777" encoding="utf-8" includes="**/*.java" excludes="**/*_.java,src/test/**" prefix="x_organization_assemble_control" />
-			<zipfileset dir="${o2server.dir}/x_organization_assemble_express" filemode="777" dirmode="777" encoding="utf-8" includes="**/*.java" excludes="**/*_.java,src/test/**" prefix="x_organization_assemble_express" />
-			<zipfileset dir="${o2server.dir}/x_organization_assemble_personal" filemode="777" dirmode="777" encoding="utf-8" includes="**/*.java" excludes="**/*_.java,src/test/**" prefix="x_organization_assemble_personal" />
-			<zipfileset dir="${o2server.dir}/x_portal_assemble_designer" filemode="777" dirmode="777" encoding="utf-8" includes="**/*.java" excludes="**/*_.java,src/test/**" prefix="x_portal_assemble_designer" />
-			<zipfileset dir="${o2server.dir}/x_portal_assemble_surface" filemode="777" dirmode="777" encoding="utf-8" includes="**/*.java" excludes="**/*_.java,src/test/**" prefix="x_portal_assemble_surface" />
-			<zipfileset dir="${o2server.dir}/x_processplatform_assemble_bam" filemode="777" dirmode="777" encoding="utf-8" includes="**/*.java" excludes="**/*_.java,src/test/**" prefix="x_processplatform_assemble_bam" />
-			<zipfileset dir="${o2server.dir}/x_processplatform_assemble_designer" filemode="777" dirmode="777" encoding="utf-8" includes="**/*.java" excludes="**/*_.java,src/test/**" prefix="x_processplatform_assemble_designer" />
-			<zipfileset dir="${o2server.dir}/x_processplatform_assemble_surface" filemode="777" dirmode="777" encoding="utf-8" includes="**/*.java" excludes="**/*_.java,src/test/**" prefix="x_processplatform_assemble_surface" />
-			<zipfileset dir="${o2server.dir}/x_processplatform_service_processing" filemode="777" dirmode="777" encoding="utf-8" includes="**/*.java" excludes="**/*_.java,src/test/**" prefix="x_processplatform_service_processing" />
-			<zipfileset dir="${o2server.dir}/x_query_assemble_designer" filemode="777" dirmode="777" encoding="utf-8" includes="**/*.java" excludes="**/*_.java,src/test/**" prefix="x_query_assemble_designer" />
-			<zipfileset dir="${o2server.dir}/x_query_assemble_surface" filemode="777" dirmode="777" encoding="utf-8" includes="**/*.java" excludes="**/*_.java,src/test/**" prefix="x_query_assemble_surface" />
-			<zipfileset dir="${o2server.dir}/x_query_service_processing" filemode="777" dirmode="777" encoding="utf-8" includes="**/*.java" excludes="**/*_.java,src/test/**" prefix="x_query_service_processing" />
-			<zipfileset dir="${o2server.dir}/x_program_center" filemode="777" dirmode="777" encoding="utf-8" includes="**/*.java" excludes="**/*_.java,src/test/**" prefix="x_program_center" />
-			<zipfileset dir="${o2server.dir}/x_console" filemode="777" dirmode="777" encoding="utf-8" includes="**/*.java" excludes="**/*_.java,src/test/**" prefix="x_console" />
-		</zip>
-
-		<echo message="${VERSION}" file="target/o2server/version.o2" append="false" />
-	</target>
-
-
-	<target name="publish" depends="prepareSource">
-		<!--windows-->
-		<delete dir="target/o2server/jvm" />
-		<mkdir dir="target/o2server/jvm" />
-		<copy todir="target/o2server/jvm/windows">
-			<fileset dir="${o2server.dir}/jvm/windows" />
-		</copy>
-		<copy todir="target/o2server">
-			<fileset dir="${o2server.dir}">
-				<include name="start_windows.bat" />
-				<include name="start_windows_debug.bat" />
-				<include name="stop_windows.bat" />
-				<include name="console_windows.bat" />
-				<include name="service_windows.bat" />
-			</fileset>
-		</copy>
-		<zip encoding="utf-8" destfile="${publish.dir}/${TYPE}_${VERSION}_windows.zip" update="false">
-			<zipfileset dir="target/o2server/" filemode="777" dirmode="777" encoding="utf-8" prefix="o2server" />
-		</zip>
-		<!--linux-->
-		<delete dir="target/o2server/jvm" />
-		<mkdir dir="target/o2server/jvm" />
-		<copy todir="target/o2server/jvm/linux">
-			<fileset dir="${o2server.dir}/jvm/linux" />
-		</copy>
-		<delete file="target/o2server/start_windows.bat" />
-		<delete file="target/o2server/start_windows_debug.bat" />
-		<delete file="target/o2server/stop_windows.bat" />
-		<delete file="target/o2server/console_windows.bat" />
-		<delete file="target/o2server/service_windows.bat" />
-		<copy todir="target/o2server">
-			<fileset dir="${o2server.dir}">
-				<include name="start_linux.sh" />
-				<include name="start_linux_debug.sh" />
-				<include name="stop_linux.sh" />
-				<include name="console_linux.sh" />
-			</fileset>
-		</copy>
-		<zip encoding="utf-8" destfile="${publish.dir}/${TYPE}_${VERSION}_linux.zip" update="false">
-			<zipfileset dir="target/o2server/" filemode="777" dirmode="777" encoding="utf-8" prefix="o2server" />
-		</zip>
-		<!--macos-->
-		<delete dir="target/o2server/jvm" />
-		<mkdir dir="target/o2server/jvm" />
-		<copy todir="target/o2server/jvm/macos">
-			<fileset dir="${o2server.dir}/jvm/macos" />
-		</copy>
-		<delete file="target/o2server/start_linux.sh" />
-		<delete file="target/o2server/start_linux_debug.sh" />
-		<delete file="target/o2server/stop_linux.sh" />
-		<delete file="target/o2server/console_linux.sh" />
-		<copy todir="target/o2server">
-			<fileset dir="${o2server.dir}">
-				<include name="start_macos.sh" />
-				<include name="start_macos_debug.sh" />
-				<include name="stop_macos.sh" />
-				<include name="console_macos.sh" />
-			</fileset>
-		</copy>
-		<mkdir dir="${publish.dir}" />
-		<zip encoding="utf-8" destfile="${publish.dir}/${TYPE}_${VERSION}_macos.zip" update="false">
-			<zipfileset dir="target/o2server/" filemode="777" dirmode="777" encoding="utf-8" prefix="o2server" />
-		</zip>
-		<!--aix-->
-		<delete dir="target/o2server/jvm" />
-		<mkdir dir="target/o2server/jvm" />
-		<copy todir="target/o2server/jvm/aix">
-			<fileset dir="${o2server.dir}/jvm/aix" />
-		</copy>
-		<delete file="target/o2server/start_macos.sh" />
-		<delete file="target/o2server/start_macos_debug.sh" />
-		<delete file="target/o2server/stop_macos.sh" />
-		<delete file="target/o2server/console_macos.sh" />
-		<copy todir="target/o2server">
-			<fileset dir="${o2server.dir}">
-				<include name="start_aix.sh" />
-				<include name="start_aix_debug.sh" />
-				<include name="stop_aix.sh" />
-				<include name="console_aix.sh" />
-			</fileset>
-		</copy>
-		<zip encoding="utf-8" destfile="${publish.dir}/${TYPE}_${VERSION}_aix.zip" update="false">
-			<zipfileset dir="target/o2server/" filemode="777" dirmode="777" encoding="utf-8" prefix="o2server" />
-		</zip>
-		<!--neokylin_loongson-->
-		<delete dir="target/o2server/jvm" />
-		<mkdir dir="target/o2server/jvm" />
-		<copy todir="target/o2server/jvm/neokylin_loongson">
-			<fileset dir="${o2server.dir}/jvm/neokylin_loongson" />
-		</copy>
-		<delete file="target/o2server/start_aix.sh" />
-		<delete file="target/o2server/start_aix_debug.sh" />
-		<delete file="target/o2server/stop_aix.sh" />
-		<delete file="target/o2server/console_aix.sh" />
-		<copy todir="target/o2server">
-			<fileset dir="${o2server.dir}">
-				<include name="start_neokylin_loongson.sh" />
-				<include name="start_neokylin_loongson_debug.sh" />
-				<include name="stop_neokylin_loongson.sh" />
-				<include name="console_neokylin_loongson.sh" />
-			</fileset>
-		</copy>
-		<zip encoding="utf-8" destfile="${publish.dir}/${TYPE}_${VERSION}_neokylin_loongson.zip" update="false">
-			<zipfileset dir="target/o2server/" filemode="777" dirmode="777" encoding="utf-8" prefix="o2server" />
-		</zip>
-		<!--raspberrypi-->
-		<delete dir="target/o2server/jvm" />
-		<mkdir dir="target/o2server/jvm" />
-		<copy todir="target/o2server/jvm/raspberrypi">
-			<fileset dir="${o2server.dir}/jvm/raspberrypi" />
-		</copy>
-		<delete file="target/o2server/start_neokylin_loongson.sh" />
-		<delete file="target/o2server/start_neokylin_loongson_debug.sh" />
-		<delete file="target/o2server/stop_neokylin_loongson.sh" />
-		<delete file="target/o2server/console_neokylin_loongson.sh" />
-		<copy todir="target/o2server">
-			<fileset dir="${o2server.dir}">
-				<include name="start_raspberrypi.sh" />
-				<include name="start_raspberrypi_debug.sh" />
-				<include name="stop_raspberrypi.sh" />
-				<include name="console_raspberrypi.sh" />
-			</fileset>
-		</copy>
-		<zip encoding="utf-8" destfile="${publish.dir}/${TYPE}_${VERSION}_raspberrypi.zip" update="false">
-			<zipfileset dir="target/o2server/" filemode="777" dirmode="777" encoding="utf-8" prefix="o2server" />
-		</zip>
-		<java classname="com.x.build.Publish">
-			<classpath refid="project.classpath" />
-			<arg value="${VERSION}" />
-			<arg value="${publish.dir}" />
-		</java>
-	</target>
-
-</project>

o2server/x_build/wrdp.xml

@@ -1,231 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project basedir="." name="main" default="default">
-	<basename property="project" file="${basedir}" />
-	<dirname property="o2server.dir" file="${basedir}../" />
-	<tstamp>
-		<format property="VERSION" pattern="yyyyMMddHHmmss" locale="zh-cn" />
-	</tstamp>
-
-	<path id="project.classpath">
-		<pathelement location="src/main/java" />
-		<pathelement location="src/main/resources" />
-		<pathelement location="target/classes" />
-		<fileset dir="${o2server.dir}/commons/ext">
-			<include name="**/*.jar" />
-		</fileset>
-		<fileset dir="${o2server.dir}/store/jars">
-			<include name="*.jar" />
-		</fileset>
-		<fileset dir="lib">
-			<include name="**/*.jar" />
-		</fileset>
-	</path>
-
-	<property name="TYPE" value="wrdp" />
-	<property name="publish.dir" location="D:/www.zoneland.net/o2server/servers/webServer/wrdp/download" />
-	<target name="default" depends="publish" />
-	<target name="prepareSource">
-		<delete dir="target/o2server" />
-		<mkdir dir="target/o2server" />
-		<mkdir dir="target/o2server/config" />
-		<mkdir dir="target/o2server/local" />
-		<mkdir dir="target/o2server/configSample" />
-		<mkdir dir="target/o2server/localSample" />
-		<mkdir dir="target/o2server/servers/webServer" />
-		<mkdir dir="target/o2server/servers/centerServer/webapps" />
-		<mkdir dir="target/o2server/servers/centerServer/work" />
-		<mkdir dir="target/o2server/servers/applicationServer/webapps" />
-		<mkdir dir="target/o2server/servers/applicationServer/work" />
-		<exec vmlauncher="false" executable="npm">
-			<arg line="install" />
-		</exec>
-		<exec vmlauncher="false" executable="npm">
-			<arg line="install -g gulp-cli" />
-		</exec>
-		<exec vmlauncher="false" executable="gulp" />
-		<copy todir="target/o2server/commons/">
-			<fileset dir="${o2server.dir}/commons/" />
-		</copy>
-		<copy todir="target/o2server/configSample">
-			<fileset dir="${o2server.dir}/configSample" />
-		</copy>
-		<copy todir="target/o2server/localSample">
-			<fileset dir="${o2server.dir}/localSample" />
-		</copy>
-		<copy todir="target/o2server/store/">
-			<fileset dir="${o2server.dir}/store/">
-				<exclude name="x_report_assemble_control.war" />
-				<exclude name="jars/x_report_core_entity.jar" />
-				<exclude name="x_strategydeploy_assemble_control.war" />
-				<exclude name="jars/x_strategydeploy_core_entity.jar" />
-			</fileset>
-		</copy>
-		<copy todir="target/o2server">
-			<fileset dir="${o2server.dir}">
-				<include name="console.jar" />
-				<include name="index.html" />
-			</fileset>
-		</copy>
-
-
-		<zip encoding="utf-8" destfile="target/o2server/src.zip" update="false">
-			<zipfileset dir="${o2server.dir}/x_base_core_project" filemode="777" dirmode="777" encoding="utf-8" includes="**/*.java" excludes="**/*_.java,src/test/**" prefix="x_base_core_project" />
-			<zipfileset dir="${o2server.dir}/x_attendance_assemble_control" filemode="777" dirmode="777" encoding="utf-8" includes="**/*.java" excludes="**/*_.java,src/test/**" prefix="x_attendance_assemble_control" />
-			<zipfileset dir="${o2server.dir}/x_attendance_core_entity" filemode="777" dirmode="777" encoding="utf-8" includes="**/*.java" excludes="**/*_.java,src/test/**" prefix="x_attendance_core_entity" />
-			<zipfileset dir="${o2server.dir}/x_bbs_core_entity" filemode="777" dirmode="777" encoding="utf-8" includes="**/*.java" excludes="**/*_.java,src/test/**" prefix="x_bbs_core_entity" />
-			<zipfileset dir="${o2server.dir}/x_calendar_core_entity" filemode="777" dirmode="777" encoding="utf-8" includes="**/*.java" excludes="**/*_.java,src/test/**" prefix="x_calendar_core_entity" />
-			<zipfileset dir="${o2server.dir}/x_cms_core_entity" filemode="777" dirmode="777" encoding="utf-8" includes="**/*.java" excludes="**/*_.java,src/test/**" prefix="x_cms_core_entity" />
-			<zipfileset dir="${o2server.dir}/x_component_core_entity" filemode="777" dirmode="777" encoding="utf-8" includes="**/*.java" excludes="**/*_.java,src/test/**" prefix="x_component_core_entity" />
-			<zipfileset dir="${o2server.dir}/x_file_core_entity" filemode="777" dirmode="777" encoding="utf-8" includes="**/*.java" excludes="**/*_.java,src/test/**" prefix="x_file_core_entity" />
-			<zipfileset dir="${o2server.dir}/x_general_core_entity" filemode="777" dirmode="777" encoding="utf-8" includes="**/*.java" excludes="**/*_.java,src/test/**" prefix="x_general_core_entity" />
-			<zipfileset dir="${o2server.dir}/x_hotpic_core_entity" filemode="777" dirmode="777" encoding="utf-8" includes="**/*.java" excludes="**/*_.java,src/test/**" prefix="x_hotpic_core_entity" />
-			<zipfileset dir="${o2server.dir}/x_meeting_core_entity" filemode="777" dirmode="777" encoding="utf-8" includes="**/*.java" excludes="**/*_.java,src/test/**" prefix="x_meeting_core_entity" />
-			<zipfileset dir="${o2server.dir}/x_message_core_entity" filemode="777" dirmode="777" encoding="utf-8" includes="**/*.java" excludes="**/*_.java,src/test/**" prefix="x_message_core_entity" />
-			<zipfileset dir="${o2server.dir}/x_mind_core_entity" filemode="777" dirmode="777" encoding="utf-8" includes="**/*.java" excludes="**/*_.java,src/test/**" prefix="x_mind_core_entity" />
-			<zipfileset dir="${o2server.dir}/x_okr_core_entity" filemode="777" dirmode="777" encoding="utf-8" includes="**/*.java" excludes="**/*_.java,src/test/**" prefix="x_okr_core_entity" />
-			<zipfileset dir="${o2server.dir}/x_organization_core_entity" filemode="777" dirmode="777" encoding="utf-8" includes="**/*.java" excludes="**/*_.java,src/test/**" prefix="x_organization_core_entity" />
-			<zipfileset dir="${o2server.dir}/x_portal_core_entity" filemode="777" dirmode="777" encoding="utf-8" includes="**/*.java" excludes="**/*_.java,src/test/**" prefix="x_portal_core_entity" />
-			<zipfileset dir="${o2server.dir}/x_processplatform_core_entity" filemode="777" dirmode="777" encoding="utf-8" includes="**/*.java" excludes="**/*_.java,src/test/**" prefix="x_processplatform_core_entity" />
-			<zipfileset dir="${o2server.dir}/x_query_core_entity" filemode="777" dirmode="777" encoding="utf-8" includes="**/*.java" excludes="**/*_.java,src/test/**" prefix="x_query_core_entity" />
-			<zipfileset dir="${o2server.dir}/x_program_center_core_entity" filemode="777" dirmode="777" encoding="utf-8" includes="**/*.java" excludes="**/*_.java,src/test/**" prefix="x_program_center_core_entity" />
-			<zipfileset dir="${o2server.dir}/x_organization_core_express" filemode="777" dirmode="777" encoding="utf-8" includes="**/*.java" excludes="**/*_.java,src/test/**" prefix="x_organization_core_express" />
-			<zipfileset dir="${o2server.dir}/x_query_core_express" filemode="777" dirmode="777" encoding="utf-8" includes="**/*.java" excludes="**/*_.java,src/test/**" prefix="x_query_core_express" />
-			<zipfileset dir="${o2server.dir}/x_bbs_assemble_control" filemode="777" dirmode="777" encoding="utf-8" includes="**/*.java" excludes="**/*_.java,src/test/**" prefix="x_bbs_assemble_control" />
-			<zipfileset dir="${o2server.dir}/x_calendar_assemble_control" filemode="777" dirmode="777" encoding="utf-8" includes="**/*.java" excludes="**/*_.java,src/test/**" prefix="x_calendar_assemble_control" />
-			<zipfileset dir="${o2server.dir}/x_cms_assemble_control" filemode="777" dirmode="777" encoding="utf-8" includes="**/*.java" excludes="**/*_.java,src/test/**" prefix="x_cms_assemble_control" />
-			<zipfileset dir="${o2server.dir}/x_component_assemble_control" filemode="777" dirmode="777" encoding="utf-8" includes="**/*.java" excludes="**/*_.java,src/test/**" prefix="x_component_assemble_control" />
-			<zipfileset dir="${o2server.dir}/x_file_assemble_control" filemode="777" dirmode="777" encoding="utf-8" includes="**/*.java" excludes="**/*_.java,src/test/**" prefix="x_file_assemble_control" />
-			<zipfileset dir="${o2server.dir}/x_general_assemble_control" filemode="777" dirmode="777" encoding="utf-8" includes="**/*.java" excludes="**/*_.java,src/test/**" prefix="x_general_assemble_control" />
-			<zipfileset dir="${o2server.dir}/x_hotpic_assemble_control" filemode="777" dirmode="777" encoding="utf-8" includes="**/*.java" excludes="**/*_.java,src/test/**" prefix="x_hotpic_assemble_control" />
-			<zipfileset dir="${o2server.dir}/x_meeting_assemble_control" filemode="777" dirmode="777" encoding="utf-8" includes="**/*.java" excludes="**/*_.java,src/test/**" prefix="x_meeting_assemble_control" />
-			<zipfileset dir="${o2server.dir}/x_message_assemble_communicate" filemode="777" dirmode="777" encoding="utf-8" includes="**/*.java" excludes="**/*_.java,src/test/**" prefix="x_message_assemble_communicate" />
-			<zipfileset dir="${o2server.dir}/x_mind_assemble_control" filemode="777" dirmode="777" encoding="utf-8" includes="**/*.java" excludes="**/*_.java,src/test/**" prefix="x_mind_assemble_control" />
-			<zipfileset dir="${o2server.dir}/x_okr_assemble_control" filemode="777" dirmode="777" encoding="utf-8" includes="**/*.java" excludes="**/*_.java,src/test/**" prefix="x_okr_assemble_control" />
-			<zipfileset dir="${o2server.dir}/x_organization_assemble_authentication" filemode="777" dirmode="777" encoding="utf-8" includes="**/*.java" excludes="**/*_.java,src/test/**" prefix="x_organization_assemble_authentication" />
-			<zipfileset dir="${o2server.dir}/x_organization_assemble_control" filemode="777" dirmode="777" encoding="utf-8" includes="**/*.java" excludes="**/*_.java,src/test/**" prefix="x_organization_assemble_control" />
-			<zipfileset dir="${o2server.dir}/x_organization_assemble_express" filemode="777" dirmode="777" encoding="utf-8" includes="**/*.java" excludes="**/*_.java,src/test/**" prefix="x_organization_assemble_express" />
-			<zipfileset dir="${o2server.dir}/x_organization_assemble_personal" filemode="777" dirmode="777" encoding="utf-8" includes="**/*.java" excludes="**/*_.java,src/test/**" prefix="x_organization_assemble_personal" />
-			<zipfileset dir="${o2server.dir}/x_portal_assemble_designer" filemode="777" dirmode="777" encoding="utf-8" includes="**/*.java" excludes="**/*_.java,src/test/**" prefix="x_portal_assemble_designer" />
-			<zipfileset dir="${o2server.dir}/x_portal_assemble_surface" filemode="777" dirmode="777" encoding="utf-8" includes="**/*.java" excludes="**/*_.java,src/test/**" prefix="x_portal_assemble_surface" />
-			<zipfileset dir="${o2server.dir}/x_processplatform_assemble_bam" filemode="777" dirmode="777" encoding="utf-8" includes="**/*.java" excludes="**/*_.java,src/test/**" prefix="x_processplatform_assemble_bam" />
-			<zipfileset dir="${o2server.dir}/x_processplatform_assemble_designer" filemode="777" dirmode="777" encoding="utf-8" includes="**/*.java" excludes="**/*_.java,src/test/**" prefix="x_processplatform_assemble_designer" />
-			<zipfileset dir="${o2server.dir}/x_processplatform_assemble_surface" filemode="777" dirmode="777" encoding="utf-8" includes="**/*.java" excludes="**/*_.java,src/test/**" prefix="x_processplatform_assemble_surface" />
-			<zipfileset dir="${o2server.dir}/x_processplatform_service_processing" filemode="777" dirmode="777" encoding="utf-8" includes="**/*.java" excludes="**/*_.java,src/test/**" prefix="x_processplatform_service_processing" />
-			<zipfileset dir="${o2server.dir}/x_query_assemble_designer" filemode="777" dirmode="777" encoding="utf-8" includes="**/*.java" excludes="**/*_.java,src/test/**" prefix="x_query_assemble_designer" />
-			<zipfileset dir="${o2server.dir}/x_query_assemble_surface" filemode="777" dirmode="777" encoding="utf-8" includes="**/*.java" excludes="**/*_.java,src/test/**" prefix="x_query_assemble_surface" />
-			<zipfileset dir="${o2server.dir}/x_query_service_processing" filemode="777" dirmode="777" encoding="utf-8" includes="**/*.java" excludes="**/*_.java,src/test/**" prefix="x_query_service_processing" />
-			<zipfileset dir="${o2server.dir}/x_program_center" filemode="777" dirmode="777" encoding="utf-8" includes="**/*.java" excludes="**/*_.java,src/test/**" prefix="x_program_center" />
-			<zipfileset dir="${o2server.dir}/x_console" filemode="777" dirmode="777" encoding="utf-8" includes="**/*.java" excludes="**/*_.java,src/test/**" prefix="x_console" />
-		</zip>
-
-		<echo message="${VERSION}" file="target/o2server/version.o2" append="false" />
-	</target>
-
-
-	<target name="publish" depends="prepareSource">
-		<!--windows-->
-		<delete dir="target/o2server/jvm" />
-		<mkdir dir="target/o2server/jvm" />
-		<copy todir="target/o2server/jvm/windows">
-			<fileset dir="${o2server.dir}/jvm/windows" />
-		</copy>
-		<copy todir="target/o2server">
-			<fileset dir="${o2server.dir}">
-				<include name="start_windows.bat" />
-				<include name="start_windows_debug.bat" />
-				<include name="stop_windows.bat" />
-				<include name="console_windows.bat" />
-				<include name="service_windows.bat" />
-			</fileset>
-		</copy>
-		<zip encoding="utf-8" destfile="${publish.dir}/${TYPE}_${VERSION}_windows.zip" update="false">
-			<zipfileset dir="target/o2server/" filemode="777" dirmode="777" encoding="utf-8" prefix="o2server" />
-		</zip>
-		<!--linux-->
-		<delete dir="target/o2server/jvm" />
-		<mkdir dir="target/o2server/jvm" />
-		<copy todir="target/o2server/jvm/linux">
-			<fileset dir="${o2server.dir}/jvm/linux" />
-		</copy>
-		<delete file="target/o2server/start_windows.bat" />
-		<delete file="target/o2server/start_windows_debug.bat" />
-		<delete file="target/o2server/stop_windows.bat" />
-		<delete file="target/o2server/console_windows.bat" />
-		<delete file="target/o2server/service_windows.bat" />
-		<copy todir="target/o2server">
-			<fileset dir="${o2server.dir}">
-				<include name="start_linux.sh" />
-				<include name="stop_linux.sh" />
-				<include name="console_linux.sh" />
-			</fileset>
-		</copy>
-		<zip encoding="utf-8" destfile="${publish.dir}/${TYPE}_${VERSION}_linux.zip" update="false">
-			<zipfileset dir="target/o2server/" filemode="777" dirmode="777" encoding="utf-8" prefix="o2server" />
-		</zip>
-		<!--macos-->
-		<delete dir="target/o2server/jvm" />
-		<mkdir dir="target/o2server/jvm" />
-		<copy todir="target/o2server/jvm/macos">
-			<fileset dir="${o2server.dir}/jvm/macos" />
-		</copy>
-		<delete file="target/o2server/start_linux.sh" />
-		<delete file="target/o2server/start_linux_debug.sh" />
-		<delete file="target/o2server/stop_linux.sh" />
-		<delete file="target/o2server/console_linux.sh" />
-		<copy todir="target/o2server">
-			<fileset dir="${o2server.dir}">
-				<include name="start_macos.sh" />
-				<include name="start_macos_debug.sh" />
-				<include name="stop_macos.sh" />
-				<include name="console_macos.sh" />
-			</fileset>
-		</copy>
-		<mkdir dir="${publish.dir}" />
-		<zip encoding="utf-8" destfile="${publish.dir}/${TYPE}_${VERSION}_macos.zip" update="false">
-			<zipfileset dir="target/o2server/" filemode="777" dirmode="777" encoding="utf-8" prefix="o2server" />
-		</zip>
-		<!--aix-->
-		<delete dir="target/o2server/jvm" />
-		<mkdir dir="target/o2server/jvm" />
-		<copy todir="target/o2server/jvm/aix">
-			<fileset dir="${o2server.dir}/jvm/aix" />
-		</copy>
-		<delete file="target/o2server/start_macos.sh" />
-		<delete file="target/o2server/start_macos_debug.sh" />
-		<delete file="target/o2server/stop_macos.sh" />
-		<delete file="target/o2server/console_macos.sh" />
-		<copy todir="target/o2server">
-			<fileset dir="${o2server.dir}">
-				<include name="start_aix.sh" />
-				<include name="start_aix_debug.sh" />
-				<include name="stop_aix.sh" />
-				<include name="console_aix.sh" />
-			</fileset>
-		</copy>
-		<zip encoding="utf-8" destfile="${publish.dir}/${TYPE}_${VERSION}_aix.zip" update="false">
-			<zipfileset dir="target/o2server/" filemode="777" dirmode="777" encoding="utf-8" prefix="o2server" />
-		</zip>
-		<!--neokylin_loongson-->
-		<delete dir="target/o2server/jvm" />
-		<mkdir dir="target/o2server/jvm" />
-		<copy todir="target/o2server/jvm/neokylin_loongson">
-			<fileset dir="${o2server.dir}/jvm/neokylin_loongson" />
-		</copy>
-		<delete file="target/o2server/start_aix.sh" />
-		<delete file="target/o2server/start_aix_debug.sh" />
-		<delete file="target/o2server/stop_aix.sh" />
-		<delete file="target/o2server/console_aix.sh" />
-		<copy todir="target/o2server">
-			<fileset dir="${o2server.dir}">
-				<include name="start_neokylin_loongson.sh" />
-				<include name="start_neokylin_loongson_debug.sh" />
-				<include name="stop_neokylin_loongson.sh" />
-				<include name="console_neokylin_loongson.sh" />
-			</fileset>
-		</copy>
-		<zip encoding="utf-8" destfile="${publish.dir}/${TYPE}_${VERSION}_neokylin_loongson.zip" update="false">
-			<zipfileset dir="target/o2server/" filemode="777" dirmode="777" encoding="utf-8" prefix="o2server" />
-		</zip>
-	</target>
-
-</project>