From e1e273fb1c1347df7daef4d157d85300a8d821eb Mon Sep 17 00:00:00 2001
From: wu ming <569287825@qq.com>
Date: Tue, 20 Sep 2016 14:12:08 +0800
Subject: [PATCH] update .gitignore

---
 .classpath                                    |   14 -
 .gitignore                                    |    3 +-
 .metadata/.lock                               |    0
 .metadata/.log                                |   14 -
 .metadata/.mylyn/repositories.xml.zip         |  Bin 438 -> 0 bytes
 .../.indexes/properties.index                 |  Bin 80 -> 0 bytes
 .../GitProjectData.properties                 |    3 -
 .../.root/.indexes/history.version            |    1 -
 .../.root/.indexes/properties.index           |  Bin 151 -> 0 bytes
 .../.root/.indexes/properties.version         |    1 -
 .../org.eclipse.core.resources/.root/1.tree   |  Bin 228 -> 0 bytes
 .../.safetable/org.eclipse.core.resources     |  Bin 608 -> 0 bytes
 .../org.eclipse.core.resources.prefs          |    2 -
 .../.settings/org.eclipse.egit.core.prefs     |    2 -
 .../.settings/org.eclipse.jdt.ui.prefs        |   14 -
 .../org.eclipse.jst.j2ee.webservice.ui.prefs  |    2 -
 .../.settings/org.eclipse.m2e.discovery.prefs |    2 -
 .../org.eclipse.mylyn.context.core.prefs      |    2 -
 .../org.eclipse.mylyn.monitor.ui.prefs        |    2 -
 .../org.eclipse.mylyn.tasks.ui.prefs          |    3 -
 .../.settings/org.eclipse.rse.core.prefs      |    3 -
 .../.settings/org.eclipse.rse.ui.prefs        |    2 -
 .../.settings/org.eclipse.team.cvs.ui.prefs   |    2 -
 .../.settings/org.eclipse.team.ui.prefs       |    2 -
 .../.settings/org.eclipse.ui.browser.prefs    |    2 -
 .../.settings/org.eclipse.ui.ide.prefs        |    5 -
 .../.settings/org.eclipse.ui.prefs            |    2 -
 .../.settings/org.eclipse.ui.workbench.prefs  |    4 -
 .../org.eclipse.e4.workbench/workbench.xmi    | 2492 -----------------
 .../org.eclipse.jdt.core/invalidArchivesCache |  Bin 4 -> 0 bytes
 .../org.eclipse.jdt.core/nonChainingJarsCache |  Bin 4 -> 0 bytes
 .../variablesAndContainers.dat                |  Bin 129 -> 0 bytes
 .../org.eclipse.jdt.ui/OpenTypeHistory.xml    |    2 -
 .../QualifiedTypeNameHistory.xml              |    2 -
 .../org.eclipse.jdt.ui/dialog_settings.xml    |   10 -
 .../0.log                                     |    0
 .../logback.1.4.0.20130601-0317.xml           |   41 -
 .metadata/.plugins/org.eclipse.rse.core/.log  |    0
 ...al.core.RSELocalConnectionInitializer.mark |    0
 .../FP.local.files_0/node.properties          |   57 -
 .../H.local_16/node.properties                |   25 -
 .../PRF.desktop-65kj4bv_32539/node.properties |    7 -
 .metadata/.plugins/org.eclipse.rse.ui/.log    |    0
 .../dialog_settings.xml                       |   28 -
 .../hidden.xml                                |  Bin 138 -> 0 bytes
 .../org.eclipse.wst.common.snippets/user.xml  |  Bin 464 -> 0 bytes
 .metadata/version.ini                         |    1 -
 .settings/.jsdtscope                          |   12 -
 .../com.genuitec.eclipse.migration.prefs      |    3 -
 .settings/org.eclipse.core.resources.prefs    |   10 -
 .settings/org.eclipse.jdt.core.prefs          |  101 -
 .settings/org.eclipse.jpt.core.prefs          |    3 -
 .settings/org.eclipse.m2e.core.prefs          |    4 -
 .settings/org.eclipse.wst.common.component    |    9 -
 ...se.wst.common.project.facet.core.prefs.xml |    7 -
 ....eclipse.wst.common.project.facet.core.xml |   11 -
 ...rg.eclipse.wst.jsdt.ui.superType.container |    1 -
 .../org.eclipse.wst.jsdt.ui.superType.name    |    1 -
 src/META-INF/persistence.xml                  |   10 +-
 src/com/base/BaseController.java              |  128 +-
 src/com/base/Constant.java                    |   46 +-
 src/com/base/Custom4exception.java            |   58 +-
 src/com/base/CustomException.java             |  254 +-
 src/com/base/Resource.java                    |  158 +-
 src/com/dao/mapper/RegionalismMapper.xml      |   82 +-
 src/com/dao/mapper/SystemCodeMapper.xml       |   82 +-
 src/com/dao/mapper/config-details-mapper.xml  |  290 +-
 src/com/dao/mapper/data-details-mapper.xml    |  496 ++--
 src/com/dao/mapper/dataInfoMoveTmpmapper.xml  |  376 +--
 .../controller/DefaultController.java         |   64 +-
 .../platform/controller/FolderController.java |  228 +-
 .../controller/SetGlusterfsController.java    |  104 +-
 .../controller/ShowGlusterfsController.java   |  100 +-
 src/com/platform/dao/DataInfoDao.java         |   54 +-
 src/com/platform/dao/DataInfoMoveTmpDao.java  |   58 +-
 src/com/platform/dao/EncodeInfoDao.java       |  196 +-
 src/com/platform/dao/GatherOracleDao.java     |   78 +-
 src/com/platform/dao/IRegionalismCodeDao.java |   56 +-
 src/com/platform/dao/ISystemCodeDao.java      |   56 +-
 src/com/platform/entities/BasedType.java      |   96 +-
 src/com/platform/entities/DataInfoEntity.java |  538 ++--
 .../entities/DataInfoEntityMoveTmp.java       |  248 +-
 .../platform/entities/EncodedInfoEntity.java  |   82 +-
 src/com/platform/entities/FolderNode.java     |  130 +-
 .../platform/entities/GatherOracleInfo.java   |  164 +-
 .../platform/entities/GfsFolderEntity.java    |  154 +-
 src/com/platform/entities/PagerOptions.java   |  316 +--
 .../platform/entities/RegionalismEntity.java  |  106 +-
 .../entities/SimpleConfigParamsBean.java      |   88 +-
 src/com/platform/entities/SystemEntity.java   |   74 +-
 src/com/platform/entities/VolumeEntity.java   |  324 +--
 src/com/platform/glusterfs/CheckoutMD5.java   |  212 +-
 src/com/platform/glusterfs/ClusterInfo.java   |  248 +-
 src/com/platform/glusterfs/GetTreeData.java   |  250 +-
 src/com/platform/glusterfs/RemoveData.java    |  112 +-
 src/com/platform/glusterfs/SetCluster.java    |  134 +-
 src/com/platform/glusterfs/SetVolume.java     | 1080 +++----
 src/com/platform/glusterfs/ShowData.java      |  262 +-
 src/com/platform/glusterfs/SizeInfo.java      |  184 +-
 src/com/platform/glusterfs/VolumeInfo.java    |  812 +++---
 .../platform/kubernetes/SimpleKubeClient.java |  308 +-
 src/com/platform/service/DataInfoService.java |   32 +-
 .../platform/service/DataInfoServiceImp.java  |  178 +-
 .../platform/service/EncodeInfoService.java   |   40 +-
 .../service/EncodeInfoServiceImpl.java        |  104 +-
 src/com/platform/service/ICodeService.java    |   80 +-
 src/com/platform/service/IGfsService.java     |  152 +-
 .../platform/service/IMoveDataService.java    |   80 +-
 src/com/platform/service/IMySqlService.java   |   50 +-
 .../service/IOracleExtractService.java        |   44 +-
 .../platform/service/OracleExtractHelper.java |  326 +--
 .../service/OracleExtractService.java         |   48 +-
 .../service/SimplePropertyReader.java         |   40 +-
 .../service/impl/CodeServiceImpl.java         |  132 +-
 .../service/impl/MoveDataServiceImpl.java     |  306 +-
 .../service/impl/MySqlServiceImpl.java        |  112 +-
 .../impl/OracleExtractServiceImpl.java        |  188 +-
 .../service/thread/ThreadMoveData.java        |  378 +--
 .../service/thread/TreadMoveData2Start.java   |   94 +-
 src/com/platform/utils/Bean2MapUtils.java     |  174 +-
 src/com/platform/utils/ConfigLoder.java       |  168 +-
 .../platform/utils/ConfigPropertyReader.java  |  168 +-
 src/com/platform/utils/Configs.java           |  104 +-
 src/com/platform/utils/DateForm.java          |  274 +-
 src/com/platform/utils/DateHandle.java        |   18 +-
 src/com/platform/utils/FileOperateHelper.java |  190 +-
 src/com/platform/utils/GanymedSSH.java        |  536 ++--
 src/com/platform/utils/RunCommand.java        |  120 +-
 src/com/platform/utils/Support.java           |   62 +-
 src/com/platform/utils/TestSupport.java       |   28 +-
 src/com/platform/utils/ThreadVolume.java      |  266 +-
 src/com/platform/utils/UtilsHelper.java       |  226 +-
 132 files changed, 6809 insertions(+), 9719 deletions(-)
 delete mode 100644 .classpath
 delete mode 100644 .metadata/.lock
 delete mode 100644 .metadata/.log
 delete mode 100644 .metadata/.mylyn/repositories.xml.zip
 delete mode 100644 .metadata/.plugins/org.eclipse.core.resources/.projects/RemoteSystemsTempFiles/.indexes/properties.index
 delete mode 100644 .metadata/.plugins/org.eclipse.core.resources/.projects/RemoteSystemsTempFiles/org.eclipse.egit.core/GitProjectData.properties
 delete mode 100644 .metadata/.plugins/org.eclipse.core.resources/.root/.indexes/history.version
 delete mode 100644 .metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.index
 delete mode 100644 .metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.version
 delete mode 100644 .metadata/.plugins/org.eclipse.core.resources/.root/1.tree
 delete mode 100644 .metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
 delete mode 100644 .metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.core.resources.prefs
 delete mode 100644 .metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.egit.core.prefs
 delete mode 100644 .metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.ui.prefs
 delete mode 100644 .metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jst.j2ee.webservice.ui.prefs
 delete mode 100644 .metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.m2e.discovery.prefs
 delete mode 100644 .metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.mylyn.context.core.prefs
 delete mode 100644 .metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.mylyn.monitor.ui.prefs
 delete mode 100644 .metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.mylyn.tasks.ui.prefs
 delete mode 100644 .metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.rse.core.prefs
 delete mode 100644 .metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.rse.ui.prefs
 delete mode 100644 .metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.team.cvs.ui.prefs
 delete mode 100644 .metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.team.ui.prefs
 delete mode 100644 .metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.browser.prefs
 delete mode 100644 .metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.ide.prefs
 delete mode 100644 .metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.prefs
 delete mode 100644 .metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.workbench.prefs
 delete mode 100644 .metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
 delete mode 100644 .metadata/.plugins/org.eclipse.jdt.core/invalidArchivesCache
 delete mode 100644 .metadata/.plugins/org.eclipse.jdt.core/nonChainingJarsCache
 delete mode 100644 .metadata/.plugins/org.eclipse.jdt.core/variablesAndContainers.dat
 delete mode 100644 .metadata/.plugins/org.eclipse.jdt.ui/OpenTypeHistory.xml
 delete mode 100644 .metadata/.plugins/org.eclipse.jdt.ui/QualifiedTypeNameHistory.xml
 delete mode 100644 .metadata/.plugins/org.eclipse.jdt.ui/dialog_settings.xml
 delete mode 100644 .metadata/.plugins/org.eclipse.m2e.logback.configuration/0.log
 delete mode 100644 .metadata/.plugins/org.eclipse.m2e.logback.configuration/logback.1.4.0.20130601-0317.xml
 delete mode 100644 .metadata/.plugins/org.eclipse.rse.core/.log
 delete mode 100644 .metadata/.plugins/org.eclipse.rse.core/initializerMarks/org.eclipse.rse.internal.core.RSELocalConnectionInitializer.mark
 delete mode 100644 .metadata/.plugins/org.eclipse.rse.core/profiles/PRF.desktop-65kj4bv_32539/FP.local.files_0/node.properties
 delete mode 100644 .metadata/.plugins/org.eclipse.rse.core/profiles/PRF.desktop-65kj4bv_32539/H.local_16/node.properties
 delete mode 100644 .metadata/.plugins/org.eclipse.rse.core/profiles/PRF.desktop-65kj4bv_32539/node.properties
 delete mode 100644 .metadata/.plugins/org.eclipse.rse.ui/.log
 delete mode 100644 .metadata/.plugins/org.eclipse.ui.workbench/dialog_settings.xml
 delete mode 100644 .metadata/.plugins/org.eclipse.wst.common.snippets/hidden.xml
 delete mode 100644 .metadata/.plugins/org.eclipse.wst.common.snippets/user.xml
 delete mode 100644 .metadata/version.ini
 delete mode 100644 .settings/.jsdtscope
 delete mode 100644 .settings/com.genuitec.eclipse.migration.prefs
 delete mode 100644 .settings/org.eclipse.core.resources.prefs
 delete mode 100644 .settings/org.eclipse.jdt.core.prefs
 delete mode 100644 .settings/org.eclipse.jpt.core.prefs
 delete mode 100644 .settings/org.eclipse.m2e.core.prefs
 delete mode 100644 .settings/org.eclipse.wst.common.component
 delete mode 100644 .settings/org.eclipse.wst.common.project.facet.core.prefs.xml
 delete mode 100644 .settings/org.eclipse.wst.common.project.facet.core.xml
 delete mode 100644 .settings/org.eclipse.wst.jsdt.ui.superType.container
 delete mode 100644 .settings/org.eclipse.wst.jsdt.ui.superType.name

diff --git a/.classpath b/.classpath
deleted file mode 100644
index 2b646a7f..00000000
--- a/.classpath
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="src" path="test"/>
-	<classpathentry kind="con" path="org.eclipse.jst.server.core.container/org.eclipse.jst.server.tomcat.runtimeTarget/Apache Tomcat v7.0">
-		<attributes>
-			<attribute name="owner.project.facets" value="jst.web"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
-	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/Java"/>
-	<classpathentry kind="output" path="build/classes"/>
-</classpath>
diff --git a/.gitignore b/.gitignore
index 30c0ce06..6c17b634 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
 /target
 /build
 .classpath
-
+.settings
+.metadata
 /bin/
diff --git a/.metadata/.lock b/.metadata/.lock
deleted file mode 100644
index e69de29b..00000000
diff --git a/.metadata/.log b/.metadata/.log
deleted file mode 100644
index f2fea4ba..00000000
--- a/.metadata/.log
+++ /dev/null
@@ -1,14 +0,0 @@
-!SESSION 2016-09-13 08:39:40.662 -----------------------------------------------
-eclipse.buildId=4.3.0.I20130605-2000
-java.version=1.8.0_91
-java.vendor=Oracle Corporation
-BootLoader constants: OS=win32, ARCH=x86_64, WS=win32, NL=zh_CN
-Framework arguments:  -product org.eclipse.epp.package.jee.product
-Command-line arguments:  -os win32 -ws win32 -arch x86_64 -product org.eclipse.epp.package.jee.product
-
-!ENTRY org.eclipse.egit.ui 2 0 2016-09-13 08:40:07.850
-!MESSAGE Warning: The environment variable HOME is not set. The following directory will be used to store the Git
-user global configuration and to define the default location to store repositories: 'C:\Users\wuming'. If this is
-not correct please set the HOME environment variable and restart Eclipse. Otherwise Git for Windows and
-EGit might behave differently since they see different configuration options.
-This warning can be switched off on the Team > Git > Confirmations and Warnings preference page.
diff --git a/.metadata/.mylyn/repositories.xml.zip b/.metadata/.mylyn/repositories.xml.zip
deleted file mode 100644
index a72104b5ad12bf667cd6ee3ed95ca32cf446622e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 438
zcmWIWW@Zs#;Nak3(00}JWIzG}Kz31TL4I*&Nq$jgYO!8LZqC~fUw<Y;fxp_m@5@Zp
zj!AHRT%a!8yWo3b`HkEexwHMcb@ty=if2<{+*>u<$9jGKz3R+-gM8031{(^)PHUHH
zvfjEBdhA-%zFs-~yr&E9OEdb%U$i#6$l9zkFZhe*zWnD;?#=b{>0P@;W_eX&heMZ$
z$7waU^X0A+Z?D;)@>p^z_t$XecNH<KXFJO&%@Pwow`kh;oCOkQ39s3DL?jctua#Yi
z6g8GKk_r8BEb8ZjXLG%JMEw*3uNbwpEI)62<^$^t`<NBy=Ekn$(=@ARiq!oe%ydv<
z^8tQqUw?O3?&L!}ri_n_Z@A>xIv(L|H@aT>E$*~)%h{Pxmb}It0&OR&#m&q_+>Kn;
zu|%<F#J*?xEkF7Gktdm|k3HLT=Ra6#dGw$Dh5sx8-s~J7j-;(nVPs&iV_{$j@MdHZ
hVL*g2vK%OkQ2~002Y9oxfmAR8p&gJ;0-DOe005H|oF4!H

diff --git a/.metadata/.plugins/org.eclipse.core.resources/.projects/RemoteSystemsTempFiles/.indexes/properties.index b/.metadata/.plugins/org.eclipse.core.resources/.projects/RemoteSystemsTempFiles/.indexes/properties.index
deleted file mode 100644
index 1e099f3bff508a47e7cce4c8ace123e0c07a5306..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 80
zcmZQ%U|?VbVI~IA{GxQd)a0DZg5p%YlGMapz2y9&R0gi1)Pnrt%#!?~N(Mz_C8_C|
TC153b?wKV4Mfqi!DXB#OWmFkc

diff --git a/.metadata/.plugins/org.eclipse.core.resources/.projects/RemoteSystemsTempFiles/org.eclipse.egit.core/GitProjectData.properties b/.metadata/.plugins/org.eclipse.core.resources/.projects/RemoteSystemsTempFiles/org.eclipse.egit.core/GitProjectData.properties
deleted file mode 100644
index ad45730a..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.projects/RemoteSystemsTempFiles/org.eclipse.egit.core/GitProjectData.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-#GitProjectData
-#Tue Sep 13 08:40:10 CST 2016
-.gitdir=../.git
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/history.version b/.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/history.version
deleted file mode 100644
index 25cb955b..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/history.version
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.index b/.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.index
deleted file mode 100644
index bfa6b4c2af8b3afcb5990bf69f6396e4a2c65df4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 151
zcmYj~u@b@{6a){fEp)W;BVwXa(%akU*dyLV9DxkH{J$Bi)VI5*04S(E78<*h`-<-C
zhr-IG%qp{_F*_ElT#CXd7wg`<i4{UMYLbENe7gI<A~p<IHm#|TCv&d5)^r-1dHwT}
V{{z+&EPOB*pW<~4PiE+Y`2l(cESCTP

diff --git a/.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.version b/.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.version
deleted file mode 100644
index 6b2aaa76..00000000
--- a/.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.version
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/.metadata/.plugins/org.eclipse.core.resources/.root/1.tree b/.metadata/.plugins/org.eclipse.core.resources/.root/1.tree
deleted file mode 100644
index a3003ede858200c1d3d63a43570744a232e558d3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 228
zcmZ9G%?iRW5QH~v5bqVwzCiOBK7a}yMdBc>4GGyO^kIBc5AON{)x8Ytd^3!#tBT%d
zKROjdi<r+2e&`az6&!=}H>M^d#DX@1<28G<7mSko!~0WlK4xg6sf^g7hL)RGcsp`I
s;2lC*cLP{$+X%5=J?;n1$mzK6Kxvq}lw%KH6gFb~!1V;4DWMOdC+(ytc>n+a

diff --git a/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources b/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
deleted file mode 100644
index 75faf83adb0ac1936639a5781724da16f5237be7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 608
zcmZ?R*xjhShe1S2b=vdAllRFf=Oz}Hq!uZZBqrsg@^UGMl%^^Krxqv}8Y>uBSeY1F
z85t=!2Ztya85o-JawX@aCKkD*=9DDH=NF~xr6%WO78IxI6#;QtW=?9cUTLOnNl_`#
zpcIfI*NTG7qQsKS{5%xpSt%uY$@xX8wuUC=#^y%mMixfK=J-tqD~Fhj!wqmlA*%HC
zN{Ui}HsEw~Ze>noo?b~}aW;~x4@CU_3=W;Z&pp+<%a1wGJhajhbBbvcTu`G4g%?yA
LsR0Jnh8|)7(5cqL

diff --git a/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.core.resources.prefs b/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index dffc6b51..00000000
--- a/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-version=1
diff --git a/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.egit.core.prefs b/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.egit.core.prefs
deleted file mode 100644
index 5a1ac199..00000000
--- a/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.egit.core.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-GitRepositoriesView.GitDirectories=C\:\\Users\\wuming\\workspace\\data_manager_backend\\.git;
-eclipse.preferences.version=1
diff --git a/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.ui.prefs b/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index b91d6678..00000000
--- a/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,14 +0,0 @@
-content_assist_proposals_background=255,255,255
-content_assist_proposals_foreground=0,0,0
-eclipse.preferences.version=1
-fontPropagated=true
-org.eclipse.jdt.internal.ui.navigator.layout=2
-org.eclipse.jdt.ui.editor.tab.width=
-org.eclipse.jdt.ui.formatterprofiles.version=12
-org.eclipse.jdt.ui.javadoclocations.migrated=true
-org.eclipse.jface.textfont=1|Courier New|10.0|0|WINDOWS|1|0|0|0|0|0|0|0|0|1|0|0|0|0|Courier New;
-proposalOrderMigrated=true
-spelling_locale_initialized=true
-tabWidthPropagated=true
-useAnnotationsPrefPage=true
-useQuickDiffPrefPage=true
diff --git a/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jst.j2ee.webservice.ui.prefs b/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jst.j2ee.webservice.ui.prefs
deleted file mode 100644
index 553bb967..00000000
--- a/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jst.j2ee.webservice.ui.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-areThereWebServices=false
-eclipse.preferences.version=1
diff --git a/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.m2e.discovery.prefs b/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.m2e.discovery.prefs
deleted file mode 100644
index 67b1d96c..00000000
--- a/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.m2e.discovery.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.m2e.discovery.pref.projects=
diff --git a/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.mylyn.context.core.prefs b/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.mylyn.context.core.prefs
deleted file mode 100644
index 43e97e40..00000000
--- a/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.mylyn.context.core.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-mylyn.attention.migrated=true
diff --git a/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.mylyn.monitor.ui.prefs b/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.mylyn.monitor.ui.prefs
deleted file mode 100644
index 8d462a6c..00000000
--- a/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.mylyn.monitor.ui.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.mylyn.monitor.activity.tracking.enabled.checked=true
diff --git a/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.mylyn.tasks.ui.prefs b/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.mylyn.tasks.ui.prefs
deleted file mode 100644
index 453b994f..00000000
--- a/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.mylyn.tasks.ui.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.mylyn.tasks.ui.filters.nonmatching=true
-org.eclipse.mylyn.tasks.ui.filters.nonmatching.encouraged=true
diff --git a/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.rse.core.prefs b/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.rse.core.prefs
deleted file mode 100644
index fbf3b5bc..00000000
--- a/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.rse.core.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-activeuserprofiles=DESKTOP-65KJ4BV;Team
-eclipse.preferences.version=1
-org.eclipse.rse.systemtype.local.systemType.defaultUserId=wuming
diff --git a/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.rse.ui.prefs b/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.rse.ui.prefs
deleted file mode 100644
index 3f67aac1..00000000
--- a/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.rse.ui.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.rse.preferences.order.connections=DESKTOP-65KJ4BV.Local
diff --git a/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.team.cvs.ui.prefs b/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.team.cvs.ui.prefs
deleted file mode 100644
index f9e585ba..00000000
--- a/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.team.cvs.ui.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-pref_first_startup=false
diff --git a/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.team.ui.prefs b/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.team.ui.prefs
deleted file mode 100644
index 56cd496f..00000000
--- a/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.team.ui.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.team.ui.first_time=false
diff --git a/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.browser.prefs b/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.browser.prefs
deleted file mode 100644
index 91372956..00000000
--- a/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.browser.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-browsers=<?xml version\="1.0" encoding\="UTF-8"?>\r\n<web-browsers current\="0">\r\n<system/>\r\n<external location\="C\:\\Program Files\\Internet Explorer\\iexplore.exe" name\="Internet Explorer"/>\r\n</web-browsers>
-eclipse.preferences.version=1
diff --git a/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.ide.prefs b/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.ide.prefs
deleted file mode 100644
index 3b68069f..00000000
--- a/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.ide.prefs
+++ /dev/null
@@ -1,5 +0,0 @@
-PROBLEMS_FILTERS_MIGRATE=true
-eclipse.preferences.version=1
-platformState=1470357608478
-quickStart=false
-tipsAndTricks=true
diff --git a/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.prefs b/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.prefs
deleted file mode 100644
index 08076f23..00000000
--- a/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-showIntro=false
diff --git a/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.workbench.prefs b/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.workbench.prefs
deleted file mode 100644
index ccd7360d..00000000
--- a/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.workbench.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-//org.eclipse.ui.commands/state/org.eclipse.wst.xml.views.XPathView.processor.xpathprocessor/org.eclipse.ui.commands.radioState=xpath10
-ENABLED_DECORATORS=org.eclipse.jst.ws.jaxws.dom.integration.navigator.WebServiceDecorator\:true,org.eclipse.m2e.core.mavenVersionDecorator\:false,org.eclipse.wst.server.ui.decorator\:false,org.eclipse.datatools.connectivity.sqm.core.internal.ui.explorer.DependencyDecoration\:true,org.eclipse.datatools.connectivity.sqm.core.internal.ui.explorer.ColumnDecoration\:true,org.eclipse.datatools.connectivity.sqm.core.internal.ui.explorer.ForeignKeyDecoration\:true,org.eclipse.datatools.connectivity.sqm.core.internal.ui.explorer.IndexTriggerDecoration\:true,org.eclipse.datatools.connectivity.internal.core.ui.bookmarkDecoration\:true,org.eclipse.datatools.connectivity.internal.core.ui.FilterNodeDecoration\:true,org.eclipse.datatools.connectivity.ui.decorator.contentextension\:false,org.eclipse.datatools.enablement.ingres.ui.providers.decorators.SynonymDecorationService\:true,org.eclipse.datatools.enablement.ingres.internal.ui.providers.decorators.ParameterDecorationService\:true,org.eclipse.datatools.enablement.sybase.asa.proxytabledecorator\:true,org.eclipse.datatools.enablement.sybase.ase.webservicetabledecorator\:true,org.eclipse.datatools.enablement.sybase.systemtabledecorator\:true,org.eclipse.egit.ui.internal.decorators.GitLightweightDecorator\:true,org.eclipse.jdt.ui.override.decorator\:true,org.eclipse.jdt.ui.interface.decorator\:false,org.eclipse.jdt.ui.buildpath.decorator\:true,org.eclipse.jst.j2ee.internal.ui.util.AnnotationIconDecorator_ejb\:true,org.eclipse.jst.j2ee.navigator.internal.J2EEProjectDecorator\:true,org.eclipse.jst.jee.ui.internal.navigator.ejb.BeanDecorator\:true,org.eclipse.jst.jee.navigator.internal.JEEProjectDecorator\:true,org.eclipse.jst.j2ee.internal.ui.util.AnnotationIconDecorator_servlet\:true,org.eclipse.m2e.core.maven2decorator\:true,org.eclipse.mylyn.context.ui.decorator.interest\:true,org.eclipse.mylyn.tasks.ui.decorators.task\:true,org.eclipse.mylyn.team.ui.changeset.decorator\:true,org.eclipse.pde.ui.binaryProjectDecorator\:false,org.eclipse.rse.core.virtualobject.decorator\:true,org.eclipse.rse.core.binary.executable.decorator\:true,org.eclipse.rse.core.script.executable.decorator\:true,org.eclipse.rse.core.java.executable.decorator\:true,org.eclipse.rse.core.library.decorator\:true,org.eclipse.rse.core.link.decorator\:true,org.eclipse.rse.subsystems.error.decorator\:true,org.eclipse.team.cvs.ui.decorator\:true,org.eclipse.ui.LinkedResourceDecorator\:true,org.eclipse.ui.SymlinkDecorator\:true,org.eclipse.ui.VirtualResourceDecorator\:true,org.eclipse.ui.ContentTypeDecorator\:true,org.eclipse.ui.ResourceFilterDecorator\:false,org.eclipse.wst.jsdt.ui.override.decorator\:true,org.eclipse.wst.server.ui.navigatorDecorator\:true,
-PLUGINS_NOT_ACTIVATED_ON_STARTUP=org.eclipse.m2e.discovery;
-eclipse.preferences.version=1
diff --git a/.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi b/.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
deleted file mode 100644
index 82ba807c..00000000
--- a/.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
+++ /dev/null
@@ -1,2492 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<application:Application xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:advanced="http://www.eclipse.org/ui/2010/UIModel/application/ui/advanced" xmlns:application="http://www.eclipse.org/ui/2010/UIModel/application" xmlns:basic="http://www.eclipse.org/ui/2010/UIModel/application/ui/basic" xmlns:menu="http://www.eclipse.org/ui/2010/UIModel/application/ui/menu" xmi:id="_mpDK4XlKEeayFayxZTWxEg" elementId="org.eclipse.e4.legacy.ide.application" contributorURI="platform:/plugin/org.eclipse.ui.workbench" selectedElement="_mpDx8HlKEeayFayxZTWxEg" bindingContexts="_mpDx-XlKEeayFayxZTWxEg">
-  <persistedState key="memento" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?>&#xD;&#xA;&lt;workbench>&#xD;&#xA;&lt;mruList/>&#xD;&#xA;&lt;/workbench>"/>
-  <tags>activeSchemeId:org.eclipse.ui.defaultAcceleratorConfiguration</tags>
-  <children xsi:type="basic:TrimmedWindow" xmi:id="_mpDx8HlKEeayFayxZTWxEg" elementId="IDEWindow" contributorURI="platform:/plugin/org.eclipse.ui.workbench" selectedElement="_m9FhMHlKEeayFayxZTWxEg" x="78" y="78" width="1024" height="768">
-    <persistedState key="coolBarVisible" value="true"/>
-    <persistedState key="perspectiveBarVisible" value="true"/>
-    <persistedState key="workingSets" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?>&#xD;&#xA;&lt;workingSets/>"/>
-    <persistedState key="aggregateWorkingSetId"/>
-    <tags>topLevel</tags>
-    <tags>shellMaximized</tags>
-    <children xsi:type="basic:PartSashContainer" xmi:id="_m9FhMHlKEeayFayxZTWxEg" selectedElement="_m9FhMXlKEeayFayxZTWxEg" horizontal="true">
-      <children xsi:type="advanced:PerspectiveStack" xmi:id="_m9FhMXlKEeayFayxZTWxEg" elementId="PerspectiveStack" containerData="7500" selectedElement="_nOXecHlKEeayFayxZTWxEg">
-        <children xsi:type="advanced:Perspective" xmi:id="_nOXecHlKEeayFayxZTWxEg" elementId="org.eclipse.jst.j2ee.J2EEPerspective" selectedElement="_nOXecXlKEeayFayxZTWxEg" label="Java EE" iconURI="platform:/plugin/org.eclipse.jst.j2ee.ui/icons/full/cview16/j2ee_perspective.gif">
-          <persistedState key="persp.hiddenItems" value="persp.hideToolbarSC:org.eclipse.debug.ui.commands.RunToLine,persp.hideToolbarSC:org.eclipse.jdt.ui.actions.OpenProjectWizard,persp.hideToolbarSC:org.eclipse.ui.edit.text.toggleShowSelectedElementOnly,"/>
-          <tags>persp.actionSet:org.eclipse.mylyn.context.ui.actionSet</tags>
-          <tags>persp.actionSet:org.eclipse.mylyn.doc.actionSet</tags>
-          <tags>persp.actionSet:org.eclipse.mylyn.tasks.ui.navigation</tags>
-          <tags>persp.actionSet:org.eclipse.ui.cheatsheets.actionSet</tags>
-          <tags>persp.actionSet:org.eclipse.rse.core.search.searchActionSet</tags>
-          <tags>persp.actionSet:org.eclipse.search.searchActionSet</tags>
-          <tags>persp.actionSet:org.eclipse.ui.edit.text.actionSet.annotationNavigation</tags>
-          <tags>persp.actionSet:org.eclipse.ui.edit.text.actionSet.navigation</tags>
-          <tags>persp.actionSet:org.eclipse.ui.edit.text.actionSet.convertLineDelimitersTo</tags>
-          <tags>persp.actionSet:org.eclipse.ui.externaltools.ExternalToolsSet</tags>
-          <tags>persp.actionSet:org.eclipse.ui.actionSet.keyBindings</tags>
-          <tags>persp.actionSet:org.eclipse.ui.actionSet.openFiles</tags>
-          <tags>persp.actionSet:org.eclipse.jst.j2ee.J2eeMainActionSet</tags>
-          <tags>persp.actionSet:org.eclipse.jdt.ui.JavaActionSet</tags>
-          <tags>persp.actionSet:org.eclipse.debug.ui.launchActionSet</tags>
-          <tags>persp.actionSet:org.eclipse.debug.ui.debugActionSet</tags>
-          <tags>persp.actionSet:org.eclipse.ui.NavigateActionSet</tags>
-          <tags>persp.viewSC:org.eclipse.ui.navigator.ProjectExplorer</tags>
-          <tags>persp.viewSC:org.eclipse.wst.server.ui.ServersView</tags>
-          <tags>persp.viewSC:org.eclipse.datatools.connectivity.DataSourceExplorerNavigator</tags>
-          <tags>persp.viewSC:org.eclipse.ui.views.BookmarkView</tags>
-          <tags>persp.viewSC:org.eclipse.ui.views.ContentOutline</tags>
-          <tags>persp.viewSC:org.eclipse.ui.views.PropertySheet</tags>
-          <tags>persp.viewSC:org.eclipse.ui.views.ResourceNavigator</tags>
-          <tags>persp.viewSC:org.eclipse.wst.common.snippets.internal.ui.SnippetsView</tags>
-          <tags>persp.viewSC:org.eclipse.ui.views.AllMarkersView</tags>
-          <tags>persp.viewSC:org.eclipse.mylyn.tasks.ui.views.tasks</tags>
-          <tags>persp.viewSC:org.eclipse.search.ui.views.SearchView</tags>
-          <tags>persp.viewSC:org.eclipse.ui.console.ConsoleView</tags>
-          <tags>persp.showIn:org.eclipse.ui.navigator.ProjectExplorer</tags>
-          <tags>persp.newWizSC:org.eclipse.jpt.jpa.ui.wizard.newJpaProject</tags>
-          <tags>persp.perspSC:org.eclipse.jpt.ui.jpaPerspective</tags>
-          <tags>persp.perspSC:org.eclipse.debug.ui.DebugPerspective</tags>
-          <tags>persp.perspSC:org.eclipse.jdt.ui.JavaPerspective</tags>
-          <tags>persp.perspSC:org.eclipse.ui.resourcePerspective</tags>
-          <tags>persp.perspSC:org.eclipse.wst.web.ui.webDevPerspective</tags>
-          <tags>persp.newWizSC:org.eclipse.jst.j2ee.ui.project.facet.EarProjectWizard</tags>
-          <tags>persp.newWizSC:org.eclipse.jst.servlet.ui.project.facet.WebProjectWizard</tags>
-          <tags>persp.newWizSC:org.eclipse.jst.ejb.ui.project.facet.EjbProjectWizard</tags>
-          <tags>persp.newWizSC:org.eclipse.jst.j2ee.jca.ui.internal.wizard.ConnectorProjectWizard</tags>
-          <tags>persp.newWizSC:org.eclipse.jst.j2ee.ui.project.facet.appclient.AppClientProjectWizard</tags>
-          <tags>persp.newWizSC:org.eclipse.wst.web.ui.internal.wizards.SimpleWebProjectWizard</tags>
-          <tags>persp.newWizSC:org.eclipse.jpt.ui.wizard.newJpaProject</tags>
-          <tags>persp.newWizSC:org.eclipse.jst.servlet.ui.internal.wizard.AddServletWizard</tags>
-          <tags>persp.newWizSC:org.eclipse.jst.ejb.ui.internal.wizard.AddSessionBeanWizard</tags>
-          <tags>persp.newWizSC:org.eclipse.jst.ejb.ui.internal.wizard.AddMessageDrivenBeanWizard</tags>
-          <tags>persp.newWizSC:org.eclipse.jpt.ui.wizard.newEntity</tags>
-          <tags>persp.newWizSC:org.eclipse.jst.ws.creation.ui.wizard.serverwizard</tags>
-          <tags>persp.newWizSC:org.eclipse.ui.wizards.new.folder</tags>
-          <tags>persp.newWizSC:org.eclipse.ui.wizards.new.file</tags>
-          <tags>persp.actionSet:org.eclipse.wst.server.ui.internal.webbrowser.actionSet</tags>
-          <tags>persp.actionSet:org.eclipse.debug.ui.breakpointActionSet</tags>
-          <tags>persp.newWizSC:org.eclipse.m2e.core.wizards.Maven2ProjectWizard</tags>
-          <tags>persp.actionSet:org.eclipse.wst.ws.explorer.explorer</tags>
-          <children xsi:type="basic:PartSashContainer" xmi:id="_nOXecXlKEeayFayxZTWxEg" selectedElement="_nOXecnlKEeayFayxZTWxEg" horizontal="true">
-            <children xsi:type="basic:PartStack" xmi:id="_nOXecnlKEeayFayxZTWxEg" elementId="topLeft" containerData="2500" selectedElement="_vVjoAHlKEeayFayxZTWxEg">
-              <tags>newtablook</tags>
-              <children xsi:type="advanced:Placeholder" xmi:id="_nOYFgHlKEeayFayxZTWxEg" elementId="org.eclipse.ui.navigator.ProjectExplorer" ref="_nLBPgHlKEeayFayxZTWxEg"/>
-              <children xsi:type="advanced:Placeholder" xmi:id="_nOYFgXlKEeayFayxZTWxEg" elementId="org.eclipse.ui.views.ResourceNavigator" toBeRendered="false" ref="_nLDrwHlKEeayFayxZTWxEg"/>
-              <children xsi:type="advanced:Placeholder" xmi:id="_nOYFgnlKEeayFayxZTWxEg" elementId="org.eclipse.jdt.ui.TypeHierarchy" toBeRendered="false" ref="_nLDrwXlKEeayFayxZTWxEg"/>
-              <children xsi:type="advanced:Placeholder" xmi:id="_nOYFg3lKEeayFayxZTWxEg" elementId="org.eclipse.jdt.ui.PackagesView" toBeRendered="false" ref="_nOMfUHlKEeayFayxZTWxEg"/>
-              <children xsi:type="advanced:Placeholder" xmi:id="_vVjoAHlKEeayFayxZTWxEg" elementId="org.eclipse.jdt.ui.PackageExplorer" ref="_vVjA8HlKEeayFayxZTWxEg"/>
-            </children>
-            <children xsi:type="basic:PartSashContainer" xmi:id="_nOYFhHlKEeayFayxZTWxEg" containerData="7500" selectedElement="_nOYFinlKEeayFayxZTWxEg">
-              <children xsi:type="basic:PartSashContainer" xmi:id="_nOYFhXlKEeayFayxZTWxEg" containerData="7000" horizontal="true">
-                <children xsi:type="advanced:Placeholder" xmi:id="_nOYFhnlKEeayFayxZTWxEg" elementId="org.eclipse.ui.editorss" containerData="7000" ref="_nKlxsHlKEeayFayxZTWxEg"/>
-                <children xsi:type="basic:PartStack" xmi:id="_nOYFh3lKEeayFayxZTWxEg" elementId="topRight" containerData="3000" selectedElement="_nOYFiHlKEeayFayxZTWxEg">
-                  <tags>newtablook</tags>
-                  <children xsi:type="advanced:Placeholder" xmi:id="_nOYFiHlKEeayFayxZTWxEg" elementId="org.eclipse.ui.views.ContentOutline" ref="_nOT0EHlKEeayFayxZTWxEg"/>
-                  <children xsi:type="advanced:Placeholder" xmi:id="_nOYFiXlKEeayFayxZTWxEg" elementId="org.eclipse.mylyn.tasks.ui.views.tasks" ref="_nOUbIHlKEeayFayxZTWxEg"/>
-                </children>
-              </children>
-              <children xsi:type="basic:PartStack" xmi:id="_nOYFinlKEeayFayxZTWxEg" elementId="bottomRight" containerData="3000" selectedElement="_nOYFj3lKEeayFayxZTWxEg">
-                <tags>newtablook</tags>
-                <tags>org.eclipse.e4.secondaryDataStack</tags>
-                <children xsi:type="advanced:Placeholder" xmi:id="_nOYFi3lKEeayFayxZTWxEg" elementId="org.eclipse.ui.views.AllMarkersView" ref="_nONGYHlKEeayFayxZTWxEg"/>
-                <children xsi:type="advanced:Placeholder" xmi:id="_nOYFjHlKEeayFayxZTWxEg" elementId="org.eclipse.ui.views.PropertySheet" ref="_nOOUgHlKEeayFayxZTWxEg"/>
-                <children xsi:type="advanced:Placeholder" xmi:id="_nOYFjXlKEeayFayxZTWxEg" elementId="org.eclipse.wst.server.ui.ServersView" ref="_nOO7kHlKEeayFayxZTWxEg"/>
-                <children xsi:type="advanced:Placeholder" xmi:id="_nOYFjnlKEeayFayxZTWxEg" elementId="org.eclipse.datatools.connectivity.DataSourceExplorerNavigator" ref="_nOQJsHlKEeayFayxZTWxEg"/>
-                <children xsi:type="advanced:Placeholder" xmi:id="_nOYFj3lKEeayFayxZTWxEg" elementId="org.eclipse.wst.common.snippets.internal.ui.SnippetsView" ref="_nORX0HlKEeayFayxZTWxEg"/>
-                <children xsi:type="advanced:Placeholder" xmi:id="_nOYskHlKEeayFayxZTWxEg" elementId="org.eclipse.ui.views.ProblemView" toBeRendered="false" ref="_nOR-4HlKEeayFayxZTWxEg"/>
-                <children xsi:type="advanced:Placeholder" xmi:id="_nOYskXlKEeayFayxZTWxEg" elementId="org.eclipse.ui.views.TaskList" toBeRendered="false" ref="_nOSl8HlKEeayFayxZTWxEg"/>
-                <children xsi:type="advanced:Placeholder" xmi:id="_nOYsknlKEeayFayxZTWxEg" elementId="org.eclipse.ui.console.ConsoleView" toBeRendered="false" ref="_nOSl8XlKEeayFayxZTWxEg"/>
-                <children xsi:type="advanced:Placeholder" xmi:id="_nOYsk3lKEeayFayxZTWxEg" elementId="org.eclipse.ui.views.BookmarkView" toBeRendered="false" ref="_nOTNAHlKEeayFayxZTWxEg"/>
-                <children xsi:type="advanced:Placeholder" xmi:id="_nOYslHlKEeayFayxZTWxEg" elementId="org.eclipse.ui.views.ProgressView" toBeRendered="false" ref="_nOTNAXlKEeayFayxZTWxEg"/>
-                <children xsi:type="advanced:Placeholder" xmi:id="_nOYslXlKEeayFayxZTWxEg" elementId="org.eclipse.search.ui.views.SearchView" toBeRendered="false" ref="_nOTNAnlKEeayFayxZTWxEg"/>
-              </children>
-            </children>
-          </children>
-        </children>
-      </children>
-      <children xsi:type="basic:PartStack" xmi:id="_m9GIQHlKEeayFayxZTWxEg" elementId="stickyFolderRight" toBeRendered="false" containerData="2500">
-        <children xsi:type="advanced:Placeholder" xmi:id="_m9GIQXlKEeayFayxZTWxEg" elementId="org.eclipse.help.ui.HelpView" toBeRendered="false" ref="_m9B20HlKEeayFayxZTWxEg"/>
-        <children xsi:type="advanced:Placeholder" xmi:id="_m9GIQnlKEeayFayxZTWxEg" elementId="org.eclipse.ui.internal.introview" toBeRendered="false" ref="_m9E6IHlKEeayFayxZTWxEg"/>
-        <children xsi:type="advanced:Placeholder" xmi:id="_m9GIQ3lKEeayFayxZTWxEg" elementId="org.eclipse.ui.cheatsheets.views.CheatSheetView" toBeRendered="false" ref="_m9E6IXlKEeayFayxZTWxEg"/>
-      </children>
-    </children>
-    <sharedElements xsi:type="basic:Part" xmi:id="_m9B20HlKEeayFayxZTWxEg" elementId="org.eclipse.help.ui.HelpView" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView" label="Help" iconURI="platform:/plugin/org.eclipse.help.ui/icons/view16/help_view.gif" closeable="true">
-      <tags>View</tags>
-      <tags>categoryTag:Help</tags>
-    </sharedElements>
-    <sharedElements xsi:type="basic:Part" xmi:id="_m9E6IHlKEeayFayxZTWxEg" elementId="org.eclipse.ui.internal.introview" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView" label="Welcome" iconURI="platform:/plugin/org.eclipse.ui/icons/full/eview16/defaultview_misc.gif" tooltip="" closeable="true">
-      <tags>View</tags>
-      <tags>categoryTag:General</tags>
-      <menus xmi:id="_nc5CoHlKEeayFayxZTWxEg" elementId="org.eclipse.ui.internal.introview">
-        <tags>ViewMenu</tags>
-        <tags>menuContribution:menu</tags>
-      </menus>
-      <toolbar xmi:id="_nc5CoXlKEeayFayxZTWxEg" elementId="org.eclipse.ui.internal.introview" visible="false"/>
-    </sharedElements>
-    <sharedElements xsi:type="basic:Part" xmi:id="_m9E6IXlKEeayFayxZTWxEg" elementId="org.eclipse.ui.cheatsheets.views.CheatSheetView" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView" label="Cheat Sheets" iconURI="platform:/plugin/org.eclipse.ui.cheatsheets/icons/view16/cheatsheet_view.gif" closeable="true">
-      <tags>View</tags>
-      <tags>categoryTag:Help</tags>
-    </sharedElements>
-    <sharedElements xsi:type="advanced:Area" xmi:id="_nKlxsHlKEeayFayxZTWxEg" elementId="org.eclipse.ui.editorss">
-      <children xsi:type="basic:PartStack" xmi:id="_nKlxsXlKEeayFayxZTWxEg" elementId="org.eclipse.e4.primaryDataStack">
-        <tags>newtablook</tags>
-        <tags>org.eclipse.e4.primaryDataStack</tags>
-        <tags>EditorStack</tags>
-      </children>
-    </sharedElements>
-    <sharedElements xsi:type="basic:Part" xmi:id="_nLBPgHlKEeayFayxZTWxEg" elementId="org.eclipse.ui.navigator.ProjectExplorer" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView" label="Project Explorer" iconURI="platform:/plugin/org.eclipse.ui.navigator.resources/icons/full/eview16/resource_persp.gif" tooltip="Workspace" closeable="true">
-      <persistedState key="memento" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?>&#xD;&#xA;&lt;view CommonNavigator.LINKING_ENABLED=&quot;0&quot; org.eclipse.ui.navigator.resources.workingSets.showTopLevelWorkingSets=&quot;0&quot;/>"/>
-      <tags>View</tags>
-      <tags>categoryTag:General</tags>
-      <menus xmi:id="_nPPBIHlKEeayFayxZTWxEg" elementId="org.eclipse.ui.navigator.ProjectExplorer">
-        <tags>ViewMenu</tags>
-        <tags>menuContribution:menu</tags>
-      </menus>
-      <toolbar xmi:id="_nPPBIXlKEeayFayxZTWxEg" elementId="org.eclipse.ui.navigator.ProjectExplorer" visible="false"/>
-    </sharedElements>
-    <sharedElements xsi:type="basic:Part" xmi:id="_nLDrwHlKEeayFayxZTWxEg" elementId="org.eclipse.ui.views.ResourceNavigator" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView" label="Navigator" iconURI="platform:/plugin/org.eclipse.ui.ide/icons/full/eview16/filenav_nav.gif" closeable="true">
-      <tags>View</tags>
-      <tags>categoryTag:General</tags>
-    </sharedElements>
-    <sharedElements xsi:type="basic:Part" xmi:id="_nLDrwXlKEeayFayxZTWxEg" elementId="org.eclipse.jdt.ui.TypeHierarchy" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView" label="Type Hierarchy" iconURI="platform:/plugin/org.eclipse.jdt.ui/icons/full/eview16/class_hi.gif" closeable="true">
-      <tags>View</tags>
-      <tags>categoryTag:Java</tags>
-    </sharedElements>
-    <sharedElements xsi:type="basic:Part" xmi:id="_nOMfUHlKEeayFayxZTWxEg" elementId="org.eclipse.jdt.ui.PackagesView" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView" label="Packages" iconURI="platform:/plugin/org.eclipse.jdt.ui/icons/full/eview16/packages.gif" closeable="true">
-      <tags>View</tags>
-      <tags>categoryTag:Java Browsing</tags>
-    </sharedElements>
-    <sharedElements xsi:type="basic:Part" xmi:id="_nONGYHlKEeayFayxZTWxEg" elementId="org.eclipse.ui.views.AllMarkersView" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView" label="Markers" iconURI="platform:/plugin/org.eclipse.ui.ide/icons/full/eview16/problems_view.gif" tooltip="0 items" closeable="true">
-      <persistedState key="memento" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?>&#xD;&#xA;&lt;view PRIMARY_SORT_FIELD=&quot;org.eclipse.ui.ide.allSeverityField&quot; categoryGroup=&quot;org.eclipse.ui.ide.type&quot; markerContentGenerator=&quot;org.eclipse.ui.ide.allMarkersGenerator&quot; partName=&quot;Markers&quot;>&#xD;&#xA;&lt;columnWidths org.eclipse.ui.ide.allSeverityField=&quot;300&quot; org.eclipse.ui.ide.locationField=&quot;90&quot; org.eclipse.ui.ide.markerType=&quot;90&quot; org.eclipse.ui.ide.pathField=&quot;120&quot; org.eclipse.ui.ide.resourceField=&quot;90&quot;/>&#xD;&#xA;&lt;visible IMemento.internal.id=&quot;org.eclipse.ui.ide.allSeverityField&quot;/>&#xD;&#xA;&lt;visible IMemento.internal.id=&quot;org.eclipse.ui.ide.resourceField&quot;/>&#xD;&#xA;&lt;visible IMemento.internal.id=&quot;org.eclipse.ui.ide.pathField&quot;/>&#xD;&#xA;&lt;visible IMemento.internal.id=&quot;org.eclipse.ui.ide.locationField&quot;/>&#xD;&#xA;&lt;visible IMemento.internal.id=&quot;org.eclipse.ui.ide.markerType&quot;/>&#xD;&#xA;&lt;/view>"/>
-      <tags>View</tags>
-      <tags>categoryTag:General</tags>
-      <menus xmi:id="_nV97QHlKEeayFayxZTWxEg" elementId="org.eclipse.ui.views.AllMarkersView">
-        <tags>ViewMenu</tags>
-        <tags>menuContribution:menu</tags>
-      </menus>
-      <toolbar xmi:id="_nV-iUHlKEeayFayxZTWxEg" elementId="org.eclipse.ui.views.AllMarkersView" visible="false"/>
-    </sharedElements>
-    <sharedElements xsi:type="basic:Part" xmi:id="_nOOUgHlKEeayFayxZTWxEg" elementId="org.eclipse.ui.views.PropertySheet" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView" label="Properties" iconURI="platform:/plugin/org.eclipse.ui.views/icons/full/eview16/prop_ps.gif" closeable="true">
-      <tags>View</tags>
-      <tags>categoryTag:General</tags>
-    </sharedElements>
-    <sharedElements xsi:type="basic:Part" xmi:id="_nOO7kHlKEeayFayxZTWxEg" elementId="org.eclipse.wst.server.ui.ServersView" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView" label="Servers" iconURI="platform:/plugin/org.eclipse.wst.server.ui/icons/cview16/servers_view.gif" closeable="true">
-      <tags>View</tags>
-      <tags>categoryTag:Server</tags>
-    </sharedElements>
-    <sharedElements xsi:type="basic:Part" xmi:id="_nOQJsHlKEeayFayxZTWxEg" elementId="org.eclipse.datatools.connectivity.DataSourceExplorerNavigator" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView" label="Data Source Explorer" iconURI="platform:/plugin/org.eclipse.datatools.connectivity.ui.dse/icons/full/cview16/enterprise_explorer.gif" closeable="true">
-      <tags>View</tags>
-      <tags>categoryTag:Data Management</tags>
-    </sharedElements>
-    <sharedElements xsi:type="basic:Part" xmi:id="_nORX0HlKEeayFayxZTWxEg" elementId="org.eclipse.wst.common.snippets.internal.ui.SnippetsView" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView" label="Snippets" iconURI="platform:/plugin/org.eclipse.wst.common.snippets/icons/snippets_view.gif" tooltip="" closeable="true">
-      <persistedState key="memento" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?>&#xD;&#xA;&lt;view>&#xD;&#xA;&lt;entry expansion=&quot;false&quot; extent=&quot;20&quot; maximum=&quot;100&quot; minimum=&quot;0&quot; pinned=&quot;false&quot; value=&quot;0&quot;>&#xD;&#xA;&lt;entry selection=&quot;0&quot;/>&#xD;&#xA;&lt;entry selection=&quot;0&quot;/>&#xD;&#xA;&lt;entry selection=&quot;0&quot;/>&#xD;&#xA;&lt;entry selection=&quot;0&quot;/>&#xD;&#xA;&lt;entry selection=&quot;0&quot;/>&#xD;&#xA;&lt;entry selection=&quot;0&quot;/>&#xD;&#xA;&lt;entry selection=&quot;0&quot;/>&#xD;&#xA;&lt;/entry>&#xD;&#xA;&lt;/view>"/>
-      <tags>View</tags>
-      <tags>categoryTag:General</tags>
-      <menus xmi:id="_vvo78HlKEeayFayxZTWxEg" elementId="org.eclipse.wst.common.snippets.internal.ui.SnippetsView">
-        <tags>ViewMenu</tags>
-        <tags>menuContribution:menu</tags>
-      </menus>
-      <toolbar xmi:id="_vvo78XlKEeayFayxZTWxEg" elementId="org.eclipse.wst.common.snippets.internal.ui.SnippetsView" visible="false"/>
-    </sharedElements>
-    <sharedElements xsi:type="basic:Part" xmi:id="_nOR-4HlKEeayFayxZTWxEg" elementId="org.eclipse.ui.views.ProblemView" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView" label="Problems" iconURI="platform:/plugin/org.eclipse.ui.ide/icons/full/eview16/problems_view.gif" closeable="true">
-      <tags>View</tags>
-      <tags>categoryTag:General</tags>
-    </sharedElements>
-    <sharedElements xsi:type="basic:Part" xmi:id="_nOSl8HlKEeayFayxZTWxEg" elementId="org.eclipse.ui.views.TaskList" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView" label="Tasks" iconURI="platform:/plugin/org.eclipse.ui.ide/icons/full/eview16/tasks_tsk.gif" closeable="true">
-      <tags>View</tags>
-      <tags>categoryTag:General</tags>
-    </sharedElements>
-    <sharedElements xsi:type="basic:Part" xmi:id="_nOSl8XlKEeayFayxZTWxEg" elementId="org.eclipse.ui.console.ConsoleView" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView" label="Console" iconURI="platform:/plugin/org.eclipse.ui.console/icons/full/cview16/console_view.gif" closeable="true">
-      <tags>View</tags>
-      <tags>categoryTag:General</tags>
-    </sharedElements>
-    <sharedElements xsi:type="basic:Part" xmi:id="_nOTNAHlKEeayFayxZTWxEg" elementId="org.eclipse.ui.views.BookmarkView" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView" label="Bookmarks" iconURI="platform:/plugin/org.eclipse.ui.ide/icons/full/eview16/bkmrk_nav.gif" closeable="true">
-      <tags>View</tags>
-      <tags>categoryTag:General</tags>
-    </sharedElements>
-    <sharedElements xsi:type="basic:Part" xmi:id="_nOTNAXlKEeayFayxZTWxEg" elementId="org.eclipse.ui.views.ProgressView" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView" label="Progress" iconURI="platform:/plugin/org.eclipse.ui.ide/icons/full/eview16/pview.gif" closeable="true">
-      <tags>View</tags>
-      <tags>categoryTag:General</tags>
-    </sharedElements>
-    <sharedElements xsi:type="basic:Part" xmi:id="_nOTNAnlKEeayFayxZTWxEg" elementId="org.eclipse.search.ui.views.SearchView" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView" label="Search" iconURI="platform:/plugin/org.eclipse.search/icons/full/eview16/searchres.gif" closeable="true">
-      <tags>View</tags>
-      <tags>categoryTag:General</tags>
-    </sharedElements>
-    <sharedElements xsi:type="basic:Part" xmi:id="_nOT0EHlKEeayFayxZTWxEg" elementId="org.eclipse.ui.views.ContentOutline" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView" label="Outline" iconURI="platform:/plugin/org.eclipse.ui.views/icons/full/eview16/outline_co.gif" tooltip="" closeable="true">
-      <persistedState key="memento" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?>&#xD;&#xA;&lt;view/>"/>
-      <tags>View</tags>
-      <tags>categoryTag:General</tags>
-      <menus xmi:id="_nTsDUHlKEeayFayxZTWxEg" elementId="org.eclipse.ui.views.ContentOutline">
-        <tags>ViewMenu</tags>
-        <tags>menuContribution:menu</tags>
-      </menus>
-      <toolbar xmi:id="_nTsqYHlKEeayFayxZTWxEg" elementId="org.eclipse.ui.views.ContentOutline" visible="false"/>
-    </sharedElements>
-    <sharedElements xsi:type="basic:Part" xmi:id="_nOUbIHlKEeayFayxZTWxEg" elementId="org.eclipse.mylyn.tasks.ui.views.tasks" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView" label="Task List" iconURI="platform:/plugin/org.eclipse.mylyn.tasks.ui/icons/eview16/task-list.gif" closeable="true">
-      <tags>View</tags>
-      <tags>categoryTag:Mylyn</tags>
-    </sharedElements>
-    <sharedElements xsi:type="basic:Part" xmi:id="_vVjA8HlKEeayFayxZTWxEg" elementId="org.eclipse.jdt.ui.PackageExplorer" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView" label="Package Explorer" iconURI="platform:/plugin/org.eclipse.jdt.ui/icons/full/eview16/package.gif" tooltip="Workspace" closeable="true">
-      <persistedState key="memento" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?>&#xD;&#xA;&lt;view group_libraries=&quot;1&quot; layout=&quot;2&quot; linkWithEditor=&quot;0&quot; rootMode=&quot;1&quot; workingSetName=&quot;&quot;>&#xD;&#xA;&lt;customFilters userDefinedPatternsEnabled=&quot;false&quot;>&#xD;&#xA;&lt;xmlDefinedFilters>&#xD;&#xA;&lt;child filterId=&quot;org.eclipse.jdt.ui.PackageExplorer.StaticsFilter&quot; isEnabled=&quot;false&quot;/>&#xD;&#xA;&lt;child filterId=&quot;org.eclipse.jdt.ui.PackageExplorer_patternFilterId_RemoteSystemsConnections&quot; isEnabled=&quot;true&quot;/>&#xD;&#xA;&lt;child filterId=&quot;org.eclipse.mylyn.java.ui.MembersFilter&quot; isEnabled=&quot;false&quot;/>&#xD;&#xA;&lt;child filterId=&quot;org.eclipse.jdt.ui.PackageExplorer.NonSharedProjectsFilter&quot; isEnabled=&quot;false&quot;/>&#xD;&#xA;&lt;child filterId=&quot;org.eclipse.jdt.internal.ui.PackageExplorer.EmptyInnerPackageFilter&quot; isEnabled=&quot;true&quot;/>&#xD;&#xA;&lt;child filterId=&quot;org.eclipse.m2e.MavenModuleFilter&quot; isEnabled=&quot;false&quot;/>&#xD;&#xA;&lt;child filterId=&quot;org.eclipse.jdt.ui.PackageExplorer.ClosedProjectsFilter&quot; isEnabled=&quot;false&quot;/>&#xD;&#xA;&lt;child filterId=&quot;org.eclipse.jdt.ui.PackageExplorer.EmptyLibraryContainerFilter&quot; isEnabled=&quot;true&quot;/>&#xD;&#xA;&lt;child filterId=&quot;org.eclipse.jdt.ui.PackageExplorer.PackageDeclarationFilter&quot; isEnabled=&quot;true&quot;/>&#xD;&#xA;&lt;child filterId=&quot;org.eclipse.pde.ui.BinaryProjectFilter1&quot; isEnabled=&quot;false&quot;/>&#xD;&#xA;&lt;child filterId=&quot;org.eclipse.jdt.ui.PackageExplorer.LocalTypesFilter&quot; isEnabled=&quot;false&quot;/>&#xD;&#xA;&lt;child filterId=&quot;org.eclipse.pde.ui.ExternalPluginLibrariesFilter1&quot; isEnabled=&quot;true&quot;/>&#xD;&#xA;&lt;child filterId=&quot;org.eclipse.jdt.ui.PackageExplorer.FieldsFilter&quot; isEnabled=&quot;false&quot;/>&#xD;&#xA;&lt;child filterId=&quot;org.eclipse.jdt.ui.PackageExplorer_patternFilterId_RemoteSystemsTempFiles&quot; isEnabled=&quot;true&quot;/>&#xD;&#xA;&lt;child filterId=&quot;org.eclipse.jdt.ui.PackageExplorer.NonJavaProjectsFilter&quot; isEnabled=&quot;false&quot;/>&#xD;&#xA;&lt;child filterId=&quot;org.eclipse.jdt.ui.PackageExplorer_patternFilterId_.*&quot; isEnabled=&quot;true&quot;/>&#xD;&#xA;&lt;child filterId=&quot;org.eclipse.jdt.ui.PackageExplorer.SyntheticMembersFilter&quot; isEnabled=&quot;true&quot;/>&#xD;&#xA;&lt;child filterId=&quot;org.eclipse.jdt.ui.PackageExplorer.ContainedLibraryFilter&quot; isEnabled=&quot;false&quot;/>&#xD;&#xA;&lt;child filterId=&quot;org.eclipse.jdt.internal.ui.PackageExplorer.HideInnerClassFilesFilter&quot; isEnabled=&quot;true&quot;/>&#xD;&#xA;&lt;child filterId=&quot;org.eclipse.jdt.ui.PackageExplorer.ImportDeclarationFilter&quot; isEnabled=&quot;true&quot;/>&#xD;&#xA;&lt;child filterId=&quot;org.eclipse.jdt.ui.PackageExplorer.NonJavaElementFilter&quot; isEnabled=&quot;false&quot;/>&#xD;&#xA;&lt;child filterId=&quot;org.eclipse.jdt.ui.PackageExplorer.LibraryFilter&quot; isEnabled=&quot;false&quot;/>&#xD;&#xA;&lt;child filterId=&quot;org.eclipse.jdt.ui.PackageExplorer.CuAndClassFileFilter&quot; isEnabled=&quot;false&quot;/>&#xD;&#xA;&lt;child filterId=&quot;org.eclipse.jdt.internal.ui.PackageExplorer.EmptyPackageFilter&quot; isEnabled=&quot;false&quot;/>&#xD;&#xA;&lt;child filterId=&quot;org.eclipse.jdt.ui.PackageExplorer.NonPublicFilter&quot; isEnabled=&quot;false&quot;/>&#xD;&#xA;&lt;/xmlDefinedFilters>&#xD;&#xA;&lt;/customFilters>&#xD;&#xA;&lt;/view>"/>
-      <tags>View</tags>
-      <tags>categoryTag:Java</tags>
-      <tags>activeOnClose</tags>
-      <menus xmi:id="_vVunIHlKEeayFayxZTWxEg" elementId="org.eclipse.jdt.ui.PackageExplorer">
-        <tags>ViewMenu</tags>
-        <tags>menuContribution:menu</tags>
-      </menus>
-      <toolbar xmi:id="_vVunIXlKEeayFayxZTWxEg" elementId="org.eclipse.jdt.ui.PackageExplorer" visible="false"/>
-    </sharedElements>
-    <trimBars xmi:id="_m9RucHlKEeayFayxZTWxEg" elementId="org.eclipse.ui.main.toolbar">
-      <children xsi:type="menu:ToolBar" xmi:id="_m_zeAHlKEeayFayxZTWxEg" elementId="group.file" toBeRendered="false">
-        <tags>toolbarSeparator</tags>
-        <children xsi:type="menu:ToolBarSeparator" xmi:id="_m_zeAXlKEeayFayxZTWxEg" elementId="group.file" toBeRendered="false"/>
-      </children>
-      <children xsi:type="menu:ToolBar" xmi:id="_m_1TMHlKEeayFayxZTWxEg" elementId="org.eclipse.ui.workbench.file">
-        <tags>Draggable</tags>
-        <children xsi:type="menu:OpaqueToolItem" xmi:id="_m_8A4HlKEeayFayxZTWxEg" elementId="new.group"/>
-        <children xsi:type="menu:OpaqueToolItem" xmi:id="_m_8n8HlKEeayFayxZTWxEg" elementId="newWizardDropDown"/>
-        <children xsi:type="menu:OpaqueToolItem" xmi:id="_m_8n8XlKEeayFayxZTWxEg" elementId="new.ext" visible="false"/>
-        <children xsi:type="menu:OpaqueToolItem" xmi:id="_m_8n8nlKEeayFayxZTWxEg" elementId="save.group" visible="false"/>
-        <children xsi:type="menu:OpaqueToolItem" xmi:id="_m_8n83lKEeayFayxZTWxEg" elementId="save"/>
-        <children xsi:type="menu:OpaqueToolItem" xmi:id="_m_8n9HlKEeayFayxZTWxEg" elementId="saveAll"/>
-        <children xsi:type="menu:OpaqueToolItem" xmi:id="_m_9PAHlKEeayFayxZTWxEg" elementId="save.ext" visible="false"/>
-        <children xsi:type="menu:HandledToolItem" xmi:id="_m_92EHlKEeayFayxZTWxEg" elementId="print" iconURI="platform:/plugin/org.eclipse.ui/icons/full/etool16/print_edit.gif" tooltip="Print" enabled="false" command="_mqk07HlKEeayFayxZTWxEg"/>
-        <children xsi:type="menu:OpaqueToolItem" xmi:id="_nAD8sHlKEeayFayxZTWxEg" elementId="print.ext" visible="false"/>
-        <children xsi:type="menu:OpaqueToolItem" xmi:id="_nAD8sXlKEeayFayxZTWxEg" elementId="build.group"/>
-        <children xsi:type="menu:OpaqueToolItem" xmi:id="_nAD8snlKEeayFayxZTWxEg" elementId="build.ext" visible="false"/>
-        <children xsi:type="menu:OpaqueToolItem" xmi:id="_nAEjwHlKEeayFayxZTWxEg" elementId="additions"/>
-      </children>
-      <children xsi:type="menu:ToolBar" xmi:id="_m_16QHlKEeayFayxZTWxEg" elementId="additions" toBeRendered="false">
-        <tags>toolbarSeparator</tags>
-        <children xsi:type="menu:ToolBarSeparator" xmi:id="_m_16QXlKEeayFayxZTWxEg" elementId="additions" toBeRendered="false"/>
-      </children>
-      <children xsi:type="menu:ToolBar" xmi:id="_nYaLQHlKEeayFayxZTWxEg" elementId="org.eclipse.debug.ui.launchActionSet">
-        <tags>Draggable</tags>
-        <children xsi:type="menu:OpaqueToolItem" xmi:id="_nZPRsHlKEeayFayxZTWxEg" elementId="debug"/>
-        <children xsi:type="menu:OpaqueToolItem" xmi:id="_nZP4wHlKEeayFayxZTWxEg" elementId="org.eclipse.debug.internal.ui.actions.DebugDropDownAction"/>
-        <children xsi:type="menu:OpaqueToolItem" xmi:id="_nZQf0HlKEeayFayxZTWxEg" elementId="org.eclipse.debug.internal.ui.actions.RunDropDownAction"/>
-        <children xsi:type="menu:OpaqueToolItem" xmi:id="_nZRG4HlKEeayFayxZTWxEg" elementId="org.eclipse.ui.externaltools.ExternalToolMenuDelegateToolbar"/>
-      </children>
-      <children xsi:type="menu:ToolBar" xmi:id="_nX3YsHlKEeayFayxZTWxEg" elementId="org.eclipse.jst.j2ee.J2eeMainActionSet">
-        <tags>Draggable</tags>
-        <children xsi:type="menu:OpaqueToolItem" xmi:id="_nZYboHlKEeayFayxZTWxEg" elementId="J2EEMain"/>
-        <children xsi:type="menu:OpaqueToolItem" xmi:id="_nZZCsHlKEeayFayxZTWxEg" elementId="org.eclipse.jst.j2ee.internal.actions.NewJavaEEProject"/>
-        <children xsi:type="menu:OpaqueToolItem" xmi:id="_nZZpwHlKEeayFayxZTWxEg" elementId="org.eclipse.jst.j2ee.internal.actions.NewJavaEEArtifact"/>
-      </children>
-      <children xsi:type="menu:ToolBar" xmi:id="_nYMv4HlKEeayFayxZTWxEg" elementId="org.eclipse.search.searchActionSet">
-        <tags>Draggable</tags>
-        <children xsi:type="menu:OpaqueToolItem" xmi:id="_nZaQ0HlKEeayFayxZTWxEg" elementId="Search"/>
-        <children xsi:type="menu:OpaqueToolItem" xmi:id="_nZa34HlKEeayFayxZTWxEg" elementId="openType"/>
-        <children xsi:type="menu:OpaqueToolItem" xmi:id="_nZa34XlKEeayFayxZTWxEg" elementId="org.eclipse.mylyn.tasks.ui.openTask"/>
-        <children xsi:type="menu:OpaqueToolItem" xmi:id="_nZbe8HlKEeayFayxZTWxEg" elementId="org.eclipse.search.OpenSearchDialogPage"/>
-      </children>
-      <children xsi:type="menu:ToolBar" xmi:id="_nX-tcHlKEeayFayxZTWxEg" elementId="org.eclipse.wst.server.ui.internal.webbrowser.actionSet">
-        <tags>Draggable</tags>
-        <children xsi:type="menu:OpaqueToolItem" xmi:id="_nZcGAHlKEeayFayxZTWxEg" elementId="browser"/>
-        <children xsi:type="menu:OpaqueToolItem" xmi:id="_nZctEHlKEeayFayxZTWxEg" elementId="org.eclipse.wst.server.ui.internal.webbrowser.action.open"/>
-      </children>
-      <children xsi:type="menu:ToolBar" xmi:id="_nYTdkHlKEeayFayxZTWxEg" elementId="org.eclipse.wst.ws.explorer.explorer">
-        <tags>Draggable</tags>
-        <children xsi:type="menu:OpaqueToolItem" xmi:id="_nZdUIHlKEeayFayxZTWxEg" elementId="additions"/>
-        <children xsi:type="menu:OpaqueToolItem" xmi:id="_nZd7MHlKEeayFayxZTWxEg" elementId="org.eclipse.wst.ws.internal.explorer.action.LaunchWSEAction"/>
-      </children>
-      <children xsi:type="menu:ToolBar" xmi:id="_m_16QnlKEeayFayxZTWxEg" elementId="group.nav" toBeRendered="false">
-        <tags>toolbarSeparator</tags>
-        <children xsi:type="menu:ToolBarSeparator" xmi:id="_m_2hUHlKEeayFayxZTWxEg" elementId="group.nav" toBeRendered="false"/>
-      </children>
-      <children xsi:type="menu:ToolBar" xmi:id="_m_3IYHlKEeayFayxZTWxEg" elementId="org.eclipse.ui.workbench.navigate">
-        <tags>Draggable</tags>
-        <children xsi:type="menu:OpaqueToolItem" xmi:id="_nAEjwXlKEeayFayxZTWxEg" elementId="history.group"/>
-        <children xsi:type="menu:OpaqueToolItem" xmi:id="_nAEjwnlKEeayFayxZTWxEg" elementId="group.application" visible="false"/>
-        <children xsi:type="menu:OpaqueToolItem" xmi:id="_nAEjw3lKEeayFayxZTWxEg" elementId="backardHistory"/>
-        <children xsi:type="menu:OpaqueToolItem" xmi:id="_nAFK0HlKEeayFayxZTWxEg" elementId="forwardHistory"/>
-        <children xsi:type="menu:OpaqueToolItem" xmi:id="_nAFK0XlKEeayFayxZTWxEg" elementId="pin.group"/>
-        <children xsi:type="menu:HandledToolItem" xmi:id="_nAFx4HlKEeayFayxZTWxEg" elementId="org.eclipse.ui.window.pinEditor" iconURI="platform:/plugin/org.eclipse.ui/icons/full/etool16/pin_editor.gif" tooltip="Pin Editor" enabled="false" command="_mqhxnHlKEeayFayxZTWxEg"/>
-        <children xsi:type="menu:OpaqueToolItem" xmi:id="_nZeiQHlKEeayFayxZTWxEg" elementId="org.eclipse.ui.edit.text.gotoNextAnnotation"/>
-        <children xsi:type="menu:OpaqueToolItem" xmi:id="_nZfwYHlKEeayFayxZTWxEg" elementId="org.eclipse.ui.edit.text.gotoPreviousAnnotation"/>
-        <children xsi:type="menu:OpaqueToolItem" xmi:id="_nZg-gHlKEeayFayxZTWxEg" elementId="org.eclipse.ui.edit.text.gotoLastEditPosition"/>
-      </children>
-      <children xsi:type="menu:ToolBar" xmi:id="_m_3vcHlKEeayFayxZTWxEg" elementId="group.editor" toBeRendered="false">
-        <tags>toolbarSeparator</tags>
-        <children xsi:type="menu:ToolBarSeparator" xmi:id="_m_3vcXlKEeayFayxZTWxEg" elementId="group.editor" toBeRendered="false"/>
-      </children>
-      <children xsi:type="menu:ToolBar" xmi:id="_m_3vcnlKEeayFayxZTWxEg" elementId="group.help" toBeRendered="false">
-        <tags>toolbarSeparator</tags>
-        <children xsi:type="menu:ToolBarSeparator" xmi:id="_m_3vc3lKEeayFayxZTWxEg" elementId="group.help" toBeRendered="false"/>
-      </children>
-      <children xsi:type="menu:ToolBar" xmi:id="_m_4WgHlKEeayFayxZTWxEg" elementId="org.eclipse.ui.workbench.help" visible="false">
-        <tags>Draggable</tags>
-        <children xsi:type="menu:OpaqueToolItem" xmi:id="_nAFx4XlKEeayFayxZTWxEg" elementId="group.help"/>
-        <children xsi:type="menu:OpaqueToolItem" xmi:id="_nAHAAHlKEeayFayxZTWxEg" elementId="group.application" visible="false"/>
-      </children>
-      <children xsi:type="menu:ToolControl" xmi:id="_nHtc0HlKEeayFayxZTWxEg" elementId="PerspectiveSpacer" contributionURI="bundleclass://org.eclipse.e4.ui.workbench.renderers.swt/org.eclipse.e4.ui.workbench.renderers.swt.LayoutModifierToolControl">
-        <tags>stretch</tags>
-      </children>
-      <children xsi:type="menu:ToolControl" xmi:id="_nHv5EHlKEeayFayxZTWxEg" elementId="Spacer Glue" contributionURI="bundleclass://org.eclipse.e4.ui.workbench.renderers.swt/org.eclipse.e4.ui.workbench.renderers.swt.LayoutModifierToolControl">
-        <tags>glue</tags>
-      </children>
-      <children xsi:type="menu:ToolControl" xmi:id="_nHxuQHlKEeayFayxZTWxEg" elementId="SearchField" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.quickaccess.SearchField"/>
-      <children xsi:type="menu:ToolControl" xmi:id="_nI3TYHlKEeayFayxZTWxEg" elementId="Search-PS Glue" contributionURI="bundleclass://org.eclipse.e4.ui.workbench.renderers.swt/org.eclipse.e4.ui.workbench.renderers.swt.LayoutModifierToolControl">
-        <tags>glue</tags>
-      </children>
-      <children xsi:type="menu:ToolControl" xmi:id="_nI4hgHlKEeayFayxZTWxEg" elementId="PerspectiveSwitcher" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.e4.ui.workbench.addons.perspectiveswitcher.PerspectiveSwitcher">
-        <tags>Draggable</tags>
-      </children>
-    </trimBars>
-    <trimBars xmi:id="_nJDgoHlKEeayFayxZTWxEg" elementId="org.eclipse.ui.trim.status" side="Bottom">
-      <children xsi:type="menu:ToolControl" xmi:id="_nJEHsHlKEeayFayxZTWxEg" elementId="org.eclipse.ui.StatusLine" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.StandardTrim">
-        <tags>stretch</tags>
-      </children>
-      <children xsi:type="menu:ToolControl" xmi:id="_nJPG0HlKEeayFayxZTWxEg" elementId="org.eclipse.ui.HeapStatus" toBeRendered="false" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.StandardTrim"/>
-      <children xsi:type="menu:ToolControl" xmi:id="_nJV0gHlKEeayFayxZTWxEg" elementId="org.eclipse.ui.ProgressBar" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.StandardTrim">
-        <tags>Draggable</tags>
-      </children>
-    </trimBars>
-    <trimBars xmi:id="_nJm6QHlKEeayFayxZTWxEg" elementId="org.eclipse.ui.trim.vertical1" toBeRendered="false" side="Left">
-      <children xsi:type="menu:ToolControl" xmi:id="_nfkjMHlKEeayFayxZTWxEg" elementId="PerspectiveStack(minimized)" toBeRendered="false" contributionURI="bundleclass://org.eclipse.e4.ui.workbench.addons.swt/org.eclipse.e4.ui.workbench.addons.minmax.TrimStack">
-        <tags>TrimStack</tags>
-      </children>
-    </trimBars>
-    <trimBars xmi:id="_nJoIYHlKEeayFayxZTWxEg" elementId="org.eclipse.ui.trim.vertical2" side="Right"/>
-  </children>
-  <handlers xmi:id="_mpDx8XlKEeayFayxZTWxEg" elementId="_UW9TY_r3Ed6gmo7caOxU9g" contributorURI="platform:/plugin/org.eclipse.ui.workbench" contributionURI="bundleclass://org.eclipse.e4.ui.workbench/org.eclipse.e4.ui.internal.workbench.ExitHandler" command="_mpDx_XlKEeayFayxZTWxEg"/>
-  <handlers xmi:id="_mpDx8nlKEeayFayxZTWxEg" elementId="_BESTZfr3Ed6gmo7caOxU04" contributorURI="platform:/plugin/org.eclipse.ui.workbench" contributionURI="bundleclass://org.eclipse.e4.ui.workbench.swt/org.eclipse.e4.ui.internal.workbench.swt.handlers.ShowViewHandler" command="_mpDx_nlKEeayFayxZTWxEg"/>
-  <handlers xmi:id="_mpDx83lKEeayFayxZTWxEg" elementId="org.eclipse.e4.ui.saveHandler" contributorURI="platform:/plugin/org.eclipse.ui.workbench" contributionURI="bundleclass://org.eclipse.e4.ui.workbench/org.eclipse.e4.ui.internal.workbench.handlers.SaveHandler" command="_mpDyAHlKEeayFayxZTWxEg"/>
-  <handlers xmi:id="_mpDx9HlKEeayFayxZTWxEg" elementId="org.eclipse.e4.ui.saveAllHandler" contributorURI="platform:/plugin/org.eclipse.ui.workbench" contributionURI="bundleclass://org.eclipse.e4.ui.workbench/org.eclipse.e4.ui.internal.workbench.handlers.SaveAllHandler" command="_mpDyAXlKEeayFayxZTWxEg"/>
-  <bindingTables xmi:id="_mpDx9XlKEeayFayxZTWxEg" contributorURI="platform:/plugin/org.eclipse.ui.workbench" bindingContext="_mpDx-XlKEeayFayxZTWxEg">
-    <bindings xmi:id="_mpDx9nlKEeayFayxZTWxEg" elementId="_UW9TZfr3Ed6gmo7caOxU9g" contributorURI="platform:/plugin/org.eclipse.ui.workbench" keySequence="CTRL+Q" command="_mpDx_XlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_mpDx93lKEeayFayxZTWxEg" elementId="_oRr6EAFSEd-Z8rQksLwRYw" contributorURI="platform:/plugin/org.eclipse.ui.workbench" keySequence="CTRL+S" command="_mpDyAHlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_mpDx-HlKEeayFayxZTWxEg" contributorURI="platform:/plugin/org.eclipse.ui.workbench" keySequence="CTRL+SHIFT+S" command="_mpDyAXlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_mr8t4HlKEeayFayxZTWxEg" keySequence="CTRL+A" command="_mqWydXlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msBmYHlKEeayFayxZTWxEg" keySequence="CTRL+SHIFT+D" command="_mqpGVXlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msIUEXlKEeayFayxZTWxEg" keySequence="SHIFT+INSERT" command="_mqJXHHlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msJiMXlKEeayFayxZTWxEg" keySequence="CTRL+V" command="_mqJXHHlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msKJQXlKEeayFayxZTWxEg" keySequence="ALT+SHIFT+F3" command="_mqlb8nlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msLXYXlKEeayFayxZTWxEg" keySequence="CTRL+C" command="_mqac2nlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msL-cHlKEeayFayxZTWxEg" keySequence="ALT+PAGE_UP" command="_mqZOsHlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msL-c3lKEeayFayxZTWxEg" keySequence="ALT+PAGE_DOWN" command="_mqgjenlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msNzoHlKEeayFayxZTWxEg" keySequence="ALT+/" command="_mqjmwnlKEeayFayxZTWxEg">
-      <tags>locale:zh</tags>
-    </bindings>
-    <bindings xmi:id="_msOasXlKEeayFayxZTWxEg" keySequence="CTRL+Z" command="_mqRS8HlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msQP5HlKEeayFayxZTWxEg" keySequence="CTRL+X" command="_mqR59HlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msW9kXlKEeayFayxZTWxEg" keySequence="CTRL+SHIFT+I" command="_mqOPl3lKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msW9knlKEeayFayxZTWxEg" keySequence="ALT+SHIFT+F1" command="_mqMabHlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msXkoXlKEeayFayxZTWxEg" keySequence="ALT+SHIFT+F2" command="_mqfVWXlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msXkonlKEeayFayxZTWxEg" keySequence="CTRL+INSERT" command="_mqac2nlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msbPAXlKEeayFayxZTWxEg" keySequence="CTRL+F10" command="_mqKlMXlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msbPBHlKEeayFayxZTWxEg" keySequence="CTRL+SHIFT+L" command="_mqmqG3lKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msijw3lKEeayFayxZTWxEg" keySequence="CTRL+Y" command="_mqYAoHlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msm1MXlKEeayFayxZTWxEg" keySequence="CTRL+1" command="_mqPdt3lKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msrGonlKEeayFayxZTWxEg" keySequence="SHIFT+DEL" command="_mqR59HlKEeayFayxZTWxEg"/>
-  </bindingTables>
-  <bindingTables xmi:id="_mrv5kHlKEeayFayxZTWxEg" elementId="org.eclipse.ui.textEditorScope" bindingContext="_mqyQQXlKEeayFayxZTWxEg">
-    <bindings xmi:id="_mr1ZIHlKEeayFayxZTWxEg" keySequence="CTRL+SHIFT+ARROW_LEFT" command="_mqWLYnlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_mr4ccnlKEeayFayxZTWxEg" keySequence="CTRL+ARROW_DOWN" command="_mqtXwnlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_mr8t4XlKEeayFayxZTWxEg" keySequence="CTRL+ARROW_UP" command="_mqMaaXlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_mr8t4nlKEeayFayxZTWxEg" keySequence="ALT+CTRL+ARROW_UP" command="_mqqUcXlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_mr9U8HlKEeayFayxZTWxEg" keySequence="ALT+ARROW_DOWN" command="_mqhKgHlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_mr9U8XlKEeayFayxZTWxEg" keySequence="CTRL+SHIFT+DEL" command="_mqjmyXlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_mr98A3lKEeayFayxZTWxEg" keySequence="ALT+SHIFT+A" command="_mqbq-XlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msA_UHlKEeayFayxZTWxEg" keySequence="CTRL+SHIFT+ARROW_RIGHT" command="_mqNoh3lKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msDbkHlKEeayFayxZTWxEg" keySequence="SHIFT+HOME" command="_mqTIFXlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msEpsXlKEeayFayxZTWxEg" keySequence="SHIFT+END" command="_mqVkVXlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msFQwHlKEeayFayxZTWxEg" keySequence="CTRL+HOME" command="_mqJXG3lKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msFQwXlKEeayFayxZTWxEg" keySequence="CTRL+END" command="_mqhKhXlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msHtBHlKEeayFayxZTWxEg" keySequence="ALT+CTRL+J" command="_mqPdsHlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msHtBXlKEeayFayxZTWxEg" keySequence="CTRL+BS" command="_mqII8XlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msIUEnlKEeayFayxZTWxEg" keySequence="SHIFT+CR" command="_mqn4MXlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msIUFHlKEeayFayxZTWxEg" keySequence="F2" command="_mqPdwHlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msJiMnlKEeayFayxZTWxEg" keySequence="CTRL+NUMPAD_SUBTRACT" command="_mqlb8HlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msKJQHlKEeayFayxZTWxEg" keySequence="CTRL+NUMPAD_ADD" command="_mqpGWXlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msKJQnlKEeayFayxZTWxEg" keySequence="CTRL+NUMPAD_DIVIDE" command="_mqMabnlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msKwUXlKEeayFayxZTWxEg" keySequence="CTRL+ARROW_LEFT" command="_mqac13lKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msL-cXlKEeayFayxZTWxEg" keySequence="CTRL+ARROW_RIGHT" command="_mqOPnHlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msMlgHlKEeayFayxZTWxEg" keySequence="CTRL+D" command="_mqLMQnlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msNMknlKEeayFayxZTWxEg" keySequence="CTRL+SHIFT+CR" command="_mqlb8XlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msSsInlKEeayFayxZTWxEg" keySequence="HOME" command="_mqn4M3lKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msUhU3lKEeayFayxZTWxEg" keySequence="INSERT" command="_mqc5G3lKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msYLs3lKEeayFayxZTWxEg" keySequence="CTRL+SHIFT+NUMPAD_MULTIPLY" command="_mqhxkXlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msYLtHlKEeayFayxZTWxEg" keySequence="CTRL+SHIFT+J" command="_mqOPknlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msYLtXlKEeayFayxZTWxEg" keySequence="CTRL+SHIFT+INSERT" command="_mqNogXlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msan8XlKEeayFayxZTWxEg" keySequence="CTRL+SHIFT+K" command="_mqMaZXlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msan83lKEeayFayxZTWxEg" keySequence="CTRL+SHIFT+NUMPAD_DIVIDE" command="_mqc5HXlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msbPAnlKEeayFayxZTWxEg" keySequence="CTRL+F10" command="_mqk08XlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msbPA3lKEeayFayxZTWxEg" keySequence="CTRL+SHIFT+X" command="_mqbD4nlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_mscdJHlKEeayFayxZTWxEg" keySequence="END" command="_mqmDB3lKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_mse5YnlKEeayFayxZTWxEg" keySequence="CTRL+SHIFT+Y" command="_mqTvJXlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msfgcHlKEeayFayxZTWxEg" keySequence="ALT+CTRL+/" command="_mqn4N3lKEeayFayxZTWxEg">
-      <tags>locale:zh</tags>
-    </bindings>
-    <bindings xmi:id="_msfgcXlKEeayFayxZTWxEg" keySequence="CTRL+SHIFT+Q" command="_mqO2oHlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msijwnlKEeayFayxZTWxEg" keySequence="CTRL+J" command="_mqKlOHlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msjx4HlKEeayFayxZTWxEg" keySequence="CTRL+NUMPAD_MULTIPLY" command="_mqhKlnlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msoDUHlKEeayFayxZTWxEg" keySequence="CTRL+L" command="_mqkN03lKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msoDU3lKEeayFayxZTWxEg" keySequence="CTRL+K" command="_mqgjdHlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msqfkHlKEeayFayxZTWxEg" keySequence="ALT+ARROW_UP" command="_mqsJpXlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msqfknlKEeayFayxZTWxEg" keySequence="CTRL+DEL" command="_mqRS6XlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_mss703lKEeayFayxZTWxEg" keySequence="ALT+CTRL+ARROW_DOWN" command="_mqWyfnlKEeayFayxZTWxEg"/>
-  </bindingTables>
-  <bindingTables xmi:id="_mr2nQHlKEeayFayxZTWxEg" elementId="org.eclipse.ui.contexts.window" bindingContext="_mpDx-nlKEeayFayxZTWxEg">
-    <bindings xmi:id="_mr2nQXlKEeayFayxZTWxEg" keySequence="ALT+ARROW_RIGHT" command="_mqShB3lKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_mr3OUHlKEeayFayxZTWxEg" keySequence="ALT+CTRL+SHIFT+ARROW_RIGHT" command="_mqc5F3lKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_mr4ccXlKEeayFayxZTWxEg" keySequence="CTRL+B" command="_mqJXJHlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_mr64sHlKEeayFayxZTWxEg" keySequence="CTRL+SHIFT+A" command="_mqgjeHlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_mr7fwnlKEeayFayxZTWxEg" keySequence="ALT+CTRL+SHIFT+ARROW_UP" command="_mqdgLXlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_mr8G0HlKEeayFayxZTWxEg" keySequence="ALT+CTRL+SHIFT+A" command="_mqhKg3lKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_mr8G0XlKEeayFayxZTWxEg" keySequence="ALT+C" command="_mqRS4HlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_mr8G03lKEeayFayxZTWxEg" keySequence="ALT+ARROW_LEFT" command="_mqKlNXlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_mr-jEHlKEeayFayxZTWxEg" keySequence="ALT+SHIFT+D E" command="_mqsJqnlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_mr-jEXlKEeayFayxZTWxEg" keySequence="ALT+SHIFT+D Q" command="_mqXZhXlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_mr_KIHlKEeayFayxZTWxEg" keySequence="ALT+SHIFT+D J" command="_mqhxlnlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_mr_KIXlKEeayFayxZTWxEg" keySequence="ALT+SHIFT+D X" command="_mqYAlXlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_mr_KInlKEeayFayxZTWxEg" keySequence="ALT+SHIFT+D A" command="_mqkN1nlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_mr_xMHlKEeayFayxZTWxEg" keySequence="ALT+SHIFT+D R" command="_mqYnoHlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_mr_xMXlKEeayFayxZTWxEg" keySequence="ALT+SHIFT+D T" command="_mqII_XlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_mr_xMnlKEeayFayxZTWxEg" keySequence="ALT+SHIFT+D P" command="_mqk053lKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msAYQHlKEeayFayxZTWxEg" keySequence="ALT+SHIFT+D O" command="_mqac4HlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msAYQXlKEeayFayxZTWxEg" keySequence="CTRL+SHIFT+F7" command="_mqofSnlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msCNcXlKEeayFayxZTWxEg" keySequence="CTRL+E" command="_mqRS53lKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msCNcnlKEeayFayxZTWxEg" keySequence="CTRL+SHIFT+E" command="_mqNBdnlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msC0gHlKEeayFayxZTWxEg" keySequence="ALT+SHIFT+F" command="_mqlb_XlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msC0gnlKEeayFayxZTWxEg" keySequence="CTRL+F" command="_mqLzUHlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msDbkXlKEeayFayxZTWxEg" keySequence="ALT+SHIFT+G" command="_mqeHN3lKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msFQwnlKEeayFayxZTWxEg" keySequence="ALT+CTRL+G" command="_mqfVVnlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msF30HlKEeayFayxZTWxEg" keySequence="CTRL+SHIFT+G" command="_mqrikHlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msGe4HlKEeayFayxZTWxEg" keySequence="CTRL+G" command="_mqII8nlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msGe4nlKEeayFayxZTWxEg" keySequence="CTRL+H" command="_mqjmwXlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msHF8HlKEeayFayxZTWxEg" keySequence="ALT+SHIFT+I" command="_mqKlM3lKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msHtAHlKEeayFayxZTWxEg" keySequence="CTRL+SHIFT+H" command="_mqac0HlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msHtAnlKEeayFayxZTWxEg" keySequence="ALT+CTRL+H" command="_mqJ-L3lKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msIUE3lKEeayFayxZTWxEg" keySequence="F2" command="_mqJXI3lKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msLXYnlKEeayFayxZTWxEg" keySequence="CTRL+#" command="_mqKlMnlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msMlgnlKEeayFayxZTWxEg" keySequence="CTRL+SHIFT+O" command="_mqpGUXlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msNzonlKEeayFayxZTWxEg" keySequence="CTRL+SHIFT+N" command="_mqbD7XlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msOasnlKEeayFayxZTWxEg" keySequence="ALT+SHIFT+Z" command="_mqZ1y3lKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msPBw3lKEeayFayxZTWxEg" keySequence="ALT+CR" command="_mqiYq3lKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msPo1XlKEeayFayxZTWxEg" keySequence="ALT+V" command="_mqWyenlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msQP43lKEeayFayxZTWxEg" keySequence="CTRL+SHIFT+F4" command="_mqR58nlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msQ28HlKEeayFayxZTWxEg" keySequence="CTRL+S" command="_mqTvLHlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msQ28XlKEeayFayxZTWxEg" keySequence="ALT+SHIFT+T" command="_mqbq-3lKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msReAHlKEeayFayxZTWxEg" keySequence="F11" command="_mqofR3lKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msReAXlKEeayFayxZTWxEg" keySequence="CTRL+M" command="_mqi_u3lKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msReAnlKEeayFayxZTWxEg" keySequence="CTRL+SHIFT+R" command="_mqtXyHlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msReA3lKEeayFayxZTWxEg" keySequence="CTRL+P" command="_mqk07HlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msSsJXlKEeayFayxZTWxEg" keySequence="ALT+SHIFT+L" command="_mqPdtHlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msTTMXlKEeayFayxZTWxEg" keySequence="ALT+CTRL+SHIFT+M" command="_mqofSXlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msT6QHlKEeayFayxZTWxEg" keySequence="CTRL+F11" command="_mqmDDXlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msT6QXlKEeayFayxZTWxEg" keySequence="CTRL+Q" command="_mqlb-HlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msT6QnlKEeayFayxZTWxEg" keySequence="CTRL+," command="_mqJXIXlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msUhUXlKEeayFayxZTWxEg" keySequence="CTRL+-" command="_mqnRIHlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msUhVXlKEeayFayxZTWxEg" keySequence="SHIFT+F2" command="_mqeHMHlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msVIYXlKEeayFayxZTWxEg" keySequence="CTRL+F8" command="_mqPduXlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msW9k3lKEeayFayxZTWxEg" keySequence="ALT+SHIFT+J" command="_mqRS5XlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msYLsnlKEeayFayxZTWxEg" keySequence="CTRL+SHIFT+NUMPAD_MULTIPLY" command="_mqeuQXlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msYywHlKEeayFayxZTWxEg" keySequence="SHIFT+F5" command="_mqWygnlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msYywXlKEeayFayxZTWxEg" keySequence="ALT+CTRL+SHIFT+F12" command="_mqptYHlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msaA4nlKEeayFayxZTWxEg" keySequence="F3" command="_mqPdsnlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msan8HlKEeayFayxZTWxEg" keySequence="CTRL+SHIFT+S" command="_mqeuQnlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msan8nlKEeayFayxZTWxEg" keySequence="CTRL+SHIFT+NUMPAD_DIVIDE" command="_mqQr2HlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_mscdInlKEeayFayxZTWxEg" keySequence="F5" command="_mqShD3lKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_mscdI3lKEeayFayxZTWxEg" keySequence="ALT+SHIFT+P" command="_mqfVXXlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msdEMHlKEeayFayxZTWxEg" keySequence="ALT+SHIFT+S" command="_mqZ1xHlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_mse5YXlKEeayFayxZTWxEg" keySequence="CTRL+N" command="_mqrilXlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_mse5Y3lKEeayFayxZTWxEg" keySequence="CTRL+F6" command="_mqLzWHlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msfgcnlKEeayFayxZTWxEg" keySequence="CTRL+." command="_mqqUdXlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msfgc3lKEeayFayxZTWxEg" keySequence="F4" command="_mqJ-JnlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msgHgnlKEeayFayxZTWxEg" keySequence="CTRL+W" command="_mqYnqHlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msgHg3lKEeayFayxZTWxEg" keySequence="CTRL+F9" command="_mqNBenlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msgukHlKEeayFayxZTWxEg" keySequence="CTRL+F7" command="_mqac23lKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msgukXlKEeayFayxZTWxEg" keySequence="CTRL+F4" command="_mqYnqHlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msguknlKEeayFayxZTWxEg" keySequence="CTRL+SHIFT+F8" command="_mqQr1nlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msguk3lKEeayFayxZTWxEg" keySequence="F12" command="_mqjmxXlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msgulHlKEeayFayxZTWxEg" keySequence="CTRL+F12" command="_mqMaaHlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_mshVo3lKEeayFayxZTWxEg" keySequence="ALT+SHIFT+N" command="_mqRS8XlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_mshVpHlKEeayFayxZTWxEg" keySequence="CTRL+SHIFT+U" command="_mqNBfHlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msh8sXlKEeayFayxZTWxEg" keySequence="ALT+X" command="_mqZ1yXlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msh8s3lKEeayFayxZTWxEg" keySequence="CTRL+3" command="_mqPdv3lKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msijxHlKEeayFayxZTWxEg" keySequence="DEL" command="_mqLzX3lKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msjK0HlKEeayFayxZTWxEg" keySequence="ALT+F5" command="_mqWLbnlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msjK0XlKEeayFayxZTWxEg" keySequence="ALT+F7" command="_mqcSAHlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msjK0nlKEeayFayxZTWxEg" keySequence="ALT+SHIFT+M" command="_mqpGWnlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msjx5HlKEeayFayxZTWxEg" keySequence="ALT+SHIFT+R" command="_mqYnpHlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_mskY9HlKEeayFayxZTWxEg" keySequence="CTRL+SHIFT+T" command="_mqR583lKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_mslAAXlKEeayFayxZTWxEg" keySequence="CTRL+BREAK" command="_mqKlQnlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_mslnEHlKEeayFayxZTWxEg" keySequence="CTRL+SHIFT+F12" command="_mqIwBXlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_mslnEnlKEeayFayxZTWxEg" keySequence="CTRL+U" command="_mqYAl3lKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_mslnE3lKEeayFayxZTWxEg" keySequence="CTRL+SHIFT+W" command="_mqR58nlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msmOI3lKEeayFayxZTWxEg" keySequence="ALT+-" command="_mqbD7HlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msm1MHlKEeayFayxZTWxEg" keySequence="ALT+SHIFT+F7" command="_mqhKh3lKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msncQ3lKEeayFayxZTWxEg" keySequence="ALT+SHIFT+V" command="_mqWLYXlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msoDUnlKEeayFayxZTWxEg" keySequence="CTRL+SHIFT+F9" command="_mqWLa3lKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msoqYXlKEeayFayxZTWxEg" keySequence="CTRL+SHIFT+F6" command="_mqeuTHlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msoqYnlKEeayFayxZTWxEg" keySequence="ALT+SHIFT+W" command="_mqqUcHlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msp4gHlKEeayFayxZTWxEg" keySequence="ALT+SHIFT+?" command="_mqQr03lKEeayFayxZTWxEg">
-      <tags>locale:zh</tags>
-    </bindings>
-    <bindings xmi:id="_msqfkXlKEeayFayxZTWxEg" keySequence="CTRL+DEL" command="_mqnRJXlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msqfk3lKEeayFayxZTWxEg" keySequence="CTRL+=" command="_mqShCnlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msrGoHlKEeayFayxZTWxEg" keySequence="ALT+?" command="_mqQr03lKEeayFayxZTWxEg">
-      <tags>locale:zh</tags>
-    </bindings>
-    <bindings xmi:id="_msrGoXlKEeayFayxZTWxEg" keySequence="SHIFT+DEL" command="_mqQr0HlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msrGo3lKEeayFayxZTWxEg" keySequence="ALT+CTRL+SHIFT+ARROW_DOWN" command="_mqsJoXlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msrtsHlKEeayFayxZTWxEg" keySequence="CTRL+SHIFT+B" command="_mqMaZnlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msrtsXlKEeayFayxZTWxEg" keySequence="ALT+SHIFT+C" command="_mqjmyHlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msuJ8HlKEeayFayxZTWxEg" keySequence="ALT+SHIFT+Q J" command="_mqf8Z3lKEeayFayxZTWxEg">
-      <parameters xmi:id="_msuJ8XlKEeayFayxZTWxEg" elementId="org.eclipse.ui.views.showView.viewId" name="org.eclipse.ui.views.showView.viewId" value="org.eclipse.jdt.ui.JavadocView"/>
-    </bindings>
-    <bindings xmi:id="_msuxAXlKEeayFayxZTWxEg" keySequence="ALT+SHIFT+Q Q" command="_mqf8Z3lKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msvYEHlKEeayFayxZTWxEg" keySequence="ALT+SHIFT+X A" command="_mqJXIHlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msvYEXlKEeayFayxZTWxEg" keySequence="ALT+SHIFT+Q B" command="_mqf8Z3lKEeayFayxZTWxEg">
-      <parameters xmi:id="_msvYEnlKEeayFayxZTWxEg" elementId="org.eclipse.ui.views.showView.viewId" name="org.eclipse.ui.views.showView.viewId" value="org.eclipse.debug.ui.BreakpointView"/>
-    </bindings>
-    <bindings xmi:id="_msv_IHlKEeayFayxZTWxEg" keySequence="ALT+SHIFT+X Q" command="_mqOPlHlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msv_IXlKEeayFayxZTWxEg" keySequence="ALT+SHIFT+Q C" command="_mqf8Z3lKEeayFayxZTWxEg">
-      <parameters xmi:id="_msv_InlKEeayFayxZTWxEg" elementId="org.eclipse.ui.views.showView.viewId" name="org.eclipse.ui.views.showView.viewId" value="org.eclipse.ui.console.ConsoleView"/>
-    </bindings>
-    <bindings xmi:id="_msv_I3lKEeayFayxZTWxEg" keySequence="ALT+SHIFT+Q T" command="_mqf8Z3lKEeayFayxZTWxEg">
-      <parameters xmi:id="_msv_JHlKEeayFayxZTWxEg" elementId="org.eclipse.ui.views.showView.viewId" name="org.eclipse.ui.views.showView.viewId" value="org.eclipse.jdt.ui.TypeHierarchy"/>
-    </bindings>
-    <bindings xmi:id="_mswmMXlKEeayFayxZTWxEg" keySequence="ALT+SHIFT+Q Y" command="_mqf8Z3lKEeayFayxZTWxEg">
-      <parameters xmi:id="_mswmMnlKEeayFayxZTWxEg" elementId="org.eclipse.ui.views.showView.viewId" name="org.eclipse.ui.views.showView.viewId" value="org.eclipse.team.sync.views.SynchronizeView"/>
-    </bindings>
-    <bindings xmi:id="_mswmM3lKEeayFayxZTWxEg" keySequence="ALT+SHIFT+Q O" command="_mqf8Z3lKEeayFayxZTWxEg">
-      <parameters xmi:id="_msxNQHlKEeayFayxZTWxEg" elementId="org.eclipse.ui.views.showView.viewId" name="org.eclipse.ui.views.showView.viewId" value="org.eclipse.ui.views.ContentOutline"/>
-    </bindings>
-    <bindings xmi:id="_msxNQXlKEeayFayxZTWxEg" keySequence="ALT+SHIFT+Q L" command="_mqf8Z3lKEeayFayxZTWxEg">
-      <parameters xmi:id="_msxNQnlKEeayFayxZTWxEg" elementId="org.eclipse.ui.views.showView.viewId" name="org.eclipse.ui.views.showView.viewId" value="org.eclipse.pde.runtime.LogView"/>
-    </bindings>
-    <bindings xmi:id="_msxNQ3lKEeayFayxZTWxEg" keySequence="ALT+SHIFT+X E" command="_mqfVVXlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msx0UXlKEeayFayxZTWxEg" keySequence="ALT+SHIFT+X X" command="_mqbq8HlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msx0UnlKEeayFayxZTWxEg" keySequence="ALT+SHIFT+X P" command="_mqptZnlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msybYHlKEeayFayxZTWxEg" keySequence="ALT+SHIFT+Q X" command="_mqf8Z3lKEeayFayxZTWxEg">
-      <parameters xmi:id="_msybYXlKEeayFayxZTWxEg" elementId="org.eclipse.ui.views.showView.viewId" name="org.eclipse.ui.views.showView.viewId" value="org.eclipse.ui.views.ProblemView"/>
-    </bindings>
-    <bindings xmi:id="_msybYnlKEeayFayxZTWxEg" keySequence="ALT+SHIFT+Q H" command="_mqf8Z3lKEeayFayxZTWxEg">
-      <parameters xmi:id="_msybY3lKEeayFayxZTWxEg" elementId="org.eclipse.ui.views.showView.viewId" name="org.eclipse.ui.views.showView.viewId" value="org.eclipse.ui.cheatsheets.views.CheatSheetView"/>
-    </bindings>
-    <bindings xmi:id="_mszCcHlKEeayFayxZTWxEg" keySequence="ALT+SHIFT+Q P" command="_mqf8Z3lKEeayFayxZTWxEg">
-      <parameters xmi:id="_mszCcXlKEeayFayxZTWxEg" elementId="org.eclipse.ui.views.showView.viewId" name="org.eclipse.ui.views.showView.viewId" value="org.eclipse.jdt.ui.PackageExplorer"/>
-    </bindings>
-    <bindings xmi:id="_mszCc3lKEeayFayxZTWxEg" keySequence="ALT+SHIFT+Q Z" command="_mqf8Z3lKEeayFayxZTWxEg">
-      <parameters xmi:id="_mszpgHlKEeayFayxZTWxEg" elementId="org.eclipse.ui.views.showView.viewId" name="org.eclipse.ui.views.showView.viewId" value="org.eclipse.team.ui.GenericHistoryView"/>
-    </bindings>
-    <bindings xmi:id="_mszpgXlKEeayFayxZTWxEg" keySequence="ALT+SHIFT+X J" command="_mqgjfnlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_mszpgnlKEeayFayxZTWxEg" keySequence="ALT+SHIFT+Q V" command="_mqf8Z3lKEeayFayxZTWxEg">
-      <parameters xmi:id="_ms0QkHlKEeayFayxZTWxEg" elementId="org.eclipse.ui.views.showView.viewId" name="org.eclipse.ui.views.showView.viewId" value="org.eclipse.debug.ui.VariableView"/>
-    </bindings>
-    <bindings xmi:id="_ms0QkXlKEeayFayxZTWxEg" keySequence="ALT+SHIFT+Q K" command="_mqf8Z3lKEeayFayxZTWxEg">
-      <parameters xmi:id="_ms0QknlKEeayFayxZTWxEg" elementId="org.eclipse.ui.views.showView.viewId" name="org.eclipse.ui.views.showView.viewId" value="org.eclipse.mylyn.tasks.ui.views.tasks"/>
-    </bindings>
-    <bindings xmi:id="_ms0Qk3lKEeayFayxZTWxEg" keySequence="ALT+SHIFT+X M" command="_mqWye3lKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_ms03oHlKEeayFayxZTWxEg" keySequence="ALT+SHIFT+Q D" command="_mqf8Z3lKEeayFayxZTWxEg">
-      <parameters xmi:id="_ms03oXlKEeayFayxZTWxEg" elementId="org.eclipse.ui.views.showView.viewId" name="org.eclipse.ui.views.showView.viewId" value="org.eclipse.jdt.ui.SourceView"/>
-    </bindings>
-    <bindings xmi:id="_ms03o3lKEeayFayxZTWxEg" keySequence="ALT+SHIFT+X T" command="_mqWycnlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_ms1esHlKEeayFayxZTWxEg" keySequence="ALT+SHIFT+X O" command="_mqeHMXlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_ms1esXlKEeayFayxZTWxEg" keySequence="ALT+SHIFT+X R" command="_mqYAnnlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_ms2FwHlKEeayFayxZTWxEg" keySequence="ALT+SHIFT+Q S" command="_mqf8Z3lKEeayFayxZTWxEg">
-      <parameters xmi:id="_ms2FwXlKEeayFayxZTWxEg" elementId="org.eclipse.ui.views.showView.viewId" name="org.eclipse.ui.views.showView.viewId" value="org.eclipse.search.ui.views.SearchView"/>
-    </bindings>
-  </bindingTables>
-  <bindingTables xmi:id="_mr3OUXlKEeayFayxZTWxEg" elementId="org.eclipse.jdt.ui.javaEditorScope" bindingContext="_mqy3UXlKEeayFayxZTWxEg">
-    <bindings xmi:id="_mr3OUnlKEeayFayxZTWxEg" keySequence="CTRL+SHIFT+C" command="_mqbD73lKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_mr4cc3lKEeayFayxZTWxEg" keySequence="ALT+SHIFT+ARROW_RIGHT" command="_mqKlQ3lKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_mr5qkHlKEeayFayxZTWxEg" keySequence="ALT+SHIFT+B" command="_mqsJqXlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_mr6RoHlKEeayFayxZTWxEg" keySequence="ALT+SHIFT+ARROW_DOWN" command="_mqMaanlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_mr64snlKEeayFayxZTWxEg" keySequence="CTRL+SHIFT+ARROW_UP" command="_mqYnq3lKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_mr9U8nlKEeayFayxZTWxEg" keySequence="ALT+SHIFT+ARROW_UP" command="_mqXZhHlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msECoHlKEeayFayxZTWxEg" keySequence="CTRL+SHIFT+F" command="_mqn4MHlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msKJQ3lKEeayFayxZTWxEg" keySequence="CTRL+SHIFT+/" command="_mqYAmHlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msSFEHlKEeayFayxZTWxEg" keySequence="ALT+SHIFT+U" command="_mqhxm3lKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msSFFHlKEeayFayxZTWxEg" keySequence="CTRL+SHIFT+M" command="_mqPdwXlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msT6Q3lKEeayFayxZTWxEg" keySequence="CTRL+7" command="_mqbD73lKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msVIYnlKEeayFayxZTWxEg" keySequence="CTRL+O" command="_mqWydnlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msXko3lKEeayFayxZTWxEg" keySequence="CTRL+I" command="_mqShBXlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msZZ0nlKEeayFayxZTWxEg" keySequence="CTRL+T" command="_mqbq-HlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msb2EnlKEeayFayxZTWxEg" keySequence="CTRL+/" command="_mqbD73lKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msdrQHlKEeayFayxZTWxEg" keySequence="CTRL+SHIFT+P" command="_mqhKhnlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_mshVoXlKEeayFayxZTWxEg" keySequence="ALT+SHIFT+O" command="_mqRS63lKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msmOIHlKEeayFayxZTWxEg" keySequence="CTRL+F3" command="_mqqUc3lKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_mspRcHlKEeayFayxZTWxEg" keySequence="CTRL+SHIFT+\" command="_mqLMRHlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_mssUwXlKEeayFayxZTWxEg" keySequence="ALT+SHIFT+ARROW_LEFT" command="_mqShDXlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_mss70HlKEeayFayxZTWxEg" keySequence="CTRL+SHIFT+ARROW_DOWN" command="_mqWyeHlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msxNRHlKEeayFayxZTWxEg" keySequence="CTRL+2 R" command="_mqiYrnlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_ms1esnlKEeayFayxZTWxEg" keySequence="CTRL+2 F" command="_mqpGWHlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_ms2FwnlKEeayFayxZTWxEg" keySequence="CTRL+2 L" command="_mqKlPHlKEeayFayxZTWxEg"/>
-  </bindingTables>
-  <bindingTables xmi:id="_mr3OU3lKEeayFayxZTWxEg" elementId="org.eclipse.jdt.ui.propertiesEditorScope" bindingContext="_mq0siXlKEeayFayxZTWxEg">
-    <bindings xmi:id="_mr31YHlKEeayFayxZTWxEg" keySequence="CTRL+SHIFT+C" command="_mqbD73lKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msT6RHlKEeayFayxZTWxEg" keySequence="CTRL+7" command="_mqbD73lKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msb2E3lKEeayFayxZTWxEg" keySequence="CTRL+/" command="_mqbD73lKEeayFayxZTWxEg"/>
-  </bindingTables>
-  <bindingTables xmi:id="_mr31YXlKEeayFayxZTWxEg" elementId="org.eclipse.wst.jsdt.ui.javaEditorScope" bindingContext="_mqyQQnlKEeayFayxZTWxEg">
-    <bindings xmi:id="_mr31YnlKEeayFayxZTWxEg" keySequence="CTRL+SHIFT+C" command="_mqc5FnlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_mr5DgHlKEeayFayxZTWxEg" keySequence="ALT+SHIFT+ARROW_RIGHT" command="_mqf8ZXlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_mr6Ro3lKEeayFayxZTWxEg" keySequence="ALT+SHIFT+ARROW_DOWN" command="_mqhxmnlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_mr7fwHlKEeayFayxZTWxEg" keySequence="CTRL+SHIFT+ARROW_UP" command="_mqt-0HlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_mr98AXlKEeayFayxZTWxEg" keySequence="ALT+SHIFT+ARROW_UP" command="_mqJ-InlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msBmY3lKEeayFayxZTWxEg" keySequence="ALT+SHIFT+E" command="_mqZ1ynlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msECo3lKEeayFayxZTWxEg" keySequence="CTRL+SHIFT+F" command="_mqKlPnlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msKJRHlKEeayFayxZTWxEg" keySequence="CTRL+SHIFT+/" command="_mqXZi3lKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msSFE3lKEeayFayxZTWxEg" keySequence="ALT+SHIFT+U" command="_mqR58XlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msSsIXlKEeayFayxZTWxEg" keySequence="CTRL+SHIFT+M" command="_mqJ-MXlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msUhUHlKEeayFayxZTWxEg" keySequence="CTRL+7" command="_mqc5FnlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msVIZ3lKEeayFayxZTWxEg" keySequence="CTRL+O" command="_mqIwDXlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msYLsHlKEeayFayxZTWxEg" keySequence="CTRL+I" command="_mqWLY3lKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msZZ03lKEeayFayxZTWxEg" keySequence="CTRL+T" command="_mqdgL3lKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msb2FHlKEeayFayxZTWxEg" keySequence="CTRL+/" command="_mqc5FnlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msdrQnlKEeayFayxZTWxEg" keySequence="CTRL+SHIFT+P" command="_mqeuRHlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_mshVonlKEeayFayxZTWxEg" keySequence="ALT+SHIFT+O" command="_mqTIFnlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_mslAAHlKEeayFayxZTWxEg" keySequence="CTRL+SHIFT+T" command="_mqXZjnlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msmOIXlKEeayFayxZTWxEg" keySequence="CTRL+F3" command="_mqac33lKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_mspRcXlKEeayFayxZTWxEg" keySequence="CTRL+SHIFT+\" command="_mqLzXXlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_mssUwnlKEeayFayxZTWxEg" keySequence="ALT+SHIFT+ARROW_LEFT" command="_mqn4MnlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_mss70XlKEeayFayxZTWxEg" keySequence="CTRL+SHIFT+ARROW_DOWN" command="_mqNogHlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msx0UHlKEeayFayxZTWxEg" keySequence="CTRL+2 R" command="_mqPdxHlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_ms1es3lKEeayFayxZTWxEg" keySequence="CTRL+2 F" command="_mqTvIHlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_ms2Fw3lKEeayFayxZTWxEg" keySequence="CTRL+2 L" command="_mqqUdHlKEeayFayxZTWxEg"/>
-  </bindingTables>
-  <bindingTables xmi:id="_mr31Y3lKEeayFayxZTWxEg" elementId="org.eclipse.wst.sse.ui.structuredTextEditorScope" bindingContext="_mqy3U3lKEeayFayxZTWxEg">
-    <bindings xmi:id="_mr4ccHlKEeayFayxZTWxEg" keySequence="CTRL+SHIFT+C" command="_mqnRKnlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_mr5DgXlKEeayFayxZTWxEg" keySequence="ALT+SHIFT+ARROW_RIGHT" command="_mqeHM3lKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_mr6RpHlKEeayFayxZTWxEg" keySequence="ALT+SHIFT+ARROW_DOWN" command="_mqhKk3lKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_mr64sXlKEeayFayxZTWxEg" keySequence="CTRL+SHIFT+A" command="_mqtXw3lKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_mr7fwXlKEeayFayxZTWxEg" keySequence="CTRL+SHIFT+ARROW_UP" command="_mqOPkHlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_mr98AnlKEeayFayxZTWxEg" keySequence="ALT+SHIFT+ARROW_UP" command="_mqgjgHlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msEpsHlKEeayFayxZTWxEg" keySequence="CTRL+SHIFT+F" command="_mqrikXlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msKwUHlKEeayFayxZTWxEg" keySequence="CTRL+SHIFT+/" command="_mqbD63lKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msVIaHlKEeayFayxZTWxEg" keySequence="CTRL+O" command="_mqcSB3lKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msYLsXlKEeayFayxZTWxEg" keySequence="CTRL+I" command="_mqk073lKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msaA5HlKEeayFayxZTWxEg" keySequence="F3" command="_mqbq93lKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_mseSUHlKEeayFayxZTWxEg" keySequence="CTRL+SHIFT+P" command="_mqbq-nlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_mspRcnlKEeayFayxZTWxEg" keySequence="CTRL+SHIFT+\" command="_mqfVWHlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msp4gXlKEeayFayxZTWxEg" keySequence="CTRL+SHIFT+>" command="_mqkN13lKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_mssUw3lKEeayFayxZTWxEg" keySequence="ALT+SHIFT+ARROW_LEFT" command="_mqJ-LXlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_mss70nlKEeayFayxZTWxEg" keySequence="CTRL+SHIFT+ARROW_DOWN" command="_mqXZjHlKEeayFayxZTWxEg"/>
-  </bindingTables>
-  <bindingTables xmi:id="_mr5DgnlKEeayFayxZTWxEg" elementId="org.eclipse.datatools.sqltools.SQLEditorScope" bindingContext="_mqyQRnlKEeayFayxZTWxEg">
-    <bindings xmi:id="_mr5Dg3lKEeayFayxZTWxEg" keySequence="ALT+CTRL+D" command="_mqRS5HlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_mr8G0nlKEeayFayxZTWxEg" keySequence="ALT+C" command="_mqQExHlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msMlgXlKEeayFayxZTWxEg" keySequence="ALT+CTRL+X" command="_mqYno3lKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msb2EXlKEeayFayxZTWxEg" keySequence="CTRL+/" command="_mqIJB3lKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msdENHlKEeayFayxZTWxEg" keySequence="CTRL+SHIFT+P" command="_mqhxlHlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msgHhHlKEeayFayxZTWxEg" keySequence="ALT+Q" command="_mqk05HlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msh8snlKEeayFayxZTWxEg" keySequence="ALT+X" command="_mqswsXlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msijwHlKEeayFayxZTWxEg" keySequence="ALT+CTRL+R" command="_mqmDDHlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msjx4XlKEeayFayxZTWxEg" keySequence="ALT+S" command="_mqWyfXlKEeayFayxZTWxEg"/>
-  </bindingTables>
-  <bindingTables xmi:id="_mr5DhHlKEeayFayxZTWxEg" elementId="org.eclipse.ui.serverViewScope" bindingContext="_mq0FcnlKEeayFayxZTWxEg">
-    <bindings xmi:id="_mr5DhXlKEeayFayxZTWxEg" keySequence="ALT+CTRL+D" command="_mqgjeXlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msW9kHlKEeayFayxZTWxEg" keySequence="ALT+CTRL+P" command="_mqhKjHlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msdEM3lKEeayFayxZTWxEg" keySequence="ALT+CTRL+S" command="_mqO2p3lKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msijwXlKEeayFayxZTWxEg" keySequence="ALT+CTRL+R" command="_mqqUeHlKEeayFayxZTWxEg"/>
-  </bindingTables>
-  <bindingTables xmi:id="_mr5qkXlKEeayFayxZTWxEg" elementId="org.eclipse.jdt.ui.breadcrumbEditorScope" bindingContext="_mqy3UHlKEeayFayxZTWxEg">
-    <bindings xmi:id="_mr5qknlKEeayFayxZTWxEg" keySequence="ALT+SHIFT+B" command="_mqsJqXlKEeayFayxZTWxEg"/>
-  </bindingTables>
-  <bindingTables xmi:id="_mr6RoXlKEeayFayxZTWxEg" elementId="org.eclipse.mylyn.tasks.ui.views.tasks" bindingContext="_mq0sgnlKEeayFayxZTWxEg">
-    <bindings xmi:id="_mr6RonlKEeayFayxZTWxEg" keySequence="ALT+SHIFT+ARROW_DOWN" command="_mqVkUnlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_mr8t43lKEeayFayxZTWxEg" keySequence="ALT+ARROW_DOWN" command="_mqRS43lKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_mr98AHlKEeayFayxZTWxEg" keySequence="ALT+SHIFT+ARROW_UP" command="_mqi_snlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msHF8XlKEeayFayxZTWxEg" keySequence="ALT+SHIFT+I" command="_mqTvK3lKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msIUEHlKEeayFayxZTWxEg" keySequence="SHIFT+INSERT" command="_mqLzWnlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msSFEXlKEeayFayxZTWxEg" keySequence="ALT+SHIFT+U" command="_mqhKkXlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msSsI3lKEeayFayxZTWxEg" keySequence="CTRL+CR" command="_mqQr4XlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msUhUnlKEeayFayxZTWxEg" keySequence="INSERT" command="_mqTvInlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msfgdHlKEeayFayxZTWxEg" keySequence="F4" command="_mqJ-M3lKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_mskY8XlKEeayFayxZTWxEg" keySequence="ALT+SHIFT+R" command="_mqWLYHlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msp4g3lKEeayFayxZTWxEg" keySequence="ALT+ARROW_UP" command="_mqf8ZHlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msrtsnlKEeayFayxZTWxEg" keySequence="ALT+SHIFT+C" command="_mqZ1wnlKEeayFayxZTWxEg"/>
-  </bindingTables>
-  <bindingTables xmi:id="_msBmYXlKEeayFayxZTWxEg" elementId="org.eclipse.core.runtime.xml" bindingContext="_mqy3V3lKEeayFayxZTWxEg">
-    <bindings xmi:id="_msBmYnlKEeayFayxZTWxEg" keySequence="CTRL+SHIFT+D" command="_mqYAlnlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msdrQXlKEeayFayxZTWxEg" keySequence="CTRL+SHIFT+P" command="_mqjmxnlKEeayFayxZTWxEg"/>
-  </bindingTables>
-  <bindingTables xmi:id="_msBmZHlKEeayFayxZTWxEg" elementId="org.eclipse.tm.terminal.TerminalContext" bindingContext="_mq0FeXlKEeayFayxZTWxEg">
-    <bindings xmi:id="_msCNcHlKEeayFayxZTWxEg" keySequence="ALT+G" command="_mqbD6XlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msC0gXlKEeayFayxZTWxEg" keySequence="ALT+H" command="_mqbD6XlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msLXY3lKEeayFayxZTWxEg" keySequence="ALT+E" command="_mqbD6XlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msL-cnlKEeayFayxZTWxEg" keySequence="ALT+F" command="_mqbD6XlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msNzoXlKEeayFayxZTWxEg" keySequence="ALT+P" command="_mqbD6XlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msQP4HlKEeayFayxZTWxEg" keySequence="ALT+V" command="_mqbD6XlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msQP4nlKEeayFayxZTWxEg" keySequence="ALT+T" command="_mqbD6XlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msaA4HlKEeayFayxZTWxEg" keySequence="ALT+W" command="_mqbD6XlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msbPAHlKEeayFayxZTWxEg" keySequence="ALT+N" command="_mqbD6XlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msjx4nlKEeayFayxZTWxEg" keySequence="ALT+S" command="_mqbD6XlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msoDVHlKEeayFayxZTWxEg" keySequence="ALT+R" command="_mqbD6XlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msp4gnlKEeayFayxZTWxEg" keySequence="ALT+A" command="_mqbD6XlKEeayFayxZTWxEg"/>
-  </bindingTables>
-  <bindingTables xmi:id="_msDbknlKEeayFayxZTWxEg" elementId="org.eclipse.ant.ui.AntEditorScope" bindingContext="_mqzeYnlKEeayFayxZTWxEg">
-    <bindings xmi:id="_msDbk3lKEeayFayxZTWxEg" keySequence="CTRL+SHIFT+F" command="_mqn4MHlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msUhVHlKEeayFayxZTWxEg" keySequence="SHIFT+F2" command="_mqcSDHlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msaA4XlKEeayFayxZTWxEg" keySequence="F3" command="_mqIJAXlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_mshVoHlKEeayFayxZTWxEg" keySequence="ALT+SHIFT+O" command="_mqII-XlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msjx43lKEeayFayxZTWxEg" keySequence="ALT+SHIFT+R" command="_mqJ-JXlKEeayFayxZTWxEg"/>
-  </bindingTables>
-  <bindingTables xmi:id="_msECoXlKEeayFayxZTWxEg" elementId="org.eclipse.pde.ui.pdeEditorContext" bindingContext="_mq0FcHlKEeayFayxZTWxEg">
-    <bindings xmi:id="_msEConlKEeayFayxZTWxEg" keySequence="CTRL+SHIFT+F" command="_mqKlQXlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msVIZnlKEeayFayxZTWxEg" keySequence="CTRL+O" command="_mqLzVnlKEeayFayxZTWxEg"/>
-  </bindingTables>
-  <bindingTables xmi:id="_msF30XlKEeayFayxZTWxEg" elementId="org.eclipse.wst.jsdt.ui.javascriptViewScope" bindingContext="_mq0shnlKEeayFayxZTWxEg">
-    <bindings xmi:id="_msF30nlKEeayFayxZTWxEg" keySequence="CTRL+SHIFT+G" command="_mqbq_nlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msGe4XlKEeayFayxZTWxEg" keySequence="CTRL+G" command="_mqgjdXlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msHF9HlKEeayFayxZTWxEg" keySequence="ALT+SHIFT+I" command="_mqcSCHlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msHtAXlKEeayFayxZTWxEg" keySequence="CTRL+SHIFT+H" command="_mqtXxXlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msHtA3lKEeayFayxZTWxEg" keySequence="ALT+CTRL+H" command="_mqi_s3lKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msNMkXlKEeayFayxZTWxEg" keySequence="CTRL+SHIFT+O" command="_mqLMQ3lKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msPBwHlKEeayFayxZTWxEg" keySequence="ALT+SHIFT+Z" command="_mqWLbXlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msQ28nlKEeayFayxZTWxEg" keySequence="ALT+SHIFT+T" command="_mqMaZHlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msTTMHlKEeayFayxZTWxEg" keySequence="ALT+SHIFT+L" command="_mqXZjXlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msVIYHlKEeayFayxZTWxEg" keySequence="SHIFT+F2" command="_mqjm0HlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msXkoHlKEeayFayxZTWxEg" keySequence="ALT+SHIFT+J" command="_mqdgLnlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msaA43lKEeayFayxZTWxEg" keySequence="F3" command="_mqhKi3lKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msdEMnlKEeayFayxZTWxEg" keySequence="ALT+SHIFT+S" command="_mqeHPHlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msgHgHlKEeayFayxZTWxEg" keySequence="F4" command="_mqWygXlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msh8sHlKEeayFayxZTWxEg" keySequence="CTRL+SHIFT+U" command="_mqOPm3lKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msjK03lKEeayFayxZTWxEg" keySequence="ALT+SHIFT+M" command="_mqmDCXlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_mskY83lKEeayFayxZTWxEg" keySequence="ALT+SHIFT+R" command="_mqeuR3lKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msncRXlKEeayFayxZTWxEg" keySequence="ALT+SHIFT+V" command="_mqOPnnlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_mssUwHlKEeayFayxZTWxEg" keySequence="ALT+SHIFT+C" command="_mqQEy3lKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msuxAHlKEeayFayxZTWxEg" keySequence="ALT+SHIFT+Q J" command="_mqmqGXlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_mswmMHlKEeayFayxZTWxEg" keySequence="ALT+SHIFT+Q T" command="_mqdgKnlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_mszCcnlKEeayFayxZTWxEg" keySequence="ALT+SHIFT+Q P" command="_mqfVUHlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_ms03onlKEeayFayxZTWxEg" keySequence="ALT+SHIFT+Q D" command="_mqhKgXlKEeayFayxZTWxEg"/>
-  </bindingTables>
-  <bindingTables xmi:id="_msF303lKEeayFayxZTWxEg" elementId="org.eclipse.debug.ui.memory.abstractasynctablerendering" bindingContext="_mq0FdHlKEeayFayxZTWxEg">
-    <bindings xmi:id="_msF31HlKEeayFayxZTWxEg" keySequence="CTRL+G" command="_mqi_unlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_mseSUXlKEeayFayxZTWxEg" keySequence="CTRL+SHIFT+." command="_mqi_uXlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msmOInlKEeayFayxZTWxEg" keySequence="CTRL+SHIFT+," command="_mqlb_HlKEeayFayxZTWxEg"/>
-  </bindingTables>
-  <bindingTables xmi:id="_msHF8nlKEeayFayxZTWxEg" elementId="org.eclipse.mylyn.tasks.ui.editors.task" bindingContext="_mq0sg3lKEeayFayxZTWxEg">
-    <bindings xmi:id="_msHF83lKEeayFayxZTWxEg" keySequence="ALT+SHIFT+I" command="_mqTvK3lKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msSFEnlKEeayFayxZTWxEg" keySequence="ALT+SHIFT+U" command="_mqhKkXlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msSsIHlKEeayFayxZTWxEg" keySequence="CTRL+SHIFT+M" command="_mqIwDHlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msVIY3lKEeayFayxZTWxEg" keySequence="CTRL+O" command="_mqptaHlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msdEMXlKEeayFayxZTWxEg" keySequence="ALT+SHIFT+S" command="_mqR5-XlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_mskY8nlKEeayFayxZTWxEg" keySequence="ALT+SHIFT+R" command="_mqWLYHlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msrts3lKEeayFayxZTWxEg" keySequence="ALT+SHIFT+C" command="_mqZ1wnlKEeayFayxZTWxEg"/>
-  </bindingTables>
-  <bindingTables xmi:id="_msI7IHlKEeayFayxZTWxEg" elementId="org.eclipse.egit.ui.RepositoriesView" bindingContext="_mq0sinlKEeayFayxZTWxEg">
-    <bindings xmi:id="_msJiMHlKEeayFayxZTWxEg" keySequence="CTRL+V" command="_mqbD4HlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msKwUnlKEeayFayxZTWxEg" keySequence="CTRL+C" command="_mqQEx3lKEeayFayxZTWxEg"/>
-  </bindingTables>
-  <bindingTables xmi:id="_msKwU3lKEeayFayxZTWxEg" elementId="org.eclipse.egit.ui.ReflogView" bindingContext="_mq0FeHlKEeayFayxZTWxEg">
-    <bindings xmi:id="_msLXYHlKEeayFayxZTWxEg" keySequence="CTRL+C" command="_mqLzWXlKEeayFayxZTWxEg"/>
-  </bindingTables>
-  <bindingTables xmi:id="_msMlg3lKEeayFayxZTWxEg" elementId="org.eclipse.mylyn.wikitext.tasks.ui.markupSourceContext" bindingContext="_mq0sh3lKEeayFayxZTWxEg">
-    <bindings xmi:id="_msNMkHlKEeayFayxZTWxEg" keySequence="CTRL+SHIFT+O" command="_mqJXFXlKEeayFayxZTWxEg"/>
-  </bindingTables>
-  <bindingTables xmi:id="_msNzo3lKEeayFayxZTWxEg" elementId="org.eclipse.debug.ui.console" bindingContext="_mqzeanlKEeayFayxZTWxEg">
-    <bindings xmi:id="_msOasHlKEeayFayxZTWxEg" keySequence="CTRL+Z" command="_mqptanlKEeayFayxZTWxEg">
-      <tags>platform:win32</tags>
-    </bindings>
-  </bindingTables>
-  <bindingTables xmi:id="_msPBwXlKEeayFayxZTWxEg" elementId="org.eclipse.debug.ui.BreakpointView" bindingContext="_mqyQQHlKEeayFayxZTWxEg">
-    <bindings xmi:id="_msPBwnlKEeayFayxZTWxEg" keySequence="ALT+CR" command="_mqZ1z3lKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msSsJHlKEeayFayxZTWxEg" keySequence="CTRL+CR" command="_mqJ-NHlKEeayFayxZTWxEg"/>
-  </bindingTables>
-  <bindingTables xmi:id="_msPBxHlKEeayFayxZTWxEg" elementId="org.eclipse.debug.ui.debugging" bindingContext="_mq0Fc3lKEeayFayxZTWxEg">
-    <bindings xmi:id="_msPo0HlKEeayFayxZTWxEg" keySequence="CTRL+F5" command="_mqofQ3lKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msQP4XlKEeayFayxZTWxEg" keySequence="F7" command="_mqqUe3lKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msVvcHlKEeayFayxZTWxEg" keySequence="CTRL+SHIFT+3" command="_mqJ-J3lKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msb2EHlKEeayFayxZTWxEg" keySequence="F6" command="_mqWLZnlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_mscdIHlKEeayFayxZTWxEg" keySequence="CTRL+F2" command="_mqjmzHlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_mscdIXlKEeayFayxZTWxEg" keySequence="F5" command="_mqJ-K3lKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_mslAAnlKEeayFayxZTWxEg" keySequence="F8" command="_mqc5FXlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_mslAA3lKEeayFayxZTWxEg" keySequence="CTRL+R" command="_mqac3nlKEeayFayxZTWxEg"/>
-  </bindingTables>
-  <bindingTables xmi:id="_msPo0XlKEeayFayxZTWxEg" elementId="org.eclipse.jst.jsf.facesconfig.editorContext" bindingContext="_mq1TkHlKEeayFayxZTWxEg">
-    <bindings xmi:id="_msPo0nlKEeayFayxZTWxEg" keySequence="CTRL+F5" command="_mqcSAHlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_mseSUnlKEeayFayxZTWxEg" keySequence="CTRL+SHIFT+F5" command="_mqhKh3lKEeayFayxZTWxEg"/>
-  </bindingTables>
-  <bindingTables xmi:id="_msPo03lKEeayFayxZTWxEg" elementId="org.eclipse.jst.pagedesigner.editorContext" bindingContext="_mqzeZXlKEeayFayxZTWxEg">
-    <bindings xmi:id="_msPo1HlKEeayFayxZTWxEg" keySequence="CTRL+F5" command="_mqcSAHlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msan9HlKEeayFayxZTWxEg" keySequence="CTRL+SHIFT+F10" command="_mqpta3lKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_mseSU3lKEeayFayxZTWxEg" keySequence="CTRL+SHIFT+F5" command="_mqhKh3lKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_mslABHlKEeayFayxZTWxEg" keySequence="CTRL+SHIFT+F12" command="_mqq7g3lKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msncQHlKEeayFayxZTWxEg" keySequence="CTRL+SHIFT+F11" command="_mqofRnlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msoDUXlKEeayFayxZTWxEg" keySequence="CTRL+SHIFT+F9" command="_mqWLZXlKEeayFayxZTWxEg"/>
-  </bindingTables>
-  <bindingTables xmi:id="_msVIZHlKEeayFayxZTWxEg" elementId="org.eclipse.mylyn.wikitext.ui.editor.markupSourceContext" bindingContext="_mq0shXlKEeayFayxZTWxEg">
-    <bindings xmi:id="_msVIZXlKEeayFayxZTWxEg" keySequence="CTRL+O" command="_mqJXFXlKEeayFayxZTWxEg"/>
-  </bindingTables>
-  <bindingTables xmi:id="_msZZ0HlKEeayFayxZTWxEg" elementId="org.eclipse.debug.ui.memoryview" bindingContext="_mqyQRXlKEeayFayxZTWxEg">
-    <bindings xmi:id="_msZZ0XlKEeayFayxZTWxEg" keySequence="CTRL+T" command="_mqPdxXlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_mse5YHlKEeayFayxZTWxEg" keySequence="CTRL+N" command="_mqfVUnlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msgHgXlKEeayFayxZTWxEg" keySequence="CTRL+W" command="_mqdgJHlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_mslnEXlKEeayFayxZTWxEg" keySequence="ALT+CTRL+M" command="_mqWLcXlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msoqYHlKEeayFayxZTWxEg" keySequence="ALT+CTRL+N" command="_mqptYXlKEeayFayxZTWxEg"/>
-  </bindingTables>
-  <bindingTables xmi:id="_msjx5XlKEeayFayxZTWxEg" elementId="org.eclipse.jst.jsp.ui.structured.text.editor.jsp.scope" bindingContext="_mqzeZ3lKEeayFayxZTWxEg">
-    <bindings xmi:id="_mskY8HlKEeayFayxZTWxEg" keySequence="ALT+SHIFT+R" command="_mqptZHlKEeayFayxZTWxEg"/>
-    <bindings xmi:id="_msncRHlKEeayFayxZTWxEg" keySequence="ALT+SHIFT+V" command="_mqWyd3lKEeayFayxZTWxEg"/>
-  </bindingTables>
-  <bindingTables xmi:id="_msncQXlKEeayFayxZTWxEg" elementId="org.eclipse.mylyn.internal.wikitext.ui.editor.basicMarkupSourceContext" bindingContext="_mq0shHlKEeayFayxZTWxEg">
-    <bindings xmi:id="_msncQnlKEeayFayxZTWxEg" keySequence="F1" command="_mqII_nlKEeayFayxZTWxEg"/>
-  </bindingTables>
-  <bindingTables xmi:id="_mxy3MHlKEeayFayxZTWxEg" bindingContext="_mxyQIHlKEeayFayxZTWxEg"/>
-  <bindingTables xmi:id="_mxzeQXlKEeayFayxZTWxEg" bindingContext="_mxzeQHlKEeayFayxZTWxEg"/>
-  <bindingTables xmi:id="_mx0FUXlKEeayFayxZTWxEg" bindingContext="_mx0FUHlKEeayFayxZTWxEg"/>
-  <bindingTables xmi:id="_mx0sYXlKEeayFayxZTWxEg" bindingContext="_mx0sYHlKEeayFayxZTWxEg"/>
-  <bindingTables xmi:id="_mx1TcnlKEeayFayxZTWxEg" bindingContext="_mx1TcXlKEeayFayxZTWxEg"/>
-  <bindingTables xmi:id="_mx3IoXlKEeayFayxZTWxEg" bindingContext="_mx3IoHlKEeayFayxZTWxEg"/>
-  <bindingTables xmi:id="_mx3vsXlKEeayFayxZTWxEg" bindingContext="_mx3vsHlKEeayFayxZTWxEg"/>
-  <bindingTables xmi:id="_mx4WwnlKEeayFayxZTWxEg" bindingContext="_mx4WwXlKEeayFayxZTWxEg"/>
-  <bindingTables xmi:id="_mx5k4XlKEeayFayxZTWxEg" bindingContext="_mx5k4HlKEeayFayxZTWxEg"/>
-  <bindingTables xmi:id="_mx6L8XlKEeayFayxZTWxEg" bindingContext="_mx6L8HlKEeayFayxZTWxEg"/>
-  <bindingTables xmi:id="_mx7aEXlKEeayFayxZTWxEg" bindingContext="_mx7aEHlKEeayFayxZTWxEg"/>
-  <bindingTables xmi:id="_mx8oMXlKEeayFayxZTWxEg" bindingContext="_mx8oMHlKEeayFayxZTWxEg"/>
-  <bindingTables xmi:id="_mx9PQnlKEeayFayxZTWxEg" bindingContext="_mx9PQXlKEeayFayxZTWxEg"/>
-  <bindingTables xmi:id="_mx-dYXlKEeayFayxZTWxEg" bindingContext="_mx-dYHlKEeayFayxZTWxEg"/>
-  <bindingTables xmi:id="_mx_EcXlKEeayFayxZTWxEg" bindingContext="_mx_EcHlKEeayFayxZTWxEg"/>
-  <bindingTables xmi:id="_mx_rgXlKEeayFayxZTWxEg" bindingContext="_mx_rgHlKEeayFayxZTWxEg"/>
-  <bindingTables xmi:id="_myASkXlKEeayFayxZTWxEg" bindingContext="_myASkHlKEeayFayxZTWxEg"/>
-  <bindingTables xmi:id="_myA5oHlKEeayFayxZTWxEg" bindingContext="_myASknlKEeayFayxZTWxEg"/>
-  <bindingTables xmi:id="_myA5onlKEeayFayxZTWxEg" bindingContext="_myA5oXlKEeayFayxZTWxEg"/>
-  <bindingTables xmi:id="_myA5pHlKEeayFayxZTWxEg" bindingContext="_myA5o3lKEeayFayxZTWxEg"/>
-  <bindingTables xmi:id="_myBgsXlKEeayFayxZTWxEg" bindingContext="_myBgsHlKEeayFayxZTWxEg"/>
-  <bindingTables xmi:id="_myCHwHlKEeayFayxZTWxEg" bindingContext="_myBgsnlKEeayFayxZTWxEg"/>
-  <bindingTables xmi:id="_myDV4XlKEeayFayxZTWxEg" bindingContext="_myDV4HlKEeayFayxZTWxEg"/>
-  <bindingTables xmi:id="_myD88XlKEeayFayxZTWxEg" bindingContext="_myD88HlKEeayFayxZTWxEg"/>
-  <bindingTables xmi:id="_myD883lKEeayFayxZTWxEg" bindingContext="_myD88nlKEeayFayxZTWxEg"/>
-  <bindingTables xmi:id="_myEkAXlKEeayFayxZTWxEg" bindingContext="_myEkAHlKEeayFayxZTWxEg"/>
-  <bindingTables xmi:id="_myFLEHlKEeayFayxZTWxEg" bindingContext="_myEkAnlKEeayFayxZTWxEg"/>
-  <bindingTables xmi:id="_myFLEnlKEeayFayxZTWxEg" bindingContext="_myFLEXlKEeayFayxZTWxEg"/>
-  <bindingTables xmi:id="_myFyIXlKEeayFayxZTWxEg" bindingContext="_myFyIHlKEeayFayxZTWxEg"/>
-  <bindingTables xmi:id="_myFyI3lKEeayFayxZTWxEg" bindingContext="_myFyInlKEeayFayxZTWxEg"/>
-  <bindingTables xmi:id="_myGZMXlKEeayFayxZTWxEg" bindingContext="_myGZMHlKEeayFayxZTWxEg"/>
-  <bindingTables xmi:id="_myGZM3lKEeayFayxZTWxEg" bindingContext="_myGZMnlKEeayFayxZTWxEg"/>
-  <bindingTables xmi:id="_nKm_0XlKEeayFayxZTWxEg" bindingContext="_nKm_0HlKEeayFayxZTWxEg"/>
-  <bindingTables xmi:id="_nKnm4XlKEeayFayxZTWxEg" bindingContext="_nKnm4HlKEeayFayxZTWxEg"/>
-  <bindingTables xmi:id="_nKoN8XlKEeayFayxZTWxEg" bindingContext="_nKoN8HlKEeayFayxZTWxEg"/>
-  <bindingTables xmi:id="_nKoN83lKEeayFayxZTWxEg" bindingContext="_nKoN8nlKEeayFayxZTWxEg"/>
-  <bindingTables xmi:id="_nKo1AXlKEeayFayxZTWxEg" bindingContext="_nKo1AHlKEeayFayxZTWxEg"/>
-  <bindingTables xmi:id="_nKo1A3lKEeayFayxZTWxEg" bindingContext="_nKo1AnlKEeayFayxZTWxEg"/>
-  <bindingTables xmi:id="_nKo1BXlKEeayFayxZTWxEg" bindingContext="_nKo1BHlKEeayFayxZTWxEg"/>
-  <bindingTables xmi:id="_nKpcEXlKEeayFayxZTWxEg" bindingContext="_nKpcEHlKEeayFayxZTWxEg"/>
-  <bindingTables xmi:id="_nKpcE3lKEeayFayxZTWxEg" bindingContext="_nKpcEnlKEeayFayxZTWxEg"/>
-  <bindingTables xmi:id="_nKqDIXlKEeayFayxZTWxEg" bindingContext="_nKqDIHlKEeayFayxZTWxEg"/>
-  <bindingTables xmi:id="_nKqDI3lKEeayFayxZTWxEg" bindingContext="_nKqDInlKEeayFayxZTWxEg"/>
-  <bindingTables xmi:id="_nKqqMXlKEeayFayxZTWxEg" bindingContext="_nKqqMHlKEeayFayxZTWxEg"/>
-  <bindingTables xmi:id="_nKqqM3lKEeayFayxZTWxEg" bindingContext="_nKqqMnlKEeayFayxZTWxEg"/>
-  <bindingTables xmi:id="_nKrRQXlKEeayFayxZTWxEg" bindingContext="_nKrRQHlKEeayFayxZTWxEg"/>
-  <bindingTables xmi:id="_nKr4UHlKEeayFayxZTWxEg" bindingContext="_nKrRQnlKEeayFayxZTWxEg"/>
-  <bindingTables xmi:id="_nKr4UnlKEeayFayxZTWxEg" bindingContext="_nKr4UXlKEeayFayxZTWxEg"/>
-  <bindingTables xmi:id="_nKsfYXlKEeayFayxZTWxEg" bindingContext="_nKsfYHlKEeayFayxZTWxEg"/>
-  <bindingTables xmi:id="_nKtGcXlKEeayFayxZTWxEg" bindingContext="_nKtGcHlKEeayFayxZTWxEg"/>
-  <bindingTables xmi:id="_nKttgXlKEeayFayxZTWxEg" bindingContext="_nKttgHlKEeayFayxZTWxEg"/>
-  <bindingTables xmi:id="_nKuUkHlKEeayFayxZTWxEg" bindingContext="_nKttgnlKEeayFayxZTWxEg"/>
-  <bindingTables xmi:id="_nKuUknlKEeayFayxZTWxEg" bindingContext="_nKuUkXlKEeayFayxZTWxEg"/>
-  <bindingTables xmi:id="_nKu7oXlKEeayFayxZTWxEg" bindingContext="_nKu7oHlKEeayFayxZTWxEg"/>
-  <bindingTables xmi:id="_nKvisXlKEeayFayxZTWxEg" bindingContext="_nKvisHlKEeayFayxZTWxEg"/>
-  <bindingTables xmi:id="_nKwJwXlKEeayFayxZTWxEg" bindingContext="_nKwJwHlKEeayFayxZTWxEg"/>
-  <bindingTables xmi:id="_nKxX4HlKEeayFayxZTWxEg" bindingContext="_nKww0HlKEeayFayxZTWxEg"/>
-  <bindingTables xmi:id="_nKx-8XlKEeayFayxZTWxEg" bindingContext="_nKx-8HlKEeayFayxZTWxEg"/>
-  <bindingTables xmi:id="_nKymAXlKEeayFayxZTWxEg" bindingContext="_nKymAHlKEeayFayxZTWxEg"/>
-  <bindingTables xmi:id="_nKzNEHlKEeayFayxZTWxEg" bindingContext="_nKymAnlKEeayFayxZTWxEg"/>
-  <bindingTables xmi:id="_nKzNEnlKEeayFayxZTWxEg" bindingContext="_nKzNEXlKEeayFayxZTWxEg"/>
-  <bindingTables xmi:id="_nKz0IXlKEeayFayxZTWxEg" bindingContext="_nKz0IHlKEeayFayxZTWxEg"/>
-  <bindingTables xmi:id="_nK0bMXlKEeayFayxZTWxEg" bindingContext="_nK0bMHlKEeayFayxZTWxEg"/>
-  <bindingTables xmi:id="_nK0bM3lKEeayFayxZTWxEg" bindingContext="_nK0bMnlKEeayFayxZTWxEg"/>
-  <bindingTables xmi:id="_nK1CQXlKEeayFayxZTWxEg" bindingContext="_nK1CQHlKEeayFayxZTWxEg"/>
-  <bindingTables xmi:id="_nK1CQ3lKEeayFayxZTWxEg" bindingContext="_nK1CQnlKEeayFayxZTWxEg"/>
-  <bindingTables xmi:id="_nK1pUXlKEeayFayxZTWxEg" bindingContext="_nK1pUHlKEeayFayxZTWxEg"/>
-  <bindingTables xmi:id="_nK2QYXlKEeayFayxZTWxEg" bindingContext="_nK2QYHlKEeayFayxZTWxEg"/>
-  <bindingTables xmi:id="_nK23cXlKEeayFayxZTWxEg" bindingContext="_nK23cHlKEeayFayxZTWxEg"/>
-  <bindingTables xmi:id="_nK3egXlKEeayFayxZTWxEg" bindingContext="_nK3egHlKEeayFayxZTWxEg"/>
-  <bindingTables xmi:id="_nK4FkXlKEeayFayxZTWxEg" bindingContext="_nK4FkHlKEeayFayxZTWxEg"/>
-  <bindingTables xmi:id="_nK4soXlKEeayFayxZTWxEg" bindingContext="_nK4soHlKEeayFayxZTWxEg"/>
-  <bindingTables xmi:id="_nK5TsXlKEeayFayxZTWxEg" bindingContext="_nK5TsHlKEeayFayxZTWxEg"/>
-  <bindingTables xmi:id="_nK6h0HlKEeayFayxZTWxEg" bindingContext="_nK56wHlKEeayFayxZTWxEg"/>
-  <bindingTables xmi:id="_nK7I4XlKEeayFayxZTWxEg" bindingContext="_nK7I4HlKEeayFayxZTWxEg"/>
-  <bindingTables xmi:id="_nK7v8XlKEeayFayxZTWxEg" bindingContext="_nK7v8HlKEeayFayxZTWxEg"/>
-  <bindingTables xmi:id="_nK8XAXlKEeayFayxZTWxEg" bindingContext="_nK8XAHlKEeayFayxZTWxEg"/>
-  <bindingTables xmi:id="_nK8-EXlKEeayFayxZTWxEg" bindingContext="_nK8-EHlKEeayFayxZTWxEg"/>
-  <bindingTables xmi:id="_nK9lIXlKEeayFayxZTWxEg" bindingContext="_nK9lIHlKEeayFayxZTWxEg"/>
-  <bindingTables xmi:id="_nK-MMXlKEeayFayxZTWxEg" bindingContext="_nK-MMHlKEeayFayxZTWxEg"/>
-  <bindingTables xmi:id="_nK-zQHlKEeayFayxZTWxEg" bindingContext="_nK-MMnlKEeayFayxZTWxEg"/>
-  <bindingTables xmi:id="_nK_aUHlKEeayFayxZTWxEg" bindingContext="_nK-zQXlKEeayFayxZTWxEg"/>
-  <rootContext xmi:id="_mpDx-XlKEeayFayxZTWxEg" elementId="org.eclipse.ui.contexts.dialogAndWindow" contributorURI="platform:/plugin/org.eclipse.ui.workbench" name="In Dialogs and Windows" description="Either a dialog or a window is open">
-    <children xmi:id="_mpDx-nlKEeayFayxZTWxEg" elementId="org.eclipse.ui.contexts.window" contributorURI="platform:/plugin/org.eclipse.ui.workbench" name="In Windows" description="A window is open">
-      <children xmi:id="_mpDx-3lKEeayFayxZTWxEg" elementId="org.eclipse.e4.ui.contexts.views" contributorURI="platform:/plugin/org.eclipse.ui.workbench" name="%bindingcontext.name.bindingView"/>
-      <children xmi:id="_mqyQQHlKEeayFayxZTWxEg" elementId="org.eclipse.debug.ui.BreakpointView" name="In Breakpoints View" description="The breakpoints view context"/>
-      <children xmi:id="_mqyQQXlKEeayFayxZTWxEg" elementId="org.eclipse.ui.textEditorScope" name="Editing Text" description="Editing Text Context">
-        <children xmi:id="_mqyQQnlKEeayFayxZTWxEg" elementId="org.eclipse.wst.jsdt.ui.javaEditorScope" name="Editing JavaScript Source" description="Editing JavaScript Source Context">
-          <children xmi:id="_mq0shnlKEeayFayxZTWxEg" elementId="org.eclipse.wst.jsdt.ui.javascriptViewScope" name="JavaScript View" description="JavaScript View Context"/>
-        </children>
-        <children xmi:id="_mqyQRnlKEeayFayxZTWxEg" elementId="org.eclipse.datatools.sqltools.SQLEditorScope" name="Editing SQL" description="Editing SQL Context"/>
-        <children xmi:id="_mqy3UXlKEeayFayxZTWxEg" elementId="org.eclipse.jdt.ui.javaEditorScope" name="Editing Java Source" description="Editing Java Source Context"/>
-        <children xmi:id="_mqy3U3lKEeayFayxZTWxEg" elementId="org.eclipse.wst.sse.ui.structuredTextEditorScope" name="Editing in Structured Text Editors" description="Editing in Structured Text Editors">
-          <children xmi:id="_mqy3VHlKEeayFayxZTWxEg" elementId="org.eclipse.wst.xml.cleanup" name="XML Source Cleanup" description="XML Source Cleanup"/>
-          <children xmi:id="_mqy3VXlKEeayFayxZTWxEg" elementId="org.eclipse.wst.sse.comments" name="Source Comments in Structured Text Editors" description="Source Comments in Structured Text Editors"/>
-          <children xmi:id="_mqy3VnlKEeayFayxZTWxEg" elementId="org.eclipse.jst.jsp.core.jspsource" name="JSP Source" description="JSP Source"/>
-          <children xmi:id="_mqy3V3lKEeayFayxZTWxEg" elementId="org.eclipse.core.runtime.xml" name="Editing XML Source" description="Editing XML Source"/>
-          <children xmi:id="_mqy3WHlKEeayFayxZTWxEg" elementId="org.eclipse.wst.xml.occurrences" name="XML Source Occurrences" description="XML Source Occurrences"/>
-          <children xmi:id="_mqy3WXlKEeayFayxZTWxEg" elementId="org.eclipse.wst.xml.grammar" name="XML Source Grammar" description="XML Source Grammar"/>
-          <children xmi:id="_mqy3WnlKEeayFayxZTWxEg" elementId="org.eclipse.wst.xml.comments" name="XML Source Comments" description="XML Source Comments"/>
-          <children xmi:id="_mqzeYXlKEeayFayxZTWxEg" elementId="org.eclipse.wst.xml.expand" name="XML Source Expand/Collapse" description="XML Source Expand/Collapse"/>
-          <children xmi:id="_mqzeY3lKEeayFayxZTWxEg" elementId="org.eclipse.wst.sse.hideFormat" name="Editing in Structured Text Editors" description="Editing in Structured Text Editors"/>
-          <children xmi:id="_mqzeZnlKEeayFayxZTWxEg" elementId="org.eclipse.wst.xml.selection" name="XML Source Selection" description="XML Source Selection"/>
-          <children xmi:id="_mqzeZ3lKEeayFayxZTWxEg" elementId="org.eclipse.jst.jsp.ui.structured.text.editor.jsp.scope" name="Editing JSP Source" description="Editing JSP Source"/>
-          <children xmi:id="_mqzea3lKEeayFayxZTWxEg" elementId="org.eclipse.wst.xml.navigation" name="XML Source Navigation" description="XML Source Navigation"/>
-          <children xmi:id="_mq0FenlKEeayFayxZTWxEg" elementId="org.eclipse.wst.css.core.csssource" name="Editing CSS Source" description="Editing CSS Source"/>
-          <children xmi:id="_mq0sgXlKEeayFayxZTWxEg" elementId="org.eclipse.wst.html.core.htmlsource" name="Editing HTML Source" description="Editing HTML Source"/>
-          <children xmi:id="_mq0siHlKEeayFayxZTWxEg" elementId="org.eclipse.wst.xml.dependencies" name="XML Source Dependencies" description="XML Source Dependencies"/>
-          <children xmi:id="_mq1TkXlKEeayFayxZTWxEg" elementId="org.eclipse.wst.html.occurrences" name="HTML Source Occurrences" description="HTML Source Occurrences"/>
-        </children>
-        <children xmi:id="_mqzeYnlKEeayFayxZTWxEg" elementId="org.eclipse.ant.ui.AntEditorScope" name="Editing Ant Buildfiles" description="Editing Ant Buildfiles Context"/>
-        <children xmi:id="_mqzeZXlKEeayFayxZTWxEg" elementId="org.eclipse.jst.pagedesigner.editorContext" name="Using Web Page Editor" description="Key binding context when using the web page editor"/>
-        <children xmi:id="_mq0FcHlKEeayFayxZTWxEg" elementId="org.eclipse.pde.ui.pdeEditorContext" name="PDE editor" description="The context used by PDE editors"/>
-        <children xmi:id="_mq0sgHlKEeayFayxZTWxEg" elementId="org.eclipse.wst.xsd.ui.text.editor.context" name="Editing XSD context"/>
-        <children xmi:id="_mq0sg3lKEeayFayxZTWxEg" elementId="org.eclipse.mylyn.tasks.ui.editors.task" name="In Tasks Editor"/>
-        <children xmi:id="_mq0shHlKEeayFayxZTWxEg" elementId="org.eclipse.mylyn.internal.wikitext.ui.editor.basicMarkupSourceContext" name="WikiText Markup Source Context" description="WikiText markup editing context">
-          <children xmi:id="_mq0shXlKEeayFayxZTWxEg" elementId="org.eclipse.mylyn.wikitext.ui.editor.markupSourceContext" name="WikiText Markup Source Context" description="WikiText markup editing context"/>
-          <children xmi:id="_mq0sh3lKEeayFayxZTWxEg" elementId="org.eclipse.mylyn.wikitext.tasks.ui.markupSourceContext" name="Task Markup Editor Source Context"/>
-        </children>
-        <children xmi:id="_mq0siXlKEeayFayxZTWxEg" elementId="org.eclipse.jdt.ui.propertiesEditorScope" name="Editing Properties Files" description="Editing Properties Files Context"/>
-        <children xmi:id="_mq1TkHlKEeayFayxZTWxEg" elementId="org.eclipse.jst.jsf.facesconfig.editorContext" name="In Faces Config Editor" description="Key binding context when using the Faces Config Editor"/>
-      </children>
-      <children xmi:id="_mqyQQ3lKEeayFayxZTWxEg" elementId="org.eclipse.compare.compareEditorScope" name="Comparing in an Editor" description="Comparing in an Editor"/>
-      <children xmi:id="_mqyQRXlKEeayFayxZTWxEg" elementId="org.eclipse.debug.ui.memoryview" name="In Memory View" description="In memory view"/>
-      <children xmi:id="_mqy3UnlKEeayFayxZTWxEg" elementId="org.eclipse.datatools.sqltools.schemaobjecteditor.schemaediting" name="Schema Object Editor" description="Schema Object Editor"/>
-      <children xmi:id="_mqzeanlKEeayFayxZTWxEg" elementId="org.eclipse.debug.ui.console" name="In I/O Console" description="In I/O console"/>
-      <children xmi:id="_mq0FcXlKEeayFayxZTWxEg" elementId="org.eclipse.ui.console.ConsoleView" name="In Console View" description="In Console View"/>
-      <children xmi:id="_mq0FcnlKEeayFayxZTWxEg" elementId="org.eclipse.ui.serverViewScope" name="In Servers View" description="In Servers View"/>
-      <children xmi:id="_mq0Fc3lKEeayFayxZTWxEg" elementId="org.eclipse.debug.ui.debugging" name="Debugging" description="Debugging programs">
-        <children xmi:id="_mq0FdHlKEeayFayxZTWxEg" elementId="org.eclipse.debug.ui.memory.abstractasynctablerendering" name="In Table Memory Rendering" description="In Table Memory Rendering"/>
-        <children xmi:id="_mq0FdXlKEeayFayxZTWxEg" elementId="org.eclipse.wst.xsl.debug.ui.context" name="XSLT Debugging" description="Context for debugging XSLT"/>
-        <children xmi:id="_mq0FdnlKEeayFayxZTWxEg" elementId="org.eclipse.jdt.debug.ui.debugging" name="Debugging Java" description="Debugging Java programs"/>
-      </children>
-      <children xmi:id="_mq0FeHlKEeayFayxZTWxEg" elementId="org.eclipse.egit.ui.ReflogView" name="In Git Reflog View"/>
-      <children xmi:id="_mq0sgnlKEeayFayxZTWxEg" elementId="org.eclipse.mylyn.tasks.ui.views.tasks" name="In Tasks View"/>
-      <children xmi:id="_mq0sinlKEeayFayxZTWxEg" elementId="org.eclipse.egit.ui.RepositoriesView" name="In Git Repositories View"/>
-    </children>
-    <children xmi:id="_mpDx_HlKEeayFayxZTWxEg" elementId="org.eclipse.ui.contexts.dialog" contributorURI="platform:/plugin/org.eclipse.ui.workbench" name="In Dialogs" description="A dialog is open"/>
-  </rootContext>
-  <rootContext xmi:id="_mqyQRHlKEeayFayxZTWxEg" elementId="org.eclipse.ui.contexts.workbenchMenu" name="Workbench Menu" description="When no Workbench windows are active"/>
-  <rootContext xmi:id="_mqy3UHlKEeayFayxZTWxEg" elementId="org.eclipse.jdt.ui.breadcrumbEditorScope" name="Editor Breadcrumb Navigation" description="Editor Breadcrumb Navigation Context"/>
-  <rootContext xmi:id="_mqzeYHlKEeayFayxZTWxEg" elementId="org.eclipse.wst.xsd.ui.editor.sourceView" name="XSD Editor Source View" description="XSD Editor Source View"/>
-  <rootContext xmi:id="_mqzeZHlKEeayFayxZTWxEg" elementId="org.eclipse.wst.wsdl.ui.editor.sourceView" name="WSDL Editor Source View" description="WSDL Editor Source View"/>
-  <rootContext xmi:id="_mqzeaHlKEeayFayxZTWxEg" elementId="org.eclipse.wst.xsd.ui.editor.designView" name="XSD Editor Design View" description="XSD Editor Design View"/>
-  <rootContext xmi:id="_mqzeaXlKEeayFayxZTWxEg" elementId="org.eclipse.ui.contexts.actionSet" name="Action Set" description="Parent context for action sets"/>
-  <rootContext xmi:id="_mq0Fd3lKEeayFayxZTWxEg" elementId="org.eclipse.wst.wsdl.ui.editor.designView" name="WSDL Editor Design View" description="WSDL Editor Design View"/>
-  <rootContext xmi:id="_mq0FeXlKEeayFayxZTWxEg" elementId="org.eclipse.tm.terminal.TerminalContext" name="Terminal widget context" description="Override ALT+x menu access keys"/>
-  <rootContext xmi:id="_mxyQIHlKEeayFayxZTWxEg" elementId="org.eclipse.jdt.debug.ui.actions.ManageBreakpointRulerAction" name="Auto::org.eclipse.jdt.debug.ui.actions.ManageBreakpointRulerAction"/>
-  <rootContext xmi:id="_mxzeQHlKEeayFayxZTWxEg" elementId="org.eclipse.ant.ui.actions.ManageBreakpointRulerAction" name="Auto::org.eclipse.ant.ui.actions.ManageBreakpointRulerAction"/>
-  <rootContext xmi:id="_mx0FUHlKEeayFayxZTWxEg" elementId="org.eclipse.emf.exporter.ui.GenModelExportActionDelegate.Editor" name="Auto::org.eclipse.emf.exporter.ui.GenModelExportActionDelegate.Editor"/>
-  <rootContext xmi:id="_mx0sYHlKEeayFayxZTWxEg" elementId="org.eclipse.emf.importer.ui.GenModelReloadActionDelegate.Editor" name="Auto::org.eclipse.emf.importer.ui.GenModelReloadActionDelegate.Editor"/>
-  <rootContext xmi:id="_mx1TcXlKEeayFayxZTWxEg" elementId="org.eclipse.emf.mapping.action.RemoveMappingActionID" name="Auto::org.eclipse.emf.mapping.action.RemoveMappingActionID"/>
-  <rootContext xmi:id="_mx3IoHlKEeayFayxZTWxEg" elementId="org.eclipse.emf.mapping.action.TypeMatchMappingActionID" name="Auto::org.eclipse.emf.mapping.action.TypeMatchMappingActionID"/>
-  <rootContext xmi:id="_mx3vsHlKEeayFayxZTWxEg" elementId="org.eclipse.emf.mapping.action.NameMatchMappingActionID" name="Auto::org.eclipse.emf.mapping.action.NameMatchMappingActionID"/>
-  <rootContext xmi:id="_mx4WwXlKEeayFayxZTWxEg" elementId="org.eclipse.emf.mapping.action.CreateOneSidedMappingActionID" name="Auto::org.eclipse.emf.mapping.action.CreateOneSidedMappingActionID"/>
-  <rootContext xmi:id="_mx5k4HlKEeayFayxZTWxEg" elementId="org.eclipse.emf.mapping.action.CreateMappingActionID" name="Auto::org.eclipse.emf.mapping.action.CreateMappingActionID"/>
-  <rootContext xmi:id="_mx6L8HlKEeayFayxZTWxEg" elementId="org.eclipse.emf.mapping.ecore2ecore.action.AddOuputRootActionID" name="Auto::org.eclipse.emf.mapping.ecore2ecore.action.AddOuputRootActionID"/>
-  <rootContext xmi:id="_mx7aEHlKEeayFayxZTWxEg" elementId="org.eclipse.emf.mapping.ecore2ecore.action.AddInputRootActionID" name="Auto::org.eclipse.emf.mapping.ecore2ecore.action.AddInputRootActionID"/>
-  <rootContext xmi:id="_mx8oMHlKEeayFayxZTWxEg" elementId="org.eclipse.jdt.debug.ui.SnippetExecute" name="Auto::org.eclipse.jdt.debug.ui.SnippetExecute"/>
-  <rootContext xmi:id="_mx9PQXlKEeayFayxZTWxEg" elementId="org.eclipse.jdt.debug.ui.SnippetDisplay" name="Auto::org.eclipse.jdt.debug.ui.SnippetDisplay"/>
-  <rootContext xmi:id="_mx-dYHlKEeayFayxZTWxEg" elementId="org.eclipse.jdt.debug.ui.SnippetInspect" name="Auto::org.eclipse.jdt.debug.ui.SnippetInspect"/>
-  <rootContext xmi:id="_mx_EcHlKEeayFayxZTWxEg" elementId="org.eclipse.jdt.internal.ui.javaeditor.BookmarkRulerAction" name="Auto::org.eclipse.jdt.internal.ui.javaeditor.BookmarkRulerAction"/>
-  <rootContext xmi:id="_mx_rgHlKEeayFayxZTWxEg" elementId="org.eclipse.jdt.internal.ui.javaeditor.JavaSelectRulerAction" name="Auto::org.eclipse.jdt.internal.ui.javaeditor.JavaSelectRulerAction"/>
-  <rootContext xmi:id="_myASkHlKEeayFayxZTWxEg" elementId="org.eclipse.jdt.internal.ui.propertiesfileeditor.BookmarkRulerAction" name="Auto::org.eclipse.jdt.internal.ui.propertiesfileeditor.BookmarkRulerAction"/>
-  <rootContext xmi:id="_myASknlKEeayFayxZTWxEg" elementId="org.eclipse.jdt.internal.ui.propertiesfileeditor.SelectRulerAction" name="Auto::org.eclipse.jdt.internal.ui.propertiesfileeditor.SelectRulerAction"/>
-  <rootContext xmi:id="_myA5oXlKEeayFayxZTWxEg" elementId="org.eclipse.ui.texteditor.BookmarkRulerAction" name="Auto::org.eclipse.ui.texteditor.BookmarkRulerAction"/>
-  <rootContext xmi:id="_myA5o3lKEeayFayxZTWxEg" elementId="org.eclipse.ui.texteditor.SelectRulerAction" name="Auto::org.eclipse.ui.texteditor.SelectRulerAction"/>
-  <rootContext xmi:id="_myBgsHlKEeayFayxZTWxEg" elementId="org.eclipse.m2e.jdt.downloadSourcesAction" name="Auto::org.eclipse.m2e.jdt.downloadSourcesAction"/>
-  <rootContext xmi:id="_myBgsnlKEeayFayxZTWxEg" elementId="org.eclipse.mylyn.wikitext.context.ui.editor.folding.auto" name="Auto::org.eclipse.mylyn.wikitext.context.ui.editor.folding.auto"/>
-  <rootContext xmi:id="_myDV4HlKEeayFayxZTWxEg" elementId="StructureSelectEnclosing" name="Auto::StructureSelectEnclosing"/>
-  <rootContext xmi:id="_myD88HlKEeayFayxZTWxEg" elementId="StructureSelectNext" name="Auto::StructureSelectNext"/>
-  <rootContext xmi:id="_myD88nlKEeayFayxZTWxEg" elementId="StructureSelectPrevious" name="Auto::StructureSelectPrevious"/>
-  <rootContext xmi:id="_myEkAHlKEeayFayxZTWxEg" elementId="StructureSelectHistory" name="Auto::StructureSelectHistory"/>
-  <rootContext xmi:id="_myEkAnlKEeayFayxZTWxEg" elementId="org.eclipse.wst.jsdt.debug.ui.RulerToggleBreakpoint" name="Auto::org.eclipse.wst.jsdt.debug.ui.RulerToggleBreakpoint"/>
-  <rootContext xmi:id="_myFLEXlKEeayFayxZTWxEg" elementId="org.eclipse.wst.jsdt.internal.ui.javaeditor.BookmarkRulerAction" name="Auto::org.eclipse.wst.jsdt.internal.ui.javaeditor.BookmarkRulerAction"/>
-  <rootContext xmi:id="_myFyIHlKEeayFayxZTWxEg" elementId="org.eclipse.wst.jsdt.internal.ui.javaeditor.JavaSelectRulerAction" name="Auto::org.eclipse.wst.jsdt.internal.ui.javaeditor.JavaSelectRulerAction"/>
-  <rootContext xmi:id="_myFyInlKEeayFayxZTWxEg" elementId="org.eclipse.wst.jsdt.internal.ui.propertiesfileeditor.BookmarkRulerAction" name="Auto::org.eclipse.wst.jsdt.internal.ui.propertiesfileeditor.BookmarkRulerAction"/>
-  <rootContext xmi:id="_myGZMHlKEeayFayxZTWxEg" elementId="org.eclipse.wst.jsdt.internal.ui.propertiesfileeditor.SelectRulerAction" name="Auto::org.eclipse.wst.jsdt.internal.ui.propertiesfileeditor.SelectRulerAction"/>
-  <rootContext xmi:id="_myGZMnlKEeayFayxZTWxEg" elementId="org.eclipse.wst.wsdl.ui.actions.ReloadDependenciesActionDelegate" name="Auto::org.eclipse.wst.wsdl.ui.actions.ReloadDependenciesActionDelegate"/>
-  <rootContext xmi:id="_nKm_0HlKEeayFayxZTWxEg" elementId="org.eclipse.ant.ui.actionSet.presentation" name="Auto::org.eclipse.ant.ui.actionSet.presentation"/>
-  <rootContext xmi:id="_nKnm4HlKEeayFayxZTWxEg" elementId="org.eclipse.datatools.sqltools.sqlscrapbook.actionSet" name="Auto::org.eclipse.datatools.sqltools.sqlscrapbook.actionSet"/>
-  <rootContext xmi:id="_nKoN8HlKEeayFayxZTWxEg" elementId="org.eclipse.debug.ui.breakpointActionSet" name="Auto::org.eclipse.debug.ui.breakpointActionSet"/>
-  <rootContext xmi:id="_nKoN8nlKEeayFayxZTWxEg" elementId="org.eclipse.debug.ui.debugActionSet" name="Auto::org.eclipse.debug.ui.debugActionSet"/>
-  <rootContext xmi:id="_nKo1AHlKEeayFayxZTWxEg" elementId="org.eclipse.debug.ui.launchActionSet" name="Auto::org.eclipse.debug.ui.launchActionSet"/>
-  <rootContext xmi:id="_nKo1AnlKEeayFayxZTWxEg" elementId="org.eclipse.debug.ui.profileActionSet" name="Auto::org.eclipse.debug.ui.profileActionSet"/>
-  <rootContext xmi:id="_nKo1BHlKEeayFayxZTWxEg" elementId="org.eclipse.egit.ui.gitaction" name="Auto::org.eclipse.egit.ui.gitaction"/>
-  <rootContext xmi:id="_nKpcEHlKEeayFayxZTWxEg" elementId="org.eclipse.egit.ui.navigation" name="Auto::org.eclipse.egit.ui.navigation"/>
-  <rootContext xmi:id="_nKpcEnlKEeayFayxZTWxEg" elementId="org.eclipse.jdt.debug.ui.JDTDebugActionSet" name="Auto::org.eclipse.jdt.debug.ui.JDTDebugActionSet"/>
-  <rootContext xmi:id="_nKqDIHlKEeayFayxZTWxEg" elementId="org.eclipse.jdt.junit.JUnitActionSet" name="Auto::org.eclipse.jdt.junit.JUnitActionSet"/>
-  <rootContext xmi:id="_nKqDInlKEeayFayxZTWxEg" elementId="org.eclipse.jdt.ui.text.java.actionSet.presentation" name="Auto::org.eclipse.jdt.ui.text.java.actionSet.presentation"/>
-  <rootContext xmi:id="_nKqqMHlKEeayFayxZTWxEg" elementId="org.eclipse.jdt.ui.JavaElementCreationActionSet" name="Auto::org.eclipse.jdt.ui.JavaElementCreationActionSet"/>
-  <rootContext xmi:id="_nKqqMnlKEeayFayxZTWxEg" elementId="org.eclipse.jdt.ui.JavaActionSet" name="Auto::org.eclipse.jdt.ui.JavaActionSet"/>
-  <rootContext xmi:id="_nKrRQHlKEeayFayxZTWxEg" elementId="org.eclipse.jdt.ui.A_OpenActionSet" name="Auto::org.eclipse.jdt.ui.A_OpenActionSet"/>
-  <rootContext xmi:id="_nKrRQnlKEeayFayxZTWxEg" elementId="org.eclipse.jdt.ui.CodingActionSet" name="Auto::org.eclipse.jdt.ui.CodingActionSet"/>
-  <rootContext xmi:id="_nKr4UXlKEeayFayxZTWxEg" elementId="org.eclipse.jdt.ui.SearchActionSet" name="Auto::org.eclipse.jdt.ui.SearchActionSet"/>
-  <rootContext xmi:id="_nKsfYHlKEeayFayxZTWxEg" elementId="org.eclipse.jpt.jpa.ui.actionSet.jpaElementCreation" name="Auto::org.eclipse.jpt.jpa.ui.actionSet.jpaElementCreation"/>
-  <rootContext xmi:id="_nKtGcHlKEeayFayxZTWxEg" elementId="org.eclipse.jst.j2ee.J2eeMainActionSet" name="Auto::org.eclipse.jst.j2ee.J2eeMainActionSet"/>
-  <rootContext xmi:id="_nKttgHlKEeayFayxZTWxEg" elementId="org.eclipse.mylyn.context.ui.actionSet" name="Auto::org.eclipse.mylyn.context.ui.actionSet"/>
-  <rootContext xmi:id="_nKttgnlKEeayFayxZTWxEg" elementId="org.eclipse.mylyn.java.actionSet" name="Auto::org.eclipse.mylyn.java.actionSet"/>
-  <rootContext xmi:id="_nKuUkXlKEeayFayxZTWxEg" elementId="org.eclipse.mylyn.java.actionSet.browsing" name="Auto::org.eclipse.mylyn.java.actionSet.browsing"/>
-  <rootContext xmi:id="_nKu7oHlKEeayFayxZTWxEg" elementId="org.eclipse.mylyn.doc.actionSet" name="Auto::org.eclipse.mylyn.doc.actionSet"/>
-  <rootContext xmi:id="_nKvisHlKEeayFayxZTWxEg" elementId="org.eclipse.mylyn.tasks.ui.navigation" name="Auto::org.eclipse.mylyn.tasks.ui.navigation"/>
-  <rootContext xmi:id="_nKwJwHlKEeayFayxZTWxEg" elementId="org.eclipse.mylyn.tasks.ui.navigation.additions" name="Auto::org.eclipse.mylyn.tasks.ui.navigation.additions"/>
-  <rootContext xmi:id="_nKww0HlKEeayFayxZTWxEg" elementId="org.eclipse.pde.ui.SearchActionSet" name="Auto::org.eclipse.pde.ui.SearchActionSet"/>
-  <rootContext xmi:id="_nKx-8HlKEeayFayxZTWxEg" elementId="org.eclipse.ui.cheatsheets.actionSet" name="Auto::org.eclipse.ui.cheatsheets.actionSet"/>
-  <rootContext xmi:id="_nKymAHlKEeayFayxZTWxEg" elementId="org.eclipse.rse.core.search.searchActionSet" name="Auto::org.eclipse.rse.core.search.searchActionSet"/>
-  <rootContext xmi:id="_nKymAnlKEeayFayxZTWxEg" elementId="org.eclipse.search.searchActionSet" name="Auto::org.eclipse.search.searchActionSet"/>
-  <rootContext xmi:id="_nKzNEXlKEeayFayxZTWxEg" elementId="org.eclipse.team.cvs.ui.CVSActionSet" name="Auto::org.eclipse.team.cvs.ui.CVSActionSet"/>
-  <rootContext xmi:id="_nKz0IHlKEeayFayxZTWxEg" elementId="org.eclipse.team.ui.actionSet" name="Auto::org.eclipse.team.ui.actionSet"/>
-  <rootContext xmi:id="_nK0bMHlKEeayFayxZTWxEg" elementId="org.eclipse.ui.edit.text.actionSet.annotationNavigation" name="Auto::org.eclipse.ui.edit.text.actionSet.annotationNavigation"/>
-  <rootContext xmi:id="_nK0bMnlKEeayFayxZTWxEg" elementId="org.eclipse.ui.edit.text.actionSet.navigation" name="Auto::org.eclipse.ui.edit.text.actionSet.navigation"/>
-  <rootContext xmi:id="_nK1CQHlKEeayFayxZTWxEg" elementId="org.eclipse.ui.edit.text.actionSet.convertLineDelimitersTo" name="Auto::org.eclipse.ui.edit.text.actionSet.convertLineDelimitersTo"/>
-  <rootContext xmi:id="_nK1CQnlKEeayFayxZTWxEg" elementId="org.eclipse.ui.externaltools.ExternalToolsSet" name="Auto::org.eclipse.ui.externaltools.ExternalToolsSet"/>
-  <rootContext xmi:id="_nK1pUHlKEeayFayxZTWxEg" elementId="org.eclipse.ui.NavigateActionSet" name="Auto::org.eclipse.ui.NavigateActionSet"/>
-  <rootContext xmi:id="_nK2QYHlKEeayFayxZTWxEg" elementId="org.eclipse.ui.actionSet.keyBindings" name="Auto::org.eclipse.ui.actionSet.keyBindings"/>
-  <rootContext xmi:id="_nK23cHlKEeayFayxZTWxEg" elementId="org.eclipse.ui.WorkingSetModificationActionSet" name="Auto::org.eclipse.ui.WorkingSetModificationActionSet"/>
-  <rootContext xmi:id="_nK3egHlKEeayFayxZTWxEg" elementId="org.eclipse.ui.WorkingSetActionSet" name="Auto::org.eclipse.ui.WorkingSetActionSet"/>
-  <rootContext xmi:id="_nK4FkHlKEeayFayxZTWxEg" elementId="org.eclipse.ui.actionSet.openFiles" name="Auto::org.eclipse.ui.actionSet.openFiles"/>
-  <rootContext xmi:id="_nK4soHlKEeayFayxZTWxEg" elementId="org.eclipse.ui.edit.text.actionSet.presentation" name="Auto::org.eclipse.ui.edit.text.actionSet.presentation"/>
-  <rootContext xmi:id="_nK5TsHlKEeayFayxZTWxEg" elementId="org.eclipse.wst.jsdt.ui.text.java.actionSet.presentation" name="Auto::org.eclipse.wst.jsdt.ui.text.java.actionSet.presentation"/>
-  <rootContext xmi:id="_nK56wHlKEeayFayxZTWxEg" elementId="org.eclipse.wst.jsdt.ui.JavaElementCreationActionSet" name="Auto::org.eclipse.wst.jsdt.ui.JavaElementCreationActionSet"/>
-  <rootContext xmi:id="_nK7I4HlKEeayFayxZTWxEg" elementId="org.eclipse.wst.jsdt.ui.JavaActionSet" name="Auto::org.eclipse.wst.jsdt.ui.JavaActionSet"/>
-  <rootContext xmi:id="_nK7v8HlKEeayFayxZTWxEg" elementId="org.eclipse.wst.jsdt.ui.A_OpenActionSet" name="Auto::org.eclipse.wst.jsdt.ui.A_OpenActionSet"/>
-  <rootContext xmi:id="_nK8XAHlKEeayFayxZTWxEg" elementId="org.eclipse.wst.jsdt.ui.CodingActionSet" name="Auto::org.eclipse.wst.jsdt.ui.CodingActionSet"/>
-  <rootContext xmi:id="_nK8-EHlKEeayFayxZTWxEg" elementId="org.eclipse.wst.jsdt.ui.SearchActionSet" name="Auto::org.eclipse.wst.jsdt.ui.SearchActionSet"/>
-  <rootContext xmi:id="_nK9lIHlKEeayFayxZTWxEg" elementId="org.eclipse.wst.server.ui.new.actionSet" name="Auto::org.eclipse.wst.server.ui.new.actionSet"/>
-  <rootContext xmi:id="_nK-MMHlKEeayFayxZTWxEg" elementId="org.eclipse.wst.server.ui.internal.webbrowser.actionSet" name="Auto::org.eclipse.wst.server.ui.internal.webbrowser.actionSet"/>
-  <rootContext xmi:id="_nK-MMnlKEeayFayxZTWxEg" elementId="org.eclipse.wst.web.ui.wizardsActionSet" name="Auto::org.eclipse.wst.web.ui.wizardsActionSet"/>
-  <rootContext xmi:id="_nK-zQXlKEeayFayxZTWxEg" elementId="org.eclipse.wst.ws.explorer.explorer" name="Auto::org.eclipse.wst.ws.explorer.explorer"/>
-  <descriptors xmi:id="_mu8-kHlKEeayFayxZTWxEg" elementId="org.eclipse.e4.ui.compatibility.editor" allowMultiple="true" category="org.eclipse.e4.primaryDataStack" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityEditor">
-    <tags>Editor</tags>
-  </descriptors>
-  <descriptors xmi:id="_mvAB4HlKEeayFayxZTWxEg" elementId="org.eclipse.ant.ui.views.AntView" label="Ant" iconURI="platform:/plugin/org.eclipse.ant.ui/icons/full/eview16/ant_view.gif" category="org.eclipse.e4.secondaryDataStack" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
-    <tags>View</tags>
-    <tags>categoryTag:Ant</tags>
-  </descriptors>
-  <descriptors xmi:id="_mvHWoHlKEeayFayxZTWxEg" elementId="org.eclipse.datatools.connectivity.DataSourceExplorerNavigator" label="Data Source Explorer" iconURI="platform:/plugin/org.eclipse.datatools.connectivity.ui.dse/icons/full/cview16/enterprise_explorer.gif" category="org.eclipse.e4.secondaryDataStack" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
-    <tags>View</tags>
-    <tags>categoryTag:Data Management</tags>
-  </descriptors>
-  <descriptors xmi:id="_mvIkwHlKEeayFayxZTWxEg" elementId="org.eclipse.datatools.sqltools.plan.planView" label="Execution Plan" iconURI="platform:/plugin/org.eclipse.datatools.sqltools.plan/icons/sqlplan.gif" category="org.eclipse.e4.secondaryDataStack" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
-    <tags>View</tags>
-    <tags>categoryTag:Data Management</tags>
-  </descriptors>
-  <descriptors xmi:id="_mvKZ8HlKEeayFayxZTWxEg" elementId="org.eclipse.datatools.sqltools.result.resultView" label="SQL Results" iconURI="platform:/plugin/org.eclipse.datatools.sqltools.result.ui/icons/sqlresult.gif" category="org.eclipse.e4.secondaryDataStack" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
-    <tags>View</tags>
-    <tags>categoryTag:Data Management</tags>
-  </descriptors>
-  <descriptors xmi:id="_mvLoEHlKEeayFayxZTWxEg" elementId="org.eclipse.debug.ui.DebugView" label="Debug" iconURI="platform:/plugin/org.eclipse.debug.ui/icons/full/eview16/debug_view.gif" category="org.eclipse.e4.secondaryDataStack" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
-    <tags>View</tags>
-    <tags>categoryTag:Debug</tags>
-  </descriptors>
-  <descriptors xmi:id="_mvMPIHlKEeayFayxZTWxEg" elementId="org.eclipse.debug.ui.BreakpointView" label="Breakpoints" iconURI="platform:/plugin/org.eclipse.debug.ui/icons/full/eview16/breakpoint_view.gif" allowMultiple="true" category="org.eclipse.e4.secondaryDataStack" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
-    <tags>View</tags>
-    <tags>categoryTag:Debug</tags>
-  </descriptors>
-  <descriptors xmi:id="_mvNdQHlKEeayFayxZTWxEg" elementId="org.eclipse.debug.ui.VariableView" label="Variables" iconURI="platform:/plugin/org.eclipse.debug.ui/icons/full/eview16/variable_view.gif" allowMultiple="true" category="org.eclipse.e4.secondaryDataStack" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
-    <tags>View</tags>
-    <tags>categoryTag:Debug</tags>
-  </descriptors>
-  <descriptors xmi:id="_mvNdQXlKEeayFayxZTWxEg" elementId="org.eclipse.debug.ui.ExpressionView" label="Expressions" iconURI="platform:/plugin/org.eclipse.debug.ui/icons/full/eview16/watchlist_view.gif" allowMultiple="true" category="org.eclipse.e4.secondaryDataStack" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
-    <tags>View</tags>
-    <tags>categoryTag:Debug</tags>
-  </descriptors>
-  <descriptors xmi:id="_mvOEUHlKEeayFayxZTWxEg" elementId="org.eclipse.debug.ui.RegisterView" label="Registers" iconURI="platform:/plugin/org.eclipse.debug.ui/icons/full/eview16/register_view.gif" allowMultiple="true" category="org.eclipse.e4.secondaryDataStack" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
-    <tags>View</tags>
-    <tags>categoryTag:Debug</tags>
-  </descriptors>
-  <descriptors xmi:id="_mvOrYHlKEeayFayxZTWxEg" elementId="org.eclipse.debug.ui.ModuleView" label="Modules" iconURI="platform:/plugin/org.eclipse.debug.ui/icons/full/eview16/module_view.gif" allowMultiple="true" category="org.eclipse.e4.secondaryDataStack" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
-    <tags>View</tags>
-    <tags>categoryTag:Debug</tags>
-  </descriptors>
-  <descriptors xmi:id="_mvPScHlKEeayFayxZTWxEg" elementId="org.eclipse.debug.ui.MemoryView" label="Memory" iconURI="platform:/plugin/org.eclipse.debug.ui/icons/full/eview16/memory_view.gif" allowMultiple="true" category="org.eclipse.e4.secondaryDataStack" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
-    <tags>View</tags>
-    <tags>categoryTag:Debug</tags>
-  </descriptors>
-  <descriptors xmi:id="_mvPScXlKEeayFayxZTWxEg" elementId="org.eclipse.egit.ui.RepositoriesView" label="Git Repositories" iconURI="platform:/plugin/org.eclipse.egit.ui/icons/eview16/repo_rep.gif" category="org.eclipse.e4.secondaryDataStack" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
-    <tags>View</tags>
-    <tags>categoryTag:Git</tags>
-  </descriptors>
-  <descriptors xmi:id="_mvQgkHlKEeayFayxZTWxEg" elementId="org.eclipse.egit.ui.StagingView" label="Git Staging" iconURI="platform:/plugin/org.eclipse.egit.ui/icons/eview16/staging.png" category="org.eclipse.e4.secondaryDataStack" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
-    <tags>View</tags>
-    <tags>categoryTag:Git</tags>
-  </descriptors>
-  <descriptors xmi:id="_mvRHoHlKEeayFayxZTWxEg" elementId="org.eclipse.egit.ui.CompareTreeView" label="Git Tree Compare" iconURI="platform:/plugin/org.eclipse.egit.ui/icons/obj16/gitrepository.gif" category="org.eclipse.e4.secondaryDataStack" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
-    <tags>View</tags>
-    <tags>categoryTag:Git</tags>
-  </descriptors>
-  <descriptors xmi:id="_mvRusHlKEeayFayxZTWxEg" elementId="org.eclipse.egit.ui.ReflogView" label="Git Reflog" iconURI="platform:/plugin/org.eclipse.egit.ui/icons/eview16/reflog.gif" category="org.eclipse.e4.secondaryDataStack" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
-    <tags>View</tags>
-    <tags>categoryTag:Git</tags>
-  </descriptors>
-  <descriptors xmi:id="_mvRusXlKEeayFayxZTWxEg" elementId="org.eclipse.gef.ui.palette_view" label="Palette" iconURI="platform:/plugin/org.eclipse.gef/icons/palette_view.gif" category="org.eclipse.e4.secondaryDataStack" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
-    <tags>View</tags>
-    <tags>categoryTag:General</tags>
-  </descriptors>
-  <descriptors xmi:id="_mvS80HlKEeayFayxZTWxEg" elementId="org.eclipse.help.ui.HelpView" label="Help" iconURI="platform:/plugin/org.eclipse.help.ui/icons/view16/help_view.gif" category="org.eclipse.e4.secondaryDataStack" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
-    <tags>View</tags>
-    <tags>categoryTag:Help</tags>
-  </descriptors>
-  <descriptors xmi:id="_mvTj4HlKEeayFayxZTWxEg" elementId="org.eclipse.jdt.debug.ui.DisplayView" label="Display" iconURI="platform:/plugin/org.eclipse.jdt.debug.ui/icons/full/etool16/disp_sbook.gif" category="org.eclipse.e4.secondaryDataStack" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
-    <tags>View</tags>
-    <tags>categoryTag:Debug</tags>
-  </descriptors>
-  <descriptors xmi:id="_mvUyAHlKEeayFayxZTWxEg" elementId="org.eclipse.jdt.junit.ResultView" label="JUnit" iconURI="platform:/plugin/org.eclipse.jdt.junit/icons/full/eview16/junit.gif" category="org.eclipse.e4.secondaryDataStack" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
-    <tags>View</tags>
-    <tags>categoryTag:Java</tags>
-  </descriptors>
-  <descriptors xmi:id="_mvVZEHlKEeayFayxZTWxEg" elementId="org.eclipse.jdt.ui.PackageExplorer" label="Package Explorer" iconURI="platform:/plugin/org.eclipse.jdt.ui/icons/full/eview16/package.gif" category="org.eclipse.e4.secondaryDataStack" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
-    <tags>View</tags>
-    <tags>categoryTag:Java</tags>
-  </descriptors>
-  <descriptors xmi:id="_mvWnMHlKEeayFayxZTWxEg" elementId="org.eclipse.jdt.ui.TypeHierarchy" label="Type Hierarchy" iconURI="platform:/plugin/org.eclipse.jdt.ui/icons/full/eview16/class_hi.gif" category="org.eclipse.e4.secondaryDataStack" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
-    <tags>View</tags>
-    <tags>categoryTag:Java</tags>
-  </descriptors>
-  <descriptors xmi:id="_mvWnMXlKEeayFayxZTWxEg" elementId="org.eclipse.jdt.ui.ProjectsView" label="Projects" iconURI="platform:/plugin/org.eclipse.jdt.ui/icons/full/eview16/projects.gif" category="org.eclipse.e4.secondaryDataStack" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
-    <tags>View</tags>
-    <tags>categoryTag:Java Browsing</tags>
-  </descriptors>
-  <descriptors xmi:id="_mvXOQHlKEeayFayxZTWxEg" elementId="org.eclipse.jdt.ui.PackagesView" label="Packages" iconURI="platform:/plugin/org.eclipse.jdt.ui/icons/full/eview16/packages.gif" category="org.eclipse.e4.secondaryDataStack" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
-    <tags>View</tags>
-    <tags>categoryTag:Java Browsing</tags>
-  </descriptors>
-  <descriptors xmi:id="_mvX1UHlKEeayFayxZTWxEg" elementId="org.eclipse.jdt.ui.TypesView" label="Types" iconURI="platform:/plugin/org.eclipse.jdt.ui/icons/full/eview16/types.gif" category="org.eclipse.e4.secondaryDataStack" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
-    <tags>View</tags>
-    <tags>categoryTag:Java Browsing</tags>
-  </descriptors>
-  <descriptors xmi:id="_mvYcYHlKEeayFayxZTWxEg" elementId="org.eclipse.jdt.ui.MembersView" label="Members" iconURI="platform:/plugin/org.eclipse.jdt.ui/icons/full/eview16/members.gif" category="org.eclipse.e4.secondaryDataStack" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
-    <tags>View</tags>
-    <tags>categoryTag:Java Browsing</tags>
-  </descriptors>
-  <descriptors xmi:id="_mvZDcHlKEeayFayxZTWxEg" elementId="org.eclipse.jdt.callhierarchy.view" label="Call Hierarchy" iconURI="platform:/plugin/org.eclipse.jdt.ui/icons/full/eview16/call_hierarchy.gif" allowMultiple="true" category="org.eclipse.e4.secondaryDataStack" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
-    <tags>View</tags>
-    <tags>categoryTag:Java</tags>
-  </descriptors>
-  <descriptors xmi:id="_mvZDcXlKEeayFayxZTWxEg" elementId="org.eclipse.ui.texteditor.TemplatesView" label="Templates" iconURI="platform:/plugin/org.eclipse.jdt.ui/icons/full/eview16/templates.gif" category="org.eclipse.e4.secondaryDataStack" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
-    <tags>View</tags>
-    <tags>categoryTag:General</tags>
-  </descriptors>
-  <descriptors xmi:id="_mvZqgHlKEeayFayxZTWxEg" elementId="org.eclipse.jdt.ui.SourceView" label="Declaration" iconURI="platform:/plugin/org.eclipse.jdt.ui/icons/full/eview16/source.gif" category="org.eclipse.e4.secondaryDataStack" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
-    <tags>View</tags>
-    <tags>categoryTag:Java</tags>
-  </descriptors>
-  <descriptors xmi:id="_mvaRkHlKEeayFayxZTWxEg" elementId="org.eclipse.jdt.ui.JavadocView" label="Javadoc" iconURI="platform:/plugin/org.eclipse.jdt.ui/icons/full/eview16/javadoc.gif" category="org.eclipse.e4.secondaryDataStack" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
-    <tags>View</tags>
-    <tags>categoryTag:Java</tags>
-  </descriptors>
-  <descriptors xmi:id="_mvaRkXlKEeayFayxZTWxEg" elementId="org.eclipse.jpt.ui.jpaStructureView" label="JPA Structure" iconURI="platform:/plugin/org.eclipse.jpt.jpa.ui/images/views/jpa-structure.gif" category="org.eclipse.e4.secondaryDataStack" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
-    <tags>View</tags>
-    <tags>categoryTag:JPA</tags>
-  </descriptors>
-  <descriptors xmi:id="_mvbfsHlKEeayFayxZTWxEg" elementId="org.eclipse.jpt.ui.jpaDetailsView" label="JPA Details" iconURI="platform:/plugin/org.eclipse.jpt.jpa.ui/images/views/jpa-details.gif" category="org.eclipse.e4.secondaryDataStack" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
-    <tags>View</tags>
-    <tags>categoryTag:JPA</tags>
-  </descriptors>
-  <descriptors xmi:id="_mvcGwHlKEeayFayxZTWxEg" elementId="org.eclipse.jst.jsf.ui.component.ComponentTreeView" label="JSF Component Tree" iconURI="platform:/plugin/org.eclipse.ui/icons/full/eview16/defaultview_misc.gif" category="org.eclipse.e4.secondaryDataStack" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
-    <tags>View</tags>
-    <tags>categoryTag:JavaServer Faces</tags>
-  </descriptors>
-  <descriptors xmi:id="_mvcGwXlKEeayFayxZTWxEg" elementId="org.eclipse.jst.jsf.ui.tagregistry.TagRegistryView" label="Tag Registry" iconURI="platform:/plugin/org.eclipse.jst.jsf.ui/icons/obj16/library_obj.gif" category="org.eclipse.e4.secondaryDataStack" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
-    <tags>View</tags>
-    <tags>categoryTag:JavaServer Faces</tags>
-  </descriptors>
-  <descriptors xmi:id="_mvct0HlKEeayFayxZTWxEg" elementId="org.eclipse.jst.ws.jaxws.ui.views.AnnotationsView" label="Annotation Properties" iconURI="platform:/plugin/org.eclipse.jst.ws.jaxws.ui/icons/eview16/prop_ps.gif" category="org.eclipse.e4.secondaryDataStack" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
-    <tags>View</tags>
-    <tags>categoryTag:Web Services</tags>
-  </descriptors>
-  <descriptors xmi:id="_mvdU4HlKEeayFayxZTWxEg" elementId="org.eclipse.m2e.core.views.MavenRepositoryView" label="Maven Repositories" iconURI="platform:/plugin/org.eclipse.m2e.core.ui/icons/maven_indexes.gif" category="org.eclipse.e4.secondaryDataStack" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
-    <tags>View</tags>
-    <tags>categoryTag:Maven</tags>
-  </descriptors>
-  <descriptors xmi:id="_mvejAHlKEeayFayxZTWxEg" elementId="org.eclipse.m2e.core.views.MavenBuild" label="Maven Workspace Build" iconURI="platform:/plugin/org.eclipse.ui/icons/full/eview16/defaultview_misc.gif" category="org.eclipse.e4.secondaryDataStack" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
-    <tags>View</tags>
-    <tags>categoryTag:Maven</tags>
-  </descriptors>
-  <descriptors xmi:id="_mvfKEHlKEeayFayxZTWxEg" elementId="org.eclipse.mylyn.commons.repositories.ui.navigator.Repositories" label="Team Repositories" iconURI="platform:/plugin/org.eclipse.mylyn.commons.repositories.ui/icons/eview16/repositories.gif" category="org.eclipse.e4.secondaryDataStack" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
-    <tags>View</tags>
-    <tags>categoryTag:Mylyn</tags>
-  </descriptors>
-  <descriptors xmi:id="_mvfxIHlKEeayFayxZTWxEg" elementId="org.eclipse.mylyn.tasks.ui.views.tasks" label="Task List" iconURI="platform:/plugin/org.eclipse.mylyn.tasks.ui/icons/eview16/task-list.gif" allowMultiple="true" category="org.eclipse.e4.secondaryDataStack" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
-    <tags>View</tags>
-    <tags>categoryTag:Mylyn</tags>
-  </descriptors>
-  <descriptors xmi:id="_mvg_QHlKEeayFayxZTWxEg" elementId="org.eclipse.mylyn.tasks.ui.views.repositories" label="Task Repositories" iconURI="platform:/plugin/org.eclipse.mylyn.tasks.ui/icons/eview16/repositories.gif" category="org.eclipse.e4.secondaryDataStack" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
-    <tags>View</tags>
-    <tags>categoryTag:Mylyn</tags>
-  </descriptors>
-  <descriptors xmi:id="_mvhmUHlKEeayFayxZTWxEg" elementId="org.eclipse.pde.api.tools.ui.views.apitooling.views.apitoolingview" label="API Tools" iconURI="platform:/plugin/org.eclipse.pde.api.tools.ui/icons/full/obj16/api_tools.gif" category="org.eclipse.e4.secondaryDataStack" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
-    <tags>View</tags>
-    <tags>categoryTag:API Tools</tags>
-  </descriptors>
-  <descriptors xmi:id="_mvi0cHlKEeayFayxZTWxEg" elementId="org.eclipse.pde.runtime.RegistryBrowser" label="Plug-in Registry" iconURI="platform:/plugin/org.eclipse.pde.runtime/icons/eview16/registry.gif" category="org.eclipse.e4.secondaryDataStack" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
-    <tags>View</tags>
-    <tags>categoryTag:Plug-in Development</tags>
-  </descriptors>
-  <descriptors xmi:id="_mvjbgHlKEeayFayxZTWxEg" elementId="org.eclipse.pde.ui.PluginsView" label="Plug-ins" iconURI="platform:/plugin/org.eclipse.pde.ui/icons/eview16/plugin_depend.gif" category="org.eclipse.e4.secondaryDataStack" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
-    <tags>View</tags>
-    <tags>categoryTag:Plug-in Development</tags>
-  </descriptors>
-  <descriptors xmi:id="_mvlQsHlKEeayFayxZTWxEg" elementId="org.eclipse.pde.ui.DependenciesView" label="Plug-in Dependencies" iconURI="platform:/plugin/org.eclipse.pde.ui/icons/obj16/req_plugins_obj.gif" category="org.eclipse.e4.secondaryDataStack" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
-    <tags>View</tags>
-    <tags>categoryTag:Plug-in Development</tags>
-  </descriptors>
-  <descriptors xmi:id="_mvl3wHlKEeayFayxZTWxEg" elementId="org.eclipse.pde.ui.TargetPlatformState" label="Target Platform State" iconURI="platform:/plugin/org.eclipse.pde.ui/icons/obj16/target_profile_xml_obj.gif" category="org.eclipse.e4.secondaryDataStack" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
-    <tags>View</tags>
-    <tags>categoryTag:Plug-in Development</tags>
-  </descriptors>
-  <descriptors xmi:id="_mvnF4HlKEeayFayxZTWxEg" elementId="org.eclipse.pde.ui.ImageBrowserView" label="Plug-in Image Browser" iconURI="platform:/plugin/org.eclipse.pde.ui/icons/obj16/psearch_obj.gif" category="org.eclipse.e4.secondaryDataStack" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
-    <tags>View</tags>
-    <tags>categoryTag:Plug-in Development</tags>
-  </descriptors>
-  <descriptors xmi:id="_mvns8HlKEeayFayxZTWxEg" elementId="org.eclipse.rse.shells.ui.view.commandsView" label="Remote Shell" iconURI="platform:/plugin/org.eclipse.rse.shells.ui/icons/full/cview16/commands_view.gif" category="org.eclipse.e4.secondaryDataStack" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
-    <tags>View</tags>
-    <tags>categoryTag:Remote Systems</tags>
-  </descriptors>
-  <descriptors xmi:id="_mvoUAHlKEeayFayxZTWxEg" elementId="org.eclipse.rse.terminals.ui.view.TerminalView" label="Terminals" iconURI="platform:/plugin/org.eclipse.rse.terminals.ui/icons/terminal_view.gif" category="org.eclipse.e4.secondaryDataStack" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
-    <tags>View</tags>
-    <tags>categoryTag:Remote Systems</tags>
-  </descriptors>
-  <descriptors xmi:id="_mvpiIHlKEeayFayxZTWxEg" elementId="org.eclipse.rse.ui.view.systemView" label="Remote Systems" iconURI="platform:/plugin/org.eclipse.rse.ui/icons/full/cview16/system_view.gif" category="org.eclipse.e4.secondaryDataStack" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
-    <tags>View</tags>
-    <tags>categoryTag:Remote Systems</tags>
-  </descriptors>
-  <descriptors xmi:id="_mvqwQHlKEeayFayxZTWxEg" elementId="org.eclipse.rse.ui.view.teamView" label="Team" iconURI="platform:/plugin/org.eclipse.rse.ui/icons/full/cview16/team_view.gif" category="org.eclipse.e4.secondaryDataStack" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
-    <tags>View</tags>
-    <tags>categoryTag:Remote Systems</tags>
-  </descriptors>
-  <descriptors xmi:id="_mvrXUHlKEeayFayxZTWxEg" elementId="org.eclipse.rse.ui.view.systemTableView" label="Remote System Details" iconURI="platform:/plugin/org.eclipse.rse.ui/icons/full/cview16/system_view.gif" category="org.eclipse.e4.secondaryDataStack" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
-    <tags>View</tags>
-    <tags>categoryTag:Remote Systems</tags>
-  </descriptors>
-  <descriptors xmi:id="_mvslcHlKEeayFayxZTWxEg" elementId="org.eclipse.rse.ui.view.SystemSearchView" label="Remote Search" iconURI="platform:/plugin/org.eclipse.rse.ui/icons/full/obj16/system_search.gif" category="org.eclipse.e4.secondaryDataStack" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
-    <tags>View</tags>
-    <tags>categoryTag:Remote Systems</tags>
-  </descriptors>
-  <descriptors xmi:id="_mvtMgHlKEeayFayxZTWxEg" elementId="org.eclipse.rse.ui.view.scratchpad.SystemScratchpadViewPart" label="Remote Scratchpad" iconURI="platform:/plugin/org.eclipse.rse.ui/icons/full/view16/scratchpad_view.gif" category="org.eclipse.e4.secondaryDataStack" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
-    <tags>View</tags>
-    <tags>categoryTag:Remote Systems</tags>
-  </descriptors>
-  <descriptors xmi:id="_mvuaoHlKEeayFayxZTWxEg" elementId="org.eclipse.rse.ui.view.monitorView" label="Remote Monitor" iconURI="platform:/plugin/org.eclipse.rse.ui/icons/full/view16/system_view.gif" category="org.eclipse.e4.secondaryDataStack" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
-    <tags>View</tags>
-    <tags>categoryTag:Remote Systems</tags>
-  </descriptors>
-  <descriptors xmi:id="_mvvBsHlKEeayFayxZTWxEg" elementId="org.eclipse.search.SearchResultView" label="Classic Search" iconURI="platform:/plugin/org.eclipse.search/icons/full/eview16/searchres.gif" category="org.eclipse.e4.secondaryDataStack" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
-    <tags>View</tags>
-    <tags>categoryTag:General</tags>
-  </descriptors>
-  <descriptors xmi:id="_mvvowHlKEeayFayxZTWxEg" elementId="org.eclipse.search.ui.views.SearchView" label="Search" iconURI="platform:/plugin/org.eclipse.search/icons/full/eview16/searchres.gif" allowMultiple="true" category="org.eclipse.e4.secondaryDataStack" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
-    <tags>View</tags>
-    <tags>categoryTag:General</tags>
-  </descriptors>
-  <descriptors xmi:id="_mvwP0HlKEeayFayxZTWxEg" elementId="org.eclipse.team.ccvs.ui.RepositoriesView" label="CVS Repositories" iconURI="platform:/plugin/org.eclipse.team.cvs.ui/icons/full/eview16/repo_rep.gif" category="org.eclipse.e4.secondaryDataStack" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
-    <tags>View</tags>
-    <tags>categoryTag:CVS</tags>
-  </descriptors>
-  <descriptors xmi:id="_mvw24HlKEeayFayxZTWxEg" elementId="org.eclipse.team.ccvs.ui.EditorsView" label="CVS Editors" iconURI="platform:/plugin/org.eclipse.team.cvs.ui/icons/full/eview16/rep_editors_view.gif" category="org.eclipse.e4.secondaryDataStack" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
-    <tags>View</tags>
-    <tags>categoryTag:CVS</tags>
-  </descriptors>
-  <descriptors xmi:id="_mvxd8HlKEeayFayxZTWxEg" elementId="org.eclipse.team.sync.views.SynchronizeView" label="Synchronize" iconURI="platform:/plugin/org.eclipse.team.ui/icons/full/eview16/synch_synch.gif" allowMultiple="true" category="org.eclipse.e4.secondaryDataStack" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
-    <tags>View</tags>
-    <tags>categoryTag:Team</tags>
-  </descriptors>
-  <descriptors xmi:id="_mvyFAHlKEeayFayxZTWxEg" elementId="org.eclipse.team.ui.GenericHistoryView" label="History" iconURI="platform:/plugin/org.eclipse.team.ui/icons/full/eview16/history_view.gif" allowMultiple="true" category="org.eclipse.e4.secondaryDataStack" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
-    <tags>View</tags>
-    <tags>categoryTag:Team</tags>
-  </descriptors>
-  <descriptors xmi:id="_mvysEHlKEeayFayxZTWxEg" elementId="org.eclipse.tm.terminal.view.TerminalView" label="Terminal" iconURI="platform:/plugin/org.eclipse.tm.terminal.view/icons/cview16/terminal_view.gif" allowMultiple="true" category="org.eclipse.e4.secondaryDataStack" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
-    <tags>View</tags>
-    <tags>categoryTag:Terminal</tags>
-  </descriptors>
-  <descriptors xmi:id="_mvz6MHlKEeayFayxZTWxEg" elementId="org.eclipse.ui.internal.introview" label="Welcome" iconURI="platform:/plugin/org.eclipse.ui/icons/full/eview16/defaultview_misc.gif" category="org.eclipse.e4.secondaryDataStack" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
-    <tags>View</tags>
-    <tags>categoryTag:General</tags>
-  </descriptors>
-  <descriptors xmi:id="_mvz6MXlKEeayFayxZTWxEg" elementId="org.eclipse.ui.browser.view" label="Internal Web Browser" iconURI="platform:/plugin/org.eclipse.ui.browser/icons/obj16/internal_browser.gif" allowMultiple="true" category="org.eclipse.e4.secondaryDataStack" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
-    <tags>View</tags>
-    <tags>categoryTag:General</tags>
-  </descriptors>
-  <descriptors xmi:id="_mv0hQHlKEeayFayxZTWxEg" elementId="org.eclipse.ui.cheatsheets.views.CheatSheetView" label="Cheat Sheets" iconURI="platform:/plugin/org.eclipse.ui.cheatsheets/icons/view16/cheatsheet_view.gif" category="org.eclipse.e4.secondaryDataStack" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
-    <tags>View</tags>
-    <tags>categoryTag:Help</tags>
-  </descriptors>
-  <descriptors xmi:id="_mv1vYHlKEeayFayxZTWxEg" elementId="org.eclipse.ui.console.ConsoleView" label="Console" iconURI="platform:/plugin/org.eclipse.ui.console/icons/full/cview16/console_view.gif" allowMultiple="true" category="org.eclipse.e4.secondaryDataStack" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
-    <tags>View</tags>
-    <tags>categoryTag:General</tags>
-  </descriptors>
-  <descriptors xmi:id="_mv2WcHlKEeayFayxZTWxEg" elementId="org.eclipse.ui.views.ProgressView" label="Progress" iconURI="platform:/plugin/org.eclipse.ui.ide/icons/full/eview16/pview.gif" category="org.eclipse.e4.secondaryDataStack" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
-    <tags>View</tags>
-    <tags>categoryTag:General</tags>
-  </descriptors>
-  <descriptors xmi:id="_mv2WcXlKEeayFayxZTWxEg" elementId="org.eclipse.ui.views.ResourceNavigator" label="Navigator" iconURI="platform:/plugin/org.eclipse.ui.ide/icons/full/eview16/filenav_nav.gif" category="org.eclipse.e4.primaryNavigationStack" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
-    <tags>View</tags>
-    <tags>categoryTag:General</tags>
-  </descriptors>
-  <descriptors xmi:id="_mv29gHlKEeayFayxZTWxEg" elementId="org.eclipse.ui.views.BookmarkView" label="Bookmarks" iconURI="platform:/plugin/org.eclipse.ui.ide/icons/full/eview16/bkmrk_nav.gif" allowMultiple="true" category="org.eclipse.e4.secondaryDataStack" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
-    <tags>View</tags>
-    <tags>categoryTag:General</tags>
-  </descriptors>
-  <descriptors xmi:id="_mv3kkHlKEeayFayxZTWxEg" elementId="org.eclipse.ui.views.TaskList" label="Tasks" iconURI="platform:/plugin/org.eclipse.ui.ide/icons/full/eview16/tasks_tsk.gif" allowMultiple="true" category="org.eclipse.e4.secondaryDataStack" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
-    <tags>View</tags>
-    <tags>categoryTag:General</tags>
-  </descriptors>
-  <descriptors xmi:id="_mv4LoHlKEeayFayxZTWxEg" elementId="org.eclipse.ui.views.ProblemView" label="Problems" iconURI="platform:/plugin/org.eclipse.ui.ide/icons/full/eview16/problems_view.gif" allowMultiple="true" category="org.eclipse.e4.secondaryDataStack" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
-    <tags>View</tags>
-    <tags>categoryTag:General</tags>
-  </descriptors>
-  <descriptors xmi:id="_mv4LoXlKEeayFayxZTWxEg" elementId="org.eclipse.ui.views.AllMarkersView" label="Markers" iconURI="platform:/plugin/org.eclipse.ui.ide/icons/full/eview16/problems_view.gif" allowMultiple="true" category="org.eclipse.e4.secondaryDataStack" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
-    <tags>View</tags>
-    <tags>categoryTag:General</tags>
-  </descriptors>
-  <descriptors xmi:id="_mv4ysHlKEeayFayxZTWxEg" elementId="org.eclipse.ui.navigator.ProjectExplorer" label="Project Explorer" iconURI="platform:/plugin/org.eclipse.ui.navigator.resources/icons/full/eview16/resource_persp.gif" category="org.eclipse.e4.primaryNavigationStack" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
-    <tags>View</tags>
-    <tags>categoryTag:General</tags>
-  </descriptors>
-  <descriptors xmi:id="_mv5ZwHlKEeayFayxZTWxEg" elementId="org.eclipse.ui.views.PropertySheet" label="Properties" iconURI="platform:/plugin/org.eclipse.ui.views/icons/full/eview16/prop_ps.gif" allowMultiple="true" category="org.eclipse.e4.secondaryDataStack" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
-    <tags>View</tags>
-    <tags>categoryTag:General</tags>
-  </descriptors>
-  <descriptors xmi:id="_mv6A0HlKEeayFayxZTWxEg" elementId="org.eclipse.ui.views.ContentOutline" label="Outline" iconURI="platform:/plugin/org.eclipse.ui.views/icons/full/eview16/outline_co.gif" category="org.eclipse.e4.secondaryNavigationStack" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
-    <tags>View</tags>
-    <tags>categoryTag:General</tags>
-  </descriptors>
-  <descriptors xmi:id="_mv6n4HlKEeayFayxZTWxEg" elementId="org.eclipse.pde.runtime.LogView" label="Error Log" iconURI="platform:/plugin/org.eclipse.ui.views.log/icons/eview16/error_log.gif" category="org.eclipse.e4.secondaryDataStack" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
-    <tags>View</tags>
-    <tags>categoryTag:General</tags>
-  </descriptors>
-  <descriptors xmi:id="_mv7O8HlKEeayFayxZTWxEg" elementId="org.eclipse.wst.common.snippets.internal.ui.SnippetsView" label="Snippets" iconURI="platform:/plugin/org.eclipse.wst.common.snippets/icons/snippets_view.gif" category="org.eclipse.e4.secondaryDataStack" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
-    <tags>View</tags>
-    <tags>categoryTag:General</tags>
-  </descriptors>
-  <descriptors xmi:id="_mv72AHlKEeayFayxZTWxEg" elementId="org.eclipse.wst.internet.monitor.view" label="TCP/IP Monitor" iconURI="platform:/plugin/org.eclipse.wst.internet.monitor.ui/icons/cview16/monitorView.gif" category="org.eclipse.e4.secondaryDataStack" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
-    <tags>View</tags>
-    <tags>categoryTag:Debug</tags>
-  </descriptors>
-  <descriptors xmi:id="_mv9EIHlKEeayFayxZTWxEg" elementId="org.eclipse.wst.jsdt.ui.PackageExplorer" label="Script Explorer" iconURI="platform:/plugin/org.eclipse.wst.jsdt.ui/icons/full/eview16/package.gif" category="org.eclipse.e4.secondaryDataStack" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
-    <tags>View</tags>
-    <tags>categoryTag:JavaScript</tags>
-  </descriptors>
-  <descriptors xmi:id="_mv-SQHlKEeayFayxZTWxEg" elementId="org.eclipse.wst.jsdt.ui.TypeHierarchy" label="Hierarchy" iconURI="platform:/plugin/org.eclipse.wst.jsdt.ui/icons/full/eview16/class_hi.gif" category="org.eclipse.e4.secondaryDataStack" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
-    <tags>View</tags>
-    <tags>categoryTag:JavaScript</tags>
-  </descriptors>
-  <descriptors xmi:id="_mv-5UHlKEeayFayxZTWxEg" elementId="org.eclipse.wst.jsdt.callhierarchy.view" label="Call Hierarchy" iconURI="platform:/plugin/org.eclipse.wst.jsdt.ui/icons/full/eview16/call_hierarchy.gif" category="org.eclipse.e4.secondaryDataStack" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
-    <tags>View</tags>
-    <tags>categoryTag:JavaScript</tags>
-  </descriptors>
-  <descriptors xmi:id="_mv_gYHlKEeayFayxZTWxEg" elementId="org.eclipse.wst.jsdt.ui.SourceView" label="Declaration" iconURI="platform:/plugin/org.eclipse.wst.jsdt.ui/icons/full/eview16/source.gif" category="org.eclipse.e4.secondaryDataStack" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
-    <tags>View</tags>
-    <tags>categoryTag:JavaScript</tags>
-  </descriptors>
-  <descriptors xmi:id="_mwAHcHlKEeayFayxZTWxEg" elementId="org.eclipse.wst.jsdt.ui.JavadocView" label="Documentation" iconURI="platform:/plugin/org.eclipse.wst.jsdt.ui/icons/full/eview16/javadoc.gif" category="org.eclipse.e4.secondaryDataStack" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
-    <tags>View</tags>
-    <tags>categoryTag:JavaScript</tags>
-  </descriptors>
-  <descriptors xmi:id="_mwAugHlKEeayFayxZTWxEg" elementId="org.eclipse.wst.server.ui.ServersView" label="Servers" iconURI="platform:/plugin/org.eclipse.wst.server.ui/icons/cview16/servers_view.gif" category="org.eclipse.e4.secondaryDataStack" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
-    <tags>View</tags>
-    <tags>categoryTag:Server</tags>
-  </descriptors>
-  <descriptors xmi:id="_mwBVkHlKEeayFayxZTWxEg" elementId="org.eclipse.wst.xml.ui.views.annotations.XMLAnnotationsView" label="Documentation" iconURI="platform:/plugin/org.eclipse.wst.xml.ui/icons/full/obj16/comment_obj.gif" category="org.eclipse.e4.secondaryDataStack" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
-    <tags>View</tags>
-    <tags>categoryTag:XML</tags>
-  </descriptors>
-  <descriptors xmi:id="_mwCjsHlKEeayFayxZTWxEg" elementId="org.eclipse.wst.xml.ui.contentmodel.view" label="Content Model" iconURI="platform:/plugin/org.eclipse.wst.xml.ui/icons/full/view16/hierarchy.gif" category="org.eclipse.e4.secondaryDataStack" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
-    <tags>View</tags>
-    <tags>categoryTag:XML</tags>
-  </descriptors>
-  <descriptors xmi:id="_mwCjsXlKEeayFayxZTWxEg" elementId="org.eclipse.wst.xml.views.XPathView" label="XPath" iconURI="platform:/plugin/org.eclipse.wst.xml.xpath.ui/icons/full/xpath.gif" category="org.eclipse.e4.secondaryDataStack" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
-    <tags>View</tags>
-    <tags>categoryTag:XML</tags>
-  </descriptors>
-  <descriptors xmi:id="_mwDKwHlKEeayFayxZTWxEg" elementId="org.eclipse.wst.xsl.jaxp.debug.ui.resultview" label="Result" iconURI="platform:/plugin/org.eclipse.ui/icons/full/eview16/defaultview_misc.gif" category="org.eclipse.e4.secondaryDataStack" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
-    <tags>View</tags>
-    <tags>categoryTag:XML</tags>
-  </descriptors>
-  <descriptors xmi:id="_mwDx0HlKEeayFayxZTWxEg" elementId="org.eclipse.wst.xsl.ui.view.outline" label="Stylesheet Model" iconURI="platform:/plugin/org.eclipse.wst.xsl.ui/icons/full/hierarchy.gif" category="org.eclipse.e4.secondaryDataStack" closeable="true" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView">
-    <tags>View</tags>
-    <tags>categoryTag:XML</tags>
-  </descriptors>
-  <commands xmi:id="_mpDx_XlKEeayFayxZTWxEg" elementId="e4.exit" contributorURI="platform:/plugin/org.eclipse.ui.workbench" commandName="%command.name.exit" description=""/>
-  <commands xmi:id="_mpDx_nlKEeayFayxZTWxEg" elementId="e4.show.view" contributorURI="platform:/plugin/org.eclipse.ui.workbench" commandName="%command.name.showView">
-    <parameters xmi:id="_mpDx_3lKEeayFayxZTWxEg" elementId="org.eclipse.ui.views.showView.viewId" contributorURI="platform:/plugin/org.eclipse.ui.workbench" name="View"/>
-  </commands>
-  <commands xmi:id="_mpDyAHlKEeayFayxZTWxEg" elementId="org.eclipse.e4.ui.saveCommands" contributorURI="platform:/plugin/org.eclipse.ui.workbench" commandName="%command.name.save"/>
-  <commands xmi:id="_mpDyAXlKEeayFayxZTWxEg" elementId="org.eclipse.e4.ui.saveAllCommands" contributorURI="platform:/plugin/org.eclipse.ui.workbench" commandName="%command.name.saveAll"/>
-  <commands xmi:id="_mqHh4HlKEeayFayxZTWxEg" elementId="org.eclipse.jdt.ui.correction.inlineLocal.assist" commandName="Quick Assist - Inline local variable" description="Invokes quick assist and selects 'Inline local variable'" category="_mqG66HlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqHh4XlKEeayFayxZTWxEg" elementId="org.eclipse.ui.edit.text.select.pageUp" commandName="Select Page Up" description="Select to the top of the page" category="_mqGTx3lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqHh4nlKEeayFayxZTWxEg" elementId="org.eclipse.egit.ui.history.ResetQuickdiffBaseline" commandName="Reset quickdiff baseline" category="_mqG67XlKEeayFayxZTWxEg">
-    <parameters xmi:id="_mqHh43lKEeayFayxZTWxEg" elementId="org.eclipse.egit.ui.history.ResetQuickdiffBaselineTarget" name="Reset target (HEAD, HEAD^1)" optional="false"/>
-  </commands>
-  <commands xmi:id="_mqHh5HlKEeayFayxZTWxEg" elementId="org.eclipse.jdt.ui.correction.convertLocalToField.assist" commandName="Quick Assist - Convert local variable to field" description="Invokes quick assist and selects 'Convert local variable to field'" category="_mqG66HlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqII8HlKEeayFayxZTWxEg" elementId="org.eclipse.jdt.ui.correction.addThrowsDecl" commandName="Quick Fix - Add throws declaration" description="Invokes quick assist and selects 'Add throws declaration'" category="_mqG66HlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqII8XlKEeayFayxZTWxEg" elementId="org.eclipse.ui.edit.text.deletePreviousWord" commandName="Delete Previous Word" description="Delete the previous word" category="_mqGTx3lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqII8nlKEeayFayxZTWxEg" elementId="org.eclipse.jdt.ui.edit.text.java.search.declarations.in.workspace" commandName="Declaration in Workspace" description="Search for declarations of the selected element in the workspace" category="_mqG63XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqII83lKEeayFayxZTWxEg" elementId="org.eclipse.wst.jsdt.ui.commands.showElementInTypeHierarchyView" commandName="Show JavaScript Element Type Hierarchy" description="Show a JavaScript element in the Type Hierarchy view" category="_mqGTy3lKEeayFayxZTWxEg">
-    <parameters xmi:id="_mqII9HlKEeayFayxZTWxEg" elementId="elementRef" name="JavaScript element reference" typeId="org.eclipse.wst.jsdt.ui.commands.javaElementReference" optional="false"/>
-  </commands>
-  <commands xmi:id="_mqII9XlKEeayFayxZTWxEg" elementId="org.eclipse.ui.edit.text.delimiter.unix" commandName="Convert Line Delimiters to Unix (LF, \n, 0A, &#xb6;)" description="Converts the line delimiters to Unix (LF, \n, 0A, &#xb6;)" category="_mqG60nlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqII9nlKEeayFayxZTWxEg" elementId="org.eclipse.wst.jsdt.ui.edit.text.java.search.references.in.working.set" commandName="References in Working Set" description="Search for references to the selected element in a working set" category="_mqG63XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqII93lKEeayFayxZTWxEg" elementId="org.eclipse.jdt.ui.edit.text.java.search.read.access.in.working.set" commandName="Read Access in Working Set" description="Search for read references to the selected element in a working set" category="_mqG63XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqII-HlKEeayFayxZTWxEg" elementId="org.eclipse.epp.mpc.ui.command.showMarketplaceWizard" commandName="Eclipse Marketplace" description="Show the Eclipse Marketplace wizard" category="_mqG67XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqII-XlKEeayFayxZTWxEg" elementId="org.eclipse.ant.ui.toggleMarkOccurrences" commandName="Toggle Ant Mark Occurrences" description="Toggles mark occurrences in Ant editors" category="_mqG66HlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqII-nlKEeayFayxZTWxEg" elementId="org.eclipse.ui.navigate.addToWorkingSet" commandName="Add to Working Set" description="Adds the selected object to a working set." category="_mqGTwnlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqII-3lKEeayFayxZTWxEg" elementId="org.eclipse.wst.jsdt.callhierarchy.view" commandName="JavaScript Call Hierarchy" description="Show the Call Hierarchy view" category="_mqGTwXlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqII_HlKEeayFayxZTWxEg" elementId="org.eclipse.datatools.connectivity.commands.export" commandName="Export Profiles Command" description="Command to export connection profiles" category="_mqG67XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqII_XlKEeayFayxZTWxEg" elementId="org.eclipse.jdt.junit.junitShortcut.debug" commandName="Debug JUnit Test" description="Debug JUnit Test" category="_mqG63nlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqII_nlKEeayFayxZTWxEg" elementId="org.eclipse.mylyn.wikitext.ui.editor.showCheatSheetCommand" commandName="Show Markup Cheat Sheet" category="_mqG67XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqII_3lKEeayFayxZTWxEg" elementId="org.eclipse.team.ui.TeamSynchronizingPerspective" commandName="Team Synchronizing" description="Open the Team Synchronizing Perspective" category="_mqG643lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqIJAHlKEeayFayxZTWxEg" elementId="org.eclipse.team.cvs.ui.compareWithRemote" commandName="Compare With Latest from Repository" description="Compare with Content on CVS Server" category="_mqG633lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqIJAXlKEeayFayxZTWxEg" elementId="org.eclipse.ant.ui.open.declaration.command" commandName="Open Declaration" description="Opens the Ant editor on the referenced element" category="_mqG66HlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqIJAnlKEeayFayxZTWxEg" elementId="org.eclipse.team.cvs.ui.ignore" commandName="Add to .cvsignore" description="Ignore the Selected Resources when Synchronizing" category="_mqG633lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqIJA3lKEeayFayxZTWxEg" elementId="org.eclipse.jdt.ui.edit.text.java.create.delegate.methods" commandName="Generate Delegate Methods" description="Add delegate methods for a type's fields" category="_mqG66HlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqIJBHlKEeayFayxZTWxEg" elementId="org.eclipse.gef.ui.palette_view" commandName="Palette" category="_mqGTwXlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqIJBXlKEeayFayxZTWxEg" elementId="org.eclipse.wst.xml.views.XPathView.prefixes" commandName="&amp;Edit Namespace Prefixes" category="_mqG653lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqIJBnlKEeayFayxZTWxEg" elementId="org.eclipse.team.cvs.ui.replaceWithRevision" commandName="Replace With Revision" description="Replace with Revision on CVS Server" category="_mqG633lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqIJB3lKEeayFayxZTWxEg" elementId="org.eclipse.datatools.sqltools.sqleditor.toggleCommentAction" commandName="Toggle Comment" category="_mqGTwnlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqIwAHlKEeayFayxZTWxEg" elementId="org.eclipse.mylyn.context.ui.commands.task.clearContext" commandName="Clear Context" category="_mqGTyHlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqIwAXlKEeayFayxZTWxEg" elementId="org.eclipse.wst.jsdt.ui.edit.text.java.search.write.access.in.working.set" commandName="Write Access in Working Set" description="Search for write references to the selected element in a working set" category="_mqG63XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqIwAnlKEeayFayxZTWxEg" elementId="org.eclipse.wst.jsdt.ui.edit.text.java.search.read.access.in.hierarchy" commandName="Read Access in Hierarchy" description="Search for read references of the selected element in its hierarchy" category="_mqG63XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqIwA3lKEeayFayxZTWxEg" elementId="org.eclipse.wst.jsdt.ui.edit.text.java.pull.up" commandName="Pull Up" description="Move members to a superclass" category="_mqG67nlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqIwBHlKEeayFayxZTWxEg" elementId="org.eclipse.debug.ui.commands.ToggleLineBreakpoint" commandName="Toggle Line Breakpoint" description="Creates or removes a line breakpoint" category="_mqG63nlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqIwBXlKEeayFayxZTWxEg" elementId="org.eclipse.mylyn.tasks.ui.command.searchForTask" commandName="Search Repository for Task" category="_mqGTy3lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqIwBnlKEeayFayxZTWxEg" elementId="org.eclipse.wst.jsdt.ui.edit.text.java.folding.collapseMembers" commandName="Collapse Members" description="Collapse all members" category="_mqGTx3lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqIwB3lKEeayFayxZTWxEg" elementId="org.eclipse.jdt.ui.correction.addImport" commandName="Quick Fix - Add import" description="Invokes quick assist and selects 'Add import'" category="_mqG66HlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqIwCHlKEeayFayxZTWxEg" elementId="org.eclipse.wst.jsdt.ui.edit.text.java.search.write.access.in.project" commandName="Write Access in Project" description="Search for write references to the selected element in the enclosing project" category="_mqG63XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqIwCXlKEeayFayxZTWxEg" elementId="org.eclipse.egit.ui.internal.reflog.CheckoutCommand" commandName="Checkout" category="_mqG67XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqIwCnlKEeayFayxZTWxEg" elementId="org.eclipse.ui.edit.move" commandName="Move..." description="Move the selected item" category="_mqG60nlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqIwC3lKEeayFayxZTWxEg" elementId="org.eclipse.jdt.ui.refactor.migrate.jar" commandName="Migrate JAR File" description="Migrate a JAR File to a new version" category="_mqG613lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqIwDHlKEeayFayxZTWxEg" elementId="org.eclipse.mylyn.tasks.ui.command.maximizePart" commandName="Maximize Part" description="Maximize Part" category="_mqGTxXlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqIwDXlKEeayFayxZTWxEg" elementId="org.eclipse.wst.jsdt.ui.edit.text.java.show.outline" commandName="Quick Outline" description="Show the quick outline for the editor input" category="_mqGTy3lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqIwDnlKEeayFayxZTWxEg" elementId="org.eclipse.wst.jsdt.ui.commands.openElementInEditor" commandName="Open JavaScript Element" description="Open a JavaScript element in its editor" category="_mqGTy3lKEeayFayxZTWxEg">
-    <parameters xmi:id="_mqIwD3lKEeayFayxZTWxEg" elementId="elementRef" name="JavaScript element reference" typeId="org.eclipse.wst.jsdt.ui.commands.javaElementReference" optional="false"/>
-  </commands>
-  <commands xmi:id="_mqIwEHlKEeayFayxZTWxEg" elementId="org.eclipse.wst.jsdt.ui.TypesView" commandName="JavaScript Types" description="Show the Types view" category="_mqGTwXlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqIwEXlKEeayFayxZTWxEg" elementId="org.eclipse.compare.ignoreWhiteSpace" commandName="Ignore White Space" description="Ignore white space where applicable" category="_mqG603lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqIwEnlKEeayFayxZTWxEg" elementId="org.eclipse.wst.jsdt.ui.edit.text.java.search.write.access.in.hierarchy" commandName="Write Access in Hierarchy" description="Search for write references of the selected element in its hierarchy" category="_mqG63XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqIwE3lKEeayFayxZTWxEg" elementId="org.eclipse.jdt.ui.edit.text.java.generate.constructor.using.fields" commandName="Generate Constructor using Fields" description="Choose fields to initialize and constructor from superclass to call " category="_mqG66HlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqIwFHlKEeayFayxZTWxEg" elementId="org.eclipse.egit.ui.RepositoriesViewRefresh" commandName="Refresh" category="_mqG64XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqIwFXlKEeayFayxZTWxEg" elementId="org.eclipse.wst.xml.ui.disable.grammar.constraints" commandName="Turn off Grammar Constraints" description="Turn off grammar Constraints" category="_mqG67XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqJXEHlKEeayFayxZTWxEg" elementId="org.eclipse.jdt.ui.commands.showElementInTypeHierarchyView" commandName="Show Java Element Type Hierarchy" description="Show a Java element in the Type Hierarchy view" category="_mqGTy3lKEeayFayxZTWxEg">
-    <parameters xmi:id="_mqJXEXlKEeayFayxZTWxEg" elementId="elementRef" name="Java element reference" typeId="org.eclipse.jdt.ui.commands.javaElementReference" optional="false"/>
-  </commands>
-  <commands xmi:id="_mqJXEnlKEeayFayxZTWxEg" elementId="org.eclipse.ui.navigate.goToResource" commandName="Go to" description="Go to a particular resource in the active view" category="_mqGTy3lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqJXE3lKEeayFayxZTWxEg" elementId="org.eclipse.jdt.ui.edit.text.java.open.super.implementation" commandName="Open Super Implementation" description="Open the Implementation in the Super Type" category="_mqGTy3lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqJXFHlKEeayFayxZTWxEg" elementId="org.eclipse.ui.window.resetPerspective" commandName="Reset Perspective" description="Reset the current perspective to its default state" category="_mqG61XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqJXFXlKEeayFayxZTWxEg" elementId="org.eclipse.mylyn.wikitext.ui.quickOutlineCommand" commandName="Quick Outline" description="Open a popup dialog with a quick outline of the current document" category="_mqGTy3lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqJXFnlKEeayFayxZTWxEg" elementId="org.eclipse.wst.jsdt.ui.edit.text.java.search.references.in.project" commandName="References in Project" description="Search for references to the selected element in the enclosing project" category="_mqG63XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqJXF3lKEeayFayxZTWxEg" elementId="org.eclipse.wst.jsdt.ui.MembersView" commandName="JavaScript Members" description="Show the Members view" category="_mqGTwXlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqJXGHlKEeayFayxZTWxEg" elementId="org.eclipse.ui.project.buildLast" commandName="Repeat Working Set Build" description="Repeat the last working set build" category="_mqG623lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqJXGXlKEeayFayxZTWxEg" elementId="org.eclipse.ui.project.buildProject" commandName="Build Project" description="Build the selected project" category="_mqG623lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqJXGnlKEeayFayxZTWxEg" elementId="org.eclipse.mylyn.tasks.ui.discoveryWizardCommand" commandName="%command.name" description="%command.description" category="_mqG67XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqJXG3lKEeayFayxZTWxEg" elementId="org.eclipse.ui.edit.text.goto.textStart" commandName="Text Start" description="Go to the beginning of the text" category="_mqGTx3lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqJXHHlKEeayFayxZTWxEg" elementId="org.eclipse.ui.edit.paste" commandName="Paste" description="Paste from the clipboard" category="_mqGTwnlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqJXHXlKEeayFayxZTWxEg" elementId="org.eclipse.wst.jsdt.ui.edit.text.java.search.declarations.in.working.set" commandName="Declaration in Working Set" description="Search for declarations of the selected element in a working set" category="_mqG63XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqJXHnlKEeayFayxZTWxEg" elementId="org.eclipse.team.cvs.ui.compareWithRevision" commandName="Compare With Revision" description="Compare with Revision on CVS Server" category="_mqG633lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqJXH3lKEeayFayxZTWxEg" elementId="org.eclipse.wst.jsdt.ui.correction.qualifyField" commandName="Quick Fix - Qualify var access" description="Invokes quick assist and selects 'Qualify var access'" category="_mqGTyXlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqJXIHlKEeayFayxZTWxEg" elementId="org.eclipse.jdt.debug.ui.javaAppletShortcut.run" commandName="Run Java Applet" description="Run Java Applet" category="_mqG63nlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqJXIXlKEeayFayxZTWxEg" elementId="org.eclipse.ui.navigate.previous" commandName="Previous" description="Navigate to the previous item" category="_mqGTy3lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqJXInlKEeayFayxZTWxEg" elementId="org.eclipse.egit.ui.team.clean" commandName="Clean..." category="_mqG64XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqJXI3lKEeayFayxZTWxEg" elementId="org.eclipse.ui.edit.rename" commandName="Rename" description="Rename the selected item" category="_mqG60nlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqJXJHlKEeayFayxZTWxEg" elementId="org.eclipse.ui.project.buildAll" commandName="Build All" description="Build all projects" category="_mqG623lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqJ-IHlKEeayFayxZTWxEg" elementId="org.eclipse.egit.ui.history.OpenInTextEditorCommand" commandName="Open in Text Editor" category="_mqG67XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqJ-IXlKEeayFayxZTWxEg" elementId="org.eclipse.ui.edit.text.cut.line.to.beginning" commandName="Cut to Beginning of Line" description="Cut to the beginning of a line of text" category="_mqGTx3lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqJ-InlKEeayFayxZTWxEg" elementId="org.eclipse.wst.jsdt.ui.edit.text.java.select.enclosing" commandName="Select Enclosing Element" description="Expand selection to include enclosing element" category="_mqGTwnlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqJ-I3lKEeayFayxZTWxEg" elementId="org.eclipse.jdt.ui.edit.text.java.toggleBreadcrumb" commandName="Toggle Java Editor Breadcrumb" description="Toggle the Java editor breadcrumb" category="_mqG66HlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqJ-JHlKEeayFayxZTWxEg" elementId="org.eclipse.ui.editors.revisions.rendering.cycle" commandName="Cycle Revision Coloring Mode" description="Cycles through the available coloring modes for revisions" category="_mqGTx3lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqJ-JXlKEeayFayxZTWxEg" elementId="org.eclipse.ant.ui.renameInFile" commandName="Rename In File" description="Renames all references within the same buildfile" category="_mqG66HlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqJ-JnlKEeayFayxZTWxEg" elementId="org.eclipse.jdt.ui.edit.text.java.open.type.hierarchy" commandName="Open Type Hierarchy" description="Open a type hierarchy on the selected element" category="_mqGTy3lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqJ-J3lKEeayFayxZTWxEg" elementId="org.eclipse.wst.jsdt.debug.ui.script.opensource" commandName="Open Source" description="Shows the JavaScript source for the selected script element" category="_mqG60XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqJ-KHlKEeayFayxZTWxEg" elementId="org.eclipse.jdt.ui.edit.text.java.extract.interface" commandName="Extract Interface" description="Extract a set of members into a new interface and try to use the new interface" category="_mqG613lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqJ-KXlKEeayFayxZTWxEg" elementId="org.eclipse.ltk.ui.refactoring.commands.moveResources" commandName="Move Resources" description="Move the selected resources and notify LTK participants." category="_mqG65HlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqJ-KnlKEeayFayxZTWxEg" elementId="org.eclipse.m2e.actions.LifeCycleGenerateSources.run" commandName="Run Maven Generate Sources" description="Run Maven Generate Sources" category="_mqG63nlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqJ-K3lKEeayFayxZTWxEg" elementId="org.eclipse.debug.ui.commands.StepInto" commandName="Step Into" description="Step into" category="_mqG63nlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqJ-LHlKEeayFayxZTWxEg" elementId="org.eclipse.jst.ws.jaxws.ui.configure.handlers" commandName="Configure Handlers" category="_mqG67XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqJ-LXlKEeayFayxZTWxEg" elementId="org.eclipse.wst.sse.ui.structure.select.previous" commandName="Select Previous Element" description="Expand selection to include previous sibling" category="_mqGTwnlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqJ-LnlKEeayFayxZTWxEg" elementId="org.eclipse.jdt.debug.ui.commands.AddExceptionBreakpoint" commandName="Add Java Exception Breakpoint" description="Add a Java exception breakpoint" category="_mqG63nlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqJ-L3lKEeayFayxZTWxEg" elementId="org.eclipse.jdt.ui.edit.text.java.open.call.hierarchy" commandName="Open Call Hierarchy" description="Open a call hierarchy on the selected element" category="_mqGTy3lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqJ-MHlKEeayFayxZTWxEg" elementId="org.eclipse.egit.ui.RepositoriesViewClearCredentials" commandName="Clear Credentials" category="_mqG64XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqJ-MXlKEeayFayxZTWxEg" elementId="org.eclipse.wst.jsdt.ui.edit.text.java.add.import" commandName="Add Import" description="Create import statement on selection" category="_mqGTyXlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqJ-MnlKEeayFayxZTWxEg" elementId="org.eclipse.wst.jsdt.ui.edit.text.java.add.unimplemented.constructors" commandName="Generate Constructors from Superclass" description="Evaluate and add constructors from superclass" category="_mqGTyXlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqJ-M3lKEeayFayxZTWxEg" elementId="org.eclipse.mylyn.tasks.ui.command.showToolTip" commandName="Show Tooltip Description" category="_mqGTynlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqJ-NHlKEeayFayxZTWxEg" elementId="org.eclipse.wst.jsdt.debug.ui.breakpoint.properties" commandName="JavaScript Breakpoint Properties" description="View and edit the properties for a given JavaScript breakpoint" category="_mqG60XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqKlMHlKEeayFayxZTWxEg" elementId="org.eclipse.mylyn.context.ui.commands.task.copyContext" commandName="Copy Context" category="_mqGTyHlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqKlMXlKEeayFayxZTWxEg" elementId="org.eclipse.ui.window.showViewMenu" commandName="Show View Menu" description="Show the view menu" category="_mqG61XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqKlMnlKEeayFayxZTWxEg" elementId="org.eclipse.egit.ui.team.Commit" commandName="Commit..." category="_mqG64XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqKlM3lKEeayFayxZTWxEg" elementId="org.eclipse.jdt.ui.edit.text.java.inline" commandName="Inline" description="Inline a constant, local variable or method" category="_mqG613lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqKlNHlKEeayFayxZTWxEg" elementId="org.eclipse.ui.edit.text.shiftRight" commandName="Shift Right" description="Shift a block of text to the right" category="_mqGTwnlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqKlNXlKEeayFayxZTWxEg" elementId="org.eclipse.ui.navigate.backwardHistory" commandName="Backward History" description="Move backward in the editor navigation history" category="_mqGTy3lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqKlNnlKEeayFayxZTWxEg" elementId="org.eclipse.wst.jsdt.ui.edit.text.java.search.implementors.in.working.set" commandName="Implementors in Working Set" description="Search for implementors of the selected interface in a working set" category="_mqG63XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqKlN3lKEeayFayxZTWxEg" elementId="org.eclipse.ui.edit.text.removeTrailingWhitespace" commandName="Remove Trailing Whitespace" description="Removes the trailing whitespace of each line" category="_mqG60nlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqKlOHlKEeayFayxZTWxEg" elementId="org.eclipse.ui.edit.findIncremental" commandName="Incremental Find" description="Incremental find" category="_mqGTwnlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqKlOXlKEeayFayxZTWxEg" elementId="org.eclipse.wst.jsdt.ui.correction.inlineLocal.assist" commandName="Quick Assist - Inline local variable" description="Invokes quick assist and selects 'Inline local variable'" category="_mqGTyXlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqKlOnlKEeayFayxZTWxEg" elementId="org.eclipse.wst.jsdt.ui.edit.text.java.convert.anonymous.to.nested" commandName="Convert Anonymous Class to Nested" description="Convert an anonymous class to a nested class" category="_mqG67nlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqKlO3lKEeayFayxZTWxEg" elementId="org.eclipse.jpt.jpa.ui.newEntity" commandName="JPA Entity" category="_mqG67XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqKlPHlKEeayFayxZTWxEg" elementId="org.eclipse.jdt.ui.correction.assignToLocal.assist" commandName="Quick Assist - Assign to local variable" description="Invokes quick assist and selects 'Assign to local variable'" category="_mqG66HlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqKlPXlKEeayFayxZTWxEg" elementId="org.eclipse.jdt.ui.edit.text.java.search.return.continue.targets" commandName="Search break/continue Target Occurrences in File" description="Search for break/continue target occurrences of a selected target name" category="_mqG63XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqKlPnlKEeayFayxZTWxEg" elementId="org.eclipse.wst.jsdt.ui.edit.text.java.format" commandName="Format" description="Format the selected text" category="_mqGTyXlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqKlP3lKEeayFayxZTWxEg" elementId="org.eclipse.wst.jsdt.ui.edit.text.java.change.type" commandName="Generalize Declared Type" description="Change the declaration of a selected variable to a more general type consistent with usage" category="_mqG67nlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqKlQHlKEeayFayxZTWxEg" elementId="org.eclipse.jdt.ui.edit.text.java.create.getter.setter" commandName="Generate Getters and Setters" description="Generate Getter and Setter methods for type's fields" category="_mqG66HlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqKlQXlKEeayFayxZTWxEg" elementId="org.eclipse.pde.ui.edit.text.format" commandName="Format Source" description="Format a PDE Source Page" category="_mqG67HlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqKlQnlKEeayFayxZTWxEg" elementId="org.eclipse.datatools.sqltools.result.terminate" commandName="Terminate Result" category="_mqG62nlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqKlQ3lKEeayFayxZTWxEg" elementId="org.eclipse.jdt.ui.edit.text.java.select.next" commandName="Select Next Element" description="Expand selection to include next sibling" category="_mqGTwnlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqKlRHlKEeayFayxZTWxEg" elementId="org.eclipse.egit.ui.RepositoriesViewNewRemote" commandName="Create Remote..." category="_mqG64XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqLMQHlKEeayFayxZTWxEg" elementId="org.eclipse.wst.jsdt.ui.edit.text.java.generate.hashcode.equals" commandName="Generate hashCode() and equals()" description="Generates hashCode() and equals() functions for the type" category="_mqGTyXlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqLMQXlKEeayFayxZTWxEg" elementId="org.eclipse.debug.ui.commands.Restart" commandName="Restart" description="Restart a process or debug target without terminating and re-launching" category="_mqG63nlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqLMQnlKEeayFayxZTWxEg" elementId="org.eclipse.ui.edit.text.delete.line" commandName="Delete Line" description="Delete a line of text" category="_mqGTx3lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqLMQ3lKEeayFayxZTWxEg" elementId="org.eclipse.wst.jsdt.ui.edit.text.java.organize.imports" commandName="Organize Imports" description="Evaluate all required imports and replace the current imports" category="_mqGTyXlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqLMRHlKEeayFayxZTWxEg" elementId="org.eclipse.jdt.ui.edit.text.java.remove.block.comment" commandName="Remove Block Comment" description="Remove the block comment enclosing the selection" category="_mqG66HlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqLMRXlKEeayFayxZTWxEg" elementId="org.eclipse.jdt.ui.edit.text.java.open.implementation" commandName="Open Implementation" description="Opens the Implementations of a method in its hierarchy" category="_mqGTy3lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqLMRnlKEeayFayxZTWxEg" elementId="org.eclipse.team.cvs.ui.showHistory" commandName="Show History" description="Show History" category="_mqG633lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqLMR3lKEeayFayxZTWxEg" elementId="org.eclipse.jdt.junit.gotoTest" commandName="Referring Tests" description="Referring Tests" category="_mqG63XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqLMSHlKEeayFayxZTWxEg" elementId="org.eclipse.jdt.ui.edit.text.java.find.broken.nls.keys" commandName="Find Broken Externalized Strings" description="Finds undefined, duplicate and unused externalized string keys in property files" category="_mqG66HlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqLMSXlKEeayFayxZTWxEg" elementId="org.eclipse.team.cvs.ui.sync" commandName="Synchronize with Repository" description="Synchronize the workspace resources with those in the repository" category="_mqG633lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqLMSnlKEeayFayxZTWxEg" elementId="org.eclipse.jdt.ui.commands.showElementInPackageView" commandName="Show Java Element in Package Explorer" description="Select Java element in the Package Explorer view" category="_mqGTy3lKEeayFayxZTWxEg">
-    <parameters xmi:id="_mqLMS3lKEeayFayxZTWxEg" elementId="elementRef" name="Java element reference" typeId="org.eclipse.jdt.ui.commands.javaElementReference" optional="false"/>
-  </commands>
-  <commands xmi:id="_mqLMTHlKEeayFayxZTWxEg" elementId="org.eclipse.jdt.debug.ui.commands.InstanceCount" commandName="Instance Count" description="View the instance count of the selected type loaded in the target VM" category="_mqG63nlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqLMTXlKEeayFayxZTWxEg" elementId="org.eclipse.wst.jsdt.ui.edit.text.java.create.getter.setter" commandName="Generate Getters and Setters" description="Generate Getter and Setter functions for type's vars" category="_mqGTyXlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqLzUHlKEeayFayxZTWxEg" elementId="org.eclipse.ui.edit.findReplace" commandName="Find and Replace" description="Find and replace text" category="_mqGTwnlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqLzUXlKEeayFayxZTWxEg" elementId="org.eclipse.egit.ui.team.MergeTool" commandName="Merge Tool" category="_mqG64XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqLzUnlKEeayFayxZTWxEg" elementId="org.eclipse.pde.ui.addAllPluginsToJavaSearch" commandName="Add All Plug-ins to Java Search" description="Adds all plug-ins in the target platform to java search" category="_mqG67XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqLzU3lKEeayFayxZTWxEg" elementId="org.eclipse.egit.ui.command.shareProject" commandName="Share with Git" description="Share the project using Git" category="_mqG67XlKEeayFayxZTWxEg">
-    <parameters xmi:id="_mqLzVHlKEeayFayxZTWxEg" elementId="org.eclipse.egit.ui.command.projectNameParameter" name="Project" optional="false"/>
-  </commands>
-  <commands xmi:id="_mqLzVXlKEeayFayxZTWxEg" elementId="org.eclipse.jdt.ui.edit.text.java.convert.anonymous.to.nested" commandName="Convert Anonymous Class to Nested" description="Convert an anonymous class to a nested class" category="_mqG613lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqLzVnlKEeayFayxZTWxEg" elementId="org.eclipse.pde.ui.quickOutline" commandName="Quick Outline" description="Open a quick outline popup dialog for a given editor input" category="_mqGTy3lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqLzV3lKEeayFayxZTWxEg" elementId="org.eclipse.team.ui.synchronizeAll" commandName="Synchronize..." description="Synchronize resources in the workspace with another location" category="_mqGTwHlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqLzWHlKEeayFayxZTWxEg" elementId="org.eclipse.ui.window.nextEditor" commandName="Next Editor" description="Switch to the next editor" category="_mqG61XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqLzWXlKEeayFayxZTWxEg" elementId="org.eclipse.egit.ui.internal.reflog.CopyCommand" commandName="Copy" category="_mqG67XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqLzWnlKEeayFayxZTWxEg" elementId="org.eclipse.mylyn.tasks.ui.command.new.subtask" commandName="New Subtask" category="_mqGTynlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqLzW3lKEeayFayxZTWxEg" elementId="org.eclipse.wst.jsdt.ui.JavaBrowsingPerspective" commandName="JavaScript Browsing" description="Show the JavaScript Browsing perspective" category="_mqG643lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqLzXHlKEeayFayxZTWxEg" elementId="org.eclipse.ui.help.helpContents" commandName="Help Contents" description="Open the help contents" category="_mqG62XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqLzXXlKEeayFayxZTWxEg" elementId="org.eclipse.wst.jsdt.ui.edit.text.java.remove.block.comment" commandName="Remove Block Comment" description="Remove the block comment enclosing the selection" category="_mqGTyXlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqLzXnlKEeayFayxZTWxEg" elementId="org.eclipse.egit.ui.team.Reset" commandName="Reset" category="_mqG64XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqLzX3lKEeayFayxZTWxEg" elementId="org.eclipse.ui.edit.delete" commandName="Delete" description="Delete the selection" category="_mqGTwnlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqMaYHlKEeayFayxZTWxEg" elementId="org.eclipse.ui.edit.text.delete.line.to.beginning" commandName="Delete to Beginning of Line" description="Delete to the beginning of a line of text" category="_mqGTx3lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqMaYXlKEeayFayxZTWxEg" elementId="org.eclipse.egit.ui.team.RenameBranch" commandName="Rename Branch" category="_mqG64XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqMaYnlKEeayFayxZTWxEg" elementId="org.eclipse.egit.ui.team.Synchronize" commandName="Synchronize" category="_mqG64XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqMaY3lKEeayFayxZTWxEg" elementId="org.eclipse.jdt.ui.edit.text.java.search.declarations.in.working.set" commandName="Declaration in Working Set" description="Search for declarations of the selected element in a working set" category="_mqG63XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqMaZHlKEeayFayxZTWxEg" elementId="org.eclipse.wst.jsdt.ui.edit.text.java.refactor.quickMenu" commandName="Show Refactor Quick Menu" description="Shows the refactor quick menu" category="_mqG67nlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqMaZXlKEeayFayxZTWxEg" elementId="org.eclipse.ui.edit.findPrevious" commandName="Find Previous" description="Find previous item" category="_mqGTwnlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqMaZnlKEeayFayxZTWxEg" elementId="org.eclipse.debug.ui.commands.ToggleBreakpoint" commandName="Toggle Breakpoint" description="Creates or removes a breakpoint" category="_mqG63nlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqMaZ3lKEeayFayxZTWxEg" elementId="org.eclipse.egit.ui.commit.Revert" commandName="Revert Commit" category="_mqG67XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqMaaHlKEeayFayxZTWxEg" elementId="org.eclipse.mylyn.tasks.ui.command.openTask" commandName="Open Task" category="_mqGTy3lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqMaaXlKEeayFayxZTWxEg" elementId="org.eclipse.ui.edit.text.scroll.lineUp" commandName="Scroll Line Up" description="Scroll up one line of text" category="_mqGTx3lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqMaanlKEeayFayxZTWxEg" elementId="org.eclipse.jdt.ui.edit.text.java.select.last" commandName="Restore Last Selection" description="Restore last selection" category="_mqGTwnlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqMaa3lKEeayFayxZTWxEg" elementId="org.eclipse.mylyn.java.ui.editor.folding.auto" commandName="Toggle Active Folding" description="Toggle Active Folding" category="_mqGTzHlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqMabHlKEeayFayxZTWxEg" elementId="org.eclipse.pde.runtime.spy.commands.spyCommand" commandName="Plug-in Selection Spy" description="Show the Plug-in Spy" category="_mqG663lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqMabXlKEeayFayxZTWxEg" elementId="org.eclipse.wst.jsdt.ui.edit.text.java.clean.up" commandName="Clean Up" description="Solve problems and improve code style on selected resources" category="_mqGTyXlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqMabnlKEeayFayxZTWxEg" elementId="org.eclipse.ui.edit.text.folding.toggle" commandName="Toggle Folding" description="Toggles folding in the current editor" category="_mqGTx3lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqNBcHlKEeayFayxZTWxEg" elementId="org.eclipse.ui.edit.text.toggleShowWhitespaceCharacters" commandName="Show Whitespace Characters" description="Shows whitespace characters in current text editor" category="_mqGTx3lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqNBcXlKEeayFayxZTWxEg" elementId="org.eclipse.ui.file.revert" commandName="Revert" description="Revert to the last saved state" category="_mqG60nlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqNBcnlKEeayFayxZTWxEg" elementId="org.eclipse.ui.project.buildAutomatically" commandName="Build Automatically" description="Toggle the workspace build automatically function" category="_mqG623lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqNBc3lKEeayFayxZTWxEg" elementId="org.eclipse.ui.file.import" commandName="Import" description="Import" category="_mqG60nlKEeayFayxZTWxEg">
-    <parameters xmi:id="_mqNBdHlKEeayFayxZTWxEg" elementId="importWizardId" name="Import Wizard"/>
-  </commands>
-  <commands xmi:id="_mqNBdXlKEeayFayxZTWxEg" elementId="org.eclipse.egit.ui.history.Merge" commandName="Merge" category="_mqG67XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqNBdnlKEeayFayxZTWxEg" elementId="org.eclipse.ui.window.switchToEditor" commandName="Switch to Editor" description="Switch to an editor" category="_mqG61XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqNBd3lKEeayFayxZTWxEg" elementId="org.eclipse.wst.jsdt.ui.edit.text.java.find.broken.nls.keys" commandName="Find Broken Externalized Strings" description="Finds undefined, duplicate and unused externalized string keys in property files" category="_mqGTyXlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqNBeHlKEeayFayxZTWxEg" elementId="org.eclipse.ui.help.dynamicHelp" commandName="Dynamic Help" description="Open the dynamic help" category="_mqG62XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqNBeXlKEeayFayxZTWxEg" elementId="org.eclipse.jdt.ui.edit.text.java.comment" commandName="Comment" description="Turn the selected lines into Java comments" category="_mqG66HlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqNBenlKEeayFayxZTWxEg" elementId="org.eclipse.mylyn.tasks.ui.command.activateTask" commandName="Activate Task" category="_mqGTy3lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqNBe3lKEeayFayxZTWxEg" elementId="org.eclipse.egit.ui.history.CreateTag" commandName="Create Tag" category="_mqG67XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqNBfHlKEeayFayxZTWxEg" elementId="org.eclipse.jdt.ui.edit.text.java.search.occurrences.in.file.quickMenu" commandName="Show Occurrences in File Quick Menu" description="Shows the Occurrences in File quick menu" category="_mqG63XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqNogHlKEeayFayxZTWxEg" elementId="org.eclipse.wst.jsdt.ui.edit.text.java.goto.next.member" commandName="Go to Next Member" description="Move the caret to the next member of the JavaScript file" category="_mqGTy3lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqNogXlKEeayFayxZTWxEg" elementId="org.eclipse.ui.edit.text.toggleInsertMode" commandName="Toggle Insert Mode" description="Toggle insert mode" category="_mqGTwnlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqNognlKEeayFayxZTWxEg" elementId="org.eclipse.egit.ui.RepositoriesViewDelete" commandName="Delete Repository" category="_mqG64XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqNog3lKEeayFayxZTWxEg" elementId="org.eclipse.ui.file.closePart" commandName="Close Part" description="Close the active workbench part" category="_mqG61XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqNohHlKEeayFayxZTWxEg" elementId="org.eclipse.ui.editors.revisions.id.toggle" commandName="Toggle Revision Id Display" description="Toggles the display of the revision id" category="_mqGTx3lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqNohXlKEeayFayxZTWxEg" elementId="org.eclipse.ui.project.cleanAction" commandName="Build Clean" description="Discard old built state" category="_mqG623lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqNohnlKEeayFayxZTWxEg" elementId="org.eclipse.ui.navigate.back" commandName="Back" description="Navigate back" category="_mqGTy3lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqNoh3lKEeayFayxZTWxEg" elementId="org.eclipse.ui.edit.text.select.wordNext" commandName="Select Next Word" description="Select the next word" category="_mqGTx3lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqNoiHlKEeayFayxZTWxEg" elementId="org.eclipse.jdt.ui.JavaBrowsingPerspective" commandName="Java Browsing" description="Show the Java Browsing perspective" category="_mqG643lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqNoiXlKEeayFayxZTWxEg" elementId="org.eclipse.ui.edit.text.goto.pageDown" commandName="Page Down" description="Go down one page" category="_mqGTx3lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqNoinlKEeayFayxZTWxEg" elementId="org.eclipse.wst.jsdt.ui.edit.text.java.search.implementors.in.project" commandName="Implementors in Project" description="Search for implementors of the selected interface in the enclosing project" category="_mqG63XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqNoi3lKEeayFayxZTWxEg" elementId="org.eclipse.egit.ui.team.GarbageCollect" commandName="Collect Garbage" category="_mqG64XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqNojHlKEeayFayxZTWxEg" elementId="org.eclipse.egit.ui.history.CompareWithWorkingTree" commandName="Compare with Working Directory" category="_mqG67XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqNojXlKEeayFayxZTWxEg" elementId="org.eclipse.egit.ui.team.Branch" commandName="Branch" category="_mqG64XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqNojnlKEeayFayxZTWxEg" elementId="org.eclipse.wst.jsdt.ui.ProjectsView" commandName="JavaScript Projects" description="Show the Projects view" category="_mqGTwXlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqOPkHlKEeayFayxZTWxEg" elementId="org.eclipse.wst.xml.ui.previousSibling" commandName="Previous Sibling" description="Go to Previous Sibling" category="_mqGTwnlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqOPkXlKEeayFayxZTWxEg" elementId="org.eclipse.egit.ui.RepositoriesViewConfigurePush" commandName="Configure Push..." category="_mqG64XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqOPknlKEeayFayxZTWxEg" elementId="org.eclipse.ui.edit.findIncrementalReverse" commandName="Incremental Find Reverse" description="Incremental find reverse" category="_mqGTwnlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqOPk3lKEeayFayxZTWxEg" elementId="org.eclipse.wst.jsdt.ui.edit.text.java.introduce.factory" commandName="Introduce Factory" description="Introduce a factory function to encapsulate invocation of the selected constructor" category="_mqG67nlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqOPlHlKEeayFayxZTWxEg" elementId="org.eclipse.ant.ui.antShortcut.run" commandName="Run Ant Build" description="Run Ant Build" category="_mqG63nlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqOPlXlKEeayFayxZTWxEg" elementId="org.eclipse.wst.jsdt.ui.correction.convertAnonymousToLocal.assist" commandName="Quick Assist - Convert anonymous to local class" description="Invokes quick assist and selects 'Convert anonymous to local class'" category="_mqGTyXlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqOPlnlKEeayFayxZTWxEg" elementId="org.eclipse.egit.ui.team.stash.apply" commandName="Apply Stashed Changes" category="_mqG64XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqOPl3lKEeayFayxZTWxEg" elementId="org.eclipse.jdt.debug.ui.commands.Inspect" commandName="Inspect" description="Inspect result of evaluating selected text" category="_mqG63nlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqOPmHlKEeayFayxZTWxEg" elementId="org.eclipse.ui.edit.text.goto.columnNext" commandName="Next Column" description="Go to the next column" category="_mqGTx3lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqOPmXlKEeayFayxZTWxEg" elementId="org.eclipse.team.cvs.ui.replaceWithTag" commandName="Replace With Another Branch or Version" description="Replace with Branch or Version on the CVS Server" category="_mqG633lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqOPmnlKEeayFayxZTWxEg" elementId="org.eclipse.search.ui.performTextSearchWorkingSet" commandName="Find Text in Working Set" description="Searches the files in the working set for specific text." category="_mqG63XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqOPm3lKEeayFayxZTWxEg" elementId="org.eclipse.wst.jsdt.ui.edit.text.java.search.occurrences.in.file.quickMenu" commandName="Show Occurrences in File Quick Menu" description="Shows the Occurrences in File quick menu" category="_mqG63XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqOPnHlKEeayFayxZTWxEg" elementId="org.eclipse.ui.edit.text.goto.wordNext" commandName="Next Word" description="Go to the next word" category="_mqGTx3lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqOPnXlKEeayFayxZTWxEg" elementId="org.eclipse.wst.jsdt.ui.correction.convertLocalToField.assist" commandName="Quick Assist - Convert local variable to var" description="Invokes quick assist and selects 'Convert local variable to var'" category="_mqGTyXlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqOPnnlKEeayFayxZTWxEg" elementId="org.eclipse.wst.jsdt.ui.edit.text.java.move.element" commandName="Move - Refactoring " description="Move the selected element to a new location" category="_mqG67nlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqO2oHlKEeayFayxZTWxEg" elementId="org.eclipse.quickdiff.toggle" commandName="Quick Diff Toggle" description="Toggles quick diff information display on the line number ruler" category="_mqGTwnlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqO2oXlKEeayFayxZTWxEg" elementId="org.eclipse.ui.edit.text.deleteNext" commandName="Delete Next" description="Delete the next character" category="_mqGTx3lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqO2onlKEeayFayxZTWxEg" elementId="org.eclipse.egit.ui.FetchGerritChange" commandName="Fetch From Gerrit" category="_mqG64XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqO2o3lKEeayFayxZTWxEg" elementId="org.eclipse.mylyn.tasks.ui.command.SynchronizeAll" commandName="Synchronize Changed" category="_mqGTynlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqO2pHlKEeayFayxZTWxEg" elementId="org.eclipse.jdt.debug.ui.commands.Watch" commandName="Watch" description="Create new watch expression" category="_mqG63nlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqO2pXlKEeayFayxZTWxEg" elementId="org.eclipse.mylyn.wikitext.context.ui.editor.folding.auto" commandName="Toggle Active Folding" description="Toggle Active Folding" category="_mqG60HlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqO2pnlKEeayFayxZTWxEg" elementId="org.eclipse.egit.ui.team.OpenCommit" commandName="Open Git Commit" category="_mqG64XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqO2p3lKEeayFayxZTWxEg" elementId="org.eclipse.wst.server.stop" commandName="Stop" description="Stop the server" category="_mqGTzXlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqO2qHlKEeayFayxZTWxEg" elementId="org.eclipse.ui.help.displayHelp" commandName="Display Help" description="Display a Help topic" category="_mqG62XlKEeayFayxZTWxEg">
-    <parameters xmi:id="_mqO2qXlKEeayFayxZTWxEg" elementId="href" name="Help topic href"/>
-  </commands>
-  <commands xmi:id="_mqO2qnlKEeayFayxZTWxEg" elementId="org.eclipse.ui.edit.text.select.pageDown" commandName="Select Page Down" description="Select to the bottom of the page" category="_mqGTx3lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqO2q3lKEeayFayxZTWxEg" elementId="org.eclipse.ltk.ui.refactor.create.refactoring.script" commandName="Create Script" description="Create a refactoring script from refactorings on the local workspace" category="_mqG613lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqPdsHlKEeayFayxZTWxEg" elementId="org.eclipse.ui.edit.text.join.lines" commandName="Join Lines" description="Join lines of text" category="_mqGTx3lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqPdsXlKEeayFayxZTWxEg" elementId="org.eclipse.datatools.sqltools.sqleditor.saveAsTemplateAction" commandName="Save as Template" category="_mqG64nlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqPdsnlKEeayFayxZTWxEg" elementId="org.eclipse.jdt.ui.edit.text.java.open.editor" commandName="Open Declaration" description="Open an editor on the selected element" category="_mqGTy3lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqPds3lKEeayFayxZTWxEg" elementId="org.eclipse.ui.window.showContextMenu" commandName="Show Context Menu" description="Show the context menu" category="_mqG61XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqPdtHlKEeayFayxZTWxEg" elementId="org.eclipse.jdt.ui.edit.text.java.extract.local.variable" commandName="Extract Local Variable" description="Extracts an expression into a new local variable and uses the new local variable" category="_mqG613lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqPdtXlKEeayFayxZTWxEg" elementId="org.eclipse.ltk.ui.refactor.show.refactoring.history" commandName="Open Refactoring History " description="Opens the refactoring history" category="_mqG613lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqPdtnlKEeayFayxZTWxEg" elementId="org.eclipse.jdt.ui.edit.text.java.search.read.access.in.hierarchy" commandName="Read Access in Hierarchy" description="Search for read references of the selected element in its hierarchy" category="_mqG63XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqPdt3lKEeayFayxZTWxEg" elementId="org.eclipse.jdt.ui.edit.text.java.correction.assist.proposals" commandName="Quick Fix" description="Suggest possible fixes for a problem" category="_mqGTwnlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqPduHlKEeayFayxZTWxEg" elementId="org.eclipse.jdt.ui.edit.text.java.push.down" commandName="Push Down" description="Move members to subclasses" category="_mqG613lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqPduXlKEeayFayxZTWxEg" elementId="org.eclipse.ui.window.nextPerspective" commandName="Next Perspective" description="Switch to the next perspective" category="_mqG61XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqPdunlKEeayFayxZTWxEg" elementId="org.eclipse.mylyn.tasks.ui.command.UpdateRepositoryConfiguration" commandName="Update Repository Configuration" category="_mqG67XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqPdu3lKEeayFayxZTWxEg" elementId="org.eclipse.jdt.ui.edit.text.java.search.write.access.in.working.set" commandName="Write Access in Working Set" description="Search for write references to the selected element in a working set" category="_mqG63XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqPdvHlKEeayFayxZTWxEg" elementId="org.eclipse.egit.ui.history.ShowVersions" commandName="Open" category="_mqG67XlKEeayFayxZTWxEg">
-    <parameters xmi:id="_mqPdvXlKEeayFayxZTWxEg" elementId="org.eclipse.egit.ui.history.CompareMode" name="Compare mode"/>
-  </commands>
-  <commands xmi:id="_mqPdvnlKEeayFayxZTWxEg" elementId="org.eclipse.ui.navigate.nextTab" commandName="Next Tab" description="Switch to the next tab" category="_mqGTy3lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqPdv3lKEeayFayxZTWxEg" elementId="org.eclipse.ui.window.quickAccess" commandName="Quick Access" description="Quickly access UI elements" category="_mqG61XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqPdwHlKEeayFayxZTWxEg" elementId="org.eclipse.ui.edit.text.showInformation" commandName="Show Tooltip Description" description="Displays information for the current caret location in a focused hover" category="_mqGTx3lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqPdwXlKEeayFayxZTWxEg" elementId="org.eclipse.jdt.ui.edit.text.java.add.import" commandName="Add Import" description="Create import statement on selection" category="_mqG66HlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqPdwnlKEeayFayxZTWxEg" elementId="org.eclipse.mylyn.tasks.ui.command.attachment.open" commandName="Open Attachment" category="_mqGTxXlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqPdw3lKEeayFayxZTWxEg" elementId="org.eclipse.wst.jsdt.ui.correction.extractLocal.assist" commandName="Quick Assist - Extract local variable" description="Invokes quick assist and selects 'Extract local variable'" category="_mqGTyXlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqPdxHlKEeayFayxZTWxEg" elementId="org.eclipse.wst.jsdt.ui.correction.renameInFile.assist" commandName="Quick Assist - Rename in file" description="Invokes quick assist and selects 'Rename in file'" category="_mqGTyXlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqPdxXlKEeayFayxZTWxEg" elementId="org.eclipse.debug.ui.commands.toggleMemoryMonitorsPane" commandName="Toggle Memory Monitors Pane" description="Toggle visibility of the Memory Monitors Pane" category="_mqG63nlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqQEwHlKEeayFayxZTWxEg" elementId="org.eclipse.egit.ui.ConfigureUpstreamFetch" commandName="Configure Upstream Fetch" category="_mqG67XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqQEwXlKEeayFayxZTWxEg" elementId="org.eclipse.jdt.ui.edit.text.java.search.implementors.in.working.set" commandName="Implementors in Working Set" description="Search for implementors of the selected interface in a working set" category="_mqG63XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqQEwnlKEeayFayxZTWxEg" elementId="org.eclipse.egit.ui.team.Discard" commandName="Replace with File in Git Index" category="_mqG64XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqQEw3lKEeayFayxZTWxEg" elementId="org.eclipse.datatools.sqltools.sqleditor.refreshFromDatabaseAction" commandName="Refresh from Database" category="_mqG64nlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqQExHlKEeayFayxZTWxEg" elementId="org.eclipse.datatools.sqltools.sqleditor.ExecuteAsOneStatementAction" commandName="Execute Selected Text As One Statement" category="_mqG64nlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqQExXlKEeayFayxZTWxEg" elementId="org.eclipse.egit.ui.RepositoriesViewCreateBranch" commandName="Create Branch..." category="_mqG64XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqQExnlKEeayFayxZTWxEg" elementId="org.eclipse.datatools.connectivity.commands.addrepository" commandName="New Repository Profile Command" description="Command to create a new repository profile" category="_mqG67XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqQEx3lKEeayFayxZTWxEg" elementId="org.eclipse.egit.ui.RepositoriesViewCopyPath" commandName="Copy Path to Clipboard" category="_mqG64XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqQEyHlKEeayFayxZTWxEg" elementId="org.eclipse.wst.jsdt.ui.JavaPerspective" commandName="JavaScript" description="Show the JavaScript perspective" category="_mqG643lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqQEyXlKEeayFayxZTWxEg" elementId="org.eclipse.ui.edit.text.showRulerAnnotationInformation" commandName="Show Ruler Annotation Tooltip" description="Displays annotation information for the caret line in a focused hover" category="_mqGTx3lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqQEynlKEeayFayxZTWxEg" elementId="org.eclipse.team.cvs.ui.update" commandName="Update" description="Update resources with new content from the repository" category="_mqG633lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqQEy3lKEeayFayxZTWxEg" elementId="org.eclipse.wst.jsdt.ui.edit.text.java.modify.method.parameters" commandName="Change Function Signature" description="Change function signature includes parameter names and parameter order" category="_mqG67nlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqQEzHlKEeayFayxZTWxEg" elementId="org.eclipse.jpt.jpa.eclipselink.ui.upgradeToEclipseLinkMappingFile" commandName="Upgrade to EclipseLink Mapping File" category="_mqG67XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqQEzXlKEeayFayxZTWxEg" elementId="org.eclipse.ui.browser.openBrowser" commandName="Open Browser" description="Opens the default web browser." category="_mqG61XlKEeayFayxZTWxEg">
-    <parameters xmi:id="_mqQEznlKEeayFayxZTWxEg" elementId="url" name="URL"/>
-    <parameters xmi:id="_mqQEz3lKEeayFayxZTWxEg" elementId="browserId" name="Browser Id"/>
-    <parameters xmi:id="_mqQE0HlKEeayFayxZTWxEg" elementId="name" name="Browser Name"/>
-    <parameters xmi:id="_mqQE0XlKEeayFayxZTWxEg" elementId="tooltip" name="Browser Tooltip"/>
-  </commands>
-  <commands xmi:id="_mqQE0nlKEeayFayxZTWxEg" elementId="org.eclipse.wst.jsdt.ui.edit.text.java.extract.constant" commandName="Extract Constant" description="Extracts a constant into a new static var and uses the new static var" category="_mqG67nlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqQr0HlKEeayFayxZTWxEg" elementId="org.eclipse.datatools.sqltools.result.removeAllInstances" commandName="Remove All Visible Results" category="_mqG62nlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqQr0XlKEeayFayxZTWxEg" elementId="org.eclipse.jdt.ui.edit.text.java.search.implement.occurrences" commandName="Search Implement Occurrences in File" description="Search for implement occurrences of a selected type" category="_mqG63XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqQr0nlKEeayFayxZTWxEg" elementId="org.eclipse.egit.ui.history.DeleteBranch" commandName="Delete Branch..." category="_mqG67XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqQr03lKEeayFayxZTWxEg" elementId="org.eclipse.ui.edit.text.contentAssist.contextInformation" commandName="Context Information" description="Show Context Information" category="_mqGTwnlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqQr1HlKEeayFayxZTWxEg" elementId="org.eclipse.ui.file.saveAs" commandName="Save As" description="Save the current contents to another location" category="_mqG60nlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqQr1XlKEeayFayxZTWxEg" elementId="org.eclipse.wst.jsdt.ui.edit.text.java.search.read.access.in.workspace" commandName="Read Access in Workspace" description="Search for read references to the selected element in the workspace" category="_mqG63XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqQr1nlKEeayFayxZTWxEg" elementId="org.eclipse.ui.window.previousPerspective" commandName="Previous Perspective" description="Switch to the previous perspective" category="_mqG61XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqQr13lKEeayFayxZTWxEg" elementId="org.eclipse.egit.ui.RepositoriesViewCreateTag" commandName="Create Tag..." category="_mqG64XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqQr2HlKEeayFayxZTWxEg" elementId="org.eclipse.ui.navigate.collapseAll" commandName="Collapse All" description="Collapse the current tree" category="_mqGTy3lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqQr2XlKEeayFayxZTWxEg" elementId="org.eclipse.compare.copyAllRightToLeft" commandName="Copy All from Right to Left" description="Copy All Changes from Right to Left" category="_mqG603lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqQr2nlKEeayFayxZTWxEg" elementId="org.eclipse.mylyn.tasks.ui.command.deactivateSelectedTask" commandName="Deactivate Selected Task" category="_mqGTy3lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqQr23lKEeayFayxZTWxEg" elementId="org.eclipse.ui.window.lockToolBar" commandName="Lock the Toolbars" description="Lock the Toolbars" category="_mqG61XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqQr3HlKEeayFayxZTWxEg" elementId="org.eclipse.debug.ui.commands.Disconnect" commandName="Disconnect" description="Disconnect" category="_mqG63nlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqQr3XlKEeayFayxZTWxEg" elementId="org.eclipse.wst.jsdt.ui.edit.text.java.extract.interface" commandName="Extract Interface" description="Extract a set of members into a new interface and try to use the new interface" category="_mqG67nlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqQr3nlKEeayFayxZTWxEg" elementId="org.eclipse.jdt.ui.edit.text.java.search.write.access.in.workspace" commandName="Write Access in Workspace" description="Search for write references to the selected element in the workspace" category="_mqG63XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqQr33lKEeayFayxZTWxEg" elementId="org.eclipse.ui.navigate.removeFromWorkingSet" commandName="Remove From Working Set" description="Removes the selected object from a working set." category="_mqGTwnlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqQr4HlKEeayFayxZTWxEg" elementId="org.eclipse.pde.ui.createAntBuildFile" commandName="Create Ant Build File" description="Creates an Ant build file for the current project" category="_mqG67XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqQr4XlKEeayFayxZTWxEg" elementId="org.eclipse.mylyn.tasks.ui.command.openSelectedTask" commandName="Open Selected Task" category="_mqGTynlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqQr4nlKEeayFayxZTWxEg" elementId="org.eclipse.wst.jsdt.ui.correction.changeToStatic" commandName="Quick Fix - Change to static access" description="Invokes quick assist and selects 'Change to static access'" category="_mqGTyXlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqRS4HlKEeayFayxZTWxEg" elementId="org.eclipse.datatools.enablement.sybase.asa.schemaobjecteditor.examples.tableschemaeditor.copycolumn" commandName="Copy" category="_mqG61nlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqRS4XlKEeayFayxZTWxEg" elementId="org.eclipse.egit.ui.RepositoriesLinkWithSelection" commandName="Link with Selection" category="_mqG64XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqRS4nlKEeayFayxZTWxEg" elementId="org.eclipse.ui.ide.deleteCompleted" commandName="Delete Completed Tasks" description="Delete the tasks marked as completed" category="_mqG67XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqRS43lKEeayFayxZTWxEg" elementId="org.eclipse.mylyn.tasks.ui.command.goToNextUnread" commandName="Go To Next Unread Task" category="_mqGTy3lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqRS5HlKEeayFayxZTWxEg" elementId="org.eclipse.datatools.sqltools.sqleditor.debugAction" commandName="Debug" category="_mqG64nlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqRS5XlKEeayFayxZTWxEg" elementId="org.eclipse.jdt.ui.edit.text.java.add.javadoc.comment" commandName="Add Javadoc Comment" description="Add a Javadoc comment stub to the member element" category="_mqG66HlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqRS5nlKEeayFayxZTWxEg" elementId="org.eclipse.wst.jsdt.ui.correction.addCast" commandName="Quick Fix - Add cast" description="Invokes quick assist and selects 'Add cast'" category="_mqGTyXlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqRS53lKEeayFayxZTWxEg" elementId="org.eclipse.ui.window.openEditorDropDown" commandName="Quick Switch Editor" description="Open the editor drop down list" category="_mqG61XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqRS6HlKEeayFayxZTWxEg" elementId="org.eclipse.jpt.jaxb.ui.generateJaxbClasses" commandName="JAXB Classes..." category="_mqG67XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqRS6XlKEeayFayxZTWxEg" elementId="org.eclipse.ui.edit.text.deleteNextWord" commandName="Delete Next Word" description="Delete the next word" category="_mqGTx3lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqRS6nlKEeayFayxZTWxEg" elementId="org.eclipse.pde.ui.openDependencies" commandName="Open Plug-in Dependencies" description="Opens the plug-in dependencies view for the current plug-in" category="_mqG67XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqRS63lKEeayFayxZTWxEg" elementId="org.eclipse.jdt.ui.edit.text.java.toggleMarkOccurrences" commandName="Toggle Mark Occurrences" description="Toggles mark occurrences in Java editors" category="_mqG66HlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqRS7HlKEeayFayxZTWxEg" elementId="org.eclipse.egit.ui.SkipRebase" commandName="Skip commit and continue" category="_mqG64XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqRS7XlKEeayFayxZTWxEg" elementId="org.eclipse.jdt.ui.edit.text.java.replace.invocations" commandName="Replace Invocations" description="Replace invocations of the selected method" category="_mqG613lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqRS7nlKEeayFayxZTWxEg" elementId="org.eclipse.jdt.ui.edit.text.java.search.declarations.in.hierarchy" commandName="Declaration in Hierarchy" description="Search for declarations of the selected element in its hierarchy" category="_mqG63XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqRS73lKEeayFayxZTWxEg" elementId="org.eclipse.egit.ui.history.SetQuickdiffBaseline" commandName="Set quickdiff baseline" category="_mqG67XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqRS8HlKEeayFayxZTWxEg" elementId="org.eclipse.ui.edit.undo" commandName="Undo" description="Undo the last operation" category="_mqGTwnlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqRS8XlKEeayFayxZTWxEg" elementId="org.eclipse.ui.file.newQuickMenu" commandName="New menu" description="Open the New menu" category="_mqG60nlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqRS8nlKEeayFayxZTWxEg" elementId="org.eclipse.wst.jsdt.ui.correction.addSuppressWarnings" commandName="Quick Fix - Add @SuppressWarnings" description="Invokes quick fix and selects 'Add @SuppressWarnings' " category="_mqGTyXlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqRS83lKEeayFayxZTWxEg" elementId="org.eclipse.debug.ui.actions.WatchCommand" commandName="Watch" description="Create a watch expression from the current selection and add it to the Expressions view" category="_mqG67XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqR58HlKEeayFayxZTWxEg" elementId="org.eclipse.ui.file.openWorkspace" commandName="Switch Workspace" description="Open the workspace selection dialog" category="_mqG60nlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqR58XlKEeayFayxZTWxEg" elementId="org.eclipse.wst.jsdt.ui.edit.text.remove.occurrence.annotations" commandName="Remove Occurrence Annotations" description="Removes the occurrence annotations from the current editor" category="_mqGTyXlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqR58nlKEeayFayxZTWxEg" elementId="org.eclipse.ui.file.closeAll" commandName="Close All" description="Close all editors" category="_mqG60nlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqR583lKEeayFayxZTWxEg" elementId="org.eclipse.jdt.ui.navigate.open.type" commandName="Open Type" description="Open a type in a Java editor" category="_mqGTy3lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqR59HlKEeayFayxZTWxEg" elementId="org.eclipse.ui.edit.cut" commandName="Cut" description="Cut the selection to the clipboard" category="_mqGTwnlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqR59XlKEeayFayxZTWxEg" elementId="org.eclipse.jdt.ui.edit.text.java.introduce.indirection" commandName="Introduce Indirection" description="Introduce an indirection to encapsulate invocations of a selected method" category="_mqG613lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqR59nlKEeayFayxZTWxEg" elementId="org.eclipse.egit.ui.team.Merge" commandName="Merge" category="_mqG64XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqR593lKEeayFayxZTWxEg" elementId="org.eclipse.ltk.ui.refactor.apply.refactoring.script" commandName="Apply Script" description="Perform refactorings from a refactoring script on the local workspace" category="_mqG613lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqR5-HlKEeayFayxZTWxEg" elementId="org.eclipse.egit.ui.team.ReplaceWithRef" commandName="Replace with branch, tag, or reference" category="_mqG64XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqR5-XlKEeayFayxZTWxEg" elementId="org.eclipse.mylyn.tasks.ui.command.submitTask" commandName="Submit Task" description="Submits the currently open task" category="_mqGTxXlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqR5-nlKEeayFayxZTWxEg" elementId="org.eclipse.jdt.ui.edit.text.java.extract.superclass" commandName="Extract Superclass" description="Extract a set of members into a new superclass and try to use the new superclass" category="_mqG613lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqR5-3lKEeayFayxZTWxEg" elementId="org.eclipse.wst.xml.ui.reload.dependencies" commandName="Reload Dependencies" description="Reload Dependencies" category="_mqG67XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqR5_HlKEeayFayxZTWxEg" elementId="org.eclipse.wst.sse.ui.generate.xml" commandName="&amp;XML File..." category="_mqG67XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqR5_XlKEeayFayxZTWxEg" elementId="org.eclipse.ui.edit.text.toggleShowSelectedElementOnly" commandName="Show Selected Element Only" description="Show Selected Element Only" category="_mqG61XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqR5_nlKEeayFayxZTWxEg" elementId="org.eclipse.wst.jsdt.ui.correction.addImport" commandName="Quick Fix - Add import" description="Invokes quick assist and selects 'Add import'" category="_mqGTyXlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqR5_3lKEeayFayxZTWxEg" elementId="org.eclipse.jdt.junit.junitShortcut.rerunFailedFirst" commandName="Rerun JUnit Test - Failures First" description="Rerun JUnit Test - Failures First" category="_mqG63nlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqR6AHlKEeayFayxZTWxEg" elementId="org.eclipse.ui.file.export" commandName="Export" description="Export" category="_mqG60nlKEeayFayxZTWxEg">
-    <parameters xmi:id="_mqShAHlKEeayFayxZTWxEg" elementId="exportWizardId" name="Export Wizard"/>
-  </commands>
-  <commands xmi:id="_mqShAXlKEeayFayxZTWxEg" elementId="org.eclipse.wst.xsd.ui.refactor.makeTypeGlobal" commandName="Make &amp;Anonymous Type Global" description="Promotes anonymous type to global level and replaces its references" category="_mqGTwnlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqShAnlKEeayFayxZTWxEg" elementId="org.eclipse.jdt.ui.edit.text.java.search.implementors.in.project" commandName="Implementors in Project" description="Search for implementors of the selected interface in the enclosing project" category="_mqG63XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqShA3lKEeayFayxZTWxEg" elementId="org.eclipse.egit.ui.team.ApplyPatch" commandName="Apply Patch" category="_mqG64XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqShBHlKEeayFayxZTWxEg" elementId="org.eclipse.jdt.ui.JavaPerspective" commandName="Java" description="Show the Java perspective" category="_mqG643lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqShBXlKEeayFayxZTWxEg" elementId="org.eclipse.jdt.ui.edit.text.java.indent" commandName="Correct Indentation" description="Corrects the indentation of the selected lines" category="_mqG66HlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqShBnlKEeayFayxZTWxEg" elementId="org.eclipse.ui.ide.copyConfigCommand" commandName="Copy Configuration Data To Clipboard" description="Copies the configuration data (system properties, installed bundles, etc) to the clipboard." category="_mqGTwnlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqShB3lKEeayFayxZTWxEg" elementId="org.eclipse.ui.navigate.forwardHistory" commandName="Forward History" description="Move forward in the editor navigation history" category="_mqGTy3lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqShCHlKEeayFayxZTWxEg" elementId="org.eclipse.search.ui.performTextSearchProject" commandName="Find Text in Project" description="Searches the files in the project for specific text." category="_mqG63XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqShCXlKEeayFayxZTWxEg" elementId="org.eclipse.ui.project.rebuildAll" commandName="Rebuild All" description="Rebuild all projects" category="_mqG623lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqShCnlKEeayFayxZTWxEg" elementId="org.eclipse.gef.zoom_in" commandName="Zoom In" description="Zoom In" category="_mqG65XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqShC3lKEeayFayxZTWxEg" elementId="org.eclipse.jdt.ui.edit.text.java.quick.format" commandName="Format Element" description="Format enclosing text element" category="_mqG66HlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqShDHlKEeayFayxZTWxEg" elementId="org.eclipse.ui.edit.text.openLocalFile" commandName="Open File..." description="Open a file" category="_mqG60nlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqShDXlKEeayFayxZTWxEg" elementId="org.eclipse.jdt.ui.edit.text.java.select.previous" commandName="Select Previous Element" description="Expand selection to include previous sibling" category="_mqGTwnlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqShDnlKEeayFayxZTWxEg" elementId="org.eclipse.pde.ui.externalizeStrings" commandName="Externalize Strings in Plug-ins" description="Extract translatable strings from plug-in files" category="_mqG67XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqShD3lKEeayFayxZTWxEg" elementId="org.eclipse.ui.file.refresh" commandName="Refresh" description="Refresh the selected items" category="_mqG60nlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqShEHlKEeayFayxZTWxEg" elementId="org.eclipse.datatools.connectivity.commands.showcategory" commandName="Show Category" description="Show Category" category="_mqG67XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqTIEHlKEeayFayxZTWxEg" elementId="org.eclipse.egit.ui.RepositoriesViewChangeCredentials" commandName="Change Credentials" category="_mqG64XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqTIEXlKEeayFayxZTWxEg" elementId="org.eclipse.ui.window.closeAllPerspectives" commandName="Close All Perspectives" description="Close all open perspectives" category="_mqG61XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqTIEnlKEeayFayxZTWxEg" elementId="org.eclipse.wst.jsdt.ui.correction.addThrowsDecl" commandName="Quick Fix - Add throws declaration" description="Invokes quick assist and selects 'Add throws declaration'" category="_mqGTyXlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqTIE3lKEeayFayxZTWxEg" elementId="org.eclipse.team.cvs.ui.updateSwitch" commandName="Switch to Another Branch or Version" description="Switch to Another Branch or Version" category="_mqG633lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqTIFHlKEeayFayxZTWxEg" elementId="org.eclipse.mylyn.tasks.ui.command.disconnected" commandName="Disconnected" category="_mqG67XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqTIFXlKEeayFayxZTWxEg" elementId="org.eclipse.ui.edit.text.select.lineStart" commandName="Select Line Start" description="Select to the beginning of the line of text" category="_mqGTx3lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqTIFnlKEeayFayxZTWxEg" elementId="org.eclipse.wst.jsdt.ui.edit.text.java.toggleMarkOccurrences" commandName="Toggle Mark Occurrences" description="Toggles mark occurrences in JavaScript editors" category="_mqGTyXlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqTIF3lKEeayFayxZTWxEg" elementId="org.eclipse.ui.editors.lineNumberToggle" commandName="Show Line Numbers" description="Toggle display of line numbers" category="_mqGTx3lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqTIGHlKEeayFayxZTWxEg" elementId="org.eclipse.wst.jsdt.ui.edit.text.java.infer.type.arguments" commandName="Infer Generic Type Arguments" description="Infer type arguments for references to generic classes and remove unnecessary casts" category="_mqG67nlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqTIGXlKEeayFayxZTWxEg" elementId="org.eclipse.jpt.jpa.ui.persistentAttributeMapAs" commandName="Map As" category="_mqG66XlKEeayFayxZTWxEg">
-    <parameters xmi:id="_mqTIGnlKEeayFayxZTWxEg" elementId="specifiedPersistentAttributeMappingKey" name="specified mapping key" optional="false"/>
-    <parameters xmi:id="_mqTIG3lKEeayFayxZTWxEg" elementId="defaultPersistentAttributeMappingKey" name="default mapping key" optional="false"/>
-  </commands>
-  <commands xmi:id="_mqTIHHlKEeayFayxZTWxEg" elementId="org.eclipse.mylyn.tasks.index.ui.command.ResetIndex" commandName="Refresh Search Index" category="_mqGTynlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqTIHXlKEeayFayxZTWxEg" elementId="org.eclipse.egit.ui.RepositoriesToggleBranchCommit" commandName="Toggle Latest Branch Commit" category="_mqG64XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqTIHnlKEeayFayxZTWxEg" elementId="org.eclipse.egit.ui.history.PushCommit" commandName="Push Commit..." category="_mqG67XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqTvIHlKEeayFayxZTWxEg" elementId="org.eclipse.wst.jsdt.ui.correction.assignToField.assist" commandName="Quick Assist - Assign to var" description="Invokes quick assist and selects 'Assign to var'" category="_mqGTyXlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqTvIXlKEeayFayxZTWxEg" elementId="org.eclipse.jpt.jpa.ui.convertJavaGenerators" commandName="Move Java Generators to XML..." category="_mqG65nlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqTvInlKEeayFayxZTWxEg" elementId="org.eclipse.mylyn.tasks.ui.command.new.local.task" commandName="New Local Task" category="_mqGTynlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqTvI3lKEeayFayxZTWxEg" elementId="org.eclipse.ui.edit.text.select.lineDown" commandName="Select Line Down" description="Extend the selection to the next line of text" category="_mqGTx3lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqTvJHlKEeayFayxZTWxEg" elementId="org.eclipse.jdt.ui.edit.text.java.sort.members" commandName="Sort Members" description="Sort all members using the member order preference" category="_mqG66HlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqTvJXlKEeayFayxZTWxEg" elementId="org.eclipse.ui.edit.text.lowerCase" commandName="To Lower Case" description="Changes the selection to lower case" category="_mqGTx3lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqTvJnlKEeayFayxZTWxEg" elementId="org.eclipse.datatools.connectivity.commands.addprofile" commandName="New Connection Profile Command" description="Command to create a new connection profile" category="_mqG67XlKEeayFayxZTWxEg">
-    <parameters xmi:id="_mqTvJ3lKEeayFayxZTWxEg" elementId="org.eclipse.datatools.connectivity.ui.ignoreCategory" name="ignoreCategory"/>
-    <parameters xmi:id="_mqTvKHlKEeayFayxZTWxEg" elementId="org.eclipse.datatools.connectivity.ui.useSelection" name="useSelection"/>
-  </commands>
-  <commands xmi:id="_mqTvKXlKEeayFayxZTWxEg" elementId="org.eclipse.egit.ui.team.CompareWithIndex" commandName="Compare with Git Index" category="_mqG64XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqTvKnlKEeayFayxZTWxEg" elementId="org.eclipse.m2e.discovery.ui" commandName="m2e Marketplace" category="_mqG67XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqTvK3lKEeayFayxZTWxEg" elementId="org.eclipse.mylyn.tasks.ui.command.markTaskIncomplete" commandName="Mark Task Incomplete" category="_mqGTynlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqTvLHlKEeayFayxZTWxEg" elementId="org.eclipse.ui.file.save" commandName="Save" description="Save the current contents" category="_mqG60nlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqTvLXlKEeayFayxZTWxEg" elementId="org.eclipse.jdt.ui.edit.text.java.search.references.in.project" commandName="References in Project" description="Search for references to the selected element in the enclosing project" category="_mqG63XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqTvLnlKEeayFayxZTWxEg" elementId="org.eclipse.wst.jsdt.ui.edit.text.java.introduce.indirection" commandName="Introduce Indirection" description="Introduce an indirection to encapsulate invocations of a selected function" category="_mqG67nlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqTvL3lKEeayFayxZTWxEg" elementId="org.eclipse.wst.jsdt.ui.edit.text.java.search.occurrences.in.file" commandName="Search All Occurrences in File" description="Search for all occurrences of the selected element in its declaring file" category="_mqG63XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqVkUHlKEeayFayxZTWxEg" elementId="org.eclipse.wst.jsdt.ui.specific_content_assist.command" commandName="Content Assist" description="A parameterizable command that invokes content assist with a single completion proposal category" category="_mqGTwnlKEeayFayxZTWxEg">
-    <parameters xmi:id="_mqVkUXlKEeayFayxZTWxEg" elementId="org.eclipse.wst.jsdt.ui.specific_content_assist.category_id" name="type" optional="false"/>
-  </commands>
-  <commands xmi:id="_mqVkUnlKEeayFayxZTWxEg" elementId="org.eclipse.mylyn.tasks.ui.command.markTaskReadGoToNextUnread" commandName="Mark Task Read and Go To Next Unread Task" category="_mqGTynlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqVkU3lKEeayFayxZTWxEg" elementId="org.eclipse.team.ui.applyPatch" commandName="Apply Patch..." description="Apply a patch to one or more workspace projects." category="_mqGTwHlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqVkVHlKEeayFayxZTWxEg" elementId="org.eclipse.jpt.jpa.ui.generateEntities" commandName="Generate Entities from Tables..." category="_mqG67XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqVkVXlKEeayFayxZTWxEg" elementId="org.eclipse.ui.edit.text.select.lineEnd" commandName="Select Line End" description="Select to the end of the line of text" category="_mqGTx3lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqWLYHlKEeayFayxZTWxEg" elementId="org.eclipse.mylyn.tasks.ui.command.markTaskRead" commandName="Mark Task Read" category="_mqGTynlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqWLYXlKEeayFayxZTWxEg" elementId="org.eclipse.jdt.ui.edit.text.java.move.element" commandName="Move - Refactoring " description="Move the selected element to a new location" category="_mqG613lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqWLYnlKEeayFayxZTWxEg" elementId="org.eclipse.ui.edit.text.select.wordPrevious" commandName="Select Previous Word" description="Select the previous word" category="_mqGTx3lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqWLY3lKEeayFayxZTWxEg" elementId="org.eclipse.wst.jsdt.ui.edit.text.java.indent" commandName="Indent Line" description="Indents the current line" category="_mqGTyXlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqWLZHlKEeayFayxZTWxEg" elementId="org.eclipse.wst.jsdt.ui.edit.text.java.quick.format" commandName="Format Element" description="Format enclosing text element" category="_mqGTyXlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqWLZXlKEeayFayxZTWxEg" elementId="org.eclipse.jst.pagedesigner.vertical" commandName="Vertical Layout" category="_mqGTw3lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqWLZnlKEeayFayxZTWxEg" elementId="org.eclipse.debug.ui.commands.StepOver" commandName="Step Over" description="Step over" category="_mqG63nlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqWLZ3lKEeayFayxZTWxEg" elementId="org.eclipse.compare.selectPreviousChange" commandName="Select Previous Change" description="Select Previous Change" category="_mqG603lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqWLaHlKEeayFayxZTWxEg" elementId="org.eclipse.ui.file.exit" commandName="Exit" description="Exit the application" category="_mqG60nlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqWLaXlKEeayFayxZTWxEg" elementId="org.eclipse.egit.ui.team.CompareWithHead" commandName="Compare with HEAD Revision" category="_mqG64XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqWLanlKEeayFayxZTWxEg" elementId="org.eclipse.egit.ui.RepositoriesViewOpen" commandName="Open" category="_mqG64XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqWLa3lKEeayFayxZTWxEg" elementId="org.eclipse.mylyn.tasks.ui.command.deactivateAllTasks" commandName="Deactivate Task" category="_mqGTy3lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqWLbHlKEeayFayxZTWxEg" elementId="org.eclipse.egit.ui.team.ShowHistory" commandName="Show in History" category="_mqG64XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqWLbXlKEeayFayxZTWxEg" elementId="org.eclipse.wst.jsdt.ui.edit.text.java.surround.with.quickMenu" commandName="Surround With Quick Menu" description="Shows the Surround With quick menu" category="_mqGTyXlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqWLbnlKEeayFayxZTWxEg" elementId="org.eclipse.m2e.core.ui.command.updateProject" commandName="Update Project" description="Update Maven Project configuration and dependencies" category="_mqG61XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqWLb3lKEeayFayxZTWxEg" elementId="org.eclipse.egit.ui.team.SimplePush" commandName="Push to Upstream" category="_mqG64XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqWLcHlKEeayFayxZTWxEg" elementId="refresh.schema.editor.action.id" commandName="Refresh from Server" category="_mqG67XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqWLcXlKEeayFayxZTWxEg" elementId="org.eclipse.debug.ui.commands.addMemoryMonitor" commandName="Add Memory Block" description="Add memory block" category="_mqG63nlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqWycHlKEeayFayxZTWxEg" elementId="org.eclipse.pde.ui.organizeManifest" commandName="Organize Manifests" description="Cleans up plug-in manifest files" category="_mqG67XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqWycXlKEeayFayxZTWxEg" elementId="org.eclipse.wst.jsdt.ui.navigate.gototype" commandName="Go to Type" description="Go to Type" category="_mqGTy3lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqWycnlKEeayFayxZTWxEg" elementId="org.eclipse.jdt.junit.junitShortcut.run" commandName="Run JUnit Test" description="Run JUnit Test" category="_mqG63nlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqWyc3lKEeayFayxZTWxEg" elementId="org.eclipse.jpt.jpa.ui.convertJavaQueries" commandName="Move Java Queries to XML..." category="_mqG65nlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqWydHlKEeayFayxZTWxEg" elementId="org.eclipse.egit.ui.PushHeadToGerrit" commandName="Push Current Head to Gerrit" category="_mqG64XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqWydXlKEeayFayxZTWxEg" elementId="org.eclipse.ui.edit.selectAll" commandName="Select All" description="Select all" category="_mqGTwnlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqWydnlKEeayFayxZTWxEg" elementId="org.eclipse.jdt.ui.edit.text.java.show.outline" commandName="Quick Outline" description="Show the quick outline for the editor input" category="_mqGTy3lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqWyd3lKEeayFayxZTWxEg" elementId="org.eclipse.jst.jsp.ui.refactor.move" commandName="Move" description="Move a Java Element to another package" category="_mqGTwnlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqWyeHlKEeayFayxZTWxEg" elementId="org.eclipse.jdt.ui.edit.text.java.goto.next.member" commandName="Go to Next Member" description="Move the caret to the next member of the compilation unit" category="_mqGTy3lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqWyeXlKEeayFayxZTWxEg" elementId="org.eclipse.ui.project.rebuildProject" commandName="Rebuild Project" description="Rebuild the selected projects" category="_mqG623lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqWyenlKEeayFayxZTWxEg" elementId="org.eclipse.datatools.enablement.sybase.asa.schemaobjecteditor.examples.tableschemaeditor.pastecolumn" commandName="Paste" category="_mqG61nlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqWye3lKEeayFayxZTWxEg" elementId="org.eclipse.m2e.core.pomFileAction.run" commandName="Run Maven Build" description="Run Maven Build" category="_mqG63nlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqWyfHlKEeayFayxZTWxEg" elementId="org.eclipse.m2e.actions.LifeCycleInstall.run" commandName="Run Maven Install" description="Run Maven Install" category="_mqG63nlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqWyfXlKEeayFayxZTWxEg" elementId="org.eclipse.datatools.sqltools.sqleditor.ExecuteCurrentAction" commandName="Execute Current Text" category="_mqG64nlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqWyfnlKEeayFayxZTWxEg" elementId="org.eclipse.ui.edit.text.copyLineDown" commandName="Copy Lines" description="Duplicates the selected lines and moves the selection to the copy" category="_mqGTx3lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqWyf3lKEeayFayxZTWxEg" elementId="org.eclipse.ui.help.installationDialog" commandName="Installation Information" description="Open the installation dialog" category="_mqG62XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqWygHlKEeayFayxZTWxEg" elementId="org.eclipse.wst.jsdt.ui.refactor.create.refactoring.script" commandName="Create Script" description="Create a refactoring script from refactorings on the local workspace" category="_mqG67nlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqWygXlKEeayFayxZTWxEg" elementId="org.eclipse.wst.jsdt.ui.edit.text.java.open.type.hierarchy" commandName="Open Type Hierarchy" description="Open a type hierarchy on the selected element" category="_mqGTy3lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqWygnlKEeayFayxZTWxEg" elementId="org.eclipse.debug.ui.commands.ToggleStepFilters" commandName="Use Step Filters" description="Toggles enablement of debug step filters" category="_mqG63nlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqXZgHlKEeayFayxZTWxEg" elementId="org.eclipse.ui.edit.text.goto.lineUp" commandName="Line Up" description="Go up one line of text" category="_mqGTx3lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqXZgXlKEeayFayxZTWxEg" elementId="org.eclipse.ui.edit.text.goto.windowStart" commandName="Window Start" description="Go to the start of the window" category="_mqGTx3lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqXZgnlKEeayFayxZTWxEg" elementId="org.eclipse.jdt.ui.correction.addBlock.assist" commandName="Quick Assist - Replace statement with block" description="Invokes quick assist and selects 'Replace statement with block'" category="_mqG66HlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqXZg3lKEeayFayxZTWxEg" elementId="org.eclipse.mylyn.commons.ui.command.AddRepository" commandName="Add Repository" category="_mqG66nlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqXZhHlKEeayFayxZTWxEg" elementId="org.eclipse.jdt.ui.edit.text.java.select.enclosing" commandName="Select Enclosing Element" description="Expand selection to include enclosing element" category="_mqGTwnlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqXZhXlKEeayFayxZTWxEg" elementId="org.eclipse.ant.ui.antShortcut.debug" commandName="Debug Ant Build" description="Debug Ant Build" category="_mqG63nlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqXZhnlKEeayFayxZTWxEg" elementId="org.eclipse.egit.ui.RepositoriesViewRenameBranch" commandName="Rename Branch..." category="_mqG64XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqXZh3lKEeayFayxZTWxEg" elementId="org.eclipse.wst.jsdt.ui.correction.addNonNLS" commandName="Quick Fix - Add non-NLS tag" description="Invokes quick assist and selects 'Add non-NLS tag'" category="_mqGTyXlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqXZiHlKEeayFayxZTWxEg" elementId="org.eclipse.egit.ui.team.AssumeUnchanged" commandName="Assume Unchanged" category="_mqG64XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqXZiXlKEeayFayxZTWxEg" elementId="org.eclipse.ui.window.closePerspective" commandName="Close Perspective" description="Close the current perspective" category="_mqG61XlKEeayFayxZTWxEg">
-    <parameters xmi:id="_mqXZinlKEeayFayxZTWxEg" elementId="org.eclipse.ui.window.closePerspective.perspectiveId" name="Perspective Id"/>
-  </commands>
-  <commands xmi:id="_mqXZi3lKEeayFayxZTWxEg" elementId="org.eclipse.wst.jsdt.ui.edit.text.java.add.block.comment" commandName="Add Block Comment" description="Enclose the selection with a block comment" category="_mqGTyXlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqXZjHlKEeayFayxZTWxEg" elementId="org.eclipse.wst.xml.ui.nextSibling" commandName="Next Sibling" description="Go to Next Sibling" category="_mqGTwnlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqXZjXlKEeayFayxZTWxEg" elementId="org.eclipse.wst.jsdt.ui.edit.text.java.extract.local.variable" commandName="Extract Local Variable" description="Extracts an expression into a new local variable and uses the new local variable" category="_mqG67nlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqXZjnlKEeayFayxZTWxEg" elementId="org.eclipse.wst.jsdt.ui.navigate.open.type" commandName="Open Type" description="Open a type in a JavaScript editor" category="_mqGTy3lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqYAkHlKEeayFayxZTWxEg" elementId="org.eclipse.ui.cheatsheets.openCheatSheetURL" commandName="Open Cheat Sheet from URL" description="Open a Cheat Sheet from file at a specified URL." category="_mqG62XlKEeayFayxZTWxEg">
-    <parameters xmi:id="_mqYAkXlKEeayFayxZTWxEg" elementId="cheatSheetId" name="Identifier" optional="false"/>
-    <parameters xmi:id="_mqYAknlKEeayFayxZTWxEg" elementId="name" name="Name" optional="false"/>
-    <parameters xmi:id="_mqYAk3lKEeayFayxZTWxEg" elementId="url" name="URL" optional="false"/>
-  </commands>
-  <commands xmi:id="_mqYAlHlKEeayFayxZTWxEg" elementId="revert.schema.editor.action.id" commandName="Revert Object" category="_mqG67XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqYAlXlKEeayFayxZTWxEg" elementId="org.eclipse.wst.xsl.debug.ui.launchshortcut.debug" commandName="Debug XSLT Transformation" description="Create a configuration to debug an XSLT transformation" category="_mqG63nlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqYAlnlKEeayFayxZTWxEg" elementId="org.eclipse.m2e.core.ui.command.addDependency" commandName="Add Maven Dependency" description="Add Maven Dependency" category="_mqGTwnlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqYAl3lKEeayFayxZTWxEg" elementId="org.eclipse.jdt.debug.ui.commands.Execute" commandName="Execute" description="Evaluate selected text" category="_mqG63nlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqYAmHlKEeayFayxZTWxEg" elementId="org.eclipse.jdt.ui.edit.text.java.add.block.comment" commandName="Add Block Comment" description="Enclose the selection with a block comment" category="_mqG66HlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqYAmXlKEeayFayxZTWxEg" elementId="org.eclipse.rse.shells.ui.actions.LaunchShellCommand" commandName="Launch Shell" category="_mqG61HlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqYAmnlKEeayFayxZTWxEg" elementId="org.eclipse.jpt.jpa.core.synchronizeClasses" commandName="Synchronize Class List" category="_mqG67XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqYAm3lKEeayFayxZTWxEg" elementId="org.eclipse.wst.jsdt.ui.navigate.gotopackage" commandName="Go to Folder" description="Go to Folder" category="_mqGTy3lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqYAnHlKEeayFayxZTWxEg" elementId="org.eclipse.jdt.ui.edit.text.java.search.read.access.in.project" commandName="Read Access in Project" description="Search for read references to the selected element in the enclosing project" category="_mqG63XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqYAnXlKEeayFayxZTWxEg" elementId="org.eclipse.ui.file.closeAllSaved" commandName="Close All Saved" description="Close all saved editors" category="_mqG60nlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqYAnnlKEeayFayxZTWxEg" elementId="org.eclipse.wst.server.launchShortcut.run" commandName="Run on Server" description="Run the current selection on a server" category="_mqG63nlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqYAn3lKEeayFayxZTWxEg" elementId="org.eclipse.wst.jsdt.ui.edit.text.java.move.inner.to.top.level" commandName="Convert Member Type to Top Level" description="Convert member type to top level" category="_mqG67nlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqYAoHlKEeayFayxZTWxEg" elementId="org.eclipse.ui.edit.redo" commandName="Redo" description="Redo the last operation" category="_mqGTwnlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqYnoHlKEeayFayxZTWxEg" elementId="org.eclipse.wst.server.launchShortcut.debug" commandName="Debug on Server" description="Debug the current selection on a server" category="_mqG63nlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqYnoXlKEeayFayxZTWxEg" elementId="org.eclipse.m2e.editor.RenameArtifactAction" commandName="Rename Maven Artifact..." category="_mqG67XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqYnonlKEeayFayxZTWxEg" elementId="org.eclipse.ui.navigate.selectWorkingSets" commandName="Select Working Sets" description="Select the working sets that are applicable for this window." category="_mqG61XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqYno3lKEeayFayxZTWxEg" elementId="org.eclipse.datatools.sqltools.sqleditor.ExecuteSQLAction" commandName="Execute All" category="_mqG64nlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqYnpHlKEeayFayxZTWxEg" elementId="org.eclipse.jdt.ui.edit.text.java.rename.element" commandName="Rename - Refactoring " description="Rename the selected element" category="_mqG613lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqYnpXlKEeayFayxZTWxEg" elementId="org.eclipse.jdt.ui.edit.text.java.externalize.strings" commandName="Externalize Strings" description="Finds all strings that are not externalized and moves them into a separate property file" category="_mqG66HlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqYnpnlKEeayFayxZTWxEg" elementId="org.eclipse.wst.jsdt.ui.correction.extractConstant.assist" commandName="Quick Assist - Extract constant" description="Invokes quick assist and selects 'Extract constant'" category="_mqGTyXlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqYnp3lKEeayFayxZTWxEg" elementId="org.eclipse.egit.ui.history.CherryPick" commandName="Cherry Pick" category="_mqG67XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqYnqHlKEeayFayxZTWxEg" elementId="org.eclipse.ui.file.close" commandName="Close" description="Close the active editor" category="_mqG60nlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqYnqXlKEeayFayxZTWxEg" elementId="org.eclipse.jdt.ui.edit.text.java.surround.with.try.catch" commandName="Surround with try/catch Block" description="Surround the selected text with a try/catch block" category="_mqG66HlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqYnqnlKEeayFayxZTWxEg" elementId="org.eclipse.team.cvs.ui.updateAll" commandName="Update All Incoming Changes" description="Update all incoming changes with new content from the repository" category="_mqG633lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqYnq3lKEeayFayxZTWxEg" elementId="org.eclipse.jdt.ui.edit.text.java.goto.previous.member" commandName="Go to Previous Member" description="Move the caret to the previous member of the compilation unit" category="_mqGTy3lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqYnrHlKEeayFayxZTWxEg" elementId="org.eclipse.egit.ui.history.Reset" commandName="Reset" category="_mqG67XlKEeayFayxZTWxEg">
-    <parameters xmi:id="_mqYnrXlKEeayFayxZTWxEg" elementId="org.eclipse.egit.ui.history.ResetMode" name="Reset mode" optional="false"/>
-  </commands>
-  <commands xmi:id="_mqZOsHlKEeayFayxZTWxEg" elementId="org.eclipse.ui.navigate.previousSubTab" commandName="Previous Sub-Tab" description="Switch to the previous sub-tab" category="_mqGTy3lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqZOsXlKEeayFayxZTWxEg" elementId="org.eclipse.jdt.ui.edit.text.java.generate.hashcode.equals" commandName="Generate hashCode() and equals()" description="Generates hashCode() and equals() methods for the type" category="_mqG66HlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqZOsnlKEeayFayxZTWxEg" elementId="org.eclipse.ui.navigate.showIn" commandName="Show In" category="_mqGTy3lKEeayFayxZTWxEg">
-    <parameters xmi:id="_mqZOs3lKEeayFayxZTWxEg" elementId="org.eclipse.ui.navigate.showIn.targetId" name="Show In Target Id" optional="false"/>
-  </commands>
-  <commands xmi:id="_mqZOtHlKEeayFayxZTWxEg" elementId="sed.tabletree.collapseAll" commandName="Collapse All" category="_mqG67XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqZOtXlKEeayFayxZTWxEg" elementId="org.eclipse.team.cvs.ui.addLocation" commandName="Add Repository Location" description="Add a new CVS repository location" category="_mqG633lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqZOtnlKEeayFayxZTWxEg" elementId="org.eclipse.egit.ui.RepositoriesViewRemoveRemote" commandName="Delete Remote" category="_mqG64XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqZOt3lKEeayFayxZTWxEg" elementId="org.eclipse.ui.dialogs.openInputDialog" commandName="Open Input Dialog" description="Open an Input Dialog" category="_mqG64HlKEeayFayxZTWxEg">
-    <parameters xmi:id="_mqZOuHlKEeayFayxZTWxEg" elementId="title" name="Title"/>
-    <parameters xmi:id="_mqZOuXlKEeayFayxZTWxEg" elementId="message" name="Message"/>
-    <parameters xmi:id="_mqZOunlKEeayFayxZTWxEg" elementId="initialValue" name="Initial Value"/>
-    <parameters xmi:id="_mqZOu3lKEeayFayxZTWxEg" elementId="cancelReturns" name="Return Value on Cancel"/>
-  </commands>
-  <commands xmi:id="_mqZ1wHlKEeayFayxZTWxEg" elementId="org.eclipse.egit.ui.RebaseCurrent" commandName="Rebase" category="_mqG67XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqZ1wXlKEeayFayxZTWxEg" elementId="org.eclipse.jdt.ui.edit.text.java.add.unimplemented.constructors" commandName="Generate Constructors from Superclass" description="Evaluate and add constructors from superclass" category="_mqG66HlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqZ1wnlKEeayFayxZTWxEg" elementId="org.eclipse.mylyn.tasks.ui.command.markTaskComplete" commandName="Mark Task Complete" category="_mqGTynlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqZ1w3lKEeayFayxZTWxEg" elementId="org.eclipse.ui.edit.text.select.windowStart" commandName="Select Window Start" description="Select to the start of the window" category="_mqGTx3lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqZ1xHlKEeayFayxZTWxEg" elementId="org.eclipse.jdt.ui.edit.text.java.source.quickMenu" commandName="Show Source Quick Menu" description="Shows the source quick menu" category="_mqG66HlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqZ1xXlKEeayFayxZTWxEg" elementId="org.eclipse.jdt.ui.edit.text.java.search.declarations.in.project" commandName="Declaration in Project" description="Search for declarations of the selected element in the enclosing project" category="_mqG63XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqZ1xnlKEeayFayxZTWxEg" elementId="org.eclipse.egit.ui.history.Revert" commandName="Revert Commit" category="_mqG67XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqZ1x3lKEeayFayxZTWxEg" elementId="org.eclipse.egit.ui.RepositoriesViewImportProjects" commandName="Import Projects..." description="Import or create in local Git repository" category="_mqG64XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqZ1yHlKEeayFayxZTWxEg" elementId="org.eclipse.compare.copyAllLeftToRight" commandName="Copy All from Left to Right" description="Copy All Changes from Left to Right" category="_mqG603lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqZ1yXlKEeayFayxZTWxEg" elementId="org.eclipse.datatools.enablement.sybase.asa.schemaobjecteditor.examples.tableschemaeditor.cutcolumn" commandName="Cut" category="_mqG61nlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqZ1ynlKEeayFayxZTWxEg" elementId="org.eclipse.wst.jsdt.debug.ui.evaluate.command" commandName="Evaluate" description="Evaluates the selected text in the JavaScript editor" category="_mqG60XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqZ1y3lKEeayFayxZTWxEg" elementId="org.eclipse.jdt.ui.edit.text.java.surround.with.quickMenu" commandName="Surround With Quick Menu" description="Shows the Surround With quick menu" category="_mqG66HlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqZ1zHlKEeayFayxZTWxEg" elementId="org.eclipse.search.ui.openFileSearchPage" commandName="File Search" description="Open the Search dialog's file search page" category="_mqG63XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqZ1zXlKEeayFayxZTWxEg" elementId="org.eclipse.jdt.ui.edit.text.java.search.implementors.in.workspace" commandName="Implementors in Workspace" description="Search for implementors of the selected interface" category="_mqG63XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqZ1znlKEeayFayxZTWxEg" elementId="org.eclipse.egit.ui.RepositoriesViewAddRepository" commandName="Add a Git Repository" category="_mqG64XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqZ1z3lKEeayFayxZTWxEg" elementId="org.eclipse.jdt.debug.ui.breakpoint.properties" commandName="Java Breakpoint Properties" description="View and edit the properties for a given Java breakpoint" category="_mqG63nlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqac0HlKEeayFayxZTWxEg" elementId="org.eclipse.jdt.ui.navigate.open.type.in.hierarchy" commandName="Open Type in Hierarchy" description="Open a type in the type hierarchy view" category="_mqGTy3lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqac0XlKEeayFayxZTWxEg" elementId="org.eclipse.mylyn.tasks.ui.command.task.clearActiveTime" commandName="Clear Active Time" category="_mqGTynlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqac0nlKEeayFayxZTWxEg" elementId="org.eclipse.ui.ide.copyBuildIdCommand" commandName="Copy Build Id To Clipboard" description="Copies the build id to the clipboard." category="_mqGTwnlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqac03lKEeayFayxZTWxEg" elementId="org.eclipse.ui.edit.text.select.textEnd" commandName="Select Text End" description="Select to the end of the text" category="_mqGTx3lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqac1HlKEeayFayxZTWxEg" elementId="org.eclipse.mylyn.context.ui.commands.task.attachContext" commandName="Attach Context" category="_mqGTyHlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqac1XlKEeayFayxZTWxEg" elementId="org.eclipse.wst.xml.views.XPathView.processor.xpathprocessor" commandName="XPath Processor" category="_mqG653lKEeayFayxZTWxEg">
-    <parameters xmi:id="_mqac1nlKEeayFayxZTWxEg" elementId="org.eclipse.ui.commands.radioStateParameter" name="State" optional="false"/>
-  </commands>
-  <commands xmi:id="_mqac13lKEeayFayxZTWxEg" elementId="org.eclipse.ui.edit.text.goto.wordPrevious" commandName="Previous Word" description="Go to the previous word" category="_mqGTx3lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqac2HlKEeayFayxZTWxEg" elementId="org.eclipse.ui.window.preferences" commandName="Preferences" description="Open the preferences dialog" category="_mqG61XlKEeayFayxZTWxEg">
-    <parameters xmi:id="_mqac2XlKEeayFayxZTWxEg" elementId="preferencePageId" name="Preference Page"/>
-  </commands>
-  <commands xmi:id="_mqac2nlKEeayFayxZTWxEg" elementId="org.eclipse.ui.edit.copy" commandName="Copy" description="Copy the selection to the clipboard" category="_mqGTwnlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqac23lKEeayFayxZTWxEg" elementId="org.eclipse.ui.window.nextView" commandName="Next View" description="Switch to the next view" category="_mqG61XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqac3HlKEeayFayxZTWxEg" elementId="org.eclipse.ui.edit.revertToSaved" commandName="Revert to Saved" description="Revert to the last saved state" category="_mqGTwnlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqac3XlKEeayFayxZTWxEg" elementId="org.eclipse.ui.views.properties.NewPropertySheetCommand" commandName="Properties" category="_mqG67XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqac3nlKEeayFayxZTWxEg" elementId="org.eclipse.debug.ui.commands.RunToLine" commandName="Run to Line" description="Resume and break when execution reaches the current line" category="_mqG63nlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqac33lKEeayFayxZTWxEg" elementId="org.eclipse.wst.jsdt.ui.navigate.java.open.structure" commandName="Open Structure" description="Show the structure of the selected element" category="_mqGTy3lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqac4HlKEeayFayxZTWxEg" elementId="org.eclipse.pde.ui.EquinoxLaunchShortcut.debug" commandName="Debug OSGi Framework" description="Debug OSGi Framework" category="_mqG63nlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqbD4HlKEeayFayxZTWxEg" elementId="org.eclipse.egit.ui.RepositoriesViewPaste" commandName="Paste Repository Path or URI" category="_mqG64XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqbD4XlKEeayFayxZTWxEg" elementId="org.eclipse.ui.edit.text.showChangeRulerInformation" commandName="Show Quick Diff Ruler Tooltip" description="Displays quick diff or revision information for the caret line in a focused hover" category="_mqGTx3lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqbD4nlKEeayFayxZTWxEg" elementId="org.eclipse.ui.edit.text.upperCase" commandName="To Upper Case" description="Changes the selection to upper case" category="_mqGTx3lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqbD43lKEeayFayxZTWxEg" elementId="org.eclipse.egit.ui.team.ConfigureFetch" commandName="Configure Upstream Fetch" category="_mqG64XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqbD5HlKEeayFayxZTWxEg" elementId="org.eclipse.ui.navigate.goInto" commandName="Go Into" description="Navigate into the selected item" category="_mqGTy3lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqbD5XlKEeayFayxZTWxEg" elementId="org.eclipse.egit.ui.ConfigureUpstreamPush" commandName="Configure Upstream Push" category="_mqG67XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqbD5nlKEeayFayxZTWxEg" elementId="org.eclipse.debug.ui.commands.OpenRunConfigurations" commandName="Run..." description="Open run launch configuration dialog" category="_mqG63nlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqbD53lKEeayFayxZTWxEg" elementId="org.eclipse.ui.edit.text.select.windowEnd" commandName="Select Window End" description="Select to the end of the window" category="_mqGTx3lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqbD6HlKEeayFayxZTWxEg" elementId="org.eclipse.ui.window.minimizePart" commandName="Minimize Active View or Editor" description="Minimizes the active view or editor" category="_mqG61XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqbD6XlKEeayFayxZTWxEg" elementId="org.eclipse.tm.terminal.command1" commandName="Terminal view insert" category="_mqG63HlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqbD6nlKEeayFayxZTWxEg" elementId="org.eclipse.egit.ui.team.Untrack" commandName="Untrack" category="_mqG64XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqbD63lKEeayFayxZTWxEg" elementId="org.eclipse.wst.sse.ui.add.block.comment" commandName="Add Block Comment" description="Add Block Comment" category="_mqGTwnlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqbD7HlKEeayFayxZTWxEg" elementId="org.eclipse.ui.window.showSystemMenu" commandName="Show System Menu" description="Show the system menu" category="_mqG61XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqbD7XlKEeayFayxZTWxEg" elementId="org.eclipse.jdt.debug.ui.commands.AllInstances" commandName="All Instances" description="View all instances of the selected type loaded in the target VM" category="_mqG63nlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqbD7nlKEeayFayxZTWxEg" elementId="org.eclipse.egit.ui.history.OpenInCommitViewerCommand" commandName="Open in Commit Viewer" category="_mqG67XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqbD73lKEeayFayxZTWxEg" elementId="org.eclipse.jdt.ui.edit.text.java.toggle.comment" commandName="Toggle Comment" description="Toggle comment the selected lines" category="_mqG66HlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqbD8HlKEeayFayxZTWxEg" elementId="org.eclipse.m2e.actions.LifeCycleTest.run" commandName="Run Maven Test" description="Run Maven Test" category="_mqG63nlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqbq8HlKEeayFayxZTWxEg" elementId="org.eclipse.wst.xsl.debug.ui.launchshortcut.run" commandName="Run XSLT Transformation" description="Create a configuration to debug an XSLT transformation" category="_mqG63nlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqbq8XlKEeayFayxZTWxEg" elementId="org.eclipse.ui.window.savePerspective" commandName="Save Perspective As" description="Save the current perspective" category="_mqG61XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqbq8nlKEeayFayxZTWxEg" elementId="org.eclipse.wst.jsdt.ui.edit.text.java.use.supertype" commandName="Use Supertype Where Possible" description="Change occurrences of a type to use a supertype instead" category="_mqG67nlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqbq83lKEeayFayxZTWxEg" elementId="org.eclipse.jdt.ui.correction.assignParamToField.assist" commandName="Quick Assist - Assign parameter to field" description="Invokes quick assist and selects 'Assign parameter to field'" category="_mqG66HlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqbq9HlKEeayFayxZTWxEg" elementId="org.eclipse.egit.ui.command.configureTrace" commandName="Configure Git Debug Trace" category="_mqG64XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqbq9XlKEeayFayxZTWxEg" elementId="org.eclipse.jdt.ui.edit.text.java.move.inner.to.top.level" commandName="Move Type to New File" description="Move Type to New File" category="_mqG613lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqbq9nlKEeayFayxZTWxEg" elementId="org.eclipse.ui.navigate.linkWithEditor" commandName="Toggle Link with Editor " description="Toggles linking of a view's selection with the active editor's selection" category="_mqGTy3lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqbq93lKEeayFayxZTWxEg" elementId="org.eclipse.wst.sse.ui.open.file.from.source" commandName="Open Selection" description="Open an editor on the selected link" category="_mqGTwnlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqbq-HlKEeayFayxZTWxEg" elementId="org.eclipse.jdt.ui.edit.text.java.open.hierarchy" commandName="Quick Hierarchy" description="Show the quick hierarchy of the selected element" category="_mqGTy3lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqbq-XlKEeayFayxZTWxEg" elementId="org.eclipse.ui.edit.text.toggleBlockSelectionMode" commandName="Toggle Block Selection" description="Toggle block / column selection in the current text editor" category="_mqGTwnlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqbq-nlKEeayFayxZTWxEg" elementId="org.eclipse.wst.sse.ui.goto.matching.bracket" commandName="Matching Character" description="Go to Matching Character" category="_mqGTy3lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqbq-3lKEeayFayxZTWxEg" elementId="org.eclipse.jdt.ui.edit.text.java.refactor.quickMenu" commandName="Show Refactor Quick Menu" description="Shows the refactor quick menu" category="_mqG613lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqbq_HlKEeayFayxZTWxEg" elementId="org.eclipse.egit.ui.team.CompareIndexWithHead" commandName="Compare File in Git Index with HEAD Revision" category="_mqG64XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqbq_XlKEeayFayxZTWxEg" elementId="org.eclipse.jdt.ui.edit.text.java.override.methods" commandName="Override/Implement Methods" description="Override or implement methods from super types" category="_mqG66HlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqbq_nlKEeayFayxZTWxEg" elementId="org.eclipse.wst.jsdt.ui.edit.text.java.search.references.in.workspace" commandName="References in Workspace" description="Search for references to the selected element in the workspace" category="_mqG63XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqbq_3lKEeayFayxZTWxEg" elementId="org.eclipse.jpt.jaxb.eclipselink.ui.command.addEclipseLinkJaxbProperty" commandName="Add EclipseLink JAXB property" category="_mqG67XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqbrAHlKEeayFayxZTWxEg" elementId="org.eclipse.mylyn.wikitext.ui.convertToDocbookCommand" commandName="Generate Docbook" category="_mqG67XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqcSAHlKEeayFayxZTWxEg" elementId="org.eclipse.ui.part.nextPage" commandName="Next Page" description="Switch to the next page" category="_mqGTy3lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqcSAXlKEeayFayxZTWxEg" elementId="org.eclipse.jdt.ui.edit.text.java.change.type" commandName="Generalize Declared Type" description="Change the declaration of a selected variable to a more general type consistent with usage" category="_mqG613lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqcSAnlKEeayFayxZTWxEg" elementId="org.eclipse.egit.ui.team.CompareWithRevision" commandName="Compare with History" category="_mqG64XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqcSA3lKEeayFayxZTWxEg" elementId="org.eclipse.egit.ui.history.CreateBranch" commandName="Create Branch" category="_mqG67XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqcSBHlKEeayFayxZTWxEg" elementId="org.eclipse.wst.jsdt.ui.edit.text.java.folding.collapseComments" commandName="Collapse Comments" description="Collapse all comments" category="_mqGTx3lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqcSBXlKEeayFayxZTWxEg" elementId="org.eclipse.egit.ui.RepositoriesViewClone" commandName="Clone a Git Repository" category="_mqG64XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqcSBnlKEeayFayxZTWxEg" elementId="org.eclipse.ui.edit.text.clear.mark" commandName="Clear Mark" description="Clear the mark" category="_mqGTx3lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqcSB3lKEeayFayxZTWxEg" elementId="org.eclipse.wst.sse.ui.quick_outline" commandName="Quick Outline" description="Show the quick outline for the editor input" category="_mqGTy3lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqcSCHlKEeayFayxZTWxEg" elementId="org.eclipse.wst.jsdt.ui.edit.text.java.inline" commandName="Inline" description="Inline a constant, local variable or function" category="_mqG67nlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqcSCXlKEeayFayxZTWxEg" elementId="org.eclipse.egit.ui.RepositoriesViewRemove" commandName="Remove Repository" category="_mqG64XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqcSCnlKEeayFayxZTWxEg" elementId="org.eclipse.team.cvs.ui.branch" commandName="Branch" description="Branch" category="_mqG633lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqcSC3lKEeayFayxZTWxEg" elementId="org.eclipse.wst.jsdt.ui.PackagesView" commandName="JavaScript Folders" description="Show the Folders view" category="_mqGTwXlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqcSDHlKEeayFayxZTWxEg" elementId="org.eclipse.ant.ui.openExternalDoc" commandName="Open External Documentation" description="Open the External documentation for the current task in the Ant editor" category="_mqG66HlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqcSDXlKEeayFayxZTWxEg" elementId="org.eclipse.egit.ui.RepositoriesViewCreateRepository" commandName="Create a Repository" category="_mqG64XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqc5EHlKEeayFayxZTWxEg" elementId="org.eclipse.jdt.ui.edit.text.java.search.write.access.in.hierarchy" commandName="Write Access in Hierarchy" description="Search for write references of the selected element in its hierarchy" category="_mqG63XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqc5EXlKEeayFayxZTWxEg" elementId="org.eclipse.egit.ui.ContinueRebase" commandName="Continue Rebase" category="_mqG64XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqc5EnlKEeayFayxZTWxEg" elementId="org.eclipse.team.cvs.ui.GenerateDiff" commandName="Create Patch" description="Compare your workspace contents with the server and generate a diff file that can be used as a patch file." category="_mqG633lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqc5E3lKEeayFayxZTWxEg" elementId="org.eclipse.help.ui.closeTray" commandName="Close User Assistance Tray" description="Close the user assistance tray containing context help information and cheat sheets." category="_mqG62XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqc5FHlKEeayFayxZTWxEg" elementId="org.eclipse.egit.ui.history.CreatePatch" commandName="Create Patch" category="_mqG67XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqc5FXlKEeayFayxZTWxEg" elementId="org.eclipse.debug.ui.commands.Resume" commandName="Resume" description="Resume" category="_mqG63nlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqc5FnlKEeayFayxZTWxEg" elementId="org.eclipse.wst.jsdt.ui.edit.text.java.toggle.comment" commandName="Toggle Comment" description="Toggle comment the selected lines" category="_mqGTyXlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqc5F3lKEeayFayxZTWxEg" elementId="org.eclipse.mylyn.context.ui.commands.open.context.dialog" commandName="Show Context Quick View" description="Show Context Quick View" category="_mqGTyHlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqc5GHlKEeayFayxZTWxEg" elementId="org.eclipse.ui.file.restartWorkbench" commandName="Restart" description="Restart the workbench" category="_mqG60nlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqc5GXlKEeayFayxZTWxEg" elementId="org.eclipse.wst.jsdt.ui.edit.text.java.search.read.access.in.project" commandName="Read Access in Project" description="Search for read references to the selected element in the enclosing project" category="_mqG63XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqc5GnlKEeayFayxZTWxEg" elementId="org.eclipse.mylyn.context.ui.commands.attachment.retrieveContext" commandName="Retrieve Context Attachment" category="_mqGTyHlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqc5G3lKEeayFayxZTWxEg" elementId="org.eclipse.ui.edit.text.toggleOverwrite" commandName="Toggle Overwrite" description="Toggle overwrite mode" category="_mqGTx3lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqc5HHlKEeayFayxZTWxEg" elementId="org.eclipse.jdt.ui.edit.text.java.pull.up" commandName="Pull Up" description="Move members to a superclass" category="_mqG613lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqc5HXlKEeayFayxZTWxEg" elementId="org.eclipse.ui.edit.text.folding.collapse_all" commandName="Collapse All" description="Collapses all folded regions" category="_mqGTx3lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqc5HnlKEeayFayxZTWxEg" elementId="org.eclipse.wst.jsdt.ui.edit.text.java.surround.with.try.catch" commandName="Surround with try/catch Block" description="Surround the selected text with a try/catch block" category="_mqGTyXlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqc5H3lKEeayFayxZTWxEg" elementId="org.eclipse.team.cvs.ui.cvsPerspective" commandName="CVS Repository Exploring" description="Open the CVS Repository Exploring Perspective" category="_mqG643lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqdgIHlKEeayFayxZTWxEg" elementId="org.eclipse.mylyn.tasks.ui.command.RefreshRepositoryTasks" commandName="Synchronize Changed" category="_mqG67XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqdgIXlKEeayFayxZTWxEg" elementId="org.eclipse.debug.ui.commands.ToggleWatchpoint" commandName="Toggle Watchpoint" description="Creates or removes a watchpoint" category="_mqG63nlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqdgInlKEeayFayxZTWxEg" elementId="org.eclipse.equinox.p2.ui.discovery.commands.ShowRepositoryCatalog" commandName="Show Repository Catalog" category="_mqG67XlKEeayFayxZTWxEg">
-    <parameters xmi:id="_mqdgI3lKEeayFayxZTWxEg" elementId="org.eclipse.equinox.p2.ui.discovery.commands.RepositoryParameter" name="P2 Repository URI"/>
-  </commands>
-  <commands xmi:id="_mqdgJHlKEeayFayxZTWxEg" elementId="org.eclipse.debug.ui.commands.closeRendering" commandName="Close Rendering" description="Close the selected rendering." category="_mqG63nlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqdgJXlKEeayFayxZTWxEg" elementId="org.eclipse.egit.ui.RepositoriesViewOpenInEditor" commandName="Open in Editor" category="_mqG64XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqdgJnlKEeayFayxZTWxEg" elementId="org.eclipse.wst.jsdt.ui.edit.text.java.introduce.parameter" commandName="Introduce Parameter" description="Introduce a new function parameter based on the selected expression" category="_mqG67nlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqdgJ3lKEeayFayxZTWxEg" elementId="org.eclipse.egit.ui.team.submodule.update" commandName="Update Submodule" category="_mqG64XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqdgKHlKEeayFayxZTWxEg" elementId="org.eclipse.debug.ui.commands.ProfileLast" commandName="Profile" description="Launch in profile mode" category="_mqG63nlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqdgKXlKEeayFayxZTWxEg" elementId="org.eclipse.egit.ui.team.Pull" commandName="Pull" category="_mqG64XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqdgKnlKEeayFayxZTWxEg" elementId="org.eclipse.wst.jsdt.ui.TypeHierarchy" commandName="JavaScript Type Hierarchy" description="Show the Type Hierarchy view" category="_mqGTwXlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqdgK3lKEeayFayxZTWxEg" elementId="org.eclipse.ui.edit.text.swap.mark" commandName="Swap Mark" description="Swap the mark with the cursor position" category="_mqGTx3lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqdgLHlKEeayFayxZTWxEg" elementId="org.eclipse.jdt.ui.correction.addCast" commandName="Quick Fix - Add cast" description="Invokes quick assist and selects 'Add cast'" category="_mqG66HlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqdgLXlKEeayFayxZTWxEg" elementId="org.eclipse.mylyn.context.ui.commands.interest.increment" commandName="Make Landmark" description="Make Landmark" category="_mqGTyHlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqdgLnlKEeayFayxZTWxEg" elementId="org.eclipse.wst.jsdt.ui.edit.text.java.add.javadoc.comment" commandName="Add JSDoc Comment" description="Add a JSDoc comment stub to the member element" category="_mqGTyXlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqdgL3lKEeayFayxZTWxEg" elementId="org.eclipse.wst.jsdt.ui.edit.text.java.open.hierarchy" commandName="Quick Hierarchy" description="Show the quick hierarchy of the selected element" category="_mqGTy3lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqdgMHlKEeayFayxZTWxEg" elementId="org.eclipse.egit.ui.RepositoriesViewConfigureFetch" commandName="Configure Fetch..." category="_mqG64XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqeHMHlKEeayFayxZTWxEg" elementId="org.eclipse.jdt.ui.edit.text.java.open.external.javadoc" commandName="Open Attached Javadoc" description="Open the attached Javadoc of the selected element in a browser" category="_mqGTy3lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqeHMXlKEeayFayxZTWxEg" elementId="org.eclipse.pde.ui.EquinoxLaunchShortcut.run" commandName="Run OSGi Framework" description="Run OSGi Framework" category="_mqG63nlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqeHMnlKEeayFayxZTWxEg" elementId="org.eclipse.ui.edit.text.shiftLeft" commandName="Shift Left" description="Shift a block of text to the left" category="_mqGTwnlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqeHM3lKEeayFayxZTWxEg" elementId="org.eclipse.wst.sse.ui.structure.select.next" commandName="Select Next Element" description="Expand selection to include next sibling" category="_mqGTwnlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqeHNHlKEeayFayxZTWxEg" elementId="org.eclipse.egit.ui.team.Push" commandName="Push" category="_mqG64XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqeHNXlKEeayFayxZTWxEg" elementId="org.eclipse.jdt.debug.ui.commands.AddClassPrepareBreakpoint" commandName="Add Class Load Breakpoint" description="Add a class load breakpoint" category="_mqG63nlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqeHNnlKEeayFayxZTWxEg" elementId="org.eclipse.jpt.jpa.ui.convertJavaProjectToJpa" commandName="Convert to JPA Project..." category="_mqG60nlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqeHN3lKEeayFayxZTWxEg" elementId="org.eclipse.emf.codegen.ecore.ui.Generate" commandName="Generate Code" description="Generate code for the EMF models in the workspace" category="_mqG62HlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqeHOHlKEeayFayxZTWxEg" elementId="org.eclipse.wst.jsdt.ui.generate.javadoc" commandName="Generate JSDoc" description="Generates JSDoc for a selectable set of JavaScript resources" category="_mqG623lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqeHOXlKEeayFayxZTWxEg" elementId="org.eclipse.egit.ui.team.stash.drop" commandName="Delete Stashed Commit..." category="_mqG64XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqeHOnlKEeayFayxZTWxEg" elementId="org.eclipse.debug.ui.DebugPerspective" commandName="Debug" description="Open the debug perspective" category="_mqG643lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqeHO3lKEeayFayxZTWxEg" elementId="org.eclipse.egit.ui.history.RenameBranch" commandName="Rename Branch..." category="_mqG67XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqeHPHlKEeayFayxZTWxEg" elementId="org.eclipse.wst.jsdt.ui.edit.text.java.source.quickMenu" commandName="Show Source Quick Menu" description="Shows the source quick menu" category="_mqGTyXlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqeHPXlKEeayFayxZTWxEg" elementId="org.eclipse.jdt.ui.specific_content_assist.command" commandName="Content Assist" description="A parameterizable command that invokes content assist with a single completion proposal category" category="_mqGTwnlKEeayFayxZTWxEg">
-    <parameters xmi:id="_mqeHPnlKEeayFayxZTWxEg" elementId="org.eclipse.jdt.ui.specific_content_assist.category_id" name="type" optional="false"/>
-  </commands>
-  <commands xmi:id="_mqeuQHlKEeayFayxZTWxEg" elementId="org.eclipse.jdt.ui.edit.text.java.search.references.in.hierarchy" commandName="References in Hierarchy" description="Search for references of the selected element in its hierarchy" category="_mqG63XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqeuQXlKEeayFayxZTWxEg" elementId="org.eclipse.ui.navigate.expandAll" commandName="Expand All" description="Expand the current tree" category="_mqGTy3lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqeuQnlKEeayFayxZTWxEg" elementId="org.eclipse.ui.file.saveAll" commandName="Save All" description="Save all current contents" category="_mqG60nlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqeuQ3lKEeayFayxZTWxEg" elementId="org.eclipse.jdt.ui.edit.text.java.search.method.exits" commandName="Search Method Exit Occurrences in File" description="Search for method exit occurrences of a selected return type" category="_mqG63XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqeuRHlKEeayFayxZTWxEg" elementId="org.eclipse.wst.jsdt.ui.edit.text.java.goto.matching.bracket" commandName="Go to Matching Bracket" description="Moves the cursor to the matching bracket" category="_mqGTy3lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqeuRXlKEeayFayxZTWxEg" elementId="org.eclipse.jdt.ui.edit.text.java.folding.collapseMembers" commandName="Collapse Members" description="Collapse all members" category="_mqGTx3lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqeuRnlKEeayFayxZTWxEg" elementId="org.eclipse.ui.file.closeOthers" commandName="Close Others" description="Close all editors except the one that is active" category="_mqG60nlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqeuR3lKEeayFayxZTWxEg" elementId="org.eclipse.wst.jsdt.ui.edit.text.java.rename.element" commandName="Rename - Refactoring " description="Rename the selected element" category="_mqG67nlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqeuSHlKEeayFayxZTWxEg" elementId="org.eclipse.ui.editors.quickdiff.revertLine" commandName="Revert Line" description="Revert the current line" category="_mqGTx3lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqeuSXlKEeayFayxZTWxEg" elementId="org.eclipse.debug.ui.commands.OpenDebugConfigurations" commandName="Debug..." description="Open debug launch configuration dialog" category="_mqG63nlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqeuSnlKEeayFayxZTWxEg" elementId="org.eclipse.jpt.jpa.eclipselink.ui.generateDynamicEntities" commandName="Generate Dynamic Entities from Tables..." category="_mqG67XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqeuS3lKEeayFayxZTWxEg" elementId="org.eclipse.egit.ui.team.SimpleFetch" commandName="Fetch from Upstream" category="_mqG64XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqeuTHlKEeayFayxZTWxEg" elementId="org.eclipse.ui.window.previousEditor" commandName="Previous Editor" description="Switch to the previous editor" category="_mqG61XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqeuTXlKEeayFayxZTWxEg" elementId="org.eclipse.jdt.ui.edit.text.java.copy.qualified.name" commandName="Copy Qualified Name" description="Copy a fully qualified name to the system clipboard" category="_mqG66HlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqeuTnlKEeayFayxZTWxEg" elementId="org.eclipse.jdt.ui.edit.text.java.promote.local.variable" commandName="Convert Local Variable to Field" description="Convert a local variable to a field" category="_mqG613lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqeuT3lKEeayFayxZTWxEg" elementId="org.eclipse.ui.ide.OpenMarkersView" commandName="Open Another" description="Open another view" category="_mqG67XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqfVUHlKEeayFayxZTWxEg" elementId="org.eclipse.wst.jsdt.ui.PackageExplorer" commandName="JavaScript Script Explorer" description="Show the Script Explorer" category="_mqGTwXlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqfVUXlKEeayFayxZTWxEg" elementId="org.eclipse.jdt.ui.correction.changeToStatic" commandName="Quick Fix - Change to static access" description="Invokes quick assist and selects 'Change to static access'" category="_mqG66HlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqfVUnlKEeayFayxZTWxEg" elementId="org.eclipse.debug.ui.commands.newRendering" commandName="New Rendering" description="Add a new rendering." category="_mqG63nlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqfVU3lKEeayFayxZTWxEg" elementId="org.eclipse.ui.project.closeUnrelatedProjects" commandName="Close Unrelated Projects" description="Close unrelated projects" category="_mqG623lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqfVVHlKEeayFayxZTWxEg" elementId="org.eclipse.jdt.ui.edit.text.java.self.encapsulate.field" commandName="Encapsulate Field" description="Create getting and setting methods for the field and use only those to access the field" category="_mqG613lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqfVVXlKEeayFayxZTWxEg" elementId="org.eclipse.pde.ui.runtimeWorkbenchShortcut.run" commandName="Run Eclipse Application" description="Run Eclipse Application" category="_mqG63nlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqfVVnlKEeayFayxZTWxEg" elementId="org.eclipse.search.ui.performTextSearchWorkspace" commandName="Find Text in Workspace" description="Searches the files in the workspace for specific text." category="_mqG63XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqfVV3lKEeayFayxZTWxEg" elementId="org.eclipse.wst.jsdt.ui.edit.text.java.extract.superclass" commandName="Extract Superclass" description="Extract a set of members into a new superclass and try to use the new superclass" category="_mqG67nlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqfVWHlKEeayFayxZTWxEg" elementId="org.eclipse.wst.sse.ui.remove.block.comment" commandName="Remove Block Comment" description="Remove Block Comment" category="_mqGTwnlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqfVWXlKEeayFayxZTWxEg" elementId="org.eclipse.pde.runtime.spy.commands.menuSpyCommand" commandName="Plug-in Menu Spy" description="Show the Plug-in Spy" category="_mqG663lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqfVWnlKEeayFayxZTWxEg" elementId="org.eclipse.jpt.jpa.ui.entityMappingsAddPersistentClass" commandName="Add Class..." category="_mqG66XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqfVW3lKEeayFayxZTWxEg" elementId="org.eclipse.wst.jsdt.ui.edit.text.java.generate.constructor.using.fields" commandName="Generate Constructor using Vars" description="Choose vars to initialize and constructor from superclass to call " category="_mqGTyXlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqfVXHlKEeayFayxZTWxEg" elementId="org.eclipse.jdt.ui.navigate.gototype" commandName="Go to Type" description="Go to Type" category="_mqGTy3lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqfVXXlKEeayFayxZTWxEg" elementId="org.eclipse.m2e.core.ui.command.openPom" commandName="Open Maven POM" category="_mqGTy3lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqfVXnlKEeayFayxZTWxEg" elementId="org.eclipse.ui.edit.addBookmark" commandName="Add Bookmark" description="Add a bookmark" category="_mqGTwnlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqf8YHlKEeayFayxZTWxEg" elementId="org.eclipse.team.cvs.ui.commit" commandName="Commit" description="Commit resources to the repository" category="_mqG633lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqf8YXlKEeayFayxZTWxEg" elementId="org.eclipse.team.cvs.ui.setKeywordSubstitution" commandName="Change ASCII/Binary Property" description="Change whether the selected resources should be treated as ASCII or binary on the CVS Server" category="_mqG633lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqf8YnlKEeayFayxZTWxEg" elementId="org.eclipse.wst.xsd.ui.refactor.rename.element" commandName="&amp;Rename XSD element" description="Rename XSD element" category="_mqGTwnlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqf8Y3lKEeayFayxZTWxEg" elementId="org.eclipse.ui.edit.text.set.mark" commandName="Set Mark" description="Set the mark" category="_mqGTx3lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqf8ZHlKEeayFayxZTWxEg" elementId="org.eclipse.mylyn.tasks.ui.command.goToPreviousUnread" commandName="Go To Previous Unread Task" category="_mqGTy3lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqf8ZXlKEeayFayxZTWxEg" elementId="org.eclipse.wst.jsdt.ui.edit.text.java.select.next" commandName="Select Next Element" description="Expand selection to include next sibling" category="_mqGTwnlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqf8ZnlKEeayFayxZTWxEg" elementId="org.eclipse.jdt.ui.correction.splitJoinVariableDeclaration.assist" commandName="Quick Assist - Split/Join variable declaration" description="Invokes quick assist and selects 'Split/Join variable declaration'" category="_mqG66HlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqf8Z3lKEeayFayxZTWxEg" elementId="org.eclipse.ui.views.showView" commandName="Show View" description="Shows a particular view" category="_mqGTwXlKEeayFayxZTWxEg">
-    <parameters xmi:id="_mqf8aHlKEeayFayxZTWxEg" elementId="org.eclipse.ui.views.showView.viewId" name="View"/>
-    <parameters xmi:id="_mqf8aXlKEeayFayxZTWxEg" elementId="org.eclipse.ui.views.showView.secondaryId" name="Secondary Id"/>
-    <parameters xmi:id="_mqf8anlKEeayFayxZTWxEg" elementId="org.eclipse.ui.views.showView.makeFast" name="As FastView"/>
-  </commands>
-  <commands xmi:id="_mqf8a3lKEeayFayxZTWxEg" elementId="org.eclipse.egit.ui.team.Ignore" commandName="Ignore" category="_mqG64XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqgjcHlKEeayFayxZTWxEg" elementId="org.eclipse.ui.navigate.showResourceByPath" commandName="Show Resource in Navigator" description="Show a resource in the Navigator given its path" category="_mqGTy3lKEeayFayxZTWxEg">
-    <parameters xmi:id="_mqgjcXlKEeayFayxZTWxEg" elementId="resourcePath" name="Resource Path" typeId="org.eclipse.ui.ide.resourcePath" optional="false"/>
-  </commands>
-  <commands xmi:id="_mqgjcnlKEeayFayxZTWxEg" elementId="org.eclipse.debug.ui.commands.SkipAllBreakpoints" commandName="Skip All Breakpoints" description="Sets whether or not any breakpoint should suspend execution" category="_mqG63nlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqgjc3lKEeayFayxZTWxEg" elementId="org.eclipse.ui.edit.text.delimiter.windows" commandName="Convert Line Delimiters to Windows (CRLF, \r\n, 0D0A, &#xa4;&#xb6;)" description="Converts the line delimiters to Windows (CRLF, \r\n, 0D0A, &#xa4;&#xb6;)" category="_mqG60nlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqgjdHlKEeayFayxZTWxEg" elementId="org.eclipse.ui.edit.findNext" commandName="Find Next" description="Find next item" category="_mqGTwnlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqgjdXlKEeayFayxZTWxEg" elementId="org.eclipse.wst.jsdt.ui.edit.text.java.search.declarations.in.workspace" commandName="Declaration in Workspace" description="Search for declarations of the selected element in the workspace" category="_mqG63XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqgjdnlKEeayFayxZTWxEg" elementId="org.eclipse.team.cvs.ui.checkout" commandName="Checkout from CVS" description="Checkout from CVS" category="_mqG633lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqgjd3lKEeayFayxZTWxEg" elementId="org.eclipse.wst.jsdt.ui.edit.text.java.open.super.implementation" commandName="Open Super Implementation" description="Open the Implementation in the Super Type" category="_mqGTy3lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqgjeHlKEeayFayxZTWxEg" elementId="org.eclipse.pde.ui.openPluginArtifact" commandName="Open Plug-in Artifact" description="Open a plug-in artifact in the manifest editor" category="_mqGTy3lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqgjeXlKEeayFayxZTWxEg" elementId="org.eclipse.wst.server.debug" commandName="Debug" description="Debug server" category="_mqGTzXlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqgjenlKEeayFayxZTWxEg" elementId="org.eclipse.ui.navigate.nextSubTab" commandName="Next Sub-Tab" description="Switch to the next sub-tab" category="_mqGTy3lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqgje3lKEeayFayxZTWxEg" elementId="org.eclipse.jdt.ui.edit.text.java.introduce.parameter" commandName="Introduce Parameter" description="Introduce a new method parameter based on the selected expression" category="_mqG613lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqgjfHlKEeayFayxZTWxEg" elementId="org.eclipse.mylyn.tasks.ui.command.addTaskRepository" commandName="Add Task Repository..." category="_mqGTynlKEeayFayxZTWxEg">
-    <parameters xmi:id="_mqgjfXlKEeayFayxZTWxEg" elementId="connectorKind" name="Repository Type"/>
-  </commands>
-  <commands xmi:id="_mqgjfnlKEeayFayxZTWxEg" elementId="org.eclipse.jdt.debug.ui.localJavaShortcut.run" commandName="Run Java Application" description="Run Java Application" category="_mqG63nlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqgjf3lKEeayFayxZTWxEg" elementId="org.eclipse.ui.edit.addTask" commandName="Add Task..." description="Add a task" category="_mqGTwnlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqgjgHlKEeayFayxZTWxEg" elementId="org.eclipse.wst.sse.ui.structure.select.enclosing" commandName="Select Enclosing Element" description="Expand selection to include enclosing element" category="_mqGTwnlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqgjgXlKEeayFayxZTWxEg" elementId="org.eclipse.wst.wsdl.ui.refactor.rename.element" commandName="Rename WSDL component" description="Renames WSDL component" category="_mqGTwnlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqgjgnlKEeayFayxZTWxEg" elementId="org.eclipse.ui.cheatsheets.openCheatSheet" commandName="Open Cheat Sheet" description="Open a Cheat Sheet." category="_mqG62XlKEeayFayxZTWxEg">
-    <parameters xmi:id="_mqgjg3lKEeayFayxZTWxEg" elementId="cheatSheetId" name="Identifier"/>
-  </commands>
-  <commands xmi:id="_mqgjhHlKEeayFayxZTWxEg" elementId="org.eclipse.mylyn.tasks.ui.viewSource.command" commandName="View Unformatted Text" category="_mqGTynlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqhKgHlKEeayFayxZTWxEg" elementId="org.eclipse.ui.edit.text.moveLineDown" commandName="Move Lines Down" description="Moves the selected lines down" category="_mqGTx3lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqhKgXlKEeayFayxZTWxEg" elementId="org.eclipse.wst.jsdt.ui.SourceView" commandName="JavaScript Declaration" description="Show the Declaration view" category="_mqGTwXlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqhKgnlKEeayFayxZTWxEg" elementId="org.eclipse.equinox.p2.ui.sdk.update" commandName="Check for Updates" category="_mqG67XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqhKg3lKEeayFayxZTWxEg" elementId="org.eclipse.pde.ui.searchTargetRepositories" commandName="Add Artifact to Target Platform" description="Add an artifact to your target platform" category="_mqG67XlKEeayFayxZTWxEg">
-    <parameters xmi:id="_mqhKhHlKEeayFayxZTWxEg" elementId="org.eclipse.pde.ui.searchTargetRepositories.term" name="The initial search pattern for the artifact search dialog"/>
-  </commands>
-  <commands xmi:id="_mqhKhXlKEeayFayxZTWxEg" elementId="org.eclipse.ui.edit.text.goto.textEnd" commandName="Text End" description="Go to the end of the text" category="_mqGTx3lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqhKhnlKEeayFayxZTWxEg" elementId="org.eclipse.jdt.ui.edit.text.java.goto.matching.bracket" commandName="Go to Matching Bracket" description="Moves the cursor to the matching bracket" category="_mqGTy3lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqhKh3lKEeayFayxZTWxEg" elementId="org.eclipse.ui.part.previousPage" commandName="Previous Page" description="Switch to the previous page" category="_mqGTy3lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqhKiHlKEeayFayxZTWxEg" elementId="org.eclipse.wst.jsdt.ui.edit.text.java.override.methods" commandName="Override/Implement Functions" description="Override or implement functions from super types" category="_mqGTyXlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqhKiXlKEeayFayxZTWxEg" elementId="org.eclipse.ui.project.closeProject" commandName="Close Project" description="Close the selected project" category="_mqG623lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqhKinlKEeayFayxZTWxEg" elementId="org.eclipse.wst.jsdt.ui.refactor.migrate.jar" commandName="Migrate JAR File" description="Migrate a JAR File to a new version" category="_mqG67nlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqhKi3lKEeayFayxZTWxEg" elementId="org.eclipse.wst.jsdt.ui.edit.text.java.open.editor" commandName="Open Declaration" description="Open an editor on the selected element" category="_mqGTy3lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqhKjHlKEeayFayxZTWxEg" elementId="org.eclipse.wst.server.publish" commandName="Publish" description="Publish to server" category="_mqGTzXlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqhKjXlKEeayFayxZTWxEg" elementId="org.eclipse.jdt.ui.edit.text.java.introduce.factory" commandName="Introduce Factory" description="Introduce a factory method to encapsulate invocation of the selected constructor" category="_mqG613lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqhKjnlKEeayFayxZTWxEg" elementId="org.eclipse.pde.ui.updateClasspath" commandName="Update Classpath" description="Updates the plug-in classpath from latest settings" category="_mqG67XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqhKj3lKEeayFayxZTWxEg" elementId="org.eclipse.egit.ui.commit.CherryPick" commandName="Cherry Pick" category="_mqG67XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqhKkHlKEeayFayxZTWxEg" elementId="org.eclipse.jdt.ui.edit.text.java.use.supertype" commandName="Use Supertype Where Possible" description="Change occurrences of a type to use a supertype instead" category="_mqG613lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqhKkXlKEeayFayxZTWxEg" elementId="org.eclipse.mylyn.tasks.ui.command.markTaskUnread" commandName="Mark Task Unread" category="_mqGTynlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqhKknlKEeayFayxZTWxEg" elementId="org.eclipse.search.ui.performTextSearchFile" commandName="Find Text in File" description="Searches the files in the file for specific text." category="_mqG63XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqhKk3lKEeayFayxZTWxEg" elementId="org.eclipse.wst.sse.ui.structure.select.last" commandName="Restore Last Selection" description="Restore last selection" category="_mqGTwnlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqhKlHlKEeayFayxZTWxEg" elementId="org.eclipse.wst.jsdt.ui.edit.text.java.sort.members" commandName="Sort Members" description="Sort all members using the member order preference" category="_mqGTyXlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqhKlXlKEeayFayxZTWxEg" elementId="org.eclipse.ui.edit.text.cut.line" commandName="Cut Line" description="Cut a line of text" category="_mqGTx3lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqhKlnlKEeayFayxZTWxEg" elementId="org.eclipse.ui.edit.text.folding.expand_all" commandName="Expand All" description="Expands all folded regions" category="_mqGTx3lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqhKl3lKEeayFayxZTWxEg" elementId="org.eclipse.wst.jsdt.ui.commands.showElementInPackageView" commandName="Show JavaScript Element in Script Explorer" description="Select JavaScript element in the Script Explorer view" category="_mqGTy3lKEeayFayxZTWxEg">
-    <parameters xmi:id="_mqhKmHlKEeayFayxZTWxEg" elementId="elementRef" name="JavaScript element reference" typeId="org.eclipse.wst.jsdt.ui.commands.javaElementReference" optional="false"/>
-  </commands>
-  <commands xmi:id="_mqhKmXlKEeayFayxZTWxEg" elementId="org.eclipse.wst.xsd.ui.refactor.makeElementGlobal" commandName="Make Local Element &amp;Global" description="Promotes local element to global level and replaces its references" category="_mqGTwnlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqhKmnlKEeayFayxZTWxEg" elementId="org.eclipse.jdt.ui.correction.encapsulateField.assist" commandName="Quick Assist - Create getter/setter for field" description="Invokes quick assist and selects 'Create getter/setter for field'" category="_mqG66HlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqhKm3lKEeayFayxZTWxEg" elementId="org.eclipse.ui.help.quickStartAction" commandName="Welcome" description="Show help for beginning users" category="_mqG62XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqhxkHlKEeayFayxZTWxEg" elementId="org.eclipse.ui.window.hideShowEditors" commandName="Toggle Editor Area Visibility" description="Toggles the visibility of the editor area" category="_mqG61XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqhxkXlKEeayFayxZTWxEg" elementId="org.eclipse.ui.edit.text.folding.restore" commandName="Reset Structure" description="Resets the folding structure" category="_mqGTx3lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqhxknlKEeayFayxZTWxEg" elementId="org.eclipse.help.ui.indexcommand" commandName="Index" description="Show Keyword Index" category="_mqG62XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqhxk3lKEeayFayxZTWxEg" elementId="org.eclipse.jdt.ui.edit.text.java.clean.up" commandName="Clean Up" description="Solve problems and improve code style on selected resources" category="_mqG66HlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqhxlHlKEeayFayxZTWxEg" elementId="org.eclipse.datatools.sqltools.sqleditor.GotoMatchingTokenAction" commandName="Goto Matching Token" category="_mqG64nlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqhxlXlKEeayFayxZTWxEg" elementId="org.eclipse.wst.jsdt.ui.edit.text.java.create.delegate.methods" commandName="Generate Delegate Functions" description="Add delegate functions for a type's vars" category="_mqGTyXlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqhxlnlKEeayFayxZTWxEg" elementId="org.eclipse.jdt.debug.ui.localJavaShortcut.debug" commandName="Debug Java Application" description="Debug Java Application" category="_mqG63nlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqhxl3lKEeayFayxZTWxEg" elementId="org.eclipse.ui.navigate.forward" commandName="Forward" description="Navigate forward" category="_mqGTy3lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqhxmHlKEeayFayxZTWxEg" elementId="org.eclipse.team.cvs.ui.tag" commandName="Tag as Version" description="Tag the resources with a CVS version tag" category="_mqG633lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqhxmXlKEeayFayxZTWxEg" elementId="org.eclipse.jpt.jpa.eclipselink.ui.convertJavaConverters" commandName="Move Java Converters to XML..." category="_mqG65nlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqhxmnlKEeayFayxZTWxEg" elementId="org.eclipse.wst.jsdt.ui.edit.text.java.select.last" commandName="Restore Last Selection" description="Restore last selection" category="_mqGTwnlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqhxm3lKEeayFayxZTWxEg" elementId="org.eclipse.jdt.ui.edit.text.remove.occurrence.annotations" commandName="Remove Occurrence Annotations" description="Removes the occurrence annotations from the current editor" category="_mqG66HlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqhxnHlKEeayFayxZTWxEg" elementId="org.eclipse.ui.window.pinEditor" commandName="Pin Editor" description="Pin the current editor" category="_mqG61XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqhxnXlKEeayFayxZTWxEg" elementId="org.eclipse.wst.jsdt.ui.edit.text.java.show.in.package.view" commandName="Show in Script Explorer" description="Show the selected element in the Script Explorer" category="_mqGTy3lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqiYoHlKEeayFayxZTWxEg" elementId="org.eclipse.ui.edit.text.goto.pageUp" commandName="Page Up" description="Go up one page" category="_mqGTx3lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqiYoXlKEeayFayxZTWxEg" elementId="org.eclipse.egit.ui.team.submodule.sync" commandName="Sync Submodule" category="_mqG64XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqiYonlKEeayFayxZTWxEg" elementId="org.eclipse.egit.ui.team.DeleteBranch" commandName="Delete Branch" category="_mqG64XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqiYo3lKEeayFayxZTWxEg" elementId="org.eclipse.ui.edit.text.goto.columnPrevious" commandName="Previous Column" description="Go to the previous column" category="_mqGTx3lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqiYpHlKEeayFayxZTWxEg" elementId="org.eclipse.compare.selectNextChange" commandName="Select Next Change" description="Select Next Change" category="_mqG603lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqiYpXlKEeayFayxZTWxEg" elementId="org.eclipse.wst.jsdt.ui.correction.splitJoinVariableDeclaration.assist" commandName="Quick Assist - Split/Join variable declaration" description="Invokes quick assist and selects 'Split/Join variable declaration'" category="_mqGTyXlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqiYpnlKEeayFayxZTWxEg" elementId="org.eclipse.wst.jsdt.ui.correction.assignParamToField.assist" commandName="Quick Assist - Assign parameter to var" description="Invokes quick assist and selects 'Assign parameter to var'" category="_mqGTyXlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqiYp3lKEeayFayxZTWxEg" elementId="org.eclipse.ltk.ui.refactoring.commands.renameResource" commandName="Rename Resource" description="Rename the selected resource and notify LTK participants." category="_mqG65HlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqiYqHlKEeayFayxZTWxEg" elementId="org.eclipse.pde.ui.importFromRepository" commandName="Import Plug-in from a Repository" description="Imports a plug-in from a source repository" category="_mqG67XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqiYqXlKEeayFayxZTWxEg" elementId="org.eclipse.egit.ui.team.Rebase" commandName="Rebase" category="_mqG64XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqiYqnlKEeayFayxZTWxEg" elementId="org.eclipse.mylyn.tasks.ui.command.previousTask" commandName="Previous Task Command" category="_mqG67XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqiYq3lKEeayFayxZTWxEg" elementId="org.eclipse.ui.file.properties" commandName="Properties" description="Display the properties of the selected item" category="_mqG60nlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqiYrHlKEeayFayxZTWxEg" elementId="org.eclipse.wst.jsdt.ui.edit.text.java.copy.qualified.name" commandName="Copy Qualified Name" description="Copy a fully qualified name to the system clipboard" category="_mqGTyXlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqiYrXlKEeayFayxZTWxEg" elementId="org.eclipse.egit.ui.team.ReplaceWithHead" commandName="Replace with HEAD revision" category="_mqG64XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqiYrnlKEeayFayxZTWxEg" elementId="org.eclipse.jdt.ui.correction.renameInFile.assist" commandName="Quick Assist - Rename in file" description="Invokes quick assist and selects 'Rename in file'" category="_mqG66HlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqi_sHlKEeayFayxZTWxEg" elementId="org.eclipse.wst.jsdt.ui.edit.text.java.search.references.in.hierarchy" commandName="References in Hierarchy" description="Search for references of the selected element in its hierarchy" category="_mqG63XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqi_sXlKEeayFayxZTWxEg" elementId="org.eclipse.ui.activeContextInfo" commandName="Show activeContext Info" category="_mqG61XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqi_snlKEeayFayxZTWxEg" elementId="org.eclipse.mylyn.tasks.ui.command.markTaskReadGoToPreviousUnread" commandName="Mark Task Read and Go To Previous Unread Task" category="_mqGTynlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqi_s3lKEeayFayxZTWxEg" elementId="org.eclipse.wst.jsdt.ui.edit.text.java.open.call.hierarchy" commandName="Open Call Hierarchy" description="Open a call hierarchy on the selected element" category="_mqGTy3lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqi_tHlKEeayFayxZTWxEg" elementId="org.eclipse.jdt.ui.edit.text.java.extract.constant" commandName="Extract Constant" description="Extracts a constant into a new static field and uses the new static field" category="_mqG613lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqi_tXlKEeayFayxZTWxEg" elementId="org.eclipse.ui.edit.text.select.textStart" commandName="Select Text Start" description="Select to the beginning of the text" category="_mqGTx3lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqi_tnlKEeayFayxZTWxEg" elementId="org.eclipse.wst.sse.ui.cleanup.document" commandName="Cleanup Document..." description="Cleanup document" category="_mqGTwnlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqi_t3lKEeayFayxZTWxEg" elementId="org.eclipse.egit.ui.team.ConfigurePush" commandName="Configure Upstream Push" category="_mqG64XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqi_uHlKEeayFayxZTWxEg" elementId="org.eclipse.egit.ui.RepositoriesViewAddToIndex" commandName="Add to Index" category="_mqG64XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqi_uXlKEeayFayxZTWxEg" elementId="org.eclipse.debug.ui.command.nextpage" commandName="Next Page of Memory" description="Load next page of memory" category="_mqG63nlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqi_unlKEeayFayxZTWxEg" elementId="org.eclipse.debug.ui.command.gotoaddress" commandName="Go to Address" description="Go to Address" category="_mqG63nlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqi_u3lKEeayFayxZTWxEg" elementId="org.eclipse.ui.window.maximizePart" commandName="Maximize Active View or Editor" description="Toggles maximize/restore state of active view or editor" category="_mqG61XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqi_vHlKEeayFayxZTWxEg" elementId="org.eclipse.jdt.ui.correction.qualifyField" commandName="Quick Fix - Qualify field access" description="Invokes quick assist and selects 'Qualify field access'" category="_mqG66HlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqi_vXlKEeayFayxZTWxEg" elementId="org.eclipse.ui.window.newEditor" commandName="New Editor" description="Open another editor on the active editor's input" category="_mqG61XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqjmwHlKEeayFayxZTWxEg" elementId="org.eclipse.wst.sse.ui.format" commandName="Format" category="_mqG67XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqjmwXlKEeayFayxZTWxEg" elementId="org.eclipse.search.ui.openSearchDialog" commandName="Open Search Dialog" description="Open the Search dialog" category="_mqG63XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqjmwnlKEeayFayxZTWxEg" elementId="org.eclipse.ui.edit.text.contentAssist.proposals" commandName="Content Assist" description="Content Assist" category="_mqGTwnlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqjmw3lKEeayFayxZTWxEg" elementId="org.eclipse.wst.jsdt.ui.edit.text.java.externalize.strings" commandName="Externalize Strings" description="Finds all strings that are not externalized and moves them into a separate property file" category="_mqGTyXlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqjmxHlKEeayFayxZTWxEg" elementId="org.eclipse.ui.navigate.up" commandName="Up" description="Navigate up one level" category="_mqGTy3lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqjmxXlKEeayFayxZTWxEg" elementId="org.eclipse.ui.window.activateEditor" commandName="Activate Editor" description="Activate the editor" category="_mqG61XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqjmxnlKEeayFayxZTWxEg" elementId="org.eclipse.m2e.core.ui.command.addPlugin" commandName="Add Maven Plugin" description="Add Maven Plugin" category="_mqGTwnlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqjmx3lKEeayFayxZTWxEg" elementId="sed.tabletree.expandAll" commandName="Expand All" category="_mqG67XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqjmyHlKEeayFayxZTWxEg" elementId="org.eclipse.jdt.ui.edit.text.java.modify.method.parameters" commandName="Change Method Signature" description="Change method signature includes parameter names and parameter order" category="_mqG613lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqjmyXlKEeayFayxZTWxEg" elementId="org.eclipse.ui.edit.text.delete.line.to.end" commandName="Delete to End of Line" description="Delete to the end of a line of text" category="_mqGTx3lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqjmynlKEeayFayxZTWxEg" elementId="org.eclipse.egit.ui.commit.CreateBranch" commandName="Create Branch..." category="_mqG67XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqjmy3lKEeayFayxZTWxEg" elementId="org.eclipse.jdt.ui.correction.extractLocal.assist" commandName="Quick Assist - Extract local variable (replace all occurrences)" description="Invokes quick assist and selects 'Extract local variable (replace all occurrences)'" category="_mqG66HlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqjmzHlKEeayFayxZTWxEg" elementId="org.eclipse.debug.ui.commands.Terminate" commandName="Terminate" description="Terminate" category="_mqG63nlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqjmzXlKEeayFayxZTWxEg" elementId="org.eclipse.egit.ui.team.ShowRepositoriesView" commandName="Show Git Repositories View" category="_mqG64XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqjmznlKEeayFayxZTWxEg" elementId="org.eclipse.help.ui.ignoreMissingPlaceholders" commandName="Do not warn of missing documentation" description="Sets the help preferences to no longer report a warning about the current set of missing documents." category="_mqG62XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqjmz3lKEeayFayxZTWxEg" elementId="org.eclipse.compare.compareWithOther" commandName="Compare With Other Resource" description="Compare resources, clipboard contents or editors" category="_mqG603lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqjm0HlKEeayFayxZTWxEg" elementId="org.eclipse.wst.jsdt.ui.edit.text.java.open.external.javadoc" commandName="Open External JSDoc" description="Open the JSDoc of the selected element in an external browser" category="_mqGTy3lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqjm0XlKEeayFayxZTWxEg" elementId="org.eclipse.egit.ui.team.CreatePatch" commandName="Create Patch" category="_mqG64XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqjm0nlKEeayFayxZTWxEg" elementId="org.eclipse.ui.editors.revisions.author.toggle" commandName="Toggle Revision Author Display" description="Toggles the display of the revision author" category="_mqGTx3lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqjm03lKEeayFayxZTWxEg" elementId="org.eclipse.ui.edit.text.goto.windowEnd" commandName="Window End" description="Go to the end of the window" category="_mqGTx3lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqjm1HlKEeayFayxZTWxEg" elementId="org.eclipse.jpt.jpa.eclipselink.ui.persistentTypeAddVirtualAttribute" commandName="Add Virtual Attribute..." category="_mqG66XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqjm1XlKEeayFayxZTWxEg" elementId="org.eclipse.ui.perspectives.showPerspective" commandName="Show Perspective" description="Show a particular perspective" category="_mqG643lKEeayFayxZTWxEg">
-    <parameters xmi:id="_mqkN0HlKEeayFayxZTWxEg" elementId="org.eclipse.ui.perspectives.showPerspective.perspectiveId" name="Parameter"/>
-    <parameters xmi:id="_mqkN0XlKEeayFayxZTWxEg" elementId="org.eclipse.ui.perspectives.showPerspective.newWindow" name="In New Window"/>
-  </commands>
-  <commands xmi:id="_mqkN0nlKEeayFayxZTWxEg" elementId="org.eclipse.jpt.jpa.eclipselink.ui.newDynamicEntity" commandName="EclipseLink Dynamic Entity" category="_mqG67XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqkN03lKEeayFayxZTWxEg" elementId="org.eclipse.ui.edit.text.goto.line" commandName="Go to Line" description="Go to a specified line of text" category="_mqGTy3lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqkN1HlKEeayFayxZTWxEg" elementId="org.eclipse.ui.editors.quickdiff.revert" commandName="Revert Lines" description="Revert the current selection, block or deleted lines" category="_mqGTx3lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqkN1XlKEeayFayxZTWxEg" elementId="org.eclipse.wst.jsdt.ui.edit.text.java.search.implement.occurrences" commandName="Search Implement Occurrences in File" description="Search for implement occurrences of a selected type" category="_mqG63XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqkN1nlKEeayFayxZTWxEg" elementId="org.eclipse.jdt.debug.ui.javaAppletShortcut.debug" commandName="Debug Java Applet" description="Debug Java Applet" category="_mqG63nlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqkN13lKEeayFayxZTWxEg" elementId="org.eclipse.wst.xml.ui.gotoMatchingTag" commandName="Matching Tag" description="Go to Matching Tag" category="_mqGTwnlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqkN2HlKEeayFayxZTWxEg" elementId="org.eclipse.ui.edit.text.select.lineUp" commandName="Select Line Up" description="Extend the selection to the previous line of text" category="_mqGTx3lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqkN2XlKEeayFayxZTWxEg" elementId="org.eclipse.datatools.sqltools.sqleditor.saveToDatabaseAction" commandName="Save to Database" category="_mqG64nlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqkN2nlKEeayFayxZTWxEg" elementId="org.eclipse.egit.ui.team.submodule.add" commandName="Add Submodule" category="_mqG64XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqkN23lKEeayFayxZTWxEg" elementId="org.eclipse.ui.edit.text.cut.line.to.end" commandName="Cut to End of Line" description="Cut to the end of a line of text" category="_mqGTx3lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqkN3HlKEeayFayxZTWxEg" elementId="org.eclipse.jdt.ui.correction.convertAnonymousToLocal.assist" commandName="Quick Assist - Convert anonymous to local class" description="Invokes quick assist and selects 'Convert anonymous to local class'" category="_mqG66HlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqkN3XlKEeayFayxZTWxEg" elementId="org.eclipse.compare.copyLeftToRight" commandName="Copy from Left to Right" description="Copy Current Change from Left to Right" category="_mqG603lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqkN3nlKEeayFayxZTWxEg" elementId="org.eclipse.ui.project.openProject" commandName="Open Project" description="Open a project" category="_mqG623lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqkN33lKEeayFayxZTWxEg" elementId="org.eclipse.egit.ui.history.ShowBlame" commandName="Show Annotations" category="_mqG67XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqkN4HlKEeayFayxZTWxEg" elementId="org.eclipse.egit.ui.org.eclipse.egit.ui.AbortRebase" commandName="Abort Rebase" category="_mqG64XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqkN4XlKEeayFayxZTWxEg" elementId="org.eclipse.jdt.ui.correction.addSuppressWarnings" commandName="Quick Fix - Add @SuppressWarnings" description="Invokes quick fix and selects 'Add @SuppressWarnings' " category="_mqG66HlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqkN4nlKEeayFayxZTWxEg" elementId="org.eclipse.jpt.jpa.ui.persistentAttributeAddToXml" commandName="Add Attribute to XML" category="_mqG66XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqkN43lKEeayFayxZTWxEg" elementId="org.eclipse.wst.jsdt.ui.edit.text.java.push.down" commandName="Push Down" description="Move members to subclasses" category="_mqG67nlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqkN5HlKEeayFayxZTWxEg" elementId="org.eclipse.jdt.ui.edit.text.java.search.write.access.in.project" commandName="Write Access in Project" description="Search for write references to the selected element in the enclosing project" category="_mqG63XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqk04HlKEeayFayxZTWxEg" elementId="org.eclipse.ui.project.properties" commandName="Properties" description="Display the properties of the selected item's project " category="_mqG623lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqk04XlKEeayFayxZTWxEg" elementId="org.eclipse.egit.ui.history.CompareVersionsInTree" commandName="Compare in Tree" category="_mqG67XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqk04nlKEeayFayxZTWxEg" elementId="org.eclipse.jpt.jpa.ui.persistentTypeMapAs" commandName="Map As" category="_mqG66XlKEeayFayxZTWxEg">
-    <parameters xmi:id="_mqk043lKEeayFayxZTWxEg" elementId="persistentTypeMappingKey" name="mapping key" optional="false"/>
-  </commands>
-  <commands xmi:id="_mqk05HlKEeayFayxZTWxEg" elementId="org.eclipse.datatools.sqltools.sqleditor.DMLDialogSelectionAction" commandName="Edit in SQL Query Builder..." category="_mqG64nlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqk05XlKEeayFayxZTWxEg" elementId="org.eclipse.ui.edit.text.select.columnPrevious" commandName="Select Previous Column" description="Select the previous column" category="_mqGTx3lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqk05nlKEeayFayxZTWxEg" elementId="org.eclipse.jpt.dbws.ui.generateDbws" commandName="Generate Database Web Services" category="_mqG67XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqk053lKEeayFayxZTWxEg" elementId="org.eclipse.pde.ui.junitWorkbenchShortcut.debug" commandName="Debug JUnit Plug-in Test" description="Debug JUnit Plug-in Test" category="_mqG63nlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqk06HlKEeayFayxZTWxEg" elementId="org.eclipse.jdt.ui.correction.extractLocalNotReplaceOccurrences.assist" commandName="Quick Assist - Extract local variable" description="Invokes quick assist and selects 'Extract local variable'" category="_mqG66HlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqk06XlKEeayFayxZTWxEg" elementId="org.eclipse.datatools.sqltools.sqleditor.attachProfileAction" commandName="Set Connection Information" category="_mqG64nlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqk06nlKEeayFayxZTWxEg" elementId="org.eclipse.egit.ui.RepositoriesToggleBranchHierarchy" commandName="Toggle Branch Representation" category="_mqG64XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqk063lKEeayFayxZTWxEg" elementId="org.eclipse.ltk.ui.refactoring.commands.deleteResources" commandName="Delete Resources" description="Delete the selected resources and notify LTK participants." category="_mqG65HlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqk07HlKEeayFayxZTWxEg" elementId="org.eclipse.ui.file.print" commandName="Print" description="Print" category="_mqG60nlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqk07XlKEeayFayxZTWxEg" elementId="org.eclipse.jdt.debug.ui.commands.AllReferences" commandName="All References" description="Inspect all references to the selected object" category="_mqG63nlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqk07nlKEeayFayxZTWxEg" elementId="org.eclipse.jdt.junit.junitShortcut.rerunLast" commandName="Rerun JUnit Test" description="Rerun JUnit Test" category="_mqG63nlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqk073lKEeayFayxZTWxEg" elementId="org.eclipse.wst.sse.ui.format.active.elements" commandName="Format Active Elements" description="Format active elements" category="_mqGTwnlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqk08HlKEeayFayxZTWxEg" elementId="org.eclipse.datatools.connectivity.commands.import" commandName="Import Profiles Command" description="Command to import connection profiles" category="_mqG67XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqk08XlKEeayFayxZTWxEg" elementId="org.eclipse.ui.edit.text.showRulerContextMenu" commandName="Show Ruler Context Menu" description="Show the context menu for the ruler" category="_mqG61XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqk08nlKEeayFayxZTWxEg" elementId="org.eclipse.jdt.ui.edit.text.java.search.references.in.working.set" commandName="References in Working Set" description="Search for references to the selected element in a working set" category="_mqG63XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqk083lKEeayFayxZTWxEg" elementId="org.eclipse.mylyn.tasks.ui.command.task.clearOutgoing" commandName="Clear Outgoing Changes" category="_mqGTynlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqlb8HlKEeayFayxZTWxEg" elementId="org.eclipse.ui.edit.text.folding.collapse" commandName="Collapse" description="Collapses the folded region at the current selection" category="_mqGTx3lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqlb8XlKEeayFayxZTWxEg" elementId="org.eclipse.ui.edit.text.smartEnterInverse" commandName="Insert Line Above Current Line" description="Adds a new line above the current line" category="_mqGTx3lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqlb8nlKEeayFayxZTWxEg" elementId="org.eclipse.ui.window.spy" commandName="Show Contributing Plug-in" description="Shows contribution information for the currently selected element" category="_mqG61XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqlb83lKEeayFayxZTWxEg" elementId="org.eclipse.ui.help.helpSearch" commandName="Help Search" description="Open the help search" category="_mqG62XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqlb9HlKEeayFayxZTWxEg" elementId="org.eclipse.jdt.ui.edit.text.java.infer.type.arguments" commandName="Infer Generic Type Arguments" description="Infer type arguments for references to generic classes and remove unnecessary casts" category="_mqG613lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqlb9XlKEeayFayxZTWxEg" elementId="org.eclipse.ui.edit.text.goto.lineDown" commandName="Line Down" description="Go down one line of text" category="_mqGTx3lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqlb9nlKEeayFayxZTWxEg" elementId="org.eclipse.egit.ui.commit.Checkout" commandName="Checkout" category="_mqG67XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqlb93lKEeayFayxZTWxEg" elementId="org.eclipse.m2e.actions.LifeCycleClean.run" commandName="Run Maven Clean" description="Run Maven Clean" category="_mqG63nlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqlb-HlKEeayFayxZTWxEg" elementId="org.eclipse.ui.edit.text.gotoLastEditPosition" commandName="Last Edit Location" description="Last edit location" category="_mqGTy3lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqlb-XlKEeayFayxZTWxEg" elementId="org.eclipse.ui.edit.text.open.hyperlink" commandName="Open Hyperlink" description="Opens the hyperlink at the caret location or opens a chooser if more than one hyperlink is available" category="_mqGTx3lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqlb-nlKEeayFayxZTWxEg" elementId="org.eclipse.mylyn.wikitext.ui.convertToEclipseHelpCommand" commandName="Generate Eclipse Help (*.html and *-toc.xml)" category="_mqG67XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqlb-3lKEeayFayxZTWxEg" elementId="org.eclipse.wst.jsdt.ui.edit.text.java.search.exception.occurrences" commandName="Search Exception Occurrences in File" description="Search for exception occurrences of a selected exception type" category="_mqG63XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqlb_HlKEeayFayxZTWxEg" elementId="org.eclipse.debug.ui.command.prevpage" commandName="Previous Page of Memory" description="Load previous page of memory" category="_mqG63nlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqlb_XlKEeayFayxZTWxEg" elementId="org.eclipse.jdt.debug.ui.commands.ForceReturn" commandName="Force Return" description="Forces return from method with value of selected expression " category="_mqG63nlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqlb_nlKEeayFayxZTWxEg" elementId="org.eclipse.ui.ide.configureFilters" commandName="Configure Contents..." description="Configure the filters to apply to the markers view" category="_mqG67XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqlb_3lKEeayFayxZTWxEg" elementId="org.eclipse.ui.navigate.previousTab" commandName="Previous Tab" description="Switch to the previous tab" category="_mqGTy3lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqlcAHlKEeayFayxZTWxEg" elementId="org.eclipse.wst.jsdt.ui.edit.text.java.search.declarations.in.hierarchy" commandName="Declaration in Hierarchy" description="Search for declarations of the selected element in its hierarchy" category="_mqG63XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqlcAXlKEeayFayxZTWxEg" elementId="org.eclipse.ui.dialogs.openMessageDialog" commandName="Open Message Dialog" description="Open a Message Dialog" category="_mqG64HlKEeayFayxZTWxEg">
-    <parameters xmi:id="_mqlcAnlKEeayFayxZTWxEg" elementId="title" name="Title"/>
-    <parameters xmi:id="_mqlcA3lKEeayFayxZTWxEg" elementId="message" name="Message"/>
-    <parameters xmi:id="_mqmDAHlKEeayFayxZTWxEg" elementId="imageType" name="Image Type Constant" typeId="org.eclipse.ui.dialogs.Integer"/>
-    <parameters xmi:id="_mqmDAXlKEeayFayxZTWxEg" elementId="defaultIndex" name="Default Button Index" typeId="org.eclipse.ui.dialogs.Integer"/>
-    <parameters xmi:id="_mqmDAnlKEeayFayxZTWxEg" elementId="buttonLabel0" name="First Button Label"/>
-    <parameters xmi:id="_mqmDA3lKEeayFayxZTWxEg" elementId="buttonLabel1" name="Second Button Label"/>
-    <parameters xmi:id="_mqmDBHlKEeayFayxZTWxEg" elementId="buttonLabel2" name="Third Button Label"/>
-    <parameters xmi:id="_mqmDBXlKEeayFayxZTWxEg" elementId="buttonLabel3" name="Fourth Button Label"/>
-    <parameters xmi:id="_mqmDBnlKEeayFayxZTWxEg" elementId="cancelReturns" name="Return Value on Cancel"/>
-  </commands>
-  <commands xmi:id="_mqmDB3lKEeayFayxZTWxEg" elementId="org.eclipse.ui.edit.text.goto.lineEnd" commandName="Line End" description="Go to the end of the line of text" category="_mqGTx3lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqmDCHlKEeayFayxZTWxEg" elementId="org.eclipse.egit.ui.commit.CreateTag" commandName="Create Tag..." category="_mqG67XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqmDCXlKEeayFayxZTWxEg" elementId="org.eclipse.wst.jsdt.ui.edit.text.java.extract.method" commandName="Extract Function" description="Extract a set of statements or an expression into a new function and use the new function" category="_mqG67nlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqmDCnlKEeayFayxZTWxEg" elementId="org.eclipse.jpt.jpa.ui.generateDDL" commandName="Generate Tables from Entities..." category="_mqG67XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqmDC3lKEeayFayxZTWxEg" elementId="org.eclipse.wst.xml.ui.referencedFileErrors" commandName="Show Details..." description="Show Details..." category="_mqG67XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqmDDHlKEeayFayxZTWxEg" elementId="org.eclipse.datatools.sqltools.sqleditor.runAction" commandName="Run" category="_mqG64nlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqmDDXlKEeayFayxZTWxEg" elementId="org.eclipse.debug.ui.commands.RunLast" commandName="Run" description="Launch in run mode" category="_mqG63nlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqmDDnlKEeayFayxZTWxEg" elementId="org.eclipse.team.cvs.ui.add" commandName="Add to Version Control" description="Add the Selected Resources to Version Control" category="_mqG633lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqmDD3lKEeayFayxZTWxEg" elementId="org.eclipse.ui.externalTools.commands.OpenExternalToolsConfigurations" commandName="External Tools..." description="Open external tools launch configuration dialog" category="_mqG63nlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqmDEHlKEeayFayxZTWxEg" elementId="org.eclipse.jdt.debug.ui.command.OpenFromClipboard" commandName="Open from Clipboard" description="Opens a Java element or a Java stack trace from clipboard" category="_mqGTy3lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqmDEXlKEeayFayxZTWxEg" elementId="org.eclipse.pde.ui.internationalize" commandName="Internationalize Plug-ins" description="Sets up internationalization for a plug-in" category="_mqG67XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqmDEnlKEeayFayxZTWxEg" elementId="org.eclipse.ui.edit.text.deletePrevious" commandName="Delete Previous" description="Delete the previous character" category="_mqGTx3lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqmDE3lKEeayFayxZTWxEg" elementId="org.eclipse.egit.ui.team.CompareWithPrevious" commandName="Compare with Previous Revision" category="_mqG64XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqmDFHlKEeayFayxZTWxEg" elementId="org.eclipse.ui.edit.text.select.columnNext" commandName="Select Next Column" description="Select the next column" category="_mqGTx3lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqmqEHlKEeayFayxZTWxEg" elementId="org.eclipse.jdt.ui.edit.text.java.search.read.access.in.workspace" commandName="Read Access in Workspace" description="Search for read references to the selected element in the workspace" category="_mqG63XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqmqEXlKEeayFayxZTWxEg" elementId="org.eclipse.wst.jsdt.ui.edit.text.java.search.implementors.in.workspace" commandName="Implementors in Workspace" description="Search for implementors of the selected interface" category="_mqG63XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqmqEnlKEeayFayxZTWxEg" elementId="org.eclipse.debug.ui.commands.TerminateAndRelaunch" commandName="Terminate and Relaunch" description="Terminate and Relaunch" category="_mqG63nlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqmqE3lKEeayFayxZTWxEg" elementId="org.eclipse.jdt.ui.JavaHierarchyPerspective" commandName="Java Type Hierarchy" description="Show the Java Type Hierarchy perspective" category="_mqG643lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqmqFHlKEeayFayxZTWxEg" elementId="org.eclipse.team.cvs.ui.replace" commandName="Replace With Latest from Repository" description="Replace with last committed content from CVS Server" category="_mqG633lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqmqFXlKEeayFayxZTWxEg" elementId="org.eclipse.wst.jsdt.ui.edit.text.java.search.declarations.in.project" commandName="Declaration in Project" description="Search for declarations of the selected element in the enclosing project" category="_mqG63XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqmqFnlKEeayFayxZTWxEg" elementId="org.eclipse.jdt.ui.edit.text.java.surround.with.try.multicatch" commandName="Surround with try/multi-catch Block" description="Surround the selected text with a try/multi-catch block" category="_mqG66HlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqmqF3lKEeayFayxZTWxEg" elementId="org.eclipse.egit.ui.team.Tag" commandName="Tag" category="_mqG64XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqmqGHlKEeayFayxZTWxEg" elementId="org.eclipse.egit.ui.team.NoAssumeUnchanged" commandName="No Assume Unchanged" category="_mqG64XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqmqGXlKEeayFayxZTWxEg" elementId="org.eclipse.wst.jsdt.ui.JavadocView" commandName="Documentation" description="Show the JavaScript Documentation view" category="_mqGTwXlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqmqGnlKEeayFayxZTWxEg" elementId="org.eclipse.debug.ui.commands.RemoveAllBreakpoints" commandName="Remove All Breakpoints" description="Removes all breakpoints" category="_mqG63nlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqmqG3lKEeayFayxZTWxEg" elementId="org.eclipse.ui.window.showKeyAssist" commandName="Show Key Assist" description="Show the key assist dialog" category="_mqG61XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqmqHHlKEeayFayxZTWxEg" elementId="org.eclipse.jdt.ui.edit.text.java.introduce.parameter.object" commandName="Introduce Parameter Object" description="Introduce a parameter object to a selected method" category="_mqG613lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqnRIHlKEeayFayxZTWxEg" elementId="org.eclipse.gef.zoom_out" commandName="Zoom Out" description="Zoom Out" category="_mqG65XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqnRIXlKEeayFayxZTWxEg" elementId="org.eclipse.jdt.ui.commands.openElementInEditor" commandName="Open Java Element" description="Open a Java element in its editor" category="_mqGTy3lKEeayFayxZTWxEg">
-    <parameters xmi:id="_mqnRInlKEeayFayxZTWxEg" elementId="elementRef" name="Java element reference" typeId="org.eclipse.jdt.ui.commands.javaElementReference" optional="false"/>
-  </commands>
-  <commands xmi:id="_mqnRI3lKEeayFayxZTWxEg" elementId="org.eclipse.rse.terminals.ui.actions.LaunchTerminalCommand" commandName="Launch Terminal " category="_mqG61HlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqnRJHlKEeayFayxZTWxEg" elementId="org.eclipse.wst.jsdt.ui.edit.text.java.uncomment" commandName="Uncomment" description="Uncomment the selected JavaScript comment lines" category="_mqGTyXlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqnRJXlKEeayFayxZTWxEg" elementId="org.eclipse.datatools.sqltools.result.removeInstance" commandName="Remove Result" category="_mqG62nlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqnRJnlKEeayFayxZTWxEg" elementId="org.eclipse.egit.ui.team.AddToIndex" commandName="Add to Git Index" category="_mqG64XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqnRJ3lKEeayFayxZTWxEg" elementId="org.eclipse.mylyn.discovery.ui.discoveryWizardCommand" commandName="Discovery Wizard" description="shows the connector discovery wizard" category="_mqG67XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqnRKHlKEeayFayxZTWxEg" elementId="org.eclipse.wst.jsdt.ui.edit.text.java.search.read.access.in.working.set" commandName="Read Access in Working Set" description="Search for read references to the selected element in a working set" category="_mqG63XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqnRKXlKEeayFayxZTWxEg" elementId="org.eclipse.jpt.jpa.ui.persistentAttributeAddToXmlAndMap" commandName="Add Attribute to XML and Map..." category="_mqG66XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqnRKnlKEeayFayxZTWxEg" elementId="org.eclipse.wst.sse.ui.toggle.comment" commandName="Toggle Comment" description="Toggle Comment" category="_mqGTwnlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqnRK3lKEeayFayxZTWxEg" elementId="org.eclipse.ui.help.tipsAndTricksAction" commandName="Tips and Tricks" description="Open the tips and tricks help page" category="_mqG62XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqn4MHlKEeayFayxZTWxEg" elementId="org.eclipse.jdt.ui.edit.text.java.format" commandName="Format" description="Format the selected text" category="_mqG66HlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqn4MXlKEeayFayxZTWxEg" elementId="org.eclipse.ui.edit.text.smartEnter" commandName="Insert Line Below Current Line" description="Adds a new line below the current line" category="_mqGTx3lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqn4MnlKEeayFayxZTWxEg" elementId="org.eclipse.wst.jsdt.ui.edit.text.java.select.previous" commandName="Select Previous Element" description="Expand selection to include previous sibling" category="_mqGTwnlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqn4M3lKEeayFayxZTWxEg" elementId="org.eclipse.ui.edit.text.goto.lineStart" commandName="Line Start" description="Go to the start of the line of text" category="_mqGTx3lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqn4NHlKEeayFayxZTWxEg" elementId="org.eclipse.wst.xml.ui.cmnd.contentmodel.sych" commandName="Synch" category="_mqG67XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqn4NXlKEeayFayxZTWxEg" elementId="org.eclipse.egit.ui.RepositoriesViewConfigureBranch" commandName="Configure Branch" category="_mqG64XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqn4NnlKEeayFayxZTWxEg" elementId="org.eclipse.debug.ui.commands.Suspend" commandName="Suspend" description="Suspend" category="_mqG63nlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqn4N3lKEeayFayxZTWxEg" elementId="org.eclipse.ui.edit.text.hippieCompletion" commandName="Word Completion" description="Context insensitive completion" category="_mqGTwnlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqn4OHlKEeayFayxZTWxEg" elementId="org.eclipse.wst.xsd.ui.refactor.renameTargetNamespace" commandName="Rename Target Namespace" description="Changes the target namespace of the schema" category="_mqGTwnlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqn4OXlKEeayFayxZTWxEg" elementId="org.eclipse.jdt.ui.edit.text.java.folding.collapseComments" commandName="Collapse Comments" description="Collapse all comments" category="_mqGTx3lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqofQHlKEeayFayxZTWxEg" elementId="org.eclipse.team.ui.synchronizeLast" commandName="Repeat last synchronization" description="Repeat the last synchronization" category="_mqGTwHlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqofQXlKEeayFayxZTWxEg" elementId="org.eclipse.jdt.ui.generate.javadoc" commandName="Generate Javadoc" description="Generates Javadoc for a selectable set of Java resources" category="_mqG623lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqofQnlKEeayFayxZTWxEg" elementId="org.eclipse.egit.ui.RepositoriesViewConfigureGerritRemote" commandName="Gerrit Configuration..." category="_mqG64XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqofQ3lKEeayFayxZTWxEg" elementId="org.eclipse.jdt.debug.ui.commands.StepIntoSelection" commandName="Step Into Selection" description="Step into the current selected statement" category="_mqG63nlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqofRHlKEeayFayxZTWxEg" elementId="org.eclipse.ui.ide.configureColumns" commandName="Configure Columns..." description="Configure the columns in the markers view" category="_mqG67XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqofRXlKEeayFayxZTWxEg" elementId="org.eclipse.egit.ui.team.ReplaceWithCommit" commandName="Replace with commit" category="_mqG64XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqofRnlKEeayFayxZTWxEg" elementId="org.eclipse.jst.pagedesigner.design" commandName="Graphical Designer" category="_mqGTw3lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqofR3lKEeayFayxZTWxEg" elementId="org.eclipse.debug.ui.commands.DebugLast" commandName="Debug" description="Launch in debug mode" category="_mqG63nlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqofSHlKEeayFayxZTWxEg" elementId="org.eclipse.mylyn.wikitext.ui.convertToHtmlCommand" commandName="Generate HTML" category="_mqG67XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqofSXlKEeayFayxZTWxEg" elementId="org.eclipse.pde.ui.openManifest" commandName="Open Manifest" description="Open the plug-in manifest" category="_mqGTy3lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqofSnlKEeayFayxZTWxEg" elementId="org.eclipse.ui.window.previousView" commandName="Previous View" description="Switch to the previous view" category="_mqG61XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqofS3lKEeayFayxZTWxEg" elementId="org.eclipse.team.cvs.ui.replaceWithBase" commandName="Revert to Base" description="Revert to Base revisions" category="_mqG633lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqofTHlKEeayFayxZTWxEg" elementId="org.eclipse.wst.jsdt.ui.edit.text.java.self.encapsulate.field" commandName="Encapsulate Var" description="Create getting and setting functions for the var and use only those to access the var" category="_mqG67nlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqpGUHlKEeayFayxZTWxEg" elementId="org.eclipse.jdt.ui.edit.text.java.generate.tostring" commandName="Generate toString()" description="Generates the toString() method for the type" category="_mqG66HlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqpGUXlKEeayFayxZTWxEg" elementId="org.eclipse.jdt.ui.edit.text.java.organize.imports" commandName="Organize Imports" description="Evaluate all required imports and replace the current imports" category="_mqG66HlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqpGUnlKEeayFayxZTWxEg" elementId="org.eclipse.debug.ui.commands.DropToFrame" commandName="Drop to Frame" description="Drop to Frame" category="_mqG63nlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqpGU3lKEeayFayxZTWxEg" elementId="org.eclipse.wst.jsdt.ui.edit.text.java.promote.local.variable" commandName="Convert Local Variable to Var" description="Convert a local variable to a var" category="_mqG67nlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqpGVHlKEeayFayxZTWxEg" elementId="org.eclipse.pde.ui.imagebrowser.saveToWorkspace" commandName="Save Image" description="Save the selected image into a project in the workspace" category="_mqG67XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqpGVXlKEeayFayxZTWxEg" elementId="org.eclipse.jdt.debug.ui.commands.Display" commandName="Display" description="Display result of evaluating selected text" category="_mqG63nlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqpGVnlKEeayFayxZTWxEg" elementId="org.eclipse.jdt.ui.edit.text.java.search.exception.occurrences" commandName="Search Exception Occurrences in File" description="Search for exception occurrences of a selected exception type" category="_mqG63XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqpGV3lKEeayFayxZTWxEg" elementId="org.eclipse.egit.ui.team.ShowBlame" commandName="Show Annotations" category="_mqG64XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqpGWHlKEeayFayxZTWxEg" elementId="org.eclipse.jdt.ui.correction.assignToField.assist" commandName="Quick Assist - Assign to field" description="Invokes quick assist and selects 'Assign to field'" category="_mqG66HlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqpGWXlKEeayFayxZTWxEg" elementId="org.eclipse.ui.edit.text.folding.expand" commandName="Expand" description="Expands the folded region at the current selection" category="_mqGTx3lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqpGWnlKEeayFayxZTWxEg" elementId="org.eclipse.jdt.ui.edit.text.java.extract.method" commandName="Extract Method" description="Extract a set of statements or an expression into a new method and use the new method" category="_mqG613lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqpGW3lKEeayFayxZTWxEg" elementId="org.eclipse.jpt.jpa.eclipselink.ui.newEclipseLinkMappingFile" commandName="EclipseLink ORM Mapping File" category="_mqG67XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqptYHlKEeayFayxZTWxEg" elementId="org.eclipse.mylyn.tasks.ui.command.openRemoteTask" commandName="Open Remote Task" category="_mqGTy3lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqptYXlKEeayFayxZTWxEg" elementId="org.eclipse.debug.ui.commands.nextMemoryBlock" commandName="Next Memory Monitor" description="Show renderings from next memory monitor." category="_mqG63nlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqptYnlKEeayFayxZTWxEg" elementId="org.eclipse.egit.ui.internal.reflog.OpenInCommitViewerCommand" commandName="Open in Commit Viewer" category="_mqG67XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqptY3lKEeayFayxZTWxEg" elementId="org.eclipse.mylyn.context.ui.commands.task.retrieveContext" commandName="Retrieve Context" category="_mqGTyHlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqptZHlKEeayFayxZTWxEg" elementId="org.eclipse.jst.jsp.ui.refactor.rename" commandName="Rename" description="Rename a Java Element" category="_mqGTwnlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqptZXlKEeayFayxZTWxEg" elementId="org.eclipse.egit.ui.team.Fetch" commandName="Fetch" category="_mqG64XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqptZnlKEeayFayxZTWxEg" elementId="org.eclipse.pde.ui.junitWorkbenchShortcut.run" commandName="Run JUnit Plug-in Test" description="Run JUnit Plug-in Test" category="_mqG63nlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqptZ3lKEeayFayxZTWxEg" elementId="org.eclipse.jdt.ui.navigate.gotopackage" commandName="Go to Package" description="Go to Package" category="_mqGTy3lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqptaHlKEeayFayxZTWxEg" elementId="org.eclipse.mylyn.task.ui.editor.QuickOutline" commandName="Quick Outline" description="Show the quick outline for the editor input" category="_mqGTynlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqptaXlKEeayFayxZTWxEg" elementId="org.eclipse.egit.ui.RepositoriesViewRebase" commandName="Rebase" category="_mqG64XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqptanlKEeayFayxZTWxEg" elementId="org.eclipse.debug.ui.commands.eof" commandName="EOF" description="Send end of file" category="_mqG63nlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqpta3lKEeayFayxZTWxEg" elementId="org.eclipse.jst.pagedesigner.horizotal" commandName="Horizontal Layout" category="_mqGTw3lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqqUcHlKEeayFayxZTWxEg" elementId="org.eclipse.ui.navigate.showInQuickMenu" commandName="Show In..." description="Open the Show In menu" category="_mqGTy3lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqqUcXlKEeayFayxZTWxEg" elementId="org.eclipse.ui.edit.text.copyLineUp" commandName="Duplicate Lines" description="Duplicates the selected lines and leaves the selection unchanged" category="_mqGTx3lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqqUcnlKEeayFayxZTWxEg" elementId="org.eclipse.debug.ui.commands.ToggleMethodBreakpoint" commandName="Toggle Method Breakpoint" description="Creates or removes a method breakpoint" category="_mqG63nlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqqUc3lKEeayFayxZTWxEg" elementId="org.eclipse.jdt.ui.navigate.java.open.structure" commandName="Open Structure" description="Show the structure of the selected element" category="_mqGTy3lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqqUdHlKEeayFayxZTWxEg" elementId="org.eclipse.wst.jsdt.ui.correction.assignToLocal.assist" commandName="Quick Assist - Assign to local variable" description="Invokes quick assist and selects 'Assign to local variable'" category="_mqGTyXlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqqUdXlKEeayFayxZTWxEg" elementId="org.eclipse.ui.navigate.next" commandName="Next" description="Navigate to the next item" category="_mqGTy3lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqqUdnlKEeayFayxZTWxEg" elementId="org.eclipse.mylyn.tasks.bugs.commands.newTaskFromMarker" commandName="New Task from Marker..." description="Report as Bug from Marker" category="_mqG67XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqqUd3lKEeayFayxZTWxEg" elementId="org.eclipse.wst.jsdt.ui.refactor.apply.refactoring.script" commandName="Apply Script" description="Perform refactorings from a refactoring script on the local workspace" category="_mqG67nlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqqUeHlKEeayFayxZTWxEg" elementId="org.eclipse.wst.server.run" commandName="Run" description="Run server" category="_mqGTzXlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqqUeXlKEeayFayxZTWxEg" elementId="org.eclipse.mylyn.context.ui.commands.focus.view" commandName="Focus View" category="_mqG67XlKEeayFayxZTWxEg">
-    <parameters xmi:id="_mqqUenlKEeayFayxZTWxEg" elementId="viewId" name="View ID to Focus" optional="false"/>
-  </commands>
-  <commands xmi:id="_mqqUe3lKEeayFayxZTWxEg" elementId="org.eclipse.debug.ui.commands.StepReturn" commandName="Step Return" description="Step return" category="_mqG63nlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqq7gHlKEeayFayxZTWxEg" elementId="org.eclipse.ui.browser.openBundleResource" commandName="Open Resource in Browser" description="Opens a bundle resource in the default web browser." category="_mqG61XlKEeayFayxZTWxEg">
-    <parameters xmi:id="_mqq7gXlKEeayFayxZTWxEg" elementId="plugin" name="Plugin"/>
-    <parameters xmi:id="_mqq7gnlKEeayFayxZTWxEg" elementId="path" name="Path"/>
-  </commands>
-  <commands xmi:id="_mqq7g3lKEeayFayxZTWxEg" elementId="org.eclipse.jst.pagedesigner.source" commandName="Source Code" category="_mqGTw3lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqq7hHlKEeayFayxZTWxEg" elementId="org.eclipse.ui.help.aboutAction" commandName="About" description="Open the about dialog" category="_mqG62XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqq7hXlKEeayFayxZTWxEg" elementId="org.eclipse.wst.common.project.facet.ui.ConvertProjectToFacetedForm" commandName="Convert to Faceted Form..." category="_mqG60nlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqq7hnlKEeayFayxZTWxEg" elementId="org.eclipse.team.cvs.ui.showAnnotation" commandName="Show Annotation" description="Show Annotation" category="_mqG633lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqq7h3lKEeayFayxZTWxEg" elementId="org.eclipse.egit.ui.team.stash.create" commandName="Stash Changes" category="_mqG64XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqq7iHlKEeayFayxZTWxEg" elementId="org.eclipse.wst.jsdt.ui.edit.text.java.replace.invocations" commandName="Replace Invocations" description="Replace invocations of the selected function" category="_mqG67nlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqq7iXlKEeayFayxZTWxEg" elementId="org.eclipse.egit.ui.history.CheckoutCommand" commandName="Checkout" category="_mqG67XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqq7inlKEeayFayxZTWxEg" elementId="org.eclipse.mylyn.tasks.ui.command.activateSelectedTask" commandName="Activate Selected Task" category="_mqGTy3lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqrikHlKEeayFayxZTWxEg" elementId="org.eclipse.jdt.ui.edit.text.java.search.references.in.workspace" commandName="References in Workspace" description="Search for references to the selected element in the workspace" category="_mqG63XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqrikXlKEeayFayxZTWxEg" elementId="org.eclipse.wst.sse.ui.format.document" commandName="Format" description="Format selection" category="_mqGTwnlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqriknlKEeayFayxZTWxEg" elementId="org.eclipse.jdt.ui.correction.addNonNLS" commandName="Quick Fix - Add non-NLS tag" description="Invokes quick assist and selects 'Add non-NLS tag'" category="_mqG66HlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqrik3lKEeayFayxZTWxEg" elementId="org.eclipse.wst.jsdt.ui.edit.text.java.search.write.access.in.workspace" commandName="Write Access in Workspace" description="Search for write references to the selected element in the workspace" category="_mqG63XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqrilHlKEeayFayxZTWxEg" elementId="org.eclipse.egit.ui.team.RemoveFromIndex" commandName="Remove from Git Index" category="_mqG64XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqrilXlKEeayFayxZTWxEg" elementId="org.eclipse.ui.newWizard" commandName="New" description="Open the New item wizard" category="_mqG60nlKEeayFayxZTWxEg">
-    <parameters xmi:id="_mqrilnlKEeayFayxZTWxEg" elementId="newWizardId" name="New Wizard"/>
-  </commands>
-  <commands xmi:id="_mqril3lKEeayFayxZTWxEg" elementId="org.eclipse.team.cvs.ui.compareWithTag" commandName="Compare With Another Branch or Version" description="Compare with a Branch or a Version on the CVS Server" category="_mqG633lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqrimHlKEeayFayxZTWxEg" elementId="org.eclipse.ui.window.newWindow" commandName="New Window" description="Open another window" category="_mqG61XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqrimXlKEeayFayxZTWxEg" elementId="org.eclipse.jdt.ui.edit.text.java.uncomment" commandName="Uncomment" description="Uncomment the selected Java comment lines" category="_mqG66HlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqrimnlKEeayFayxZTWxEg" elementId="org.eclipse.egit.ui.history.CompareVersions" commandName="Compare with each other" category="_mqG67XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqrim3lKEeayFayxZTWxEg" elementId="org.eclipse.equinox.p2.ui.sdk.install" commandName="Install New Software..." category="_mqG67XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqsJoHlKEeayFayxZTWxEg" elementId="org.eclipse.ui.window.customizePerspective" commandName="Customize Perspective" description="Customize the current perspective" category="_mqG61XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqsJoXlKEeayFayxZTWxEg" elementId="org.eclipse.mylyn.context.ui.commands.interest.decrement" commandName="Make Less Interesting" description="Make Less Interesting" category="_mqGTyHlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqsJonlKEeayFayxZTWxEg" elementId="org.eclipse.ui.externaltools.ExternalToolMenuDelegateToolbar" commandName="Run Last Launched External Tool" description="Runs the last launched external Tool" category="_mqG63nlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqsJo3lKEeayFayxZTWxEg" elementId="org.eclipse.egit.ui.CheckoutCommand" commandName="Checkout" category="_mqG64XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqsJpHlKEeayFayxZTWxEg" elementId="org.eclipse.jdt.ui.edit.text.java.search.occurrences.in.file" commandName="Search All Occurrences in File" description="Search for all occurrences of the selected element in its declaring file" category="_mqG63XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqsJpXlKEeayFayxZTWxEg" elementId="org.eclipse.ui.edit.text.moveLineUp" commandName="Move Lines Up" description="Moves the selected lines up" category="_mqGTx3lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqsJpnlKEeayFayxZTWxEg" elementId="org.eclipse.equinox.p2.ui.discovery.commands.ShowBundleCatalog" commandName="Show Bundle Catalog" category="_mqG67XlKEeayFayxZTWxEg">
-    <parameters xmi:id="_mqsJp3lKEeayFayxZTWxEg" elementId="org.eclipse.equinox.p2.ui.discovery.commands.DirectoryParameter" name="Directory URL"/>
-    <parameters xmi:id="_mqsJqHlKEeayFayxZTWxEg" elementId="org.eclipse.equinox.p2.ui.discovery.commands.TagsParameter" name="Tags"/>
-  </commands>
-  <commands xmi:id="_mqsJqXlKEeayFayxZTWxEg" elementId="org.eclipse.jdt.ui.edit.text.java.gotoBreadcrumb" commandName="Show In Breadcrumb" description="Shows the Java editor breadcrumb and sets the keyboard focus into it" category="_mqGTy3lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqsJqnlKEeayFayxZTWxEg" elementId="org.eclipse.pde.ui.runtimeWorkbenchShortcut.debug" commandName="Debug Eclipse Application" description="Debug Eclipse Application" category="_mqG63nlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqswsHlKEeayFayxZTWxEg" elementId="org.eclipse.jpt.jpa.ui.makePersistent" commandName="Make Persistent..." category="_mqG67XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqswsXlKEeayFayxZTWxEg" elementId="org.eclipse.datatools.sqltools.sqleditor.ExecuteSelectionAction" commandName="Execute Selected Text" category="_mqG64nlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqswsnlKEeayFayxZTWxEg" elementId="org.eclipse.jpt.jaxb.ui.command.createPackageInfo" commandName="Create package-info.java" category="_mqG67XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqsws3lKEeayFayxZTWxEg" elementId="org.eclipse.jdt.ui.edit.text.java.extract.class" commandName="Extract Class..." description="Extracts fields into a new class" category="_mqG613lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqswtHlKEeayFayxZTWxEg" elementId="org.eclipse.jdt.ui.correction.extractConstant.assist" commandName="Quick Assist - Extract constant" description="Invokes quick assist and selects 'Extract constant'" category="_mqG66HlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqswtXlKEeayFayxZTWxEg" elementId="org.eclipse.compare.copyRightToLeft" commandName="Copy from Right to Left" description="Copy Current Change from Right to Left" category="_mqG603lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqswtnlKEeayFayxZTWxEg" elementId="org.eclipse.debug.ui.commands.OpenProfileConfigurations" commandName="Profile..." description="Open profile launch configuration dialog" category="_mqG63nlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqswt3lKEeayFayxZTWxEg" elementId="org.eclipse.jpt.jpa.ui.newMappingFile" commandName="JPA ORM Mapping File" category="_mqG67XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqswuHlKEeayFayxZTWxEg" elementId="org.eclipse.team.cvs.ui.commitAll" commandName="Commit All Outgoing Changes" description="Commit all outgoing changes to the repository" category="_mqG633lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqswuXlKEeayFayxZTWxEg" elementId="org.eclipse.ui.ide.markCompleted" commandName="Mark Completed" description="Mark the selected tasks as completed" category="_mqG67XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqswunlKEeayFayxZTWxEg" elementId="org.eclipse.wst.jsdt.ui.edit.text.java.comment" commandName="Comment" description="Turn the selected lines into JavaScript comments" category="_mqGTyXlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqswu3lKEeayFayxZTWxEg" elementId="org.eclipse.ui.edit.text.recenter" commandName="Recenter" description="Recenter the window based on the cursor" category="_mqGTx3lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqtXwHlKEeayFayxZTWxEg" elementId="org.eclipse.team.cvs.ui.merge" commandName="Merge" description="Merge" category="_mqG633lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqtXwXlKEeayFayxZTWxEg" elementId="org.eclipse.jpt.jpa.ui.xmlFileUpgradeToLatestVersion" commandName="Upgrade JPA Document Version" category="_mqG67XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqtXwnlKEeayFayxZTWxEg" elementId="org.eclipse.ui.edit.text.scroll.lineDown" commandName="Scroll Line Down" description="Scroll down one line of text" category="_mqGTx3lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqtXw3lKEeayFayxZTWxEg" elementId="org.eclipse.wst.sse.ui.search.find.occurrences" commandName="Occurrences in File" description="Find occurrences of the selection in the file" category="_mqGTwnlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqtXxHlKEeayFayxZTWxEg" elementId="org.eclipse.ui.ToggleCoolbarAction" commandName="Toggle Toolbar Visibility" description="Toggles the visibility of the window toolbar" category="_mqG61XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqtXxXlKEeayFayxZTWxEg" elementId="org.eclipse.wst.jsdt.ui.navigate.open.type.in.hierarchy" commandName="Open Type in Hierarchy" description="Open a type in the type hierarchy view" category="_mqGTy3lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqtXxnlKEeayFayxZTWxEg" elementId="org.eclipse.wst.sse.ui.outline.customFilter" commandName="&amp;Filters" category="_mqG67XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqtXx3lKEeayFayxZTWxEg" elementId="org.eclipse.datatools.sqltools.sqlscrapbook.commands.openscrapbook" commandName="Open SQL Scrapboo&amp;k" category="_mqG67XlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqtXyHlKEeayFayxZTWxEg" elementId="org.eclipse.ui.navigate.openResource" commandName="Open Resource" description="Open an editor on a particular resource" category="_mqGTy3lKEeayFayxZTWxEg">
-    <parameters xmi:id="_mqtXyXlKEeayFayxZTWxEg" elementId="filePath" name="File Path" typeId="org.eclipse.ui.ide.resourcePath"/>
-  </commands>
-  <commands xmi:id="_mqtXynlKEeayFayxZTWxEg" elementId="org.eclipse.wst.jsdt.ui.correction.addBlock.assist" commandName="Quick Assist - Replace statement with block" description="Invokes quick assist and selects 'Replace statement with block'" category="_mqGTyXlKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mqt-0HlKEeayFayxZTWxEg" elementId="org.eclipse.wst.jsdt.ui.edit.text.java.goto.previous.member" commandName="Go to Previous Member" description="Move the caret to the previous member of the JavaScript file" category="_mqGTy3lKEeayFayxZTWxEg"/>
-  <commands xmi:id="_mx0FUnlKEeayFayxZTWxEg" elementId="AUTOGEN:::org.eclipse.emf.exporter.genModelEditorContribution/org.eclipse.emf.exporter.ui.GenModelExportActionDelegate.Editor" commandName="&amp;Export Model..."/>
-  <commands xmi:id="_mx1TcHlKEeayFayxZTWxEg" elementId="AUTOGEN:::org.eclipse.emf.importer.genModelEditorContribution/org.eclipse.emf.importer.ui.GenModelReloadActionDelegate.Editor" commandName="&amp;Reload..."/>
-  <commands xmi:id="_mx2hkHlKEeayFayxZTWxEg" elementId="AUTOGEN:::org.eclipse.emf.mapping.ecore2ecore.presentation.Ecore2EcoreContributionID/org.eclipse.emf.mapping.action.RemoveMappingActionID" commandName="&amp;Remove Mapping"/>
-  <commands xmi:id="_mx3IonlKEeayFayxZTWxEg" elementId="AUTOGEN:::org.eclipse.emf.mapping.ecore2ecore.presentation.Ecore2EcoreContributionID/org.eclipse.emf.mapping.action.TypeMatchMappingActionID" commandName="Match Mapping by &amp;Type"/>
-  <commands xmi:id="_mx4WwHlKEeayFayxZTWxEg" elementId="AUTOGEN:::org.eclipse.emf.mapping.ecore2ecore.presentation.Ecore2EcoreContributionID/org.eclipse.emf.mapping.action.NameMatchMappingActionID" commandName="Match Mapping by &amp;Name"/>
-  <commands xmi:id="_mx490HlKEeayFayxZTWxEg" elementId="AUTOGEN:::org.eclipse.emf.mapping.ecore2ecore.presentation.Ecore2EcoreContributionID/org.eclipse.emf.mapping.action.CreateOneSidedMappingActionID" commandName="Create &amp;One-sided Mapping"/>
-  <commands xmi:id="_mx5k4nlKEeayFayxZTWxEg" elementId="AUTOGEN:::org.eclipse.emf.mapping.ecore2ecore.presentation.Ecore2EcoreContributionID/org.eclipse.emf.mapping.action.CreateMappingActionID" commandName="Create &amp;Mapping"/>
-  <commands xmi:id="_mx6zAHlKEeayFayxZTWxEg" elementId="AUTOGEN:::org.eclipse.emf.mapping.ecore2ecore.presentation.Ecore2EcoreContributionID/org.eclipse.emf.mapping.ecore2ecore.action.AddOuputRootActionID" commandName="Add &amp;Output Root..."/>
-  <commands xmi:id="_mx8BIHlKEeayFayxZTWxEg" elementId="AUTOGEN:::org.eclipse.emf.mapping.ecore2ecore.presentation.Ecore2EcoreContributionID/org.eclipse.emf.mapping.ecore2ecore.action.AddInputRootActionID" commandName="Add &amp;Input Root..."/>
-  <commands xmi:id="_mx9PQHlKEeayFayxZTWxEg" elementId="AUTOGEN:::org.eclipse.jdt.debug.ui.JavaSnippetToolbarActions/org.eclipse.jdt.debug.ui.SnippetExecute" commandName="E&amp;xecute"/>
-  <commands xmi:id="_mx92UHlKEeayFayxZTWxEg" elementId="AUTOGEN:::org.eclipse.jdt.debug.ui.JavaSnippetToolbarActions/org.eclipse.jdt.debug.ui.SnippetDisplay" commandName="Displa&amp;y"/>
-  <commands xmi:id="_mx-dYnlKEeayFayxZTWxEg" elementId="AUTOGEN:::org.eclipse.jdt.debug.ui.JavaSnippetToolbarActions/org.eclipse.jdt.debug.ui.SnippetInspect" commandName="Insp&amp;ect"/>
-  <commands xmi:id="_myHnUHlKEeayFayxZTWxEg" elementId="AUTOGEN:::org.eclipse.ui.articles.action.contribution.editor/org.eclipse.wst.wsdl.ui.actions.ReloadDependenciesActionDelegate" commandName="Reload Dependencies"/>
-  <addons xmi:id="_mpDyAnlKEeayFayxZTWxEg" elementId="org.eclipse.e4.core.commands.service" contributorURI="platform:/plugin/org.eclipse.ui.workbench" contributionURI="bundleclass://org.eclipse.e4.core.commands/org.eclipse.e4.core.commands.CommandServiceAddon"/>
-  <addons xmi:id="_mpDyA3lKEeayFayxZTWxEg" elementId="org.eclipse.e4.ui.contexts.service" contributorURI="platform:/plugin/org.eclipse.ui.workbench" contributionURI="bundleclass://org.eclipse.e4.ui.services/org.eclipse.e4.ui.services.ContextServiceAddon"/>
-  <addons xmi:id="_mpDyBHlKEeayFayxZTWxEg" elementId="org.eclipse.e4.ui.bindings.service" contributorURI="platform:/plugin/org.eclipse.ui.workbench" contributionURI="bundleclass://org.eclipse.e4.ui.bindings/org.eclipse.e4.ui.bindings.BindingServiceAddon"/>
-  <addons xmi:id="_mpDyBXlKEeayFayxZTWxEg" elementId="org.eclipse.e4.ui.workbench.commands.model" contributorURI="platform:/plugin/org.eclipse.ui.workbench" contributionURI="bundleclass://org.eclipse.e4.ui.workbench/org.eclipse.e4.ui.internal.workbench.addons.CommandProcessingAddon"/>
-  <addons xmi:id="_mpDyBnlKEeayFayxZTWxEg" elementId="org.eclipse.e4.ui.workbench.contexts.model" contributorURI="platform:/plugin/org.eclipse.ui.workbench" contributionURI="bundleclass://org.eclipse.e4.ui.workbench/org.eclipse.e4.ui.internal.workbench.addons.ContextProcessingAddon"/>
-  <addons xmi:id="_mpDyB3lKEeayFayxZTWxEg" elementId="org.eclipse.e4.ui.workbench.bindings.model" contributorURI="platform:/plugin/org.eclipse.ui.workbench" contributionURI="bundleclass://org.eclipse.e4.ui.workbench.swt/org.eclipse.e4.ui.workbench.swt.util.BindingProcessingAddon"/>
-  <addons xmi:id="_mpDyCHlKEeayFayxZTWxEg" elementId="Cleanup Addon" contributorURI="platform:/plugin/org.eclipse.ui.workbench" contributionURI="bundleclass://org.eclipse.e4.ui.workbench.addons.swt/org.eclipse.e4.ui.workbench.addons.cleanupaddon.CleanupAddon"/>
-  <addons xmi:id="_mpDyCXlKEeayFayxZTWxEg" elementId="DnD Addon" contributorURI="platform:/plugin/org.eclipse.ui.workbench" contributionURI="bundleclass://org.eclipse.e4.ui.workbench.addons.swt/org.eclipse.e4.ui.workbench.addons.dndaddon.DnDAddon"/>
-  <addons xmi:id="_mpDyCnlKEeayFayxZTWxEg" elementId="MinMax Addon" contributorURI="platform:/plugin/org.eclipse.ui.workbench" contributionURI="bundleclass://org.eclipse.e4.ui.workbench.addons.swt/org.eclipse.e4.ui.workbench.addons.minmax.MinMaxAddon"/>
-  <addons xmi:id="_mpDyC3lKEeayFayxZTWxEg" elementId="org.eclipse.ui.workbench.addon.0" contributorURI="platform:/plugin/org.eclipse.ui.workbench" contributionURI="bundleclass://org.eclipse.e4.ui.workbench/org.eclipse.e4.ui.internal.workbench.addons.HandlerProcessingAddon"/>
-  <categories xmi:id="_mqGTwHlKEeayFayxZTWxEg" elementId="org.eclipse.team.ui.category.team" name="Team" description="Actions that apply when working with a Team"/>
-  <categories xmi:id="_mqGTwXlKEeayFayxZTWxEg" elementId="org.eclipse.ui.category.views" name="Views" description="Commands for opening views"/>
-  <categories xmi:id="_mqGTwnlKEeayFayxZTWxEg" elementId="org.eclipse.ui.category.edit" name="Edit"/>
-  <categories xmi:id="_mqGTw3lKEeayFayxZTWxEg" elementId="org.eclipse.jst.pagedesigner.pagelayout" name="Web Page Editor Layout"/>
-  <categories xmi:id="_mqGTxHlKEeayFayxZTWxEg" elementId="org.eclipse.mylyn.wikitext.ui.editor.category" name="WikiText Markup Editing Commands" description="commands for editing lightweight markup"/>
-  <categories xmi:id="_mqGTxXlKEeayFayxZTWxEg" elementId="org.eclipse.mylyn.tasks.ui.category.editor" name="Task Editor"/>
-  <categories xmi:id="_mqGTxnlKEeayFayxZTWxEg" elementId="org.eclipse.ui.ide.markerContents" name="Contents" description="The category for menu contents"/>
-  <categories xmi:id="_mqGTx3lKEeayFayxZTWxEg" elementId="org.eclipse.ui.category.textEditor" name="Text Editing" description="Text Editing Commands"/>
-  <categories xmi:id="_mqGTyHlKEeayFayxZTWxEg" elementId="org.eclipse.mylyn.context.ui.commands" name="Focused UI" description="Task-Focused Interface"/>
-  <categories xmi:id="_mqGTyXlKEeayFayxZTWxEg" elementId="org.eclipse.wst.jsdt.ui.category.source" name="Source" description="JavaScript Source Actions"/>
-  <categories xmi:id="_mqGTynlKEeayFayxZTWxEg" elementId="org.eclipse.mylyn.tasks.ui.commands" name="Task Repositories"/>
-  <categories xmi:id="_mqGTy3lKEeayFayxZTWxEg" elementId="org.eclipse.ui.category.navigate" name="Navigate"/>
-  <categories xmi:id="_mqGTzHlKEeayFayxZTWxEg" elementId="org.eclipse.mylyn.java.ui.commands" name="Java Context" description="Java Task-Focused Interface Commands"/>
-  <categories xmi:id="_mqGTzXlKEeayFayxZTWxEg" elementId="org.eclipse.wst.server.ui" name="Server" description="Server"/>
-  <categories xmi:id="_mqG60HlKEeayFayxZTWxEg" elementId="org.eclipse.mylyn.wikitext.context.ui.commands" name="%commands.category.name" description="%commands.category.description"/>
-  <categories xmi:id="_mqG60XlKEeayFayxZTWxEg" elementId="org.eclipse.wst.jsdt.debug.ui.category" name="JavaScript Debug" description="Tooling for debugging JavaScript"/>
-  <categories xmi:id="_mqG60nlKEeayFayxZTWxEg" elementId="org.eclipse.ui.category.file" name="File"/>
-  <categories xmi:id="_mqG603lKEeayFayxZTWxEg" elementId="org.eclipse.compare.ui.category.compare" name="Compare" description="Compare command category"/>
-  <categories xmi:id="_mqG61HlKEeayFayxZTWxEg" elementId="org.eclipse.rse.ui.commands.category" name="Remote Systems"/>
-  <categories xmi:id="_mqG61XlKEeayFayxZTWxEg" elementId="org.eclipse.ui.category.window" name="Window"/>
-  <categories xmi:id="_mqG61nlKEeayFayxZTWxEg" elementId="org.eclipse.datatools.enablement.sybase.asa.schemaobjecteditor.examples.tableschemaedtor.10x" name="ASA 9.x table schema editor"/>
-  <categories xmi:id="_mqG613lKEeayFayxZTWxEg" elementId="org.eclipse.jdt.ui.category.refactoring" name="Refactor - Java" description="Java Refactoring Actions"/>
-  <categories xmi:id="_mqG62HlKEeayFayxZTWxEg" elementId="org.eclipse.emf.codegen.ecore.ui.Commands" name="EMF Code Generation" description="Commands for the EMF code generation tools"/>
-  <categories xmi:id="_mqG62XlKEeayFayxZTWxEg" elementId="org.eclipse.ui.category.help" name="Help"/>
-  <categories xmi:id="_mqG62nlKEeayFayxZTWxEg" elementId="org.eclipse.datatools.sqltools.result.category" name="SQL Results View"/>
-  <categories xmi:id="_mqG623lKEeayFayxZTWxEg" elementId="org.eclipse.ui.category.project" name="Project"/>
-  <categories xmi:id="_mqG63HlKEeayFayxZTWxEg" elementId="org.eclipse.tm.terminal.category1" name="Terminal view commands" description="%terminal.view.insertion.description"/>
-  <categories xmi:id="_mqG63XlKEeayFayxZTWxEg" elementId="org.eclipse.search.ui.category.search" name="Search" description="Search command category"/>
-  <categories xmi:id="_mqG63nlKEeayFayxZTWxEg" elementId="org.eclipse.debug.ui.category.run" name="Run/Debug" description="Run/Debug command category"/>
-  <categories xmi:id="_mqG633lKEeayFayxZTWxEg" elementId="org.eclipse.team.cvs.ui.actionSet" name="CVS" description="Actions that apply when working with CVS repositories"/>
-  <categories xmi:id="_mqG64HlKEeayFayxZTWxEg" elementId="org.eclipse.ui.category.dialogs" name="Dialogs" description="Commands for opening dialogs"/>
-  <categories xmi:id="_mqG64XlKEeayFayxZTWxEg" elementId="org.eclipse.egit.ui.commandCategory" name="Git"/>
-  <categories xmi:id="_mqG64nlKEeayFayxZTWxEg" elementId="org.eclipse.datatools.sqltools.sqleditor.category" name="Database Tools" description="Database Development tools"/>
-  <categories xmi:id="_mqG643lKEeayFayxZTWxEg" elementId="org.eclipse.ui.category.perspectives" name="Perspectives" description="Commands for opening perspectives"/>
-  <categories xmi:id="_mqG65HlKEeayFayxZTWxEg" elementId="org.eclipse.ltk.ui.category.refactoring" name="Refactoring"/>
-  <categories xmi:id="_mqG65XlKEeayFayxZTWxEg" elementId="org.eclipse.gef.category.view" name="View" description="View"/>
-  <categories xmi:id="_mqG65nlKEeayFayxZTWxEg" elementId="org.eclipse.jpt.jpa.ui.jpaMetadataConversionCommands" name="JPA Metadata Conversion"/>
-  <categories xmi:id="_mqG653lKEeayFayxZTWxEg" elementId="org.eclipse.wst.xml.views.XPathView" name="XPath"/>
-  <categories xmi:id="_mqG66HlKEeayFayxZTWxEg" elementId="org.eclipse.jdt.ui.category.source" name="Source" description="Java Source Actions"/>
-  <categories xmi:id="_mqG66XlKEeayFayxZTWxEg" elementId="org.eclipse.jpt.jpa.ui.jpaStructureViewCommands" name="JPA Structure View"/>
-  <categories xmi:id="_mqG66nlKEeayFayxZTWxEg" elementId="org.eclipse.mylyn.commons.repositories.ui.category.Team" name="Team"/>
-  <categories xmi:id="_mqG663lKEeayFayxZTWxEg" elementId="org.eclipse.pde.runtime.spy.commands.category" name="Spy"/>
-  <categories xmi:id="_mqG67HlKEeayFayxZTWxEg" elementId="org.eclipse.pde.ui.category.source" name="Manifest Editor Source" description="PDE Source Page actions"/>
-  <categories xmi:id="_mqG67XlKEeayFayxZTWxEg" elementId="org.eclipse.core.commands.categories.autogenerated" name="Uncategorized" description="Commands that were either auto-generated or have no category"/>
-  <categories xmi:id="_mqG67nlKEeayFayxZTWxEg" elementId="org.eclipse.wst.jsdt.ui.category.refactoring" name="Refactor - JavaScript" description="JavaScript Refactoring Actions"/>
-</application:Application>
diff --git a/.metadata/.plugins/org.eclipse.jdt.core/invalidArchivesCache b/.metadata/.plugins/org.eclipse.jdt.core/invalidArchivesCache
deleted file mode 100644
index 593f4708db84ac8fd0f5cc47c634f38c013fe9e4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4
LcmZQzU|;|M00aO5

diff --git a/.metadata/.plugins/org.eclipse.jdt.core/nonChainingJarsCache b/.metadata/.plugins/org.eclipse.jdt.core/nonChainingJarsCache
deleted file mode 100644
index 593f4708db84ac8fd0f5cc47c634f38c013fe9e4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4
LcmZQzU|;|M00aO5

diff --git a/.metadata/.plugins/org.eclipse.jdt.core/variablesAndContainers.dat b/.metadata/.plugins/org.eclipse.jdt.core/variablesAndContainers.dat
deleted file mode 100644
index 3de398e8f2856ff30f4c5dd9cf8cfd66b137fcc8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 129
zcmX|&TMB?66hudR2o)`+B_tP8G)3*({qG_l;QblSnYjQs`iT}o2g*j>tPn$^7-S`m
py>^9ybE%pMoBm#v^5ZO3G2<X<l#evjg0pYR-;gVWy>cM$*bk0n6(Ils

diff --git a/.metadata/.plugins/org.eclipse.jdt.ui/OpenTypeHistory.xml b/.metadata/.plugins/org.eclipse.jdt.ui/OpenTypeHistory.xml
deleted file mode 100644
index a4ee3cbc..00000000
--- a/.metadata/.plugins/org.eclipse.jdt.ui/OpenTypeHistory.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<typeInfoHistroy/>
diff --git a/.metadata/.plugins/org.eclipse.jdt.ui/QualifiedTypeNameHistory.xml b/.metadata/.plugins/org.eclipse.jdt.ui/QualifiedTypeNameHistory.xml
deleted file mode 100644
index 9e390f50..00000000
--- a/.metadata/.plugins/org.eclipse.jdt.ui/QualifiedTypeNameHistory.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<qualifiedTypeNameHistroy/>
diff --git a/.metadata/.plugins/org.eclipse.jdt.ui/dialog_settings.xml b/.metadata/.plugins/org.eclipse.jdt.ui/dialog_settings.xml
deleted file mode 100644
index 86bcee4f..00000000
--- a/.metadata/.plugins/org.eclipse.jdt.ui/dialog_settings.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<section name="Workbench">
-	<section name="org.eclipse.jdt.internal.ui.packageview.PackageExplorerPart">
-		<item value="2" key="layout"/>
-		<item value="true" key="group_libraries"/>
-		<item value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#x0D;&#x0A;&lt;packageExplorer group_libraries=&quot;1&quot; layout=&quot;2&quot; linkWithEditor=&quot;0&quot; rootMode=&quot;1&quot; workingSetName=&quot;&quot;&gt;&#x0D;&#x0A;&lt;customFilters userDefinedPatternsEnabled=&quot;false&quot;&gt;&#x0D;&#x0A;&lt;xmlDefinedFilters&gt;&#x0D;&#x0A;&lt;child filterId=&quot;org.eclipse.jdt.ui.PackageExplorer.StaticsFilter&quot; isEnabled=&quot;false&quot;/&gt;&#x0D;&#x0A;&lt;child filterId=&quot;org.eclipse.jdt.ui.PackageExplorer_patternFilterId_RemoteSystemsConnections&quot; isEnabled=&quot;true&quot;/&gt;&#x0D;&#x0A;&lt;child filterId=&quot;org.eclipse.mylyn.java.ui.MembersFilter&quot; isEnabled=&quot;false&quot;/&gt;&#x0D;&#x0A;&lt;child filterId=&quot;org.eclipse.jdt.ui.PackageExplorer.NonSharedProjectsFilter&quot; isEnabled=&quot;false&quot;/&gt;&#x0D;&#x0A;&lt;child filterId=&quot;org.eclipse.jdt.internal.ui.PackageExplorer.EmptyInnerPackageFilter&quot; isEnabled=&quot;true&quot;/&gt;&#x0D;&#x0A;&lt;child filterId=&quot;org.eclipse.m2e.MavenModuleFilter&quot; isEnabled=&quot;false&quot;/&gt;&#x0D;&#x0A;&lt;child filterId=&quot;org.eclipse.jdt.ui.PackageExplorer.ClosedProjectsFilter&quot; isEnabled=&quot;false&quot;/&gt;&#x0D;&#x0A;&lt;child filterId=&quot;org.eclipse.jdt.ui.PackageExplorer.EmptyLibraryContainerFilter&quot; isEnabled=&quot;true&quot;/&gt;&#x0D;&#x0A;&lt;child filterId=&quot;org.eclipse.jdt.ui.PackageExplorer.PackageDeclarationFilter&quot; isEnabled=&quot;true&quot;/&gt;&#x0D;&#x0A;&lt;child filterId=&quot;org.eclipse.pde.ui.BinaryProjectFilter1&quot; isEnabled=&quot;false&quot;/&gt;&#x0D;&#x0A;&lt;child filterId=&quot;org.eclipse.jdt.ui.PackageExplorer.LocalTypesFilter&quot; isEnabled=&quot;false&quot;/&gt;&#x0D;&#x0A;&lt;child filterId=&quot;org.eclipse.pde.ui.ExternalPluginLibrariesFilter1&quot; isEnabled=&quot;true&quot;/&gt;&#x0D;&#x0A;&lt;child filterId=&quot;org.eclipse.jdt.ui.PackageExplorer.FieldsFilter&quot; isEnabled=&quot;false&quot;/&gt;&#x0D;&#x0A;&lt;child filterId=&quot;org.eclipse.jdt.ui.PackageExplorer_patternFilterId_RemoteSystemsTempFiles&quot; isEnabled=&quot;true&quot;/&gt;&#x0D;&#x0A;&lt;child filterId=&quot;org.eclipse.jdt.ui.PackageExplorer.NonJavaProjectsFilter&quot; isEnabled=&quot;false&quot;/&gt;&#x0D;&#x0A;&lt;child filterId=&quot;org.eclipse.jdt.ui.PackageExplorer_patternFilterId_.*&quot; isEnabled=&quot;true&quot;/&gt;&#x0D;&#x0A;&lt;child filterId=&quot;org.eclipse.jdt.ui.PackageExplorer.SyntheticMembersFilter&quot; isEnabled=&quot;true&quot;/&gt;&#x0D;&#x0A;&lt;child filterId=&quot;org.eclipse.jdt.ui.PackageExplorer.ContainedLibraryFilter&quot; isEnabled=&quot;false&quot;/&gt;&#x0D;&#x0A;&lt;child filterId=&quot;org.eclipse.jdt.internal.ui.PackageExplorer.HideInnerClassFilesFilter&quot; isEnabled=&quot;true&quot;/&gt;&#x0D;&#x0A;&lt;child filterId=&quot;org.eclipse.jdt.ui.PackageExplorer.ImportDeclarationFilter&quot; isEnabled=&quot;true&quot;/&gt;&#x0D;&#x0A;&lt;child filterId=&quot;org.eclipse.jdt.ui.PackageExplorer.NonJavaElementFilter&quot; isEnabled=&quot;false&quot;/&gt;&#x0D;&#x0A;&lt;child filterId=&quot;org.eclipse.jdt.ui.PackageExplorer.LibraryFilter&quot; isEnabled=&quot;false&quot;/&gt;&#x0D;&#x0A;&lt;child filterId=&quot;org.eclipse.jdt.ui.PackageExplorer.CuAndClassFileFilter&quot; isEnabled=&quot;false&quot;/&gt;&#x0D;&#x0A;&lt;child filterId=&quot;org.eclipse.jdt.internal.ui.PackageExplorer.EmptyPackageFilter&quot; isEnabled=&quot;false&quot;/&gt;&#x0D;&#x0A;&lt;child filterId=&quot;org.eclipse.jdt.ui.PackageExplorer.NonPublicFilter&quot; isEnabled=&quot;false&quot;/&gt;&#x0D;&#x0A;&lt;/xmlDefinedFilters&gt;&#x0D;&#x0A;&lt;/customFilters&gt;&#x0D;&#x0A;&lt;/packageExplorer&gt;" key="memento"/>
-		<item value="1" key="rootMode"/>
-		<item value="false" key="linkWithEditor"/>
-	</section>
-</section>
diff --git a/.metadata/.plugins/org.eclipse.m2e.logback.configuration/0.log b/.metadata/.plugins/org.eclipse.m2e.logback.configuration/0.log
deleted file mode 100644
index e69de29b..00000000
diff --git a/.metadata/.plugins/org.eclipse.m2e.logback.configuration/logback.1.4.0.20130601-0317.xml b/.metadata/.plugins/org.eclipse.m2e.logback.configuration/logback.1.4.0.20130601-0317.xml
deleted file mode 100644
index e0de5155..00000000
--- a/.metadata/.plugins/org.eclipse.m2e.logback.configuration/logback.1.4.0.20130601-0317.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<configuration scan="true">
-  <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-    <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
-      <pattern>%date [%thread] %-5level %logger{35} - %msg%n</pattern>
-    </encoder>
-    <filter class="org.eclipse.m2e.logback.appender.ConsoleAppenderFilter"/>
-  </appender>
-
-  <appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
-    <File>${org.eclipse.m2e.log.dir}/0.log</File>
-    <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
-      <FileNamePattern>${org.eclipse.m2e.log.dir}/%i.log</FileNamePattern>
-      <MinIndex>1</MinIndex>
-      <MaxIndex>10</MaxIndex>
-    </rollingPolicy>
-    <triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
-      <MaxFileSize>100MB</MaxFileSize>
-    </triggeringPolicy>
-    <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
-      <pattern>%date [%thread] %-5level %logger{35} - %msg%n</pattern>
-    </encoder>
-  </appender>
-
-  <appender name="EclipseLog" class="org.eclipse.m2e.logback.appender.EclipseLogAppender">
-    <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
-      <level>WARN</level>
-    </filter>
-  </appender>
-
-  <appender name="MavenConsoleLog" class="org.eclipse.m2e.logback.appender.MavenConsoleAppender">
-  </appender>
-        
-  <root level="INFO">
-    <appender-ref ref="FILE" />
-    <appender-ref ref="STDOUT" />
-    <appender-ref ref="EclipseLog" />
-    <appender-ref ref="MavenConsoleLog" />
-  </root>
-
-  <logger name="com.ning.http.client" level="INFO" />
-</configuration>
diff --git a/.metadata/.plugins/org.eclipse.rse.core/.log b/.metadata/.plugins/org.eclipse.rse.core/.log
deleted file mode 100644
index e69de29b..00000000
diff --git a/.metadata/.plugins/org.eclipse.rse.core/initializerMarks/org.eclipse.rse.internal.core.RSELocalConnectionInitializer.mark b/.metadata/.plugins/org.eclipse.rse.core/initializerMarks/org.eclipse.rse.internal.core.RSELocalConnectionInitializer.mark
deleted file mode 100644
index e69de29b..00000000
diff --git a/.metadata/.plugins/org.eclipse.rse.core/profiles/PRF.desktop-65kj4bv_32539/FP.local.files_0/node.properties b/.metadata/.plugins/org.eclipse.rse.core/profiles/PRF.desktop-65kj4bv_32539/FP.local.files_0/node.properties
deleted file mode 100644
index 4312c4a6..00000000
--- a/.metadata/.plugins/org.eclipse.rse.core/profiles/PRF.desktop-65kj4bv_32539/FP.local.files_0/node.properties
+++ /dev/null
@@ -1,57 +0,0 @@
-# RSE DOM Node
-00-name=DESKTOP-65KJ4BV\:local.files
-01-type=FilterPool
-03-attr.default=true
-03-attr.deletable=true
-03-attr.id=local.files
-03-attr.nonRenamable=false
-03-attr.owningParentName=null
-03-attr.release=200
-03-attr.singleFilterStringOnly=false
-03-attr.singleFilterStringOnlyESet=false
-03-attr.stringsCaseSensitive=true
-03-attr.supportsDuplicateFilterStrings=false
-03-attr.supportsNestedFilters=true
-03-attr.type=default
-06-child.00000.00-name=My Home
-06-child.00000.01-type=Filter
-06-child.00000.03-attr.default=false
-06-child.00000.03-attr.filterType=default
-06-child.00000.03-attr.id=My Home
-06-child.00000.03-attr.nonChangable=false
-06-child.00000.03-attr.nonDeletable=false
-06-child.00000.03-attr.nonRenamable=false
-06-child.00000.03-attr.promptable=false
-06-child.00000.03-attr.relativeOrder=0
-06-child.00000.03-attr.release=200
-06-child.00000.03-attr.singleFilterStringOnly=false
-06-child.00000.03-attr.stringsCaseSensitive=false
-06-child.00000.03-attr.stringsNonChangable=false
-06-child.00000.03-attr.supportsDuplicateFilterStrings=false
-06-child.00000.03-attr.supportsNestedFilters=true
-06-child.00000.06-child.00000.00-name=C\:\\Users\\wuming\\*
-06-child.00000.06-child.00000.01-type=FilterString
-06-child.00000.06-child.00000.03-attr.default=false
-06-child.00000.06-child.00000.03-attr.string=C\:\\Users\\wuming\\*
-06-child.00000.06-child.00000.03-attr.type=default
-06-child.00001.00-name=Drives
-06-child.00001.01-type=Filter
-06-child.00001.03-attr.default=false
-06-child.00001.03-attr.filterType=default
-06-child.00001.03-attr.id=Drives
-06-child.00001.03-attr.nonChangable=false
-06-child.00001.03-attr.nonDeletable=false
-06-child.00001.03-attr.nonRenamable=false
-06-child.00001.03-attr.promptable=false
-06-child.00001.03-attr.relativeOrder=0
-06-child.00001.03-attr.release=200
-06-child.00001.03-attr.singleFilterStringOnly=false
-06-child.00001.03-attr.stringsCaseSensitive=false
-06-child.00001.03-attr.stringsNonChangable=false
-06-child.00001.03-attr.supportsDuplicateFilterStrings=false
-06-child.00001.03-attr.supportsNestedFilters=true
-06-child.00001.06-child.00000.00-name=*
-06-child.00001.06-child.00000.01-type=FilterString
-06-child.00001.06-child.00000.03-attr.default=false
-06-child.00001.06-child.00000.03-attr.string=*
-06-child.00001.06-child.00000.03-attr.type=default
diff --git a/.metadata/.plugins/org.eclipse.rse.core/profiles/PRF.desktop-65kj4bv_32539/H.local_16/node.properties b/.metadata/.plugins/org.eclipse.rse.core/profiles/PRF.desktop-65kj4bv_32539/H.local_16/node.properties
deleted file mode 100644
index e469a944..00000000
--- a/.metadata/.plugins/org.eclipse.rse.core/profiles/PRF.desktop-65kj4bv_32539/H.local_16/node.properties
+++ /dev/null
@@ -1,25 +0,0 @@
-# RSE DOM Node
-00-name=Local
-01-type=Host
-03-attr.description=
-03-attr.hostname=LOCALHOST
-03-attr.offline=false
-03-attr.promptable=false
-03-attr.systemType=org.eclipse.rse.systemtype.local
-03-attr.type=Local
-06-child.00000.00-name=Local Connector Service
-06-child.00000.01-type=ConnectorService
-06-child.00000.03-attr.group=Local Connector Service
-06-child.00000.03-attr.port=0
-06-child.00000.03-attr.useSSL=false
-06-child.00000.06-child.00000.00-name=Local Files
-06-child.00000.06-child.00000.01-type=SubSystem
-06-child.00000.06-child.00000.03-attr.hidden=false
-06-child.00000.06-child.00000.03-attr.type=local.files
-06-child.00000.06-child.00000.06-child.00000.00-name=DESKTOP-65KJ4BV___DESKTOP-65KJ4BV\:local.files
-06-child.00000.06-child.00000.06-child.00000.01-type=FilterPoolReference
-06-child.00000.06-child.00000.06-child.00000.03-attr.refID=local.files
-06-child.00000.06-child.00001.00-name=Local Shells
-06-child.00000.06-child.00001.01-type=SubSystem
-06-child.00000.06-child.00001.03-attr.hidden=false
-06-child.00000.06-child.00001.03-attr.type=local.shells
diff --git a/.metadata/.plugins/org.eclipse.rse.core/profiles/PRF.desktop-65kj4bv_32539/node.properties b/.metadata/.plugins/org.eclipse.rse.core/profiles/PRF.desktop-65kj4bv_32539/node.properties
deleted file mode 100644
index 9237cbe5..00000000
--- a/.metadata/.plugins/org.eclipse.rse.core/profiles/PRF.desktop-65kj4bv_32539/node.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-# RSE DOM Node
-00-name=DESKTOP-65KJ4BV
-01-type=Profile
-03-attr.defaultPrivate=true
-03-attr.isActive=true
-05-ref.00000=FP.local.files_0
-05-ref.00001=H.local_16
diff --git a/.metadata/.plugins/org.eclipse.rse.ui/.log b/.metadata/.plugins/org.eclipse.rse.ui/.log
deleted file mode 100644
index e69de29b..00000000
diff --git a/.metadata/.plugins/org.eclipse.ui.workbench/dialog_settings.xml b/.metadata/.plugins/org.eclipse.ui.workbench/dialog_settings.xml
deleted file mode 100644
index 8ce2f5ca..00000000
--- a/.metadata/.plugins/org.eclipse.ui.workbench/dialog_settings.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<section name="Workbench">
-	<section name="org.eclipse.ui.internal.QuickAccess">
-		<item value="759" key="dialogHeight"/>
-		<item value="1440" key="dialogWidth"/>
-		<list key="textEntries">
-		</list>
-		<list key="orderedElements">
-		</list>
-		<list key="orderedProviders">
-		</list>
-		<list key="textArray">
-		</list>
-	</section>
-	<section name="ShowViewDialog">
-		<item value="345" key="DIALOG_WIDTH"/>
-		<item value="1|Microsoft YaHei UI|9.0|0|WINDOWS|1|-12|0|0|0|400|0|0|0|1|0|0|0|0|Microsoft YaHei UI" key="DIALOG_FONT_NAME"/>
-		<item value="org.eclipse.jdt.ui.PackageExplorer" key="ShowViewDialog.STORE_SELECTED_VIEW_ID"/>
-		<item value="452" key="DIALOG_HEIGHT"/>
-		<item value="796" key="DIALOG_X_ORIGIN"/>
-		<item value="227" key="DIALOG_Y_ORIGIN"/>
-		<list key="ShowViewDialog.STORE_EXPANDED_CATEGORIES_ID">
-			<item value="org.eclipse.jdt.ui.java"/>
-		</list>
-	</section>
-	<section name="ImportExportAction">
-	</section>
-</section>
diff --git a/.metadata/.plugins/org.eclipse.wst.common.snippets/hidden.xml b/.metadata/.plugins/org.eclipse.wst.common.snippets/hidden.xml
deleted file mode 100644
index ab946b83f7b748424b8707693bcfdfa71590470b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 138
zcmXAiK?;LF5CrQi_y^g05_8E(&CM4i50LDV1l9?-67qVrvobI<bT!?}O2d^OBaw<P
zfr-SM4@QgQ%#m8R5-}dqy{Pfb^v;c*gIt&FNz4qQUOVQDkbS1#si&i)P~%G(Uh~g9
G?dk^Fw-(X>

diff --git a/.metadata/.plugins/org.eclipse.wst.common.snippets/user.xml b/.metadata/.plugins/org.eclipse.wst.common.snippets/user.xml
deleted file mode 100644
index 77a5127fd1899f2f420380c05d9e59660ab1806d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 464
zcmb7=&5FW65QOWz;5!753&vk02i?8-1nYSb9c3iO;Hc=!yMEmfFY84DQ<LuMu9~|2
zX`*jkv{R`}X9XRU6t!2SsoLr*R}akSR9aGB(XF)c?p!~bsRL{5oTQ@`bXT0E?+DJT
zxVO>yQcE8wCOA<wUtl6V>KQ8bP0(3T52)<%bEUS1UwX~_nX^w<jA+@P@iur3%$B}8
zanH4deSBaIp6KQO_BSuIcSYFI-T(Sz<D*H!QmEN}Ldm%A>e~G4ge~QQoO|F|1F)|l
U=KvgmL(YO%cAp7$arYv_J94H=ng9R*

diff --git a/.metadata/version.ini b/.metadata/version.ini
deleted file mode 100644
index c51ff745..00000000
--- a/.metadata/version.ini
+++ /dev/null
@@ -1 +0,0 @@
-org.eclipse.core.runtime=1
\ No newline at end of file
diff --git a/.settings/.jsdtscope b/.settings/.jsdtscope
deleted file mode 100644
index 3a28de0c..00000000
--- a/.settings/.jsdtscope
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="WebContent"/>
-	<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.WebProject">
-		<attributes>
-			<attribute name="hide" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.baseBrowserLibrary"/>
-	<classpathentry kind="output" path=""/>
-</classpath>
diff --git a/.settings/com.genuitec.eclipse.migration.prefs b/.settings/com.genuitec.eclipse.migration.prefs
deleted file mode 100644
index bf0067e7..00000000
--- a/.settings/com.genuitec.eclipse.migration.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-eclipse.preferences.version=1
-performed.operation.correct.unbound.jre=1.0
-performed.operation.resolve.unknown.runtime=1.0
diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 02c46235..00000000
--- a/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,10 +0,0 @@
-eclipse.preferences.version=1
-encoding//WebContent/WEB-INF/config/config.properties=UTF-8
-<<<<<<< HEAD
-encoding//src/com/platform/controller/DataModelController.java=UTF-8
-encoding/<project>=UTF-8
-=======
-encoding//src/com/platform/utils/GanymedSSH.java=UTF-8
-encoding/<project>=UTF-8
-separateDerivedEncodings=true
->>>>>>> ef099fd1aed73bcc4ef4c8d62aaba6cc6ec2dabf
diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 68c704e1..00000000
--- a/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,101 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled
-org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
-org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull
-org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault
-org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
-org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.7
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
-org.eclipse.jdt.core.compiler.problem.deadCode=warning
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDefaultCase=ignore
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled
-org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning
-org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error
-org.eclipse.jdt.core.compiler.problem.nullReference=warning
-org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error
-org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
-org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
-org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
-org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=ignore
-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
-org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
-org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedExceptionParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.7
diff --git a/.settings/org.eclipse.jpt.core.prefs b/.settings/org.eclipse.jpt.core.prefs
deleted file mode 100644
index 4fd5f244..00000000
--- a/.settings/org.eclipse.jpt.core.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jpt.core.platform=generic2_1
-org.eclipse.jpt.jpa.core.discoverAnnotatedClasses=false
diff --git a/.settings/org.eclipse.m2e.core.prefs b/.settings/org.eclipse.m2e.core.prefs
deleted file mode 100644
index f897a7f1..00000000
--- a/.settings/org.eclipse.m2e.core.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-activeProfiles=
-eclipse.preferences.version=1
-resolveWorkspaceProjects=true
-version=1
diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component
deleted file mode 100644
index d5dd44d5..00000000
--- a/.settings/org.eclipse.wst.common.component
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
-    <wb-module deploy-name="data_manager_backend">
-        <wb-resource deploy-path="/" source-path="/WebContent" tag="defaultRootSource"/>
-        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src"/>
-        <wb-resource deploy-path="/WEB-INF/classes" source-path="/test"/>
-        <property name="java-output-path" value="/data_manager_backend/build/classes"/>
-        <property name="context-root" value="/"/>
-    </wb-module>
-</project-modules>
diff --git a/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml b/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml
deleted file mode 100644
index 7961132f..00000000
--- a/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<root>
-  <facet id="jpt.jpa">
-    <node name="libprov">
-      <attribute name="provider-id" value="jpa-no-op-library-provider"/>
-    </node>
-  </facet>
-</root>
diff --git a/.settings/org.eclipse.wst.common.project.facet.core.xml b/.settings/org.eclipse.wst.common.project.facet.core.xml
deleted file mode 100644
index ba1bfbde..00000000
--- a/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<faceted-project>
-  <runtime name="MyEclipse Tomcat v7.0"/>
-  <fixed facet="java"/>
-  <fixed facet="wst.jsdt.web"/>
-  <fixed facet="jst.web"/>
-  <installed facet="java" version="1.7"/>
-  <installed facet="jst.web" version="3.0"/>
-  <installed facet="wst.jsdt.web" version="1.0"/>
-  <installed facet="jpt.jpa" version="2.1"/>
-</faceted-project>
diff --git a/.settings/org.eclipse.wst.jsdt.ui.superType.container b/.settings/org.eclipse.wst.jsdt.ui.superType.container
deleted file mode 100644
index 3bd5d0a4..00000000
--- a/.settings/org.eclipse.wst.jsdt.ui.superType.container
+++ /dev/null
@@ -1 +0,0 @@
-org.eclipse.wst.jsdt.launching.baseBrowserLibrary
\ No newline at end of file
diff --git a/.settings/org.eclipse.wst.jsdt.ui.superType.name b/.settings/org.eclipse.wst.jsdt.ui.superType.name
deleted file mode 100644
index 05bd71b6..00000000
--- a/.settings/org.eclipse.wst.jsdt.ui.superType.name
+++ /dev/null
@@ -1 +0,0 @@
-Window
\ No newline at end of file
diff --git a/src/META-INF/persistence.xml b/src/META-INF/persistence.xml
index 200e82f9..2ad4aeca 100644
--- a/src/META-INF/persistence.xml
+++ b/src/META-INF/persistence.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<persistence version="2.1" xmlns="http://xmlns.jcp.org/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/persistence http://xmlns.jcp.org/xml/ns/persistence/persistence_2_1.xsd">
-	<persistence-unit name="aggregation-platform">
-	</persistence-unit>
-</persistence>
+<?xml version="1.0" encoding="UTF-8"?>
+<persistence version="2.1" xmlns="http://xmlns.jcp.org/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/persistence http://xmlns.jcp.org/xml/ns/persistence/persistence_2_1.xsd">
+	<persistence-unit name="aggregation-platform">
+	</persistence-unit>
+</persistence>
diff --git a/src/com/base/BaseController.java b/src/com/base/BaseController.java
index 8a98dcfd..64c66474 100644
--- a/src/com/base/BaseController.java
+++ b/src/com/base/BaseController.java
@@ -1,65 +1,65 @@
-
-/**
- * 文件名    : BaseController.java
- * 版权       : XX科技有限公司。
- * 描述       : <描述>
- * 修改时间:2016年9月7日
- * 修改内容:<修改内容>
- */
-package com.base;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.log4j.Logger;
-import org.springframework.web.bind.annotation.ExceptionHandler;
-
-import com.platform.utils.Configs;
-
-/**
- * <一句话功能简述> 
- * <功能详细描述>
- * @author    chen
- * @version   [版本号,2016年9月7日]
- * @see       [相关类/方法]
- * @since     [产品/模块版本]
- */
-public class BaseController { 
-	
-	/** log4j  */
-	public static Logger log = Logger.getRootLogger();
-	
-    /**
-     * <一句话功能简述> 基于@ExceptionHandler异常处理----全局异常处理
-     * <功能详细描述>
-     * @param request
-     * @param ex 异常
-     * @return
-     * @see [类、类#方法、类#成员]
-     */
-    @ExceptionHandler  
-    public Object exp(HttpServletRequest request, HttpServletResponse response,Exception ex) {  
-        System.out.println("URI"+request.getRequestURI());
-        request.setAttribute("ex", ex);  
-        System.err.println("BaseController --exp ");
-        // 根据不同错误转向不同页面  
-        if(ex instanceof CustomException) {
-        	CustomException cuse = (CustomException) ex;
-        	Map<String, String> errmsg = new HashMap<>();
-        	errmsg.put("code", cuse.getCode());
-        	errmsg.put("msg", cuse.getMsg());
-        	log.error(cuse.getCode());
-        	response.setStatus(500);
-            return response;  
-        } else {  
-        	//其他错误则 调到指定页面
-        	log.error(Configs.GLOBAL_EXP_NOT_CUSTOM, ex);
-        	response.setStatus(500);
-            return response;  
-        }  
-    }  
-
+
+/**
+ * 文件名    : BaseController.java
+ * 版权       : XX科技有限公司。
+ * 描述       : <描述>
+ * 修改时间:2016年9月7日
+ * 修改内容:<修改内容>
+ */
+package com.base;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.log4j.Logger;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+
+import com.platform.utils.Configs;
+
+/**
+ * <一句话功能简述> 
+ * <功能详细描述>
+ * @author    chen
+ * @version   [版本号,2016年9月7日]
+ * @see       [相关类/方法]
+ * @since     [产品/模块版本]
+ */
+public class BaseController { 
+	
+	/** log4j  */
+	public static Logger log = Logger.getRootLogger();
+	
+    /**
+     * <一句话功能简述> 基于@ExceptionHandler异常处理----全局异常处理
+     * <功能详细描述>
+     * @param request
+     * @param ex 异常
+     * @return
+     * @see [类、类#方法、类#成员]
+     */
+    @ExceptionHandler  
+    public Object exp(HttpServletRequest request, HttpServletResponse response,Exception ex) {  
+        System.out.println("URI"+request.getRequestURI());
+        request.setAttribute("ex", ex);  
+        System.err.println("BaseController --exp ");
+        // 根据不同错误转向不同页面  
+        if(ex instanceof CustomException) {
+        	CustomException cuse = (CustomException) ex;
+        	Map<String, String> errmsg = new HashMap<>();
+        	errmsg.put("code", cuse.getCode());
+        	errmsg.put("msg", cuse.getMsg());
+        	log.error(cuse.getCode());
+        	response.setStatus(500);
+            return response;  
+        } else {  
+        	//其他错误则 调到指定页面
+        	log.error(Configs.GLOBAL_EXP_NOT_CUSTOM, ex);
+        	response.setStatus(500);
+            return response;  
+        }  
+    }  
+
 }  
\ No newline at end of file
diff --git a/src/com/base/Constant.java b/src/com/base/Constant.java
index 3b1dcc59..4d336465 100644
--- a/src/com/base/Constant.java
+++ b/src/com/base/Constant.java
@@ -1,23 +1,23 @@
-package com.base;
-
-/**
- * <一句话功能简述>
- * <功能详细描述>
- * @author    chen
- * @version   [版本号,2016年9月8日]
- * @see       [相关类/方法]
- * @since     [产品/模块版本]
- */
-public class Constant {
-	
-	/** 国际话配置文件文件-i18n.properties  */
-	public static String I18N_PROPERTIES_FIEL_PATH = "/com/base/i18n.properties";
-	
-	/** WritefileThread-线程睡眠时间--3000 */
-	public final static long THREAD_SLEEP_WRITEFILETHREAD = 3000;
-	
-	/** CustomException记录报异常的对象的对象个数--10 */
-	public final static int CustomException_log_object_size = 10;
-	
-	
-}
+package com.base;
+
+/**
+ * <一句话功能简述>
+ * <功能详细描述>
+ * @author    chen
+ * @version   [版本号,2016年9月8日]
+ * @see       [相关类/方法]
+ * @since     [产品/模块版本]
+ */
+public class Constant {
+	
+	/** 国际话配置文件文件-i18n.properties  */
+	public static String I18N_PROPERTIES_FIEL_PATH = "/com/base/i18n.properties";
+	
+	/** WritefileThread-线程睡眠时间--3000 */
+	public final static long THREAD_SLEEP_WRITEFILETHREAD = 3000;
+	
+	/** CustomException记录报异常的对象的对象个数--10 */
+	public final static int CustomException_log_object_size = 10;
+	
+	
+}
diff --git a/src/com/base/Custom4exception.java b/src/com/base/Custom4exception.java
index 7a1ed58b..0ca8b567 100644
--- a/src/com/base/Custom4exception.java
+++ b/src/com/base/Custom4exception.java
@@ -1,29 +1,29 @@
-package com.base;
-
-/**
- * <一句话功能简述> 异常常量编码
- * <功能详细描述>
- * @author    chen
- * @version   [版本号,2016年9月8日]
- * @see       [相关类/方法]
- * @since     [产品/模块版本]
- */
-public class Custom4exception {
-	//3003001001  :  第一位:标识异常,  第二到第四位:标识模块,第五道第七位:标识类别,第八道第十位标识具体异常
-	/**eg
-	 *  3:异常
-	 * 	 003:虚拟机模块
-	 * 	    001:软件依赖虚拟机资源类别
-	 * 	       001:启动异常
-	 */
-	/**
-	 * ThreadVolume类查询 volume异常
-	 */
-	public final static String threadVolume_class_Except = "3001001001";
-	
-	/**
-	 * ThreadVolume类线程休眠异常
-	 */
-	public final static String threadVolume_Thread_Except = "3001001002";
-	
-}
+package com.base;
+
+/**
+ * <一句话功能简述> 异常常量编码
+ * <功能详细描述>
+ * @author    chen
+ * @version   [版本号,2016年9月8日]
+ * @see       [相关类/方法]
+ * @since     [产品/模块版本]
+ */
+public class Custom4exception {
+	//3003001001  :  第一位:标识异常,  第二到第四位:标识模块,第五道第七位:标识类别,第八道第十位标识具体异常
+	/**eg
+	 *  3:异常
+	 * 	 003:虚拟机模块
+	 * 	    001:软件依赖虚拟机资源类别
+	 * 	       001:启动异常
+	 */
+	/**
+	 * ThreadVolume类查询 volume异常
+	 */
+	public final static String threadVolume_class_Except = "3001001001";
+	
+	/**
+	 * ThreadVolume类线程休眠异常
+	 */
+	public final static String threadVolume_Thread_Except = "3001001002";
+	
+}
diff --git a/src/com/base/CustomException.java b/src/com/base/CustomException.java
index 08b75248..9cf46a4a 100644
--- a/src/com/base/CustomException.java
+++ b/src/com/base/CustomException.java
@@ -1,127 +1,127 @@
-
-
-package com.base;
-
-import org.apache.log4j.Logger;
-
-/**
- * <一句话功能简述>
- * <功能详细描述>
- * @author    chen
- * @version   [版本号,2016年9月8日]
- * @see       [相关类/方法]
- * @since     [产品/模块版本]
- */
-@SuppressWarnings("serial")
-public class CustomException extends Exception {
-	
-	/** log4j  */
-	public static Logger log = Logger.getRootLogger();
-	
-	/** 自定义异常信息-错误信息  */
-	private String msg;
-	
-	/** 自定义异常信息-错误代码  */
-	private String code;
-	
-	/** 操作对象  */
-	private Object[] objArray;
-	
-	/** 异常  */
-	private Throwable cause;
-	
-	public CustomException() {
-	        super();
-    }
-	 
-	/**
-	 * @功能 将异常记录进文件
-	 * @param code 异常编码
-	 * @param msg 自定义异常信息
-	 * @param e
-	 * @param obj
-	 */
-	public CustomException(String code,Exception e,Object... obj) {
-		super(code);
-		StringBuffer sbuf= new StringBuffer();
-		sbuf.append(msg);
-		this.code = code;
-		sbuf.append(code);
-		sbuf.append("\r\n");
-		msg = Resource.getProperties().get(code);
-		// 记录自定义的 异常
-		if (null != msg) {
-			sbuf.append(msg);
-			sbuf.append("\r\n");
-		}
-		// 记录原始的异常
-		if (null != e) {
-			StackTraceElement[] array = e.getStackTrace();
-			cause = e.getCause();
-			for (StackTraceElement stackTraceElement : array) {
-				sbuf.append(stackTraceElement.toString());
-				sbuf.append("\r\n");
-			}
-		}
-		//记录  出现异常时  当前的对象
-		if (null != obj) {
-			Object[] array = obj;
-			sbuf.append("Object[] size :  ");
-			sbuf.append(array.length);
-			int forSize = 0;
-			if (Constant.CustomException_log_object_size < array.length) {
-				forSize = Constant.CustomException_log_object_size;
-			}
-			else {
-				forSize = array.length;
-			}
-			for (int i = 0; i < forSize; i++) {
-				sbuf.append(array[i]);
-				sbuf.append("\r\n");
-			}
-			sbuf.append("......");
-			sbuf.append("\r\n");
-		}
-		else {
-			sbuf.append("null");
-			sbuf.append("\r\n");
-		}
-		
-		sbuf.append("\r\n");
-		// 是否 写入 文件
-		log.error(sbuf.toString());
-	}
-
-	/**
-	 * @功能  获得msg
-	 * @return msg
-	 */
-	public String getMsg() {
-		return msg;
-	}
-	
-
-	/**
-	 * @return the code
-	 */
-	public String getCode() {
-		return code;
-	}
-
-	/**
-	 * @功能  获得objArray
-	 * @return objArray
-	 */
-	public Object[] getObjArray() {
-		return objArray;
-	}
-
-	/**
-	 * @功能  获得cause
-	 * @return cause
-	 */
-	public Throwable getCause() {
-		return cause;
-	}
-}
-
+
+
+package com.base;
+
+import org.apache.log4j.Logger;
+
+/**
+ * <一句话功能简述>
+ * <功能详细描述>
+ * @author    chen
+ * @version   [版本号,2016年9月8日]
+ * @see       [相关类/方法]
+ * @since     [产品/模块版本]
+ */
+@SuppressWarnings("serial")
+public class CustomException extends Exception {
+	
+	/** log4j  */
+	public static Logger log = Logger.getRootLogger();
+	
+	/** 自定义异常信息-错误信息  */
+	private String msg;
+	
+	/** 自定义异常信息-错误代码  */
+	private String code;
+	
+	/** 操作对象  */
+	private Object[] objArray;
+	
+	/** 异常  */
+	private Throwable cause;
+	
+	public CustomException() {
+	        super();
+    }
+	 
+	/**
+	 * @功能 将异常记录进文件
+	 * @param code 异常编码
+	 * @param msg 自定义异常信息
+	 * @param e
+	 * @param obj
+	 */
+	public CustomException(String code,Exception e,Object... obj) {
+		super(code);
+		StringBuffer sbuf= new StringBuffer();
+		sbuf.append(msg);
+		this.code = code;
+		sbuf.append(code);
+		sbuf.append("\r\n");
+		msg = Resource.getProperties().get(code);
+		// 记录自定义的 异常
+		if (null != msg) {
+			sbuf.append(msg);
+			sbuf.append("\r\n");
+		}
+		// 记录原始的异常
+		if (null != e) {
+			StackTraceElement[] array = e.getStackTrace();
+			cause = e.getCause();
+			for (StackTraceElement stackTraceElement : array) {
+				sbuf.append(stackTraceElement.toString());
+				sbuf.append("\r\n");
+			}
+		}
+		//记录  出现异常时  当前的对象
+		if (null != obj) {
+			Object[] array = obj;
+			sbuf.append("Object[] size :  ");
+			sbuf.append(array.length);
+			int forSize = 0;
+			if (Constant.CustomException_log_object_size < array.length) {
+				forSize = Constant.CustomException_log_object_size;
+			}
+			else {
+				forSize = array.length;
+			}
+			for (int i = 0; i < forSize; i++) {
+				sbuf.append(array[i]);
+				sbuf.append("\r\n");
+			}
+			sbuf.append("......");
+			sbuf.append("\r\n");
+		}
+		else {
+			sbuf.append("null");
+			sbuf.append("\r\n");
+		}
+		
+		sbuf.append("\r\n");
+		// 是否 写入 文件
+		log.error(sbuf.toString());
+	}
+
+	/**
+	 * @功能  获得msg
+	 * @return msg
+	 */
+	public String getMsg() {
+		return msg;
+	}
+	
+
+	/**
+	 * @return the code
+	 */
+	public String getCode() {
+		return code;
+	}
+
+	/**
+	 * @功能  获得objArray
+	 * @return objArray
+	 */
+	public Object[] getObjArray() {
+		return objArray;
+	}
+
+	/**
+	 * @功能  获得cause
+	 * @return cause
+	 */
+	public Throwable getCause() {
+		return cause;
+	}
+}
+
diff --git a/src/com/base/Resource.java b/src/com/base/Resource.java
index 5cd15923..0b900bfe 100644
--- a/src/com/base/Resource.java
+++ b/src/com/base/Resource.java
@@ -1,79 +1,79 @@
-package com.base;
-
-import java.io.BufferedInputStream;
-import java.io.BufferedReader;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Properties;
-
-import com.base.Constant;
-
-public class Resource {
-
-	private static Map<String, String> properties = new HashMap<>();
-	
-	static{
-		// 读取 properties文件
-//		readPropertiesFile(Constant.SYSTEM_PROPERTIES_FIEL_PATH);
-		readPropertiesFile4Chinese(Constant.I18N_PROPERTIES_FIEL_PATH);
-	
-	}
-
-	/**
-	 * @功能 读取配置(解决中文乱码)
-	 * @param filename  "/com/utils/exception/i18n.properties"  的格式
-	 */
-	public static void readPropertiesFile4Chinese(String filename) {
-		Properties pro = new Properties();
-		try {
-			// 读取属性文件 XXXX.properties(Reader。writer解决中文乱码)
-//			InputStreamReader in= new InputStreamReader(Resource.class.getClassLoader().getResourceAsStream(filename), "UTF-8");
-			InputStreamReader in= new InputStreamReader(Resource.class.getResourceAsStream(filename), "UTF-8");
-			BufferedReader bf = new BufferedReader(in);
-	//		InputStreamReader in = new BufferedInputStream(new FileInputStream(filename));
-			pro.load(bf); // /加载属性列表
-			Iterator<String> it = pro.stringPropertyNames().iterator();
-			while (it.hasNext()) {
-				String key = it.next();
-				properties.put(key, pro.getProperty(key));
-			}
-			in.close();
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @功能  获得properties
-	 * @return properties
-	 */
-	public static Map<String, String> getProperties() {
-		return properties;
-	}
-
-	/**
-	 * @功能 读取配置
-	 * @param filename 文件绝对路径
-	 */
-	public static void readPropertiesFile(String filename) {
-			Properties pro = new Properties();
-			try {
-				// 读取属性文件 XXXX.properties( 中文会 乱码)
-				BufferedInputStream bf = new BufferedInputStream(new FileInputStream(filename));
-				pro.load(bf); // /加载属性列表
-				Iterator<String> it = pro.stringPropertyNames().iterator();
-				while (it.hasNext()) {
-					String key = it.next();
-					properties.put(key, pro.getProperty(key));
-				}
-				bf.close();
-			} catch (IOException e) {
-				e.printStackTrace();
-			}
-		}
-
-}
+package com.base;
+
+import java.io.BufferedInputStream;
+import java.io.BufferedReader;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Properties;
+
+import com.base.Constant;
+
+public class Resource {
+
+	private static Map<String, String> properties = new HashMap<>();
+	
+	static{
+		// 读取 properties文件
+//		readPropertiesFile(Constant.SYSTEM_PROPERTIES_FIEL_PATH);
+		readPropertiesFile4Chinese(Constant.I18N_PROPERTIES_FIEL_PATH);
+	
+	}
+
+	/**
+	 * @功能 读取配置(解决中文乱码)
+	 * @param filename  "/com/utils/exception/i18n.properties"  的格式
+	 */
+	public static void readPropertiesFile4Chinese(String filename) {
+		Properties pro = new Properties();
+		try {
+			// 读取属性文件 XXXX.properties(Reader。writer解决中文乱码)
+//			InputStreamReader in= new InputStreamReader(Resource.class.getClassLoader().getResourceAsStream(filename), "UTF-8");
+			InputStreamReader in= new InputStreamReader(Resource.class.getResourceAsStream(filename), "UTF-8");
+			BufferedReader bf = new BufferedReader(in);
+	//		InputStreamReader in = new BufferedInputStream(new FileInputStream(filename));
+			pro.load(bf); // /加载属性列表
+			Iterator<String> it = pro.stringPropertyNames().iterator();
+			while (it.hasNext()) {
+				String key = it.next();
+				properties.put(key, pro.getProperty(key));
+			}
+			in.close();
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+	}
+
+	/**
+	 * @功能  获得properties
+	 * @return properties
+	 */
+	public static Map<String, String> getProperties() {
+		return properties;
+	}
+
+	/**
+	 * @功能 读取配置
+	 * @param filename 文件绝对路径
+	 */
+	public static void readPropertiesFile(String filename) {
+			Properties pro = new Properties();
+			try {
+				// 读取属性文件 XXXX.properties( 中文会 乱码)
+				BufferedInputStream bf = new BufferedInputStream(new FileInputStream(filename));
+				pro.load(bf); // /加载属性列表
+				Iterator<String> it = pro.stringPropertyNames().iterator();
+				while (it.hasNext()) {
+					String key = it.next();
+					properties.put(key, pro.getProperty(key));
+				}
+				bf.close();
+			} catch (IOException e) {
+				e.printStackTrace();
+			}
+		}
+
+}
diff --git a/src/com/dao/mapper/RegionalismMapper.xml b/src/com/dao/mapper/RegionalismMapper.xml
index ce2c48f5..9110649b 100644
--- a/src/com/dao/mapper/RegionalismMapper.xml
+++ b/src/com/dao/mapper/RegionalismMapper.xml
@@ -1,42 +1,42 @@
-<?xml version="1.0" encoding="UTF-8" ?>    
-<!DOCTYPE mapper    
-PUBLIC "-//ibatis.apache.org//DTD Mapper 3.0//EN"    
-"http://ibatis.apache.org/dtd/ibatis-3-mapper.dtd">
-
-<mapper namespace="com.platform.dao.IRegionalismCodeDao">
-	<resultMap id="getEntityByText" type="com.platform.entities.RegionalismEntity">
-		<id property="code" column="code" jdbcType="VARCHAR" />
-		<result property="cityName" column="city_name" jdbcType="VARCHAR" />
-		<result property="districtName" column="district_name" jdbcType="VARCHAR" />
-	</resultMap>
-	
-	<sql id="Base_Column_List">
-		code,city_name,district_name
-	</sql>
-	
-	<!-- 获取数据全部记录信息 -->
-	<select id="findAllRegionalism" resultMap="getEntityByText">
-		SELECT
-		<include refid="Base_Column_List" />
-		FROM regionalism_info
-		order by code
-	</select>
-	
-	<select id="findSubRegionalism" parameterType="com.platform.entities.RegionalismEntity" resultMap="getEntityByText">
-		SELECT
-		<include refid="Base_Column_List" />
-		FROM regionalism_info
-		<where>
-			<if test="code != null and code != ''">
-				AND code LIKE CONCAT(CONCAT('%', #{code}), '%')
-			</if>
-			<if test="cityName != null and cityName != ''">
-				AND city_name LIKE CONCAT(CONCAT('%', #{cityName}), '%')
-			</if>
-			<if test="districtName != null and districtName != ''">
-				AND district_name LIKE CONCAT(CONCAT('%', #{districtName}), '%')
-			</if>
-		</where>
-		order by code
-	</select>
+<?xml version="1.0" encoding="UTF-8" ?>    
+<!DOCTYPE mapper    
+PUBLIC "-//ibatis.apache.org//DTD Mapper 3.0//EN"    
+"http://ibatis.apache.org/dtd/ibatis-3-mapper.dtd">
+
+<mapper namespace="com.platform.dao.IRegionalismCodeDao">
+	<resultMap id="getEntityByText" type="com.platform.entities.RegionalismEntity">
+		<id property="code" column="code" jdbcType="VARCHAR" />
+		<result property="cityName" column="city_name" jdbcType="VARCHAR" />
+		<result property="districtName" column="district_name" jdbcType="VARCHAR" />
+	</resultMap>
+	
+	<sql id="Base_Column_List">
+		code,city_name,district_name
+	</sql>
+	
+	<!-- 获取数据全部记录信息 -->
+	<select id="findAllRegionalism" resultMap="getEntityByText">
+		SELECT
+		<include refid="Base_Column_List" />
+		FROM regionalism_info
+		order by code
+	</select>
+	
+	<select id="findSubRegionalism" parameterType="com.platform.entities.RegionalismEntity" resultMap="getEntityByText">
+		SELECT
+		<include refid="Base_Column_List" />
+		FROM regionalism_info
+		<where>
+			<if test="code != null and code != ''">
+				AND code LIKE CONCAT(CONCAT('%', #{code}), '%')
+			</if>
+			<if test="cityName != null and cityName != ''">
+				AND city_name LIKE CONCAT(CONCAT('%', #{cityName}), '%')
+			</if>
+			<if test="districtName != null and districtName != ''">
+				AND district_name LIKE CONCAT(CONCAT('%', #{districtName}), '%')
+			</if>
+		</where>
+		order by code
+	</select>
 </mapper>  
\ No newline at end of file
diff --git a/src/com/dao/mapper/SystemCodeMapper.xml b/src/com/dao/mapper/SystemCodeMapper.xml
index c23937dd..f835c99f 100644
--- a/src/com/dao/mapper/SystemCodeMapper.xml
+++ b/src/com/dao/mapper/SystemCodeMapper.xml
@@ -1,42 +1,42 @@
-<?xml version="1.0" encoding="UTF-8" ?>    
-<!DOCTYPE mapper    
-PUBLIC "-//ibatis.apache.org//DTD Mapper 3.0//EN"    
-"http://ibatis.apache.org/dtd/ibatis-3-mapper.dtd">
-
-<mapper namespace="com.platform.dao.ISystemCodeDao">
-	<resultMap id="getEntityByText" type="com.platform.entities.SystemEntity">
-		<id property="code" column="code" jdbcType="INTEGER" />
-		<result property="systemName" column="system_name" jdbcType="VARCHAR" />
-	</resultMap>
-	
-	<sql id="Base_Column_List">
-		code,system_name
-	</sql>
-	
-	<!-- 获取数据全部记录信息 -->
-	<select id="findAllSystem" resultMap="getEntityByText">
-		SELECT
-		<include refid="Base_Column_List" />
-		FROM system_info
-		order by code
-	</select>
-	
-	<select id="findSubSystem" parameterType="com.platform.entities.SystemEntity" resultMap="getEntityByText">
-		SELECT
-		<include refid="Base_Column_List" />
-		FROM system_info
-		<where>
-			<if test="code > 0">
-				AND code = #{code}
-			</if>
-			<if test="cityName != null and cityName != ''">
-				AND city_name LIKE CONCAT(CONCAT('%', #{cityName}), '%')
-			</if>
-			<if test="districtName != null and districtName != ''">
-				AND district_name LIKE CONCAT(CONCAT('%', #{districtName}), '%')
-			</if>
-		</where>
-		order by code
-	</select>
-	
+<?xml version="1.0" encoding="UTF-8" ?>    
+<!DOCTYPE mapper    
+PUBLIC "-//ibatis.apache.org//DTD Mapper 3.0//EN"    
+"http://ibatis.apache.org/dtd/ibatis-3-mapper.dtd">
+
+<mapper namespace="com.platform.dao.ISystemCodeDao">
+	<resultMap id="getEntityByText" type="com.platform.entities.SystemEntity">
+		<id property="code" column="code" jdbcType="INTEGER" />
+		<result property="systemName" column="system_name" jdbcType="VARCHAR" />
+	</resultMap>
+	
+	<sql id="Base_Column_List">
+		code,system_name
+	</sql>
+	
+	<!-- 获取数据全部记录信息 -->
+	<select id="findAllSystem" resultMap="getEntityByText">
+		SELECT
+		<include refid="Base_Column_List" />
+		FROM system_info
+		order by code
+	</select>
+	
+	<select id="findSubSystem" parameterType="com.platform.entities.SystemEntity" resultMap="getEntityByText">
+		SELECT
+		<include refid="Base_Column_List" />
+		FROM system_info
+		<where>
+			<if test="code > 0">
+				AND code = #{code}
+			</if>
+			<if test="cityName != null and cityName != ''">
+				AND city_name LIKE CONCAT(CONCAT('%', #{cityName}), '%')
+			</if>
+			<if test="districtName != null and districtName != ''">
+				AND district_name LIKE CONCAT(CONCAT('%', #{districtName}), '%')
+			</if>
+		</where>
+		order by code
+	</select>
+	
 </mapper>  
\ No newline at end of file
diff --git a/src/com/dao/mapper/config-details-mapper.xml b/src/com/dao/mapper/config-details-mapper.xml
index 3d1dba4d..439d4f98 100644
--- a/src/com/dao/mapper/config-details-mapper.xml
+++ b/src/com/dao/mapper/config-details-mapper.xml
@@ -1,146 +1,146 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper    
-PUBLIC "-//ibatis.apache.org//DTD Mapper 3.0//EN"    
-"http://ibatis.apache.org/dtd/ibatis-3-mapper.dtd">
-
-<mapper namespace="com.platform.dao.GatherOracleDao">
-	<resultMap type="com.platform.entities.GatherOracleInfo" id="getEntityBytext">
-		<id property="id" column="id" javaType="int" jdbcType="INTEGER" />
-		<result property="port" column="service_port" javaType="int" jdbcType="INTEGER"/>
-		<result property="ip" column="service_ip" javaType="string" jdbcType="VARCHAR"/>
-		<result property="name" column="service_name" javaType="string" jdbcType="VARCHAR"/>
-		<result property="user" column="service_user" javaType="string" jdbcType="VARCHAR"/>
-		<result property="password" column="service_password" javaType="string" jdbcType="VARCHAR"/>
-		<result property="databaseName" column="service_database" javaType="string" jdbcType="VARCHAR"/>
-		<result property="tableName" column="service_table" javaType="string" jdbcType="VARCHAR"/>
-		<result property="suffix" column="service_suffix" javaType="string" jdbcType="VARCHAR"/>
-		<result property="status" column="service_status" javaType="string" jdbcType="VARCHAR"/>
-		<result property="remove" column="remove" jdbcType="CHAR"/>
-	</resultMap>
-	<sql id="baseOracleInfo">
-		id id, service_port port, service_ip ip, service_name name, service_user user, service_password password, service_database databaseName, service_table tableName, service_suffix suffix, service_status status
-	</sql>
-
-	<select id="selectAllOracle" resultType="com.platform.entities.GatherOracleInfo">
-		SELECT
-		<include refid="baseOracleInfo" />
-		FROM services_info
-		WHERE remove = "0"
-	</select>
-	
-	<insert id="insertOracle" parameterType="com.platform.entities.GatherOracleInfo">
-		INSERT INTO
-		services_info(
-		<trim suffixOverrides=",">
-			<if test="port > 0">
-				service_port,
-			</if>
-			<if test="ip != null and ip != ''">
-				service_ip,
-			</if>
-			<if test="name != null and name != ''">
-				service_name,
-			</if>
-			<if test="user != null and user != ''">
-				service_user,
-			</if>
-			<if test="password != null and password != ''">
-				service_password,
-			</if>
-			<if test="databaseName != null and databaseName != ''">
-				service_database,
-			</if>
-			<if test="tableName != null and tableName != ''">
-				service_table,
-			</if>
-			<if test="suffix != null and suffix != ''">
-				service_suffix,
-			</if>
-			<if test="status != null and status != ''">
-				service_status,
-			</if>
-		</trim>
-		)
-		VALUES(
-		<trim suffixOverrides=",">
-			<if test="port > 0">
-				#{port},
-			</if>
-			<if test="ip != null and ip != ''">
-				#{ip},
-			</if>
-			<if test="name != null and name != ''">
-				#{name},
-			</if>
-			<if test="user != null and user != ''">
-				#{user},
-			</if>
-			<if test="password != null and password != ''">
-				#{password},
-			</if>
-			<if test="databaseName != null and databaseName != ''">
-				#{databaseName},
-			</if>
-			<if test="tableName != null and tableName != ''">
-				#{tableName},
-			</if>
-			<if test="suffix != null and suffix != ''">
-				#{suffix},
-			</if>
-			<if test="status != null and status != ''">
-				#{status},
-			</if>
-		</trim>
-		)
-	</insert>
-	
-	<delete id="deleteOracleById" parameterType="java.lang.Integer">
-		DELETE FROM services_info 
-		<where>
-			id =#{id}
-		</where>
-	</delete>
-	
-	<update id="updateOracleById" parameterType="com.platform.entities.GatherOracleInfo">
-		UPDATE
-		services_info
-		<set >
-			<trim suffixOverrides=",">
-				<if test="name != null and name != ''">
-					service_name = #{name},
-				</if>
-				<if test="ip != null and ip != ''">
-					service_ip = #{ip},
-				</if>
-				<if test="port > 0">
-					service_port= #{port},
-				</if>
-				<if test="user != null and user != ''">
-					service_user= #{user},
-				</if>
-				<if test="password != null and password != ''">
-					service_password= #{password},
-				</if>
-				<if test="databaseName != null and databaseName != ''">
-					service_database= #{databaseName},
-				</if>
-				<if test="tableName != null and tableName != ''">
-					service_table= #{tableName},
-				</if>
-				<if test="suffix != null and suffix != ''">
-					service_suffix= #{suffix},
-				</if>
-				<if test="status != null and status != ''">
-					service_status= #{status},
-				</if>
-				<if test="remove != null and remove != ''">
-					remove= #{remove},
-				</if>
-			</trim>
-		</set>
-		<where>
-			id = #{id}
-		</where>
-	</update>
-	
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper    
+PUBLIC "-//ibatis.apache.org//DTD Mapper 3.0//EN"    
+"http://ibatis.apache.org/dtd/ibatis-3-mapper.dtd">
+
+<mapper namespace="com.platform.dao.GatherOracleDao">
+	<resultMap type="com.platform.entities.GatherOracleInfo" id="getEntityBytext">
+		<id property="id" column="id" javaType="int" jdbcType="INTEGER" />
+		<result property="port" column="service_port" javaType="int" jdbcType="INTEGER"/>
+		<result property="ip" column="service_ip" javaType="string" jdbcType="VARCHAR"/>
+		<result property="name" column="service_name" javaType="string" jdbcType="VARCHAR"/>
+		<result property="user" column="service_user" javaType="string" jdbcType="VARCHAR"/>
+		<result property="password" column="service_password" javaType="string" jdbcType="VARCHAR"/>
+		<result property="databaseName" column="service_database" javaType="string" jdbcType="VARCHAR"/>
+		<result property="tableName" column="service_table" javaType="string" jdbcType="VARCHAR"/>
+		<result property="suffix" column="service_suffix" javaType="string" jdbcType="VARCHAR"/>
+		<result property="status" column="service_status" javaType="string" jdbcType="VARCHAR"/>
+		<result property="remove" column="remove" jdbcType="CHAR"/>
+	</resultMap>
+	<sql id="baseOracleInfo">
+		id id, service_port port, service_ip ip, service_name name, service_user user, service_password password, service_database databaseName, service_table tableName, service_suffix suffix, service_status status
+	</sql>
+
+	<select id="selectAllOracle" resultType="com.platform.entities.GatherOracleInfo">
+		SELECT
+		<include refid="baseOracleInfo" />
+		FROM services_info
+		WHERE remove = "0"
+	</select>
+	
+	<insert id="insertOracle" parameterType="com.platform.entities.GatherOracleInfo">
+		INSERT INTO
+		services_info(
+		<trim suffixOverrides=",">
+			<if test="port > 0">
+				service_port,
+			</if>
+			<if test="ip != null and ip != ''">
+				service_ip,
+			</if>
+			<if test="name != null and name != ''">
+				service_name,
+			</if>
+			<if test="user != null and user != ''">
+				service_user,
+			</if>
+			<if test="password != null and password != ''">
+				service_password,
+			</if>
+			<if test="databaseName != null and databaseName != ''">
+				service_database,
+			</if>
+			<if test="tableName != null and tableName != ''">
+				service_table,
+			</if>
+			<if test="suffix != null and suffix != ''">
+				service_suffix,
+			</if>
+			<if test="status != null and status != ''">
+				service_status,
+			</if>
+		</trim>
+		)
+		VALUES(
+		<trim suffixOverrides=",">
+			<if test="port > 0">
+				#{port},
+			</if>
+			<if test="ip != null and ip != ''">
+				#{ip},
+			</if>
+			<if test="name != null and name != ''">
+				#{name},
+			</if>
+			<if test="user != null and user != ''">
+				#{user},
+			</if>
+			<if test="password != null and password != ''">
+				#{password},
+			</if>
+			<if test="databaseName != null and databaseName != ''">
+				#{databaseName},
+			</if>
+			<if test="tableName != null and tableName != ''">
+				#{tableName},
+			</if>
+			<if test="suffix != null and suffix != ''">
+				#{suffix},
+			</if>
+			<if test="status != null and status != ''">
+				#{status},
+			</if>
+		</trim>
+		)
+	</insert>
+	
+	<delete id="deleteOracleById" parameterType="java.lang.Integer">
+		DELETE FROM services_info 
+		<where>
+			id =#{id}
+		</where>
+	</delete>
+	
+	<update id="updateOracleById" parameterType="com.platform.entities.GatherOracleInfo">
+		UPDATE
+		services_info
+		<set >
+			<trim suffixOverrides=",">
+				<if test="name != null and name != ''">
+					service_name = #{name},
+				</if>
+				<if test="ip != null and ip != ''">
+					service_ip = #{ip},
+				</if>
+				<if test="port > 0">
+					service_port= #{port},
+				</if>
+				<if test="user != null and user != ''">
+					service_user= #{user},
+				</if>
+				<if test="password != null and password != ''">
+					service_password= #{password},
+				</if>
+				<if test="databaseName != null and databaseName != ''">
+					service_database= #{databaseName},
+				</if>
+				<if test="tableName != null and tableName != ''">
+					service_table= #{tableName},
+				</if>
+				<if test="suffix != null and suffix != ''">
+					service_suffix= #{suffix},
+				</if>
+				<if test="status != null and status != ''">
+					service_status= #{status},
+				</if>
+				<if test="remove != null and remove != ''">
+					remove= #{remove},
+				</if>
+			</trim>
+		</set>
+		<where>
+			id = #{id}
+		</where>
+	</update>
+	
 </mapper>
\ No newline at end of file
diff --git a/src/com/dao/mapper/data-details-mapper.xml b/src/com/dao/mapper/data-details-mapper.xml
index 217885ca..39a61797 100644
--- a/src/com/dao/mapper/data-details-mapper.xml
+++ b/src/com/dao/mapper/data-details-mapper.xml
@@ -1,249 +1,249 @@
-<?xml version="1.0" encoding="UTF-8" ?>    
-<!DOCTYPE mapper    
-PUBLIC "-//ibatis.apache.org//DTD Mapper 3.0//EN"    
-"http://ibatis.apache.org/dtd/ibatis-3-mapper.dtd">
-
-<mapper namespace="com.platform.dao.DataInfoDao">
-	<resultMap id="getEntityByText" type="com.platform.entities.DataInfoEntity">
-		<id property="id" column="id" javaType="int" jdbcType="INTEGER" />
-		<result property="regionalismCode" column="regionalism_code"
-			javaType="string" jdbcType="VARCHAR" />
-		<result property="cityName" column="city_name" javaType="string"
-			jdbcType="VARCHAR" />
-		<result property="districtName" column="district_name"
-			javaType="string" jdbcType="VARCHAR" />
-		<result property="systemCode" column="system_code" javaType="int"
-			jdbcType="INTEGER" />
-		<result property="systemName" column="system_name" javaType="string"
-			jdbcType="VARCHAR" />
-		<result property="dataType" column="data_type" javaType="string"
-			jdbcType="VARCHAR" />
-		<result property="dataVersion" column="data_version" javaType="int"
-			jdbcType="INTEGER" />
-		<result property="submittedBatch" column="submitted_batch"
-			javaType="string" jdbcType="VARCHAR" />
-		<result property="dataPath" column="data_path" javaType="string"
-			jdbcType="VARCHAR" />
-		<result property="charset" column="data_charset" javaType="string"
-			jdbcType="VARCHAR" />
-		<result property="collectingTime" column="collection_time"
-			javaType="string" jdbcType="DATE" />
-		<result property="collectorContacts" column="collector_contacts"
-			javaType="string" jdbcType="VARCHAR" />
-		<result property="collectorName" column="collector_name"
-			javaType="string" jdbcType="VARCHAR" />
-		<result property="extractStatus" column="extract_status" jdbcType="INTEGER" />
-		
-		<result property="year" column="data_year" javaType="string"
-			jdbcType="VARCHAR" />
-		<result property="startYear" column="start_year" javaType="string"
-			jdbcType="VARCHAR" />
-		<result property="endYear" column="end_year" javaType="string"
-			jdbcType="VARCHAR" />
-		<result property="volumeIp" column="volume_ip" javaType="string"
-			jdbcType="VARCHAR" />
-		<result property="volumePath" column="volume_path" javaType="string"
-			jdbcType="VARCHAR" />
-	</resultMap>
-	<sql id="conditionsFilters">
-		<if test="dataType!=null">
-			AND data_details.data_type=#{dataType}
-		</if>
-		<if test="submittedBatch!=null">
-			AND
-			data_details.submitted_batch=#{submittedBatch}
-		</if>
-		<if test="cityName!=null">
-			AND data_details.city_name=#{cityName}
-		</if>
-		<if test="districtName!=null">
-			AND
-			data_details.district_name=#{districtName}
-		</if>
-		<if test="dataVersion !=null">
-			AND data_details.data_version=#{dataVersion}
-		</if>
-		<if test="systemName !=null">
-			AND data_details.system_name=#{systemName}
-		</if>
-		<if test="dataYear !=null">
-			AND data_details.data_year=#{dataYear}
-		</if>
-		<if test="array !=null and array.length > 0">
-			<foreach collection="array" item="item" index="index">
-			AND CONCAT(regionalism_code,system_code,city_name,district_name,system_name) LIKE CONCAT('%',CONCAT(#{item},'%'))
-			</foreach>
-		</if>
-	</sql>
-
-	<!-- 获取数据符合筛选条件的全部记录信息 -->
-	<select id="getLimitedDataInfoEntities" parameterType="com.platform.entities.PagerOptions"
-		resultMap="getEntityByText">
-		SELECT
-		id,regionalism_code,city_name,district_name,system_code,system_name,data_type,data_version,submitted_batch,data_path,data_charset,collection_time,collector_name,collector_contacts,extract_status,data_year,start_year,end_year,volume_ip,volume_path
-		FROM data_details
-			<where>
-				<include refid="conditionsFilters" />
-				<choose>
-					<when test="offset > 0">
-						and data_details.id>= #{offset}
-					</when>
-					<otherwise>
-						and data_details.id>=0
-					</otherwise>
-				</choose>
-			</where>
-			
-			ORDER BY data_details.id
-			<if test="limit > 0">
-				LIMIT #{limit}
-			</if>
-	</select>
-
-	<!-- 获取数据符合筛选条件的总记录条数 -->
-	<select id="getLimitedDataCount" resultType="java.lang.Integer"
-		parameterType="com.platform.entities.PagerOptions">
-		SELECT COUNT(id) FROM data_details
-			<where>
-				<include refid="conditionsFilters" />
-			</where>
-
-	</select>
-
-	<!-- 获取数据查询的起始di -->
-	<select id="getLimitedBeginId" resultType="java.lang.Integer"
-		parameterType="com.platform.entities.PagerOptions">
-		SELECT MAX(idx) FROM (SELECT id idx FROM data_details 
-		ORDER BY id LIMIT 0,#{totalLimit}) AS TEMP
-	</select>
-	
-	<insert id="save" parameterType="com.platform.entities.DataInfoEntity">
-		INSERT INTO
-		data_info(
-		<trim suffixOverrides=",">
-			<if test="regionalismCode != null and regionalismCode != ''">
-				regionalism_code,
-			</if>
-			<if test="systemCode != null">
-				system_code,
-			</if>
-			<if test="dataType != null and dataType != ''">
-				data_type,
-			</if>
-			<if test="dataVersion != null">
-				data_version,
-			</if>
-			<if test="submittedBatch != null and submittedBatch != ''">
-				submitted_batch,
-			</if>
-			<if test="dataPath != null and dataPath != ''">
-				data_path,
-			</if>
-			<if test="collectingTime != null">
-				collection_time,
-			</if>
-			<if test="collectorName != null and collectorName != ''">
-				collector_name,
-			</if>
-			<if test="collectorContacts != null and collectorContacts != ''">
-				collector_contacts,
-			</if>
-			<if test="charset != null and charset != ''">
-				data_charset,
-			</if>
-			<if test="year != null and year != ''">
-				data_year,
-			</if>
-			<if test="startYear != null and startYear != ''">
-				start_year,
-			</if>
-			<if test="endYear != null and endYear != ''">
-				end_year,
-			</if>
-			<if test="volumeIp != null and volumeIp != ''">
-				volume_ip,
-			</if>
-			<if test="volumePath != null and volumePath != ''">
-				volume_path,
-			</if>
-			<if test="extractStatus > 0">
-				extract_status,
-			</if>
-		</trim>
-		)
-		VALUES(
-		<trim suffixOverrides=",">
-			<if test="regionalismCode != null and regionalismCode != ''">
-				#{regionalismCode},
-			</if>
-			<if test="systemCode != null">
-				#{systemCode},
-			</if>
-			<if test="dataType != null and dataType != ''">
-				#{dataType},
-			</if>
-			<if test="dataVersion != null">
-				#{dataVersion},
-			</if>
-			<if test="submittedBatch != null and submittedBatch != ''">
-				#{submittedBatch},
-			</if>
-			<if test="dataPath != null and dataPath != ''">
-				#{dataPath},
-			</if>
-			<if test="collectingTime != null">
-				#{collectingTime},
-			</if>
-			<if test="collectorName != null and collectorName != ''">
-				#{collectorName},
-			</if>
-			<if test="collectorContacts != null and collectorContacts != ''">
-				#{collectorContacts},
-			</if>
-			<if test="charset != null and charset != ''">
-				#{charset},
-			</if>
-			<if test="year != null and year != ''">
-				#{year},
-			</if>
-			<if test="startYear != null and startYear != ''">
-				#{start_year},
-			</if>
-			<if test="endYear != null and endYear != ''">
-				#{end_year},
-			</if>
-			<if test="volumeIp != null and volumeIp != ''">
-				#{volumeIp},
-			</if>
-			<if test="volumePath != null and volumePath != ''">
-				#{volumePath},
-			</if>
-			<if test="extractStatus > 0">
-				#{extractStatus},
-			</if>
-		</trim>
-		)
-	</insert>
-	
-	<select id="getIdIsExist" parameterType="java.util.List" resultType="java.lang.String">
-		select data_path
-		from data_info
-		where id in 
-		<foreach item="item" index="index" collection="list" open="(" separator="," close=")">
-			#{item}
-		</foreach>
-		and remove ='0'
-	</select>
-	
-	<update id="removes" parameterType="java.util.List">
-		UPDATE
-		data_info
-		set remove = '1'
-		where id in
-		<foreach item="item" index="index" collection="list" open="(" separator="," close=")">
-			#{item}
-		</foreach>
-		and remove ='0'
-	</update>
-
+<?xml version="1.0" encoding="UTF-8" ?>    
+<!DOCTYPE mapper    
+PUBLIC "-//ibatis.apache.org//DTD Mapper 3.0//EN"    
+"http://ibatis.apache.org/dtd/ibatis-3-mapper.dtd">
+
+<mapper namespace="com.platform.dao.DataInfoDao">
+	<resultMap id="getEntityByText" type="com.platform.entities.DataInfoEntity">
+		<id property="id" column="id" javaType="int" jdbcType="INTEGER" />
+		<result property="regionalismCode" column="regionalism_code"
+			javaType="string" jdbcType="VARCHAR" />
+		<result property="cityName" column="city_name" javaType="string"
+			jdbcType="VARCHAR" />
+		<result property="districtName" column="district_name"
+			javaType="string" jdbcType="VARCHAR" />
+		<result property="systemCode" column="system_code" javaType="int"
+			jdbcType="INTEGER" />
+		<result property="systemName" column="system_name" javaType="string"
+			jdbcType="VARCHAR" />
+		<result property="dataType" column="data_type" javaType="string"
+			jdbcType="VARCHAR" />
+		<result property="dataVersion" column="data_version" javaType="int"
+			jdbcType="INTEGER" />
+		<result property="submittedBatch" column="submitted_batch"
+			javaType="string" jdbcType="VARCHAR" />
+		<result property="dataPath" column="data_path" javaType="string"
+			jdbcType="VARCHAR" />
+		<result property="charset" column="data_charset" javaType="string"
+			jdbcType="VARCHAR" />
+		<result property="collectingTime" column="collection_time"
+			javaType="string" jdbcType="DATE" />
+		<result property="collectorContacts" column="collector_contacts"
+			javaType="string" jdbcType="VARCHAR" />
+		<result property="collectorName" column="collector_name"
+			javaType="string" jdbcType="VARCHAR" />
+		<result property="extractStatus" column="extract_status" jdbcType="INTEGER" />
+		
+		<result property="year" column="data_year" javaType="string"
+			jdbcType="VARCHAR" />
+		<result property="startYear" column="start_year" javaType="string"
+			jdbcType="VARCHAR" />
+		<result property="endYear" column="end_year" javaType="string"
+			jdbcType="VARCHAR" />
+		<result property="volumeIp" column="volume_ip" javaType="string"
+			jdbcType="VARCHAR" />
+		<result property="volumePath" column="volume_path" javaType="string"
+			jdbcType="VARCHAR" />
+	</resultMap>
+	<sql id="conditionsFilters">
+		<if test="dataType!=null">
+			AND data_details.data_type=#{dataType}
+		</if>
+		<if test="submittedBatch!=null">
+			AND
+			data_details.submitted_batch=#{submittedBatch}
+		</if>
+		<if test="cityName!=null">
+			AND data_details.city_name=#{cityName}
+		</if>
+		<if test="districtName!=null">
+			AND
+			data_details.district_name=#{districtName}
+		</if>
+		<if test="dataVersion !=null">
+			AND data_details.data_version=#{dataVersion}
+		</if>
+		<if test="systemName !=null">
+			AND data_details.system_name=#{systemName}
+		</if>
+		<if test="dataYear !=null">
+			AND data_details.data_year=#{dataYear}
+		</if>
+		<if test="array !=null and array.length > 0">
+			<foreach collection="array" item="item" index="index">
+			AND CONCAT(regionalism_code,system_code,city_name,district_name,system_name) LIKE CONCAT('%',CONCAT(#{item},'%'))
+			</foreach>
+		</if>
+	</sql>
+
+	<!-- 获取数据符合筛选条件的全部记录信息 -->
+	<select id="getLimitedDataInfoEntities" parameterType="com.platform.entities.PagerOptions"
+		resultMap="getEntityByText">
+		SELECT
+		id,regionalism_code,city_name,district_name,system_code,system_name,data_type,data_version,submitted_batch,data_path,data_charset,collection_time,collector_name,collector_contacts,extract_status,data_year,start_year,end_year,volume_ip,volume_path
+		FROM data_details
+			<where>
+				<include refid="conditionsFilters" />
+				<choose>
+					<when test="offset > 0">
+						and data_details.id>= #{offset}
+					</when>
+					<otherwise>
+						and data_details.id>=0
+					</otherwise>
+				</choose>
+			</where>
+			
+			ORDER BY data_details.id
+			<if test="limit > 0">
+				LIMIT #{limit}
+			</if>
+	</select>
+
+	<!-- 获取数据符合筛选条件的总记录条数 -->
+	<select id="getLimitedDataCount" resultType="java.lang.Integer"
+		parameterType="com.platform.entities.PagerOptions">
+		SELECT COUNT(id) FROM data_details
+			<where>
+				<include refid="conditionsFilters" />
+			</where>
+
+	</select>
+
+	<!-- 获取数据查询的起始di -->
+	<select id="getLimitedBeginId" resultType="java.lang.Integer"
+		parameterType="com.platform.entities.PagerOptions">
+		SELECT MAX(idx) FROM (SELECT id idx FROM data_details 
+		ORDER BY id LIMIT 0,#{totalLimit}) AS TEMP
+	</select>
+	
+	<insert id="save" parameterType="com.platform.entities.DataInfoEntity">
+		INSERT INTO
+		data_info(
+		<trim suffixOverrides=",">
+			<if test="regionalismCode != null and regionalismCode != ''">
+				regionalism_code,
+			</if>
+			<if test="systemCode != null">
+				system_code,
+			</if>
+			<if test="dataType != null and dataType != ''">
+				data_type,
+			</if>
+			<if test="dataVersion != null">
+				data_version,
+			</if>
+			<if test="submittedBatch != null and submittedBatch != ''">
+				submitted_batch,
+			</if>
+			<if test="dataPath != null and dataPath != ''">
+				data_path,
+			</if>
+			<if test="collectingTime != null">
+				collection_time,
+			</if>
+			<if test="collectorName != null and collectorName != ''">
+				collector_name,
+			</if>
+			<if test="collectorContacts != null and collectorContacts != ''">
+				collector_contacts,
+			</if>
+			<if test="charset != null and charset != ''">
+				data_charset,
+			</if>
+			<if test="year != null and year != ''">
+				data_year,
+			</if>
+			<if test="startYear != null and startYear != ''">
+				start_year,
+			</if>
+			<if test="endYear != null and endYear != ''">
+				end_year,
+			</if>
+			<if test="volumeIp != null and volumeIp != ''">
+				volume_ip,
+			</if>
+			<if test="volumePath != null and volumePath != ''">
+				volume_path,
+			</if>
+			<if test="extractStatus > 0">
+				extract_status,
+			</if>
+		</trim>
+		)
+		VALUES(
+		<trim suffixOverrides=",">
+			<if test="regionalismCode != null and regionalismCode != ''">
+				#{regionalismCode},
+			</if>
+			<if test="systemCode != null">
+				#{systemCode},
+			</if>
+			<if test="dataType != null and dataType != ''">
+				#{dataType},
+			</if>
+			<if test="dataVersion != null">
+				#{dataVersion},
+			</if>
+			<if test="submittedBatch != null and submittedBatch != ''">
+				#{submittedBatch},
+			</if>
+			<if test="dataPath != null and dataPath != ''">
+				#{dataPath},
+			</if>
+			<if test="collectingTime != null">
+				#{collectingTime},
+			</if>
+			<if test="collectorName != null and collectorName != ''">
+				#{collectorName},
+			</if>
+			<if test="collectorContacts != null and collectorContacts != ''">
+				#{collectorContacts},
+			</if>
+			<if test="charset != null and charset != ''">
+				#{charset},
+			</if>
+			<if test="year != null and year != ''">
+				#{year},
+			</if>
+			<if test="startYear != null and startYear != ''">
+				#{start_year},
+			</if>
+			<if test="endYear != null and endYear != ''">
+				#{end_year},
+			</if>
+			<if test="volumeIp != null and volumeIp != ''">
+				#{volumeIp},
+			</if>
+			<if test="volumePath != null and volumePath != ''">
+				#{volumePath},
+			</if>
+			<if test="extractStatus > 0">
+				#{extractStatus},
+			</if>
+		</trim>
+		)
+	</insert>
+	
+	<select id="getIdIsExist" parameterType="java.util.List" resultType="java.lang.String">
+		select data_path
+		from data_info
+		where id in 
+		<foreach item="item" index="index" collection="list" open="(" separator="," close=")">
+			#{item}
+		</foreach>
+		and remove ='0'
+	</select>
+	
+	<update id="removes" parameterType="java.util.List">
+		UPDATE
+		data_info
+		set remove = '1'
+		where id in
+		<foreach item="item" index="index" collection="list" open="(" separator="," close=")">
+			#{item}
+		</foreach>
+		and remove ='0'
+	</update>
+
 </mapper>  
\ No newline at end of file
diff --git a/src/com/dao/mapper/dataInfoMoveTmpmapper.xml b/src/com/dao/mapper/dataInfoMoveTmpmapper.xml
index e35029a5..13a74388 100644
--- a/src/com/dao/mapper/dataInfoMoveTmpmapper.xml
+++ b/src/com/dao/mapper/dataInfoMoveTmpmapper.xml
@@ -1,189 +1,189 @@
-<?xml version="1.0" encoding="UTF-8" ?>    
-<!DOCTYPE mapper    
-PUBLIC "-//ibatis.apache.org//DTD Mapper 3.0//EN"    
-"http://ibatis.apache.org/dtd/ibatis-3-mapper.dtd">
-
-<mapper namespace="com.platform.dao.DataInfoMoveTmpDao">
-	<resultMap id="getEntityByText" type="com.platform.entities.DataInfoEntityMoveTmp">
-		<id property="id" column="id" javaType="int" jdbcType="INTEGER" />
-		<result property="regionalismCode" column="regionalism_code"
-			javaType="string" jdbcType="VARCHAR" />
-		<result property="cityName" column="city_name" javaType="string"
-			jdbcType="VARCHAR" />
-		<result property="districtName" column="district_name"
-			javaType="string" jdbcType="VARCHAR" />
-		<result property="systemCode" column="system_code" javaType="int"
-			jdbcType="INTEGER" />
-		<result property="systemName" column="system_name" javaType="string"
-			jdbcType="VARCHAR" />
-		<result property="dataType" column="data_type" javaType="string"
-			jdbcType="VARCHAR" />
-		<result property="dataVersion" column="data_version" javaType="int"
-			jdbcType="INTEGER" />
-		<result property="submittedBatch" column="submitted_batch"
-			javaType="string" jdbcType="VARCHAR" />
-		<result property="dataPath" column="data_path" javaType="string"
-			jdbcType="VARCHAR" />
-		<result property="charset" column="data_charset" javaType="string"
-			jdbcType="VARCHAR" />
-		<result property="collectingTime" column="collection_time"
-			javaType="string" jdbcType="DATE" />
-		<result property="collectorContacts" column="collector_contacts"
-			javaType="string" jdbcType="VARCHAR" />
-		<result property="collectorName" column="collector_name"
-			javaType="string" jdbcType="VARCHAR" />
-		<result property="year" column="data_year" javaType="string"
-			jdbcType="VARCHAR" />
-			
-		<result property="dstPath" column="dst_path" javaType="string"
-		jdbcType="VARCHAR" />
-		<result property="completeStatus" column="complete_status" javaType="string"
-		jdbcType="VARCHAR" />
-		<result property="rate" column="rate" javaType="int"
-		jdbcType="INTEGER" />
-		<result property="lastTime" column="lasttime"
-			javaType="string" jdbcType="VARCHAR" />
-		<result property="fkid" column="fkid" javaType="int" jdbcType="INTEGER" />
-		<result property="dstVolumeIp" column="dst_volume_ip" jdbcType="VARCHAR" />
-		<result property="dstVolumePath" column="dst_volume_ip" jdbcType="VARCHAR" />
-	</resultMap>
-	
-	<sql id="Base_Column_List">
-		regionalism_code,system_code,dst_path,lasttime,fkid
-	</sql>
-	
-	<!-- 获取数据全部记录信息 -->
-	<select id="findAll" resultType="com.platform.entities.DataInfoEntityMoveTmp">
-		SELECT
-		a.id id,a.regionalism_code regionalismCode,a.dst_path dstPath,a.complete_status completeStatus,
-		a.rate rate, a.lasttime lastTime, a.system_code systemCode,a.dst_volume_ip dstVolumeIp,a.dst_volume_path dstVolumePath,
-		b.city_name cityName,b.district_name districtName,b.system_name systemName,b.data_type dataType,
-		b.data_version dataVersion,b.submitted_batch submittedBatch,b.data_path dataPath,b.data_charset charset,
-		b.collection_time collectingTime,b.collector_name collectorName,b.collector_contacts collectorContacts,
-		b.data_year year,b.extract_status extractStatus,b.start_year startYear,b.end_year endYear,
-		b.volume_ip volumeIp,b.volume_path volumePath
-		FROM 
-		move_data_tmp a LEFT JOIN data_details b 
-		ON a.system_code = b.system_code AND a.regionalism_code = b.regionalism_code AND a.fkid = b.id
-		ORDER BY a.id
-	</select>
-	
-	<update id="update" parameterType="com.platform.entities.DataInfoEntityMoveTmp">
-		UPDATE
-		move_data_tmp
-		<set >
-			<trim suffixOverrides=",">
-				<if test="dstPath != null and dstPath != ''">
-					dst_path= #{dstPath},
-				</if>
-				<if test="completeStatus != null and completeStatus != ''">
-					complete_status= #{completeStatus},
-				</if>
-				<if test="rate > 0">
-					rate= #{rate},
-				</if>
-				<if test="lastTime != null and lastTime != ''">
-					lasttime= #{lastTime},
-				</if>
-			</trim>
-		</set>
-		<where>
-			id = #{id}
-		</where>
-	</update>
-	
-	<insert id="save" parameterType="com.platform.entities.DataInfoEntityMoveTmp">
-		INSERT INTO
-		move_data_tmp(
-		<trim suffixOverrides=",">
-			<if test="id > 0">
-				id,
-			</if>
-			<if test="regionalismCode != null and regionalismCode != ''">
-				regionalism_code,
-			</if>
-			<if test="systemCode != null">
-				system_code,
-			</if>
-			<if test="dstPath != null and dstPath != ''">
-				dst_path,
-			</if>
-			<if test="completeStatus != null and completeStatus != ''">
-				complete_status,
-			</if>
-			<if test="rate > 0">
-				rate,
-			</if>
-			<if test="lastTime != null and lastTime != ''">
-				lasttime,
-			</if>
-			<if test="fkid > 0 ">
-				fkid,
-			</if>
-		</trim>
-		)
-		VALUES(
-		<trim suffixOverrides=",">
-			<if test="id > 0">
-				id,
-			</if>
-			<if test="regionalismCode != null and regionalismCode != ''">
-				#{regionalismCode},
-			</if>
-			<if test="systemCode != null and systemCode != ''">
-				#{systemCode},
-			</if>
-			<if test="dstPath != null and dstPath != ''">
-				#{dstPath},
-			</if>
-			<if test="completeStatus != null and completeStatus != ''">
-				#{completeStatus},
-			</if>
-			<if test="rate > 0">
-				#{rate}
-			</if>
-			<if test="lastTime != null and lastTime != ''">
-				#{lastTime},
-			</if>
-			<if test="fkid > 0 ">
-				#{fkid),
-			</if>
-		</trim>
-		)
-	</insert>
-	
-	<select id="insertBatch" parameterType="java.util.List">
-	    INSERT INTO move_data_tmp ( <include refid="Base_Column_List" /> ) 
-	    VALUES 
-	    <foreach collection="list" item="item" index="index" separator=",">
-	        (#{item.regionalismCode,jdbcType=VARCHAR},#{item.systemCode,jdbcType=INTEGER},#{item.dstPath,jdbcType=VARCHAR},#{item.lastTime,jdbcType=VARCHAR},#{item.fkid})
-	    </foreach>
-	</select> 
-	
-	<delete id="remove" parameterType="java.lang.Integer">
-		DELETE FROM
-			move_data_tmp 
-		WHERE
-			id = #{id}
-	</delete>
-<!-- 获取数据符合筛选条件的总记录条数 -->
-	<!-- 
-	<select id="getLimitedDataCount" resultType="java.lang.Integer"
-		parameterType="PagerOptions">
-		SELECT COUNT(id) FROM move_data_tmp
-		<if test="PagerOptions!=null">
-			<where>
-				<include refid="conditionsFilters" />
-			</where>
-		</if>
-
-	</select>
-
-	获取数据查询的起始di
-	<select id="getLimitedBeginId" resultType="java.lang.Integer"
-		parameterType="PagerOptions">
-		SELECT MAX(idx) FROM (SELECT id idx FROM move_data_tmp
-		ORDER BY id LIMIT 0,#{PagerOptions.totalLimit}) AS TEMP
-	</select> -->
-
+<?xml version="1.0" encoding="UTF-8" ?>    
+<!DOCTYPE mapper    
+PUBLIC "-//ibatis.apache.org//DTD Mapper 3.0//EN"    
+"http://ibatis.apache.org/dtd/ibatis-3-mapper.dtd">
+
+<mapper namespace="com.platform.dao.DataInfoMoveTmpDao">
+	<resultMap id="getEntityByText" type="com.platform.entities.DataInfoEntityMoveTmp">
+		<id property="id" column="id" javaType="int" jdbcType="INTEGER" />
+		<result property="regionalismCode" column="regionalism_code"
+			javaType="string" jdbcType="VARCHAR" />
+		<result property="cityName" column="city_name" javaType="string"
+			jdbcType="VARCHAR" />
+		<result property="districtName" column="district_name"
+			javaType="string" jdbcType="VARCHAR" />
+		<result property="systemCode" column="system_code" javaType="int"
+			jdbcType="INTEGER" />
+		<result property="systemName" column="system_name" javaType="string"
+			jdbcType="VARCHAR" />
+		<result property="dataType" column="data_type" javaType="string"
+			jdbcType="VARCHAR" />
+		<result property="dataVersion" column="data_version" javaType="int"
+			jdbcType="INTEGER" />
+		<result property="submittedBatch" column="submitted_batch"
+			javaType="string" jdbcType="VARCHAR" />
+		<result property="dataPath" column="data_path" javaType="string"
+			jdbcType="VARCHAR" />
+		<result property="charset" column="data_charset" javaType="string"
+			jdbcType="VARCHAR" />
+		<result property="collectingTime" column="collection_time"
+			javaType="string" jdbcType="DATE" />
+		<result property="collectorContacts" column="collector_contacts"
+			javaType="string" jdbcType="VARCHAR" />
+		<result property="collectorName" column="collector_name"
+			javaType="string" jdbcType="VARCHAR" />
+		<result property="year" column="data_year" javaType="string"
+			jdbcType="VARCHAR" />
+			
+		<result property="dstPath" column="dst_path" javaType="string"
+		jdbcType="VARCHAR" />
+		<result property="completeStatus" column="complete_status" javaType="string"
+		jdbcType="VARCHAR" />
+		<result property="rate" column="rate" javaType="int"
+		jdbcType="INTEGER" />
+		<result property="lastTime" column="lasttime"
+			javaType="string" jdbcType="VARCHAR" />
+		<result property="fkid" column="fkid" javaType="int" jdbcType="INTEGER" />
+		<result property="dstVolumeIp" column="dst_volume_ip" jdbcType="VARCHAR" />
+		<result property="dstVolumePath" column="dst_volume_ip" jdbcType="VARCHAR" />
+	</resultMap>
+	
+	<sql id="Base_Column_List">
+		regionalism_code,system_code,dst_path,lasttime,fkid
+	</sql>
+	
+	<!-- 获取数据全部记录信息 -->
+	<select id="findAll" resultType="com.platform.entities.DataInfoEntityMoveTmp">
+		SELECT
+		a.id id,a.regionalism_code regionalismCode,a.dst_path dstPath,a.complete_status completeStatus,
+		a.rate rate, a.lasttime lastTime, a.system_code systemCode,a.dst_volume_ip dstVolumeIp,a.dst_volume_path dstVolumePath,
+		b.city_name cityName,b.district_name districtName,b.system_name systemName,b.data_type dataType,
+		b.data_version dataVersion,b.submitted_batch submittedBatch,b.data_path dataPath,b.data_charset charset,
+		b.collection_time collectingTime,b.collector_name collectorName,b.collector_contacts collectorContacts,
+		b.data_year year,b.extract_status extractStatus,b.start_year startYear,b.end_year endYear,
+		b.volume_ip volumeIp,b.volume_path volumePath
+		FROM 
+		move_data_tmp a LEFT JOIN data_details b 
+		ON a.system_code = b.system_code AND a.regionalism_code = b.regionalism_code AND a.fkid = b.id
+		ORDER BY a.id
+	</select>
+	
+	<update id="update" parameterType="com.platform.entities.DataInfoEntityMoveTmp">
+		UPDATE
+		move_data_tmp
+		<set >
+			<trim suffixOverrides=",">
+				<if test="dstPath != null and dstPath != ''">
+					dst_path= #{dstPath},
+				</if>
+				<if test="completeStatus != null and completeStatus != ''">
+					complete_status= #{completeStatus},
+				</if>
+				<if test="rate > 0">
+					rate= #{rate},
+				</if>
+				<if test="lastTime != null and lastTime != ''">
+					lasttime= #{lastTime},
+				</if>
+			</trim>
+		</set>
+		<where>
+			id = #{id}
+		</where>
+	</update>
+	
+	<insert id="save" parameterType="com.platform.entities.DataInfoEntityMoveTmp">
+		INSERT INTO
+		move_data_tmp(
+		<trim suffixOverrides=",">
+			<if test="id > 0">
+				id,
+			</if>
+			<if test="regionalismCode != null and regionalismCode != ''">
+				regionalism_code,
+			</if>
+			<if test="systemCode != null">
+				system_code,
+			</if>
+			<if test="dstPath != null and dstPath != ''">
+				dst_path,
+			</if>
+			<if test="completeStatus != null and completeStatus != ''">
+				complete_status,
+			</if>
+			<if test="rate > 0">
+				rate,
+			</if>
+			<if test="lastTime != null and lastTime != ''">
+				lasttime,
+			</if>
+			<if test="fkid > 0 ">
+				fkid,
+			</if>
+		</trim>
+		)
+		VALUES(
+		<trim suffixOverrides=",">
+			<if test="id > 0">
+				id,
+			</if>
+			<if test="regionalismCode != null and regionalismCode != ''">
+				#{regionalismCode},
+			</if>
+			<if test="systemCode != null and systemCode != ''">
+				#{systemCode},
+			</if>
+			<if test="dstPath != null and dstPath != ''">
+				#{dstPath},
+			</if>
+			<if test="completeStatus != null and completeStatus != ''">
+				#{completeStatus},
+			</if>
+			<if test="rate > 0">
+				#{rate}
+			</if>
+			<if test="lastTime != null and lastTime != ''">
+				#{lastTime},
+			</if>
+			<if test="fkid > 0 ">
+				#{fkid),
+			</if>
+		</trim>
+		)
+	</insert>
+	
+	<select id="insertBatch" parameterType="java.util.List">
+	    INSERT INTO move_data_tmp ( <include refid="Base_Column_List" /> ) 
+	    VALUES 
+	    <foreach collection="list" item="item" index="index" separator=",">
+	        (#{item.regionalismCode,jdbcType=VARCHAR},#{item.systemCode,jdbcType=INTEGER},#{item.dstPath,jdbcType=VARCHAR},#{item.lastTime,jdbcType=VARCHAR},#{item.fkid})
+	    </foreach>
+	</select> 
+	
+	<delete id="remove" parameterType="java.lang.Integer">
+		DELETE FROM
+			move_data_tmp 
+		WHERE
+			id = #{id}
+	</delete>
+<!-- 获取数据符合筛选条件的总记录条数 -->
+	<!-- 
+	<select id="getLimitedDataCount" resultType="java.lang.Integer"
+		parameterType="PagerOptions">
+		SELECT COUNT(id) FROM move_data_tmp
+		<if test="PagerOptions!=null">
+			<where>
+				<include refid="conditionsFilters" />
+			</where>
+		</if>
+
+	</select>
+
+	获取数据查询的起始di
+	<select id="getLimitedBeginId" resultType="java.lang.Integer"
+		parameterType="PagerOptions">
+		SELECT MAX(idx) FROM (SELECT id idx FROM move_data_tmp
+		ORDER BY id LIMIT 0,#{PagerOptions.totalLimit}) AS TEMP
+	</select> -->
+
 </mapper>  
\ No newline at end of file
diff --git a/src/com/platform/controller/DefaultController.java b/src/com/platform/controller/DefaultController.java
index 7fb907c8..631e6b77 100644
--- a/src/com/platform/controller/DefaultController.java
+++ b/src/com/platform/controller/DefaultController.java
@@ -1,32 +1,32 @@
-
-package com.platform.controller;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.ModelMap;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.servlet.ModelAndView;
-
-import com.platform.utils.Configs;
-
-@Controller
-public class DefaultController {
-	
-	@RequestMapping("/")
-	public ModelAndView defaultHandler(HttpServletRequest req, HttpServletResponse res){
-		//处理不匹配的请求		
-		System.out.println("index");		
-		return new ModelAndView("index");
-	}
-	
-	@RequestMapping("/test")
-	public ModelMap test(HttpServletRequest req, HttpServletResponse res){
-		//System.out.println(Class.class.getClass().getResource("/").getPath());
-		System.out.println(Configs.EXTRACT_LOG_LOCALTION);
-		return new ModelMap();
-	}
-	
-}
-
+
+package com.platform.controller;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.servlet.ModelAndView;
+
+import com.platform.utils.Configs;
+
+@Controller
+public class DefaultController {
+	
+	@RequestMapping("/")
+	public ModelAndView defaultHandler(HttpServletRequest req, HttpServletResponse res){
+		//处理不匹配的请求		
+		System.out.println("index");		
+		return new ModelAndView("index");
+	}
+	
+	@RequestMapping("/test")
+	public ModelMap test(HttpServletRequest req, HttpServletResponse res){
+		//System.out.println(Class.class.getClass().getResource("/").getPath());
+		System.out.println(Configs.EXTRACT_LOG_LOCALTION);
+		return new ModelMap();
+	}
+	
+}
+
diff --git a/src/com/platform/controller/FolderController.java b/src/com/platform/controller/FolderController.java
index 8bea311e..04254ffb 100644
--- a/src/com/platform/controller/FolderController.java
+++ b/src/com/platform/controller/FolderController.java
@@ -1,114 +1,114 @@
-
-package com.platform.controller;
-
-
-import java.util.Date;
-import java.util.List;
-
-import javax.annotation.Resource;
-
-import oracle.sql.DATE;
-
-import org.springframework.stereotype.Controller;
-import org.springframework.stereotype.Service;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-
-
-
-import com.base.BaseController;
-import com.base.CustomException;
-import com.platform.entities.GfsFolderEntity;
-
-
-import com.platform.entities.VolumeEntity;
-import com.platform.glusterfs.VolumeInfo;
-
-import com.platform.entities.VolumeEntity;
-import com.platform.glusterfs.VolumeInfo;
-
-import com.platform.service.IGfsService;
-
-
-/**
- * <一句话功能简述>
- * <功能详细描述>
- * @author    chen
- * @version   [版本号,2016年9月8日]
- * @see       [相关类/方法]
- * @since     [产品/模块版本]
- */
-@Controller
-
-@RequestMapping("")
-
-public class FolderController extends BaseController {
-	
-	@Resource(name = "gfsService")
-	private IGfsService gfsService;
-	
-
-
-
-	@RequestMapping(value="/getAllSubPathByPath", method= RequestMethod.POST)
-
-	public Object getAllSubPathByPath(String path) throws Exception {
-		System.out.println(path);
-		Object result = null;
-		if (null != path && !"".equals(path)) {
-			System.out.println(path);
-			result = gfsService.getFolder(path);
-		}
-		return result;
-	}
-	
-
-	@RequestMapping("/copyFolder")
-	public Object copyFolder(String srcpath, String dstPath, String name) throws Exception {
-		// -1 :error; -2: the filename is not exists ;-3 :destFolderName ; 1: right 
-		int result = 0;
-//		int result = gfsService.copyFolder(srcpath, dstPath, name);
-		System.out.println(srcpath);
-		System.out.println(dstPath);
-		String obj = "right";
-		
-		if (1 != result) {
-			obj = "err";
-		}
-		return obj;
-	}
-
-//	/**
-//	 * <一句话功能简述> 查询集群中所有的 volume 及其 信息
-//	 * <功能详细描述>
-//	 * @return
-//	 * @throws Exception 
-//	 * @see [类、类#方法、类#成员]
-//	 */
-//	@RequestMapping(value="/volume/list", method= RequestMethod.POST)
-//	public Object getVolums() throws Exception{
-//		System.out.println("----------------------------------");
-//		long a = new Date().getTime();
-//		 List<VolumeEntity> result = gfsService.getAllVolumes();
-//		 System.out.println("----------------------------------");
-//		 System.out.println(new Date().getTime()-a);
-//		return result;
-//	}
-//	
-	/**
-	 * <一句话功能简述> 查询集群中所有的 volume 及其 信息
-	 * <功能详细描述>
-	 * @param volumeName "/home/gfs_ftp_point" "/home/v1_point"
-	 * @return 
-	 * @throws Exception 
-	 * @see [类、类#方法、类#成员]
-	 */
-	
-	@RequestMapping(value="/volume/findByName", method= RequestMethod.POST)
-	public Object getVolumByName(String volumeName) throws Exception{
-		VolumeEntity result = gfsService.getOneVolume(volumeName);
-		return result;
-
-	}
-	
-}
+
+package com.platform.controller;
+
+
+import java.util.Date;
+import java.util.List;
+
+import javax.annotation.Resource;
+
+import oracle.sql.DATE;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.stereotype.Service;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+
+
+
+import com.base.BaseController;
+import com.base.CustomException;
+import com.platform.entities.GfsFolderEntity;
+
+
+import com.platform.entities.VolumeEntity;
+import com.platform.glusterfs.VolumeInfo;
+
+import com.platform.entities.VolumeEntity;
+import com.platform.glusterfs.VolumeInfo;
+
+import com.platform.service.IGfsService;
+
+
+/**
+ * <一句话功能简述>
+ * <功能详细描述>
+ * @author    chen
+ * @version   [版本号,2016年9月8日]
+ * @see       [相关类/方法]
+ * @since     [产品/模块版本]
+ */
+@Controller
+
+@RequestMapping("")
+
+public class FolderController extends BaseController {
+	
+	@Resource(name = "gfsService")
+	private IGfsService gfsService;
+	
+
+
+
+	@RequestMapping(value="/getAllSubPathByPath", method= RequestMethod.POST)
+
+	public Object getAllSubPathByPath(String path) throws Exception {
+		System.out.println(path);
+		Object result = null;
+		if (null != path && !"".equals(path)) {
+			System.out.println(path);
+			result = gfsService.getFolder(path);
+		}
+		return result;
+	}
+	
+
+	@RequestMapping("/copyFolder")
+	public Object copyFolder(String srcpath, String dstPath, String name) throws Exception {
+		// -1 :error; -2: the filename is not exists ;-3 :destFolderName ; 1: right 
+		int result = 0;
+//		int result = gfsService.copyFolder(srcpath, dstPath, name);
+		System.out.println(srcpath);
+		System.out.println(dstPath);
+		String obj = "right";
+		
+		if (1 != result) {
+			obj = "err";
+		}
+		return obj;
+	}
+
+//	/**
+//	 * <一句话功能简述> 查询集群中所有的 volume 及其 信息
+//	 * <功能详细描述>
+//	 * @return
+//	 * @throws Exception 
+//	 * @see [类、类#方法、类#成员]
+//	 */
+//	@RequestMapping(value="/volume/list", method= RequestMethod.POST)
+//	public Object getVolums() throws Exception{
+//		System.out.println("----------------------------------");
+//		long a = new Date().getTime();
+//		 List<VolumeEntity> result = gfsService.getAllVolumes();
+//		 System.out.println("----------------------------------");
+//		 System.out.println(new Date().getTime()-a);
+//		return result;
+//	}
+//	
+	/**
+	 * <一句话功能简述> 查询集群中所有的 volume 及其 信息
+	 * <功能详细描述>
+	 * @param volumeName "/home/gfs_ftp_point" "/home/v1_point"
+	 * @return 
+	 * @throws Exception 
+	 * @see [类、类#方法、类#成员]
+	 */
+	
+	@RequestMapping(value="/volume/findByName", method= RequestMethod.POST)
+	public Object getVolumByName(String volumeName) throws Exception{
+		VolumeEntity result = gfsService.getOneVolume(volumeName);
+		return result;
+
+	}
+	
+}
diff --git a/src/com/platform/controller/SetGlusterfsController.java b/src/com/platform/controller/SetGlusterfsController.java
index 78ce8915..60b776b0 100644
--- a/src/com/platform/controller/SetGlusterfsController.java
+++ b/src/com/platform/controller/SetGlusterfsController.java
@@ -1,52 +1,52 @@
-
-/**
- * 文件名   :   SetGlusterfs.java
- * 版权       :   <版权/公司名>
- * 描述       :   <描述>
- * @author  liliy
- * 版本       :   <版本>
- * 修改时间:      2016年9月8日
- * 修改内容:      <修改内容>
- */
-package com.platform.controller;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-/**
-
- * <一句话功能简述>
-
-
- * <一句话功能简述>
-
- * <功能详细描述>
- * @author    liliy
- * @version   [版本号,2016年9月8日]
- * @see       [相关类/方法]
- * @since     [产品/模块版本]
- */
-@Controller
-public class SetGlusterfsController {
-
-	@RequestMapping("/tes")
-	public Object defaultHandler(HttpServletRequest req, HttpServletResponse request) {
-		//���?ƥ�������		
-		try {            
-           
-           System.out.println("fsdfds");
-            
-            return "listAll";
-        } catch (Exception e) {
-            e.printStackTrace();
-            
-            return "result";
-        }
-    
-
-	}
-
-}
+
+/**
+ * 文件名   :   SetGlusterfs.java
+ * 版权       :   <版权/公司名>
+ * 描述       :   <描述>
+ * @author  liliy
+ * 版本       :   <版本>
+ * 修改时间:      2016年9月8日
+ * 修改内容:      <修改内容>
+ */
+package com.platform.controller;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+/**
+
+ * <一句话功能简述>
+
+
+ * <一句话功能简述>
+
+ * <功能详细描述>
+ * @author    liliy
+ * @version   [版本号,2016年9月8日]
+ * @see       [相关类/方法]
+ * @since     [产品/模块版本]
+ */
+@Controller
+public class SetGlusterfsController {
+
+	@RequestMapping("/tes")
+	public Object defaultHandler(HttpServletRequest req, HttpServletResponse request) {
+		//���?ƥ�������		
+		try {            
+           
+           System.out.println("fsdfds");
+            
+            return "listAll";
+        } catch (Exception e) {
+            e.printStackTrace();
+            
+            return "result";
+        }
+    
+
+	}
+
+}
diff --git a/src/com/platform/controller/ShowGlusterfsController.java b/src/com/platform/controller/ShowGlusterfsController.java
index 6fa3fadd..7667bc2b 100644
--- a/src/com/platform/controller/ShowGlusterfsController.java
+++ b/src/com/platform/controller/ShowGlusterfsController.java
@@ -1,50 +1,50 @@
-
-/**
- * 文件名   :   ShowGlusterfsController.java
- * 版权       :   <版权/公司名>
- * 描述       :   <描述>
- * @author  liliy
- * 版本       :   <版本>
- * 修改时间:      2016年9月8日
- * 修改内容:      <修改内容>
- */
-package com.platform.controller;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import com.platform.glusterfs.ClusterInfo;
-import com.platform.glusterfs.VolumeInfo;
-
-/**
- * <一句话功能简述>
-
- * <功能详细描述>
- * @author    liliy
- * @version   [版本号,2016年9月8日]
- * @see       [相关类/方法]
- * @since     [产品/模块版本]
- */
-@Controller
-public class ShowGlusterfsController {
-
-
-	/**
-	 * <一句话功能简述>
-
-	 * <功能详细描述>
-	 * @return
-	 * @see [类、类#方法、类#成员]
-	 */
-	@RequestMapping("/showPeerStatus")
-	public Map<String,String> showPeerStatus(){
-		Map<String, String> peer_status=new ClusterInfo().showClusterInfo();
-		return peer_status;
-	} 
-	
-	
-}
+
+/**
+ * 文件名   :   ShowGlusterfsController.java
+ * 版权       :   <版权/公司名>
+ * 描述       :   <描述>
+ * @author  liliy
+ * 版本       :   <版本>
+ * 修改时间:      2016年9月8日
+ * 修改内容:      <修改内容>
+ */
+package com.platform.controller;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import com.platform.glusterfs.ClusterInfo;
+import com.platform.glusterfs.VolumeInfo;
+
+/**
+ * <一句话功能简述>
+
+ * <功能详细描述>
+ * @author    liliy
+ * @version   [版本号,2016年9月8日]
+ * @see       [相关类/方法]
+ * @since     [产品/模块版本]
+ */
+@Controller
+public class ShowGlusterfsController {
+
+
+	/**
+	 * <一句话功能简述>
+
+	 * <功能详细描述>
+	 * @return
+	 * @see [类、类#方法、类#成员]
+	 */
+	@RequestMapping("/showPeerStatus")
+	public Map<String,String> showPeerStatus(){
+		Map<String, String> peer_status=new ClusterInfo().showClusterInfo();
+		return peer_status;
+	} 
+	
+	
+}
diff --git a/src/com/platform/dao/DataInfoDao.java b/src/com/platform/dao/DataInfoDao.java
index 5b9419b0..005e2bc3 100644
--- a/src/com/platform/dao/DataInfoDao.java
+++ b/src/com/platform/dao/DataInfoDao.java
@@ -1,27 +1,27 @@
-package com.platform.dao;
-
-import java.util.List;
-import java.util.Map;
-
-import org.apache.ibatis.annotations.Param;
-import org.springframework.stereotype.Repository;
-
-import com.platform.entities.DataInfoEntity;
-import com.platform.entities.PagerOptions;
-
-@Repository(value = "dataInfoDao")
-public interface DataInfoDao {
-
-	int getLimitedDataCount(PagerOptions pagerOptions);
-
-	int getLimitedBeginId(PagerOptions pagerOptions);
-
-	List<DataInfoEntity> getLimitedDataInfoEntities(PagerOptions pagerOptions);
-
-	List<String> getIdIsExist(List<Integer> list)throws Exception;
-	
-	int removes(List<Integer> list)throws Exception;
-	
-	int save(DataInfoEntity data) throws Exception;
-
-}
+package com.platform.dao;
+
+import java.util.List;
+import java.util.Map;
+
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import com.platform.entities.DataInfoEntity;
+import com.platform.entities.PagerOptions;
+
+@Repository(value = "dataInfoDao")
+public interface DataInfoDao {
+
+	int getLimitedDataCount(PagerOptions pagerOptions);
+
+	int getLimitedBeginId(PagerOptions pagerOptions);
+
+	List<DataInfoEntity> getLimitedDataInfoEntities(PagerOptions pagerOptions);
+
+	List<String> getIdIsExist(List<Integer> list)throws Exception;
+	
+	int removes(List<Integer> list)throws Exception;
+	
+	int save(DataInfoEntity data) throws Exception;
+
+}
diff --git a/src/com/platform/dao/DataInfoMoveTmpDao.java b/src/com/platform/dao/DataInfoMoveTmpDao.java
index 3891c117..096d8938 100644
--- a/src/com/platform/dao/DataInfoMoveTmpDao.java
+++ b/src/com/platform/dao/DataInfoMoveTmpDao.java
@@ -1,29 +1,29 @@
-package com.platform.dao;
-
-import java.util.List;
-
-import org.springframework.stereotype.Repository;
-
-import com.platform.entities.DataInfoEntityMoveTmp;
-
-/**
- * @author chen
- * 数据迁移状态 临时 存放 ,
- */
-@Repository(value = "dataInfoMoveTmpDao")
-public interface DataInfoMoveTmpDao {
-
-	/** 查
-	 * @return
-	 * @throws Exception
-	 */
-	List<DataInfoEntityMoveTmp> findAll() throws Exception;
-	
-	int update(DataInfoEntityMoveTmp data) throws Exception;
-	
-	int save(DataInfoEntityMoveTmp data) throws Exception;
-	
-	void insertBatch(List<DataInfoEntityMoveTmp> list) throws Exception;
-	
-	int remove(int id) throws Exception;
-}
+package com.platform.dao;
+
+import java.util.List;
+
+import org.springframework.stereotype.Repository;
+
+import com.platform.entities.DataInfoEntityMoveTmp;
+
+/**
+ * @author chen
+ * 数据迁移状态 临时 存放 ,
+ */
+@Repository(value = "dataInfoMoveTmpDao")
+public interface DataInfoMoveTmpDao {
+
+	/** 查
+	 * @return
+	 * @throws Exception
+	 */
+	List<DataInfoEntityMoveTmp> findAll() throws Exception;
+	
+	int update(DataInfoEntityMoveTmp data) throws Exception;
+	
+	int save(DataInfoEntityMoveTmp data) throws Exception;
+	
+	void insertBatch(List<DataInfoEntityMoveTmp> list) throws Exception;
+	
+	int remove(int id) throws Exception;
+}
diff --git a/src/com/platform/dao/EncodeInfoDao.java b/src/com/platform/dao/EncodeInfoDao.java
index 18fb399e..a877f5f3 100644
--- a/src/com/platform/dao/EncodeInfoDao.java
+++ b/src/com/platform/dao/EncodeInfoDao.java
@@ -1,99 +1,99 @@
-package com.platform.dao;
-
-import java.util.List;
-
-import org.apache.ibatis.annotations.Delete;
-import org.apache.ibatis.annotations.Insert;
-import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Select;
-import org.apache.ibatis.annotations.Update;
-import org.springframework.stereotype.Repository;
-
-import com.platform.entities.EncodedInfoEntity;
-
-/**
- * 数据库操作: 实现增、删、改、查
- * 
- * @author wuming
- * 
- */
-@Repository(value = "encodeInfoDao")
-public interface EncodeInfoDao {
-
-	/**
-	 * 获取查询表下的所有实体(行政区划/系统)信息
-	 * 
-	 * @param tableName
-	 *            查询的表名
-	 * @return 所有实体信息:名称和编码
-	 */
-	@Select("SELECT code, name FROM ${tableName}")
-	public List<EncodedInfoEntity> getAllEntityInfo(
-			@Param("tableName") String tableName);
-
-	/**
-	 * 根据实体(行政区划/系统)的名称查询编码
-	 * 
-	 * @param code
-	 *            实体编码
-	 * @param tableName
-	 *            查询的表名
-	 * @return 编码是主键,查询结果最多只有一条记录
-	 */
-	@Select("SELECT name FROM ${tableName} WHERE code = #{code}")
-	public String getEncodeNameByCode(@Param("code") String code,
-			@Param("tableName") String tableName);
-
-	/**
-	 * 根据实体(行政区划/系统)的编码查询名称
-	 * 
-	 * @param name
-	 *            实体名称
-	 * @param tableName
-	 *            查询的表名
-	 * @return 名称不是主键,查询结果可能会有多个
-	 */
-	@Select("SELECT code FROM ${tableName} WHERE name = #{name}")
-	public List<String> getEncodeCodeByName(@Param("name") String name,
-			@Param("tableName") String tableName);
-
-	/**
-	 * 根据实体(行政区划/系统)的编码,更新实体的名称
-	 * 
-	 * @param code
-	 *            系统编码
-	 * @param tableName
-	 *            查询的表名
-	 * @return
-	 */
-	@Update("UPDATE ${tableName} SET name = #{name} WHERE code = #{code}")
-	public int updateEncodeNameByCode(@Param("code") String code,
-			@Param("name") String name, @Param("tableName") String tableName);
-
-	/**
-	 * 向表中插入实体(行政区划/系统)信息
-	 * 
-	 * @param efe
-	 *            插入的实体信息
-	 * @param tableName
-	 *            表名
-	 * @return
-	 */
-	@Insert("INSERT INTO ${tableName} (code, name) VALUES (#{efe.code}, #{efe.name})")
-	public int insertEncodeEntity(@Param("efe") EncodedInfoEntity efe,
-			@Param("tableName") String tableName);
-
-	/**
-	 * 删除表中的实体(行政区划/系统)
-	 * 
-	 * @param code
-	 *            实体的编码
-	 * @param tableName
-	 *            表名
-	 * @return
-	 */
-	@Delete("DELETE FROM ${tableName} WHERE code = #{code}")
-	public int deleteEncodeByCode(@Param("code") String code,
-			@Param("tableName") String tableName);
-
+package com.platform.dao;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Delete;
+import org.apache.ibatis.annotations.Insert;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+import org.apache.ibatis.annotations.Update;
+import org.springframework.stereotype.Repository;
+
+import com.platform.entities.EncodedInfoEntity;
+
+/**
+ * 数据库操作: 实现增、删、改、查
+ * 
+ * @author wuming
+ * 
+ */
+@Repository(value = "encodeInfoDao")
+public interface EncodeInfoDao {
+
+	/**
+	 * 获取查询表下的所有实体(行政区划/系统)信息
+	 * 
+	 * @param tableName
+	 *            查询的表名
+	 * @return 所有实体信息:名称和编码
+	 */
+	@Select("SELECT code, name FROM ${tableName}")
+	public List<EncodedInfoEntity> getAllEntityInfo(
+			@Param("tableName") String tableName);
+
+	/**
+	 * 根据实体(行政区划/系统)的名称查询编码
+	 * 
+	 * @param code
+	 *            实体编码
+	 * @param tableName
+	 *            查询的表名
+	 * @return 编码是主键,查询结果最多只有一条记录
+	 */
+	@Select("SELECT name FROM ${tableName} WHERE code = #{code}")
+	public String getEncodeNameByCode(@Param("code") String code,
+			@Param("tableName") String tableName);
+
+	/**
+	 * 根据实体(行政区划/系统)的编码查询名称
+	 * 
+	 * @param name
+	 *            实体名称
+	 * @param tableName
+	 *            查询的表名
+	 * @return 名称不是主键,查询结果可能会有多个
+	 */
+	@Select("SELECT code FROM ${tableName} WHERE name = #{name}")
+	public List<String> getEncodeCodeByName(@Param("name") String name,
+			@Param("tableName") String tableName);
+
+	/**
+	 * 根据实体(行政区划/系统)的编码,更新实体的名称
+	 * 
+	 * @param code
+	 *            系统编码
+	 * @param tableName
+	 *            查询的表名
+	 * @return
+	 */
+	@Update("UPDATE ${tableName} SET name = #{name} WHERE code = #{code}")
+	public int updateEncodeNameByCode(@Param("code") String code,
+			@Param("name") String name, @Param("tableName") String tableName);
+
+	/**
+	 * 向表中插入实体(行政区划/系统)信息
+	 * 
+	 * @param efe
+	 *            插入的实体信息
+	 * @param tableName
+	 *            表名
+	 * @return
+	 */
+	@Insert("INSERT INTO ${tableName} (code, name) VALUES (#{efe.code}, #{efe.name})")
+	public int insertEncodeEntity(@Param("efe") EncodedInfoEntity efe,
+			@Param("tableName") String tableName);
+
+	/**
+	 * 删除表中的实体(行政区划/系统)
+	 * 
+	 * @param code
+	 *            实体的编码
+	 * @param tableName
+	 *            表名
+	 * @return
+	 */
+	@Delete("DELETE FROM ${tableName} WHERE code = #{code}")
+	public int deleteEncodeByCode(@Param("code") String code,
+			@Param("tableName") String tableName);
+
 }
\ No newline at end of file
diff --git a/src/com/platform/dao/GatherOracleDao.java b/src/com/platform/dao/GatherOracleDao.java
index b2061c0c..43852cac 100644
--- a/src/com/platform/dao/GatherOracleDao.java
+++ b/src/com/platform/dao/GatherOracleDao.java
@@ -1,39 +1,39 @@
-package com.platform.dao;
-
-import java.util.List;
-
-import org.springframework.stereotype.Repository;
-
-import com.platform.entities.GatherOracleInfo;
-
-@Repository(value = "gatherOracleDao")
-public interface GatherOracleDao {
-	
-	/**
-	 * @return 查询所有的oracle记录
-	 * @throws Exception 异常
-	 */
-	public List<GatherOracleInfo> selectAllOracle() throws Exception;
-	
-	/**
-	 * @param id
-	 * @return
-	 * @throws Exception
-	 */
-	public int deleteOracleById(int id) throws Exception;
-	
-	/**
-	 * @param oracle
-	 * @return
-	 * @throws Exception
-	 */
-	public int insertOracle(GatherOracleInfo oracle) throws Exception;
-	
-	/**
-	 * @param oracle
-	 * @return
-	 * @throws Exception
-	 */
-	public int updateOracleById(GatherOracleInfo oracle) throws Exception;
-
-}
+package com.platform.dao;
+
+import java.util.List;
+
+import org.springframework.stereotype.Repository;
+
+import com.platform.entities.GatherOracleInfo;
+
+@Repository(value = "gatherOracleDao")
+public interface GatherOracleDao {
+	
+	/**
+	 * @return 查询所有的oracle记录
+	 * @throws Exception 异常
+	 */
+	public List<GatherOracleInfo> selectAllOracle() throws Exception;
+	
+	/**
+	 * @param id
+	 * @return
+	 * @throws Exception
+	 */
+	public int deleteOracleById(int id) throws Exception;
+	
+	/**
+	 * @param oracle
+	 * @return
+	 * @throws Exception
+	 */
+	public int insertOracle(GatherOracleInfo oracle) throws Exception;
+	
+	/**
+	 * @param oracle
+	 * @return
+	 * @throws Exception
+	 */
+	public int updateOracleById(GatherOracleInfo oracle) throws Exception;
+
+}
diff --git a/src/com/platform/dao/IRegionalismCodeDao.java b/src/com/platform/dao/IRegionalismCodeDao.java
index dfc15b47..e89cd938 100644
--- a/src/com/platform/dao/IRegionalismCodeDao.java
+++ b/src/com/platform/dao/IRegionalismCodeDao.java
@@ -1,28 +1,28 @@
-package com.platform.dao;
-
-import java.util.List;
-
-import org.apache.ibatis.annotations.Param;
-import org.springframework.stereotype.Repository;
-
-import com.platform.entities.DataInfoEntity;
-import com.platform.entities.DataInfoEntityMoveTmp;
-import com.platform.entities.PagerOptions;
-import com.platform.entities.RegionalismEntity;
-
-/**
- * @author chen
- * 数据迁移状态 临时 存放 ,
- */
-@Repository(value = "regionalismCodeDao")
-public interface IRegionalismCodeDao {
-
-	/** 查
-	 * @return
-	 * @throws Exception
-	 */
-	List<RegionalismEntity> findAllRegionalism() throws Exception;
-	
-	List<RegionalismEntity> findSubRegionalism(RegionalismEntity region) throws Exception;
-	
-}
+package com.platform.dao;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import com.platform.entities.DataInfoEntity;
+import com.platform.entities.DataInfoEntityMoveTmp;
+import com.platform.entities.PagerOptions;
+import com.platform.entities.RegionalismEntity;
+
+/**
+ * @author chen
+ * 数据迁移状态 临时 存放 ,
+ */
+@Repository(value = "regionalismCodeDao")
+public interface IRegionalismCodeDao {
+
+	/** 查
+	 * @return
+	 * @throws Exception
+	 */
+	List<RegionalismEntity> findAllRegionalism() throws Exception;
+	
+	List<RegionalismEntity> findSubRegionalism(RegionalismEntity region) throws Exception;
+	
+}
diff --git a/src/com/platform/dao/ISystemCodeDao.java b/src/com/platform/dao/ISystemCodeDao.java
index 401b7787..fde3b02f 100644
--- a/src/com/platform/dao/ISystemCodeDao.java
+++ b/src/com/platform/dao/ISystemCodeDao.java
@@ -1,28 +1,28 @@
-package com.platform.dao;
-
-import java.util.List;
-
-import org.apache.ibatis.annotations.Param;
-import org.springframework.stereotype.Repository;
-
-import com.platform.entities.DataInfoEntity;
-import com.platform.entities.DataInfoEntityMoveTmp;
-import com.platform.entities.PagerOptions;
-import com.platform.entities.RegionalismEntity;
-import com.platform.entities.SystemEntity;
-
-/**
- * @author chen
- * 数据迁移状态 临时 存放 ,
- */
-@Repository(value = "systemCodeDao")
-public interface ISystemCodeDao {
-
-	/** 查
-	 * @return
-	 * @throws Exception
-	 */
-	List<SystemEntity> findAllSystem() throws Exception;
-	
-	List<SystemEntity> findSubSystem(SystemEntity system) throws Exception;
-}
+package com.platform.dao;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import com.platform.entities.DataInfoEntity;
+import com.platform.entities.DataInfoEntityMoveTmp;
+import com.platform.entities.PagerOptions;
+import com.platform.entities.RegionalismEntity;
+import com.platform.entities.SystemEntity;
+
+/**
+ * @author chen
+ * 数据迁移状态 临时 存放 ,
+ */
+@Repository(value = "systemCodeDao")
+public interface ISystemCodeDao {
+
+	/** 查
+	 * @return
+	 * @throws Exception
+	 */
+	List<SystemEntity> findAllSystem() throws Exception;
+	
+	List<SystemEntity> findSubSystem(SystemEntity system) throws Exception;
+}
diff --git a/src/com/platform/entities/BasedType.java b/src/com/platform/entities/BasedType.java
index e1568cec..d133a0eb 100644
--- a/src/com/platform/entities/BasedType.java
+++ b/src/com/platform/entities/BasedType.java
@@ -1,48 +1,48 @@
-package com.platform.entities;
-
-import java.util.Date;
-
-public enum BasedType {
-
-	STRING("java.lang.String", String.class), INTEGER("java.lang.Integer",
-			Integer.class), SHORT("java.lang.Short", Short.class), LONG(
-			"java.lang.Long", Long.class), DATE("java.util.Date", Date.class);
-
-	private String type;
-	private Class<?> clazz;
-
-	private BasedType(String type, Class<?> clazz) {
-		this.type = type;
-		this.clazz = clazz;
-	}
-
-	public static Class<?> getTypeClass(String type) {
-		for (BasedType bt : BasedType.values()) {
-			if (bt.equals(type))
-				return bt.clazz;
-		}
-		return null;
-	}
-
-	public String getType() {
-		return type;
-	}
-
-	public void setType(String type) {
-		this.type = type;
-	}
-
-	public Class<?> getClazz() {
-		return clazz;
-	}
-
-	public void setClazz(Class<?> clazz) {
-		this.clazz = clazz;
-	}
-
-	@Override
-	public String toString() {
-		return this.type;
-	}
-
-}
+package com.platform.entities;
+
+import java.util.Date;
+
+public enum BasedType {
+
+	STRING("java.lang.String", String.class), INTEGER("java.lang.Integer",
+			Integer.class), SHORT("java.lang.Short", Short.class), LONG(
+			"java.lang.Long", Long.class), DATE("java.util.Date", Date.class);
+
+	private String type;
+	private Class<?> clazz;
+
+	private BasedType(String type, Class<?> clazz) {
+		this.type = type;
+		this.clazz = clazz;
+	}
+
+	public static Class<?> getTypeClass(String type) {
+		for (BasedType bt : BasedType.values()) {
+			if (bt.equals(type))
+				return bt.clazz;
+		}
+		return null;
+	}
+
+	public String getType() {
+		return type;
+	}
+
+	public void setType(String type) {
+		this.type = type;
+	}
+
+	public Class<?> getClazz() {
+		return clazz;
+	}
+
+	public void setClazz(Class<?> clazz) {
+		this.clazz = clazz;
+	}
+
+	@Override
+	public String toString() {
+		return this.type;
+	}
+
+}
diff --git a/src/com/platform/entities/DataInfoEntity.java b/src/com/platform/entities/DataInfoEntity.java
index 062db3ce..bf5db6fa 100644
--- a/src/com/platform/entities/DataInfoEntity.java
+++ b/src/com/platform/entities/DataInfoEntity.java
@@ -1,269 +1,269 @@
-package com.platform.entities;
-
-/**
- * 数据信息实体类
- * 
- * @author wuming
- * 
- */
-public class DataInfoEntity {
-	private int id;
-	private String regionalismCode; // 行政区划编码
-	private String cityName; // 市
-	private String districtName; // 区县
-	private int systemCode; // 系统编码
-	private String systemName; // 系统名称
-	private String dataType; // 数据类型:财政\社保\...
-	private int dataVersion; // 数据版本
-	private String submittedBatch; // 上报批次
-	private String dataPath; // 数据路径
-	private String collectingTime; // 采集时间
-	private String collectorContacts; // 采集人的联系
-	private String charset; // 数据的字符编码
-	private String collectorName; // 采集人姓名
-	private String year; // 数据年度
-	
-	/**	 是否抽取 	 */
-	private int extractStatus;
-	/**	数据年度起始	 */
-	private String startYear;
-	/**	数据年度结束	 */
-	private String endYear;
-	
-	/**	volume的ip	 */
-	private String volumeIp;
-	/**	volume的path	 */
-	private String volumePath;
-	
-	public DataInfoEntity() {
-	}
-
-	public DataInfoEntity(int id, String regionalismCode, String cityName,
-			String districtName, int systemCode, String systemName,
-			String dataType, int dataVersion, String submittedBatch,
-			String dataPath, String collectingTime, String collectorContacts,
-			String charset, String collectorName, String year) {
-		super();
-		this.id = id;
-		this.regionalismCode = regionalismCode;
-		this.cityName = cityName;
-		this.districtName = districtName;
-		this.systemCode = systemCode;
-		this.systemName = systemName;
-		this.dataType = dataType;
-		this.dataVersion = dataVersion;
-		this.submittedBatch = submittedBatch;
-		this.dataPath = dataPath;
-		this.collectingTime = collectingTime;
-		this.collectorContacts = collectorContacts;
-		this.charset = charset;
-		this.collectorName = collectorName;
-		this.year = year;
-	}
-
-	public int getId() {
-		return id;
-	}
-
-	public void setId(int id) {
-		this.id = id;
-	}
-
-	public String getRegionalismCode() {
-		return regionalismCode;
-	}
-
-	public void setRegionalismCode(String regionalismCode) {
-		this.regionalismCode = regionalismCode;
-	}
-
-	public String getCityName() {
-		return cityName;
-	}
-
-	public void setCityName(String cityName) {
-		this.cityName = cityName;
-	}
-
-	public String getDistrictName() {
-		return districtName;
-	}
-
-	public void setDistrictName(String districtName) {
-		this.districtName = districtName;
-	}
-
-	public int getSystemCode() {
-		return systemCode;
-	}
-
-	public void setSystemCode(int systemCode) {
-		this.systemCode = systemCode;
-	}
-
-	public String getSystemName() {
-		return systemName;
-	}
-
-	public void setSystemName(String systemName) {
-		this.systemName = systemName;
-	}
-
-	public String getDataType() {
-		return dataType;
-	}
-
-	public void setDataType(String dataType) {
-		this.dataType = dataType;
-	}
-
-	public int getDataVersion() {
-		return dataVersion;
-	}
-
-	public void setDataVersion(int dataVersion) {
-		this.dataVersion = dataVersion;
-	}
-
-	public String getSubmittedBatch() {
-		return submittedBatch;
-	}
-
-	public void setSubmittedBatch(String submittedBatch) {
-		this.submittedBatch = submittedBatch;
-	}
-
-	public String getDataPath() {
-		return dataPath;
-	}
-
-	public void setDataPath(String dataPath) {
-		this.dataPath = dataPath;
-	}
-
-	public String getCollectingTime() {
-		return collectingTime;
-	}
-
-	public void setCollectingTime(String collectingTime) {
-		this.collectingTime = collectingTime;
-	}
-
-	public String getCollectorContacts() {
-		return collectorContacts;
-	}
-
-	public void setCollectorContacts(String collectorContacts) {
-		this.collectorContacts = collectorContacts;
-	}
-
-	public String getCharset() {
-		return charset;
-	}
-
-	public void setCharset(String charset) {
-		this.charset = charset;
-	}
-
-	public String getCollectorName() {
-		return collectorName;
-	}
-
-	public void setCollectorName(String collectorName) {
-		this.collectorName = collectorName;
-	}
-
-	public String getYear() {
-		return year;
-	}
-
-	public void setYear(String year) {
-		this.year = year;
-	}
-
-	/**
-	 * @return the startYear
-	 */
-	public String getStartYear() {
-		return startYear;
-	}
-
-	/**
-	 * @param startYear the startYear to set
-	 */
-	public void setStartYear(String startYear) {
-		this.startYear = startYear;
-	}
-
-	/**
-	 * @return the endYear
-	 */
-	public String getEndYear() {
-		return endYear;
-	}
-
-	/**
-	 * @param endYear the endYear to set
-	 */
-	public void setEndYear(String endYear) {
-		this.endYear = endYear;
-	}
-
-	/**
-	 * @return the extractStatus
-	 */
-	public int getExtractStatus() {
-		return extractStatus;
-	}
-
-	/**
-	 * @param extractStatus the extractStatus to set
-	 */
-	public void setExtractStatus(int extractStatus) {
-		this.extractStatus = extractStatus;
-	}
-
-	/**
-	 * @return the volumeIp
-	 */
-	public String getVolumeIp() {
-		return volumeIp;
-	}
-
-	/**
-	 * @param volumeIp the volumeIp to set
-	 */
-	public void setVolumeIp(String volumeIp) {
-		this.volumeIp = volumeIp;
-	}
-
-	/**
-	 * @return the volumePath
-	 */
-	public String getVolumePath() {
-		return volumePath;
-	}
-
-	/**
-	 * @param volumePath the volumePath to set
-	 */
-	public void setVolumePath(String volumePath) {
-		this.volumePath = volumePath;
-	}
-
-	@Override
-	public String toString() {
-		return "id=" + this.id + " ,regionalismCode=" + this.regionalismCode
-				+ " ,cityName=" + this.cityName + " ,districtName="
-				+ this.districtName + " ,systemCode=" + this.systemCode
-				+ " ,systemName" + this.systemName + " ,dataType="
-				+ this.dataType + " ,dataVersion=" + this.dataVersion
-				+ " ,submittedBatch=" + this.submittedBatch + " ,dataPath="
-				+ this.dataPath + " ,collectingTime=" + this.collectingTime
-				+ " ,collectorContacts=" + this.collectorContacts
-				+ " ,charset=" + this.charset + " ,collectorName="
-				+ this.collectorName + " ,year=" + this.year + " startYear=" 
-				+this.startYear +" endYear="+this.endYear;
-	}
-
-}
+package com.platform.entities;
+
+/**
+ * 数据信息实体类
+ * 
+ * @author wuming
+ * 
+ */
+public class DataInfoEntity {
+	private int id;
+	private String regionalismCode; // 行政区划编码
+	private String cityName; // 市
+	private String districtName; // 区县
+	private int systemCode; // 系统编码
+	private String systemName; // 系统名称
+	private String dataType; // 数据类型:财政\社保\...
+	private int dataVersion; // 数据版本
+	private String submittedBatch; // 上报批次
+	private String dataPath; // 数据路径
+	private String collectingTime; // 采集时间
+	private String collectorContacts; // 采集人的联系
+	private String charset; // 数据的字符编码
+	private String collectorName; // 采集人姓名
+	private String year; // 数据年度
+	
+	/**	 是否抽取 	 */
+	private int extractStatus;
+	/**	数据年度起始	 */
+	private String startYear;
+	/**	数据年度结束	 */
+	private String endYear;
+	
+	/**	volume的ip	 */
+	private String volumeIp;
+	/**	volume的path	 */
+	private String volumePath;
+	
+	public DataInfoEntity() {
+	}
+
+	public DataInfoEntity(int id, String regionalismCode, String cityName,
+			String districtName, int systemCode, String systemName,
+			String dataType, int dataVersion, String submittedBatch,
+			String dataPath, String collectingTime, String collectorContacts,
+			String charset, String collectorName, String year) {
+		super();
+		this.id = id;
+		this.regionalismCode = regionalismCode;
+		this.cityName = cityName;
+		this.districtName = districtName;
+		this.systemCode = systemCode;
+		this.systemName = systemName;
+		this.dataType = dataType;
+		this.dataVersion = dataVersion;
+		this.submittedBatch = submittedBatch;
+		this.dataPath = dataPath;
+		this.collectingTime = collectingTime;
+		this.collectorContacts = collectorContacts;
+		this.charset = charset;
+		this.collectorName = collectorName;
+		this.year = year;
+	}
+
+	public int getId() {
+		return id;
+	}
+
+	public void setId(int id) {
+		this.id = id;
+	}
+
+	public String getRegionalismCode() {
+		return regionalismCode;
+	}
+
+	public void setRegionalismCode(String regionalismCode) {
+		this.regionalismCode = regionalismCode;
+	}
+
+	public String getCityName() {
+		return cityName;
+	}
+
+	public void setCityName(String cityName) {
+		this.cityName = cityName;
+	}
+
+	public String getDistrictName() {
+		return districtName;
+	}
+
+	public void setDistrictName(String districtName) {
+		this.districtName = districtName;
+	}
+
+	public int getSystemCode() {
+		return systemCode;
+	}
+
+	public void setSystemCode(int systemCode) {
+		this.systemCode = systemCode;
+	}
+
+	public String getSystemName() {
+		return systemName;
+	}
+
+	public void setSystemName(String systemName) {
+		this.systemName = systemName;
+	}
+
+	public String getDataType() {
+		return dataType;
+	}
+
+	public void setDataType(String dataType) {
+		this.dataType = dataType;
+	}
+
+	public int getDataVersion() {
+		return dataVersion;
+	}
+
+	public void setDataVersion(int dataVersion) {
+		this.dataVersion = dataVersion;
+	}
+
+	public String getSubmittedBatch() {
+		return submittedBatch;
+	}
+
+	public void setSubmittedBatch(String submittedBatch) {
+		this.submittedBatch = submittedBatch;
+	}
+
+	public String getDataPath() {
+		return dataPath;
+	}
+
+	public void setDataPath(String dataPath) {
+		this.dataPath = dataPath;
+	}
+
+	public String getCollectingTime() {
+		return collectingTime;
+	}
+
+	public void setCollectingTime(String collectingTime) {
+		this.collectingTime = collectingTime;
+	}
+
+	public String getCollectorContacts() {
+		return collectorContacts;
+	}
+
+	public void setCollectorContacts(String collectorContacts) {
+		this.collectorContacts = collectorContacts;
+	}
+
+	public String getCharset() {
+		return charset;
+	}
+
+	public void setCharset(String charset) {
+		this.charset = charset;
+	}
+
+	public String getCollectorName() {
+		return collectorName;
+	}
+
+	public void setCollectorName(String collectorName) {
+		this.collectorName = collectorName;
+	}
+
+	public String getYear() {
+		return year;
+	}
+
+	public void setYear(String year) {
+		this.year = year;
+	}
+
+	/**
+	 * @return the startYear
+	 */
+	public String getStartYear() {
+		return startYear;
+	}
+
+	/**
+	 * @param startYear the startYear to set
+	 */
+	public void setStartYear(String startYear) {
+		this.startYear = startYear;
+	}
+
+	/**
+	 * @return the endYear
+	 */
+	public String getEndYear() {
+		return endYear;
+	}
+
+	/**
+	 * @param endYear the endYear to set
+	 */
+	public void setEndYear(String endYear) {
+		this.endYear = endYear;
+	}
+
+	/**
+	 * @return the extractStatus
+	 */
+	public int getExtractStatus() {
+		return extractStatus;
+	}
+
+	/**
+	 * @param extractStatus the extractStatus to set
+	 */
+	public void setExtractStatus(int extractStatus) {
+		this.extractStatus = extractStatus;
+	}
+
+	/**
+	 * @return the volumeIp
+	 */
+	public String getVolumeIp() {
+		return volumeIp;
+	}
+
+	/**
+	 * @param volumeIp the volumeIp to set
+	 */
+	public void setVolumeIp(String volumeIp) {
+		this.volumeIp = volumeIp;
+	}
+
+	/**
+	 * @return the volumePath
+	 */
+	public String getVolumePath() {
+		return volumePath;
+	}
+
+	/**
+	 * @param volumePath the volumePath to set
+	 */
+	public void setVolumePath(String volumePath) {
+		this.volumePath = volumePath;
+	}
+
+	@Override
+	public String toString() {
+		return "id=" + this.id + " ,regionalismCode=" + this.regionalismCode
+				+ " ,cityName=" + this.cityName + " ,districtName="
+				+ this.districtName + " ,systemCode=" + this.systemCode
+				+ " ,systemName" + this.systemName + " ,dataType="
+				+ this.dataType + " ,dataVersion=" + this.dataVersion
+				+ " ,submittedBatch=" + this.submittedBatch + " ,dataPath="
+				+ this.dataPath + " ,collectingTime=" + this.collectingTime
+				+ " ,collectorContacts=" + this.collectorContacts
+				+ " ,charset=" + this.charset + " ,collectorName="
+				+ this.collectorName + " ,year=" + this.year + " startYear=" 
+				+this.startYear +" endYear="+this.endYear;
+	}
+
+}
diff --git a/src/com/platform/entities/DataInfoEntityMoveTmp.java b/src/com/platform/entities/DataInfoEntityMoveTmp.java
index bf64fdd9..30a02e7b 100644
--- a/src/com/platform/entities/DataInfoEntityMoveTmp.java
+++ b/src/com/platform/entities/DataInfoEntityMoveTmp.java
@@ -1,124 +1,124 @@
-package com.platform.entities;
-
-public class DataInfoEntityMoveTmp extends DataInfoEntity {
-	
-	private String dstPath;
-	
-	private String completeStatus;
-	
-	private int rate;
-	
-	/**
-	 * 
-	 */
-	private String lastTime; 
-	
-	private String dstVolumeIp;
-	
-	private String dstVolumePath;	
-	
-	private int fkid;
-	
-	public DataInfoEntityMoveTmp() {
-		// TODO Auto-generated constructor stub
-	}
-
-	/**
-	 * @return the dstPath
-	 */
-	public String getDstPath() {
-		return dstPath;
-	}
-
-	/**
-	 * @param dstPath the dstPath to set
-	 */
-	public void setDstPath(String dstPath) {
-		this.dstPath = dstPath;
-	}
-
-	/**
-	 * @return the completeStatus
-	 */
-	public String getCompleteStatus() {
-		return completeStatus;
-	}
-
-	/**
-	 * @param completeStatus the completeStatus to set
-	 */
-	public void setCompleteStatus(String completeStatus) {
-		this.completeStatus = completeStatus;
-	}
-
-	/**
-	 * @return the rate
-	 */
-	public int getRate() {
-		return rate;
-	}
-
-	/**
-	 * @param rate the rate to set
-	 */
-	public void setRate(int rate) {
-		this.rate = rate;
-	}
-
-	/**
-	 * @return the lastTime
-	 */
-	public String getLastTime() {
-		return lastTime;
-	}
-
-	/**
-	 * @param lastTime the lastTime to set
-	 */
-	public void setLastTime(String lastTime) {
-		this.lastTime = lastTime;
-	}
-
-	/**
-	 * @return the fkid
-	 */
-	public int getFkid() {
-		return fkid;
-	}
-
-	/**
-	 * @param fkid the fkid to set
-	 */
-	public void setFkid(int fkid) {
-		this.fkid = fkid;
-	}
-
-	/**
-	 * @return the dstVolumeIp
-	 */
-	public String getDstVolumeIp() {
-		return dstVolumeIp;
-	}
-
-	/**
-	 * @param dstVolumeIp the dstVolumeIp to set
-	 */
-	public void setDstVolumeIp(String dstVolumeIp) {
-		this.dstVolumeIp = dstVolumeIp;
-	}
-
-	/**
-	 * @return the dstVolumePath
-	 */
-	public String getDstVolumePath() {
-		return dstVolumePath;
-	}
-
-	/**
-	 * @param dstVolumePath the dstVolumePath to set
-	 */
-	public void setDstVolumePath(String dstVolumePath) {
-		this.dstVolumePath = dstVolumePath;
-	}
-
-}
+package com.platform.entities;
+
+public class DataInfoEntityMoveTmp extends DataInfoEntity {
+	
+	private String dstPath;
+	
+	private String completeStatus;
+	
+	private int rate;
+	
+	/**
+	 * 
+	 */
+	private String lastTime; 
+	
+	private String dstVolumeIp;
+	
+	private String dstVolumePath;	
+	
+	private int fkid;
+	
+	public DataInfoEntityMoveTmp() {
+		// TODO Auto-generated constructor stub
+	}
+
+	/**
+	 * @return the dstPath
+	 */
+	public String getDstPath() {
+		return dstPath;
+	}
+
+	/**
+	 * @param dstPath the dstPath to set
+	 */
+	public void setDstPath(String dstPath) {
+		this.dstPath = dstPath;
+	}
+
+	/**
+	 * @return the completeStatus
+	 */
+	public String getCompleteStatus() {
+		return completeStatus;
+	}
+
+	/**
+	 * @param completeStatus the completeStatus to set
+	 */
+	public void setCompleteStatus(String completeStatus) {
+		this.completeStatus = completeStatus;
+	}
+
+	/**
+	 * @return the rate
+	 */
+	public int getRate() {
+		return rate;
+	}
+
+	/**
+	 * @param rate the rate to set
+	 */
+	public void setRate(int rate) {
+		this.rate = rate;
+	}
+
+	/**
+	 * @return the lastTime
+	 */
+	public String getLastTime() {
+		return lastTime;
+	}
+
+	/**
+	 * @param lastTime the lastTime to set
+	 */
+	public void setLastTime(String lastTime) {
+		this.lastTime = lastTime;
+	}
+
+	/**
+	 * @return the fkid
+	 */
+	public int getFkid() {
+		return fkid;
+	}
+
+	/**
+	 * @param fkid the fkid to set
+	 */
+	public void setFkid(int fkid) {
+		this.fkid = fkid;
+	}
+
+	/**
+	 * @return the dstVolumeIp
+	 */
+	public String getDstVolumeIp() {
+		return dstVolumeIp;
+	}
+
+	/**
+	 * @param dstVolumeIp the dstVolumeIp to set
+	 */
+	public void setDstVolumeIp(String dstVolumeIp) {
+		this.dstVolumeIp = dstVolumeIp;
+	}
+
+	/**
+	 * @return the dstVolumePath
+	 */
+	public String getDstVolumePath() {
+		return dstVolumePath;
+	}
+
+	/**
+	 * @param dstVolumePath the dstVolumePath to set
+	 */
+	public void setDstVolumePath(String dstVolumePath) {
+		this.dstVolumePath = dstVolumePath;
+	}
+
+}
diff --git a/src/com/platform/entities/EncodedInfoEntity.java b/src/com/platform/entities/EncodedInfoEntity.java
index 728850ff..3f2f425e 100644
--- a/src/com/platform/entities/EncodedInfoEntity.java
+++ b/src/com/platform/entities/EncodedInfoEntity.java
@@ -1,41 +1,41 @@
-package com.platform.entities;
-
-/**
- * 
- * 编码信息实体
- *   行政区划/系统信息
- * @author wuming
- *
- */
-public class EncodedInfoEntity {
-	private String name; //名称
-	private String code; //编码
-	
-	public EncodedInfoEntity() {}
-	
-	public EncodedInfoEntity(String name, String code) {		
-		this.name = name;
-		this.code = code;
-	}
-	
-	public String getName() {
-		return name;
-	}
-	
-	public void setName(String name) {
-		this.name = name;
-	}
-	
-	public String getCode() {
-		return code;
-	}
-	
-	public void setCode(String code) {
-		this.code = code;
-	}	
-	
-	@Override
-	public String toString(){
-		return "code=" + this.code + ", name=" + this.name;
-	}
-}
+package com.platform.entities;
+
+/**
+ * 
+ * 编码信息实体
+ *   行政区划/系统信息
+ * @author wuming
+ *
+ */
+public class EncodedInfoEntity {
+	private String name; //名称
+	private String code; //编码
+	
+	public EncodedInfoEntity() {}
+	
+	public EncodedInfoEntity(String name, String code) {		
+		this.name = name;
+		this.code = code;
+	}
+	
+	public String getName() {
+		return name;
+	}
+	
+	public void setName(String name) {
+		this.name = name;
+	}
+	
+	public String getCode() {
+		return code;
+	}
+	
+	public void setCode(String code) {
+		this.code = code;
+	}	
+	
+	@Override
+	public String toString(){
+		return "code=" + this.code + ", name=" + this.name;
+	}
+}
diff --git a/src/com/platform/entities/FolderNode.java b/src/com/platform/entities/FolderNode.java
index e9bc91da..5a9a56b7 100644
--- a/src/com/platform/entities/FolderNode.java
+++ b/src/com/platform/entities/FolderNode.java
@@ -1,65 +1,65 @@
-package com.platform.entities;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class FolderNode {
-	private String name;
-	private int isFolder; // 1 is file and other integer is folder show children number
-	private String path;
-	private List<FolderNode> childNodes = new ArrayList<FolderNode>();
-	
-
-	public FolderNode() {
-		// TODO Auto-generated constructor stub
-	}
-
-	
-	public FolderNode(String name) {
-		this.name = name;
-	}
-
-	public FolderNode(String name, int isFolder) {
-		this.name = name;
-		this.isFolder = isFolder;
-	}
-
-	public String getName() {
-		return name;
-	}
-
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	/**
-	 * @return the isFolder
-	 */
-	public int getIsFolder() {
-		return isFolder;
-	}
-
-	/**
-	 * @param isFolder the isFolder to set
-	 */
-	public void setIsFolder(int isFolder) {
-		this.isFolder = isFolder;
-	}
-
-	public String getPath() {
-		return path;
-	}
-
-	public void setPath(String path) {
-		this.path = path;
-	}
-
-	public List<FolderNode> getChildNodes() {
-		return childNodes;
-	}
-
-	public void setChildNodes(List<FolderNode> childNodes) {
-		this.childNodes = childNodes;
-	}
-
-}
+package com.platform.entities;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class FolderNode {
+	private String name;
+	private int isFolder; // 1 is file and other integer is folder show children number
+	private String path;
+	private List<FolderNode> childNodes = new ArrayList<FolderNode>();
+	
+
+	public FolderNode() {
+		// TODO Auto-generated constructor stub
+	}
+
+	
+	public FolderNode(String name) {
+		this.name = name;
+	}
+
+	public FolderNode(String name, int isFolder) {
+		this.name = name;
+		this.isFolder = isFolder;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	/**
+	 * @return the isFolder
+	 */
+	public int getIsFolder() {
+		return isFolder;
+	}
+
+	/**
+	 * @param isFolder the isFolder to set
+	 */
+	public void setIsFolder(int isFolder) {
+		this.isFolder = isFolder;
+	}
+
+	public String getPath() {
+		return path;
+	}
+
+	public void setPath(String path) {
+		this.path = path;
+	}
+
+	public List<FolderNode> getChildNodes() {
+		return childNodes;
+	}
+
+	public void setChildNodes(List<FolderNode> childNodes) {
+		this.childNodes = childNodes;
+	}
+
+}
diff --git a/src/com/platform/entities/GatherOracleInfo.java b/src/com/platform/entities/GatherOracleInfo.java
index b06fee63..4ceca3b4 100644
--- a/src/com/platform/entities/GatherOracleInfo.java
+++ b/src/com/platform/entities/GatherOracleInfo.java
@@ -1,82 +1,82 @@
-package com.platform.entities;
-
-import com.platform.entities.OracleConnectorParams;
-
-public class GatherOracleInfo extends OracleConnectorParams {
-	
-	private String tableName;
-	
-	private String suffix;
-	
-	private int id;
-	
-	private String remove;
-	
-	/**
-	 * 0:未知状态, 1:连接成功 ,2:在使用 ,3 :失败
-	 */
-	private int status;
-	
-	public GatherOracleInfo() {
-		super();
-	}
-
-	public GatherOracleInfo(String port, String ip, String name, String user,
-			String password, String database) {
-		super(port, ip, name, user, password, database);
-		// TODO Auto-generated constructor stub
-	}
-
-	public GatherOracleInfo(String port, String ip, String name, String user,
-			String password, String database, int _id, String tableName, String suffix, int status) {
-		super(port, ip, name, user, password, database);
-		this.tableName = tableName;
-		this.suffix = suffix;
-		this.id=_id;
-		this.status = status;
-	}
-
-	
-	
-
-	public String getTableName() {
-		return tableName;
-	}
-
-	public void setTableName(String tableName) {
-		this.tableName = tableName;
-	}
-
-	public String getSuffix() {
-		return suffix;
-	}
-
-	public void setSuffix(String suffix) {
-		this.suffix = suffix;
-	}
-
-	public int getId() {
-		return id;
-	}
-
-	public void setId(int id) {
-		this.id = id;
-	}
-
-	public int getStatus() {
-		return status;
-	}
-
-	public void setStatus(int status) {
-		this.status = status;
-	}
-
-	public String getRemove() {
-		return remove;
-	}
-
-	public void setRemove(String remove) {
-		this.remove = remove;
-	}	
-	
-}
+package com.platform.entities;
+
+import com.platform.entities.OracleConnectorParams;
+
+public class GatherOracleInfo extends OracleConnectorParams {
+	
+	private String tableName;
+	
+	private String suffix;
+	
+	private int id;
+	
+	private String remove;
+	
+	/**
+	 * 0:未知状态, 1:连接成功 ,2:在使用 ,3 :失败
+	 */
+	private int status;
+	
+	public GatherOracleInfo() {
+		super();
+	}
+
+	public GatherOracleInfo(String port, String ip, String name, String user,
+			String password, String database) {
+		super(port, ip, name, user, password, database);
+		// TODO Auto-generated constructor stub
+	}
+
+	public GatherOracleInfo(String port, String ip, String name, String user,
+			String password, String database, int _id, String tableName, String suffix, int status) {
+		super(port, ip, name, user, password, database);
+		this.tableName = tableName;
+		this.suffix = suffix;
+		this.id=_id;
+		this.status = status;
+	}
+
+	
+	
+
+	public String getTableName() {
+		return tableName;
+	}
+
+	public void setTableName(String tableName) {
+		this.tableName = tableName;
+	}
+
+	public String getSuffix() {
+		return suffix;
+	}
+
+	public void setSuffix(String suffix) {
+		this.suffix = suffix;
+	}
+
+	public int getId() {
+		return id;
+	}
+
+	public void setId(int id) {
+		this.id = id;
+	}
+
+	public int getStatus() {
+		return status;
+	}
+
+	public void setStatus(int status) {
+		this.status = status;
+	}
+
+	public String getRemove() {
+		return remove;
+	}
+
+	public void setRemove(String remove) {
+		this.remove = remove;
+	}	
+	
+}
diff --git a/src/com/platform/entities/GfsFolderEntity.java b/src/com/platform/entities/GfsFolderEntity.java
index ed87f85b..13429ddf 100644
--- a/src/com/platform/entities/GfsFolderEntity.java
+++ b/src/com/platform/entities/GfsFolderEntity.java
@@ -1,77 +1,77 @@
-
-/**
- * 文件名   :   GfsPathModel.java
- * 版权       :   <版权/公司名>
- * 描述       :   <描述>
- * @author  chen
- * 版本       :   <版本>
- * 修改时间:      2016年9月8日
- * 修改内容:      <修改内容>
- */
-package com.platform.entities;
-
-import java.util.List;
-
-/**
- * <一句话功能简述>
- * <功能详细描述>
- * @author    chen
- * @version   [版本号,2016年9月8日]
- * @see       [相关类/方法]
- * @since     [产品/模块版本]
- */
-
-public class GfsFolderEntity {
-
-	/** 当前路径  */
-	private String path;
-	
-	/** 当前路径  */
-	private String name;
-	
-	/** 子目录  */
-	private List<GfsFolderEntity> children;
-
-	/**
-	 * @return the path
-	 */
-	public String getPath() {
-		return path;
-	}
-
-	/**
-	 * @param path the path to set
-	 */
-	public void setPath(String path) {
-		this.path = path;
-	}
-
-	/**
-	 * @return the name
-	 */
-	public String getName() {
-		return name;
-	}
-
-	/**
-	 * @param name the name to set
-	 */
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	/**
-	 * @return the children
-	 */
-	public List<GfsFolderEntity> getChildren() {
-		return children;
-	}
-
-	/**
-	 * @param children the children to set
-	 */
-	public void setChildren(List<GfsFolderEntity> children) {
-		this.children = children;
-	}
-	
-}
+
+/**
+ * 文件名   :   GfsPathModel.java
+ * 版权       :   <版权/公司名>
+ * 描述       :   <描述>
+ * @author  chen
+ * 版本       :   <版本>
+ * 修改时间:      2016年9月8日
+ * 修改内容:      <修改内容>
+ */
+package com.platform.entities;
+
+import java.util.List;
+
+/**
+ * <一句话功能简述>
+ * <功能详细描述>
+ * @author    chen
+ * @version   [版本号,2016年9月8日]
+ * @see       [相关类/方法]
+ * @since     [产品/模块版本]
+ */
+
+public class GfsFolderEntity {
+
+	/** 当前路径  */
+	private String path;
+	
+	/** 当前路径  */
+	private String name;
+	
+	/** 子目录  */
+	private List<GfsFolderEntity> children;
+
+	/**
+	 * @return the path
+	 */
+	public String getPath() {
+		return path;
+	}
+
+	/**
+	 * @param path the path to set
+	 */
+	public void setPath(String path) {
+		this.path = path;
+	}
+
+	/**
+	 * @return the name
+	 */
+	public String getName() {
+		return name;
+	}
+
+	/**
+	 * @param name the name to set
+	 */
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	/**
+	 * @return the children
+	 */
+	public List<GfsFolderEntity> getChildren() {
+		return children;
+	}
+
+	/**
+	 * @param children the children to set
+	 */
+	public void setChildren(List<GfsFolderEntity> children) {
+		this.children = children;
+	}
+	
+}
diff --git a/src/com/platform/entities/PagerOptions.java b/src/com/platform/entities/PagerOptions.java
index e69e560a..96c5b77f 100644
--- a/src/com/platform/entities/PagerOptions.java
+++ b/src/com/platform/entities/PagerOptions.java
@@ -1,158 +1,158 @@
-package com.platform.entities;
-
-import java.util.List;
-
-public class PagerOptions {
-	private Integer currentPageNum; //当前页码
-
-	private String dataType; //数据类型
-
-	private String submittedBatch;  //数据批次
- 
-	private String cityName;  //城市名称
-
-	private String districtName; //区县名
-
-	private Integer dataVersion;  //数据版本
-
-	private String systemName;  //系统名称
-
-	private String dataYear; // 数据年度
-
-	private Integer limit; //一次查询返回记录条数
-	
-	private Integer offset; // 查询偏移量:起始id
-	
-	private Integer totalLimit; //当前页前面已有多少条数据
-	
-	private Integer priorTableSize; //前一次操作一页显示的数据条数
-	
-	private String keyQuery;
-	
-	private String[] array;
-	
-	public Integer getCurrentPageNum() {
-		return currentPageNum;
-	}
-
-	public void setCurrentPageNum(Integer currentPageNum) {
-		this.currentPageNum = currentPageNum;
-	}
-
-	public String getDataType() {
-		return dataType;
-	}
-
-	public void setDataType(String dataType) {
-		this.dataType = dataType;
-	}
-
-	public String getSubmittedBatch() {
-		return submittedBatch;
-	}
-
-	public void setSubmittedBatch(String submittedBatch) {
-		this.submittedBatch = submittedBatch;
-	}
-
-	public String getCityName() {
-		return cityName;
-	}
-
-	public void setCityName(String cityName) {
-		this.cityName = cityName;
-	}
-
-	public String getDistrictName() {
-		return districtName;
-	}
-
-	public void setDistrictName(String districtName) {
-		this.districtName = districtName;
-	}
-
-	public Integer getDataVersion() {
-		return dataVersion;
-	}
-
-	public void setDataVersion(Integer dataVersion) {
-		this.dataVersion = dataVersion;
-	}
-
-	public String getSystemName() {
-		return systemName;
-	}
-
-	public void setSystemName(String systemName) {
-		this.systemName = systemName;
-	}
-
-	public String getDataYear() {
-		return dataYear;
-	}
-
-	public void setDataYear(String dataYear) {
-		this.dataYear = dataYear;
-	}
-
-	public Integer getLimit() {
-		return limit;
-	}
-
-	public void setLimit(Integer limit) {
-		this.limit = limit;
-	}
-
-	public Integer getOffset() {
-		return offset;
-	}
-
-	public void setOffset(Integer offset) {
-		this.offset = offset;
-	}
-
-	public Integer getTotalLimit() {
-		return totalLimit;
-	}
-
-	public void setTotalLimit(Integer totalLimit) {
-		this.totalLimit = totalLimit;
-	}
-
-	public Integer getPriorTableSize() {
-		return priorTableSize;
-	}
-
-	public void setPriorTableSize(Integer priorTableSize) {
-		this.priorTableSize = priorTableSize;
-	}
-
-	/**
-	 * @return the keyQuery
-	 */
-	public String getKeyQuery() {
-		return keyQuery;
-	}
-
-	/**
-	 * @param keyQuery the keyQuery to set
-	 */
-	public void setKeyQuery(String keyQuery) {
-		this.keyQuery = keyQuery;
-	}
-
-	/**
-	 * @return the array
-	 */
-	public String[] getArray() {
-		return array;
-	}
-
-	/**
-	 * @param array the array to set
-	 */
-	public void setArray(String[] array) {
-		this.array = array;
-	}
-	
-}
+package com.platform.entities;
+
+import java.util.List;
+
+public class PagerOptions {
+	private Integer currentPageNum; //当前页码
+
+	private String dataType; //数据类型
+
+	private String submittedBatch;  //数据批次
+ 
+	private String cityName;  //城市名称
+
+	private String districtName; //区县名
+
+	private Integer dataVersion;  //数据版本
+
+	private String systemName;  //系统名称
+
+	private String dataYear; // 数据年度
+
+	private Integer limit; //一次查询返回记录条数
+	
+	private Integer offset; // 查询偏移量:起始id
+	
+	private Integer totalLimit; //当前页前面已有多少条数据
+	
+	private Integer priorTableSize; //前一次操作一页显示的数据条数
+	
+	private String keyQuery;
+	
+	private String[] array;
+	
+	public Integer getCurrentPageNum() {
+		return currentPageNum;
+	}
+
+	public void setCurrentPageNum(Integer currentPageNum) {
+		this.currentPageNum = currentPageNum;
+	}
+
+	public String getDataType() {
+		return dataType;
+	}
+
+	public void setDataType(String dataType) {
+		this.dataType = dataType;
+	}
+
+	public String getSubmittedBatch() {
+		return submittedBatch;
+	}
+
+	public void setSubmittedBatch(String submittedBatch) {
+		this.submittedBatch = submittedBatch;
+	}
+
+	public String getCityName() {
+		return cityName;
+	}
+
+	public void setCityName(String cityName) {
+		this.cityName = cityName;
+	}
+
+	public String getDistrictName() {
+		return districtName;
+	}
+
+	public void setDistrictName(String districtName) {
+		this.districtName = districtName;
+	}
+
+	public Integer getDataVersion() {
+		return dataVersion;
+	}
+
+	public void setDataVersion(Integer dataVersion) {
+		this.dataVersion = dataVersion;
+	}
+
+	public String getSystemName() {
+		return systemName;
+	}
+
+	public void setSystemName(String systemName) {
+		this.systemName = systemName;
+	}
+
+	public String getDataYear() {
+		return dataYear;
+	}
+
+	public void setDataYear(String dataYear) {
+		this.dataYear = dataYear;
+	}
+
+	public Integer getLimit() {
+		return limit;
+	}
+
+	public void setLimit(Integer limit) {
+		this.limit = limit;
+	}
+
+	public Integer getOffset() {
+		return offset;
+	}
+
+	public void setOffset(Integer offset) {
+		this.offset = offset;
+	}
+
+	public Integer getTotalLimit() {
+		return totalLimit;
+	}
+
+	public void setTotalLimit(Integer totalLimit) {
+		this.totalLimit = totalLimit;
+	}
+
+	public Integer getPriorTableSize() {
+		return priorTableSize;
+	}
+
+	public void setPriorTableSize(Integer priorTableSize) {
+		this.priorTableSize = priorTableSize;
+	}
+
+	/**
+	 * @return the keyQuery
+	 */
+	public String getKeyQuery() {
+		return keyQuery;
+	}
+
+	/**
+	 * @param keyQuery the keyQuery to set
+	 */
+	public void setKeyQuery(String keyQuery) {
+		this.keyQuery = keyQuery;
+	}
+
+	/**
+	 * @return the array
+	 */
+	public String[] getArray() {
+		return array;
+	}
+
+	/**
+	 * @param array the array to set
+	 */
+	public void setArray(String[] array) {
+		this.array = array;
+	}
+	
+}
diff --git a/src/com/platform/entities/RegionalismEntity.java b/src/com/platform/entities/RegionalismEntity.java
index ad494fca..ba1b7f2b 100644
--- a/src/com/platform/entities/RegionalismEntity.java
+++ b/src/com/platform/entities/RegionalismEntity.java
@@ -1,53 +1,53 @@
-package com.platform.entities;
-
-public class RegionalismEntity {
-	
-	private String code;
-	
-	private String cityName;
-	
-	private String districtName;
-
-	/**
-	 * @return the code
-	 */
-	public String getCode() {
-		return code;
-	}
-
-	/**
-	 * @param code the code to set
-	 */
-	public void setCode(String code) {
-		this.code = code;
-	}
-
-	/**
-	 * @return the cityName
-	 */
-	public String getCityName() {
-		return cityName;
-	}
-
-	/**
-	 * @param cityName the cityName to set
-	 */
-	public void setCityName(String cityName) {
-		this.cityName = cityName;
-	}
-
-	/**
-	 * @return the districtName
-	 */
-	public String getDistrictName() {
-		return districtName;
-	}
-
-	/**
-	 * @param districtName the districtName to set
-	 */
-	public void setDistrictName(String districtName) {
-		this.districtName = districtName;
-	}
-
-}
+package com.platform.entities;
+
+public class RegionalismEntity {
+	
+	private String code;
+	
+	private String cityName;
+	
+	private String districtName;
+
+	/**
+	 * @return the code
+	 */
+	public String getCode() {
+		return code;
+	}
+
+	/**
+	 * @param code the code to set
+	 */
+	public void setCode(String code) {
+		this.code = code;
+	}
+
+	/**
+	 * @return the cityName
+	 */
+	public String getCityName() {
+		return cityName;
+	}
+
+	/**
+	 * @param cityName the cityName to set
+	 */
+	public void setCityName(String cityName) {
+		this.cityName = cityName;
+	}
+
+	/**
+	 * @return the districtName
+	 */
+	public String getDistrictName() {
+		return districtName;
+	}
+
+	/**
+	 * @param districtName the districtName to set
+	 */
+	public void setDistrictName(String districtName) {
+		this.districtName = districtName;
+	}
+
+}
diff --git a/src/com/platform/entities/SimpleConfigParamsBean.java b/src/com/platform/entities/SimpleConfigParamsBean.java
index 6453a5a7..520d5ee7 100644
--- a/src/com/platform/entities/SimpleConfigParamsBean.java
+++ b/src/com/platform/entities/SimpleConfigParamsBean.java
@@ -1,44 +1,44 @@
-package com.platform.entities;
-
-public class SimpleConfigParamsBean {
-	private String masterUrl;
-
-	private String oracleUserName;
-
-	private String oraclePassword;
-
-	private String oracleDBName;
-
-	public String getMasterUrl() {
-		return masterUrl;
-	}
-
-	public void setMasterUrl(String masterUrl) {
-		this.masterUrl = masterUrl;
-	}
-
-	public String getOracleUserName() {
-		return oracleUserName;
-	}
-
-	public void setOracleUserName(String oracleUserName) {
-		this.oracleUserName = oracleUserName;
-	}
-
-	public String getOraclePassword() {
-		return oraclePassword;
-	}
-
-	public void setOraclePassword(String oraclePassword) {
-		this.oraclePassword = oraclePassword;
-	}
-
-	public String getOracleDBName() {
-		return oracleDBName;
-	}
-
-	public void setOracleDBName(String oracleDBName) {
-		this.oracleDBName = oracleDBName;
-	}	
-
-}
+package com.platform.entities;
+
+public class SimpleConfigParamsBean {
+	private String masterUrl;
+
+	private String oracleUserName;
+
+	private String oraclePassword;
+
+	private String oracleDBName;
+
+	public String getMasterUrl() {
+		return masterUrl;
+	}
+
+	public void setMasterUrl(String masterUrl) {
+		this.masterUrl = masterUrl;
+	}
+
+	public String getOracleUserName() {
+		return oracleUserName;
+	}
+
+	public void setOracleUserName(String oracleUserName) {
+		this.oracleUserName = oracleUserName;
+	}
+
+	public String getOraclePassword() {
+		return oraclePassword;
+	}
+
+	public void setOraclePassword(String oraclePassword) {
+		this.oraclePassword = oraclePassword;
+	}
+
+	public String getOracleDBName() {
+		return oracleDBName;
+	}
+
+	public void setOracleDBName(String oracleDBName) {
+		this.oracleDBName = oracleDBName;
+	}	
+
+}
diff --git a/src/com/platform/entities/SystemEntity.java b/src/com/platform/entities/SystemEntity.java
index 40eb0750..6ac6cfb8 100644
--- a/src/com/platform/entities/SystemEntity.java
+++ b/src/com/platform/entities/SystemEntity.java
@@ -1,37 +1,37 @@
-package com.platform.entities;
-
-public class SystemEntity {
-
-	private int code;
-	
-	private String systemName;
-
-	/**
-	 * @return the code
-	 */
-	public int getCode() {
-		return code;
-	}
-
-	/**
-	 * @param code the code to set
-	 */
-	public void setCode(int code) {
-		this.code = code;
-	}
-
-	/**
-	 * @return the systemName
-	 */
-	public String getSystemName() {
-		return systemName;
-	}
-
-	/**
-	 * @param systemName the systemName to set
-	 */
-	public void setSystemName(String systemName) {
-		this.systemName = systemName;
-	}
-	
-}
+package com.platform.entities;
+
+public class SystemEntity {
+
+	private int code;
+	
+	private String systemName;
+
+	/**
+	 * @return the code
+	 */
+	public int getCode() {
+		return code;
+	}
+
+	/**
+	 * @param code the code to set
+	 */
+	public void setCode(int code) {
+		this.code = code;
+	}
+
+	/**
+	 * @return the systemName
+	 */
+	public String getSystemName() {
+		return systemName;
+	}
+
+	/**
+	 * @param systemName the systemName to set
+	 */
+	public void setSystemName(String systemName) {
+		this.systemName = systemName;
+	}
+	
+}
diff --git a/src/com/platform/entities/VolumeEntity.java b/src/com/platform/entities/VolumeEntity.java
index ae2604ea..13b4eb27 100644
--- a/src/com/platform/entities/VolumeEntity.java
+++ b/src/com/platform/entities/VolumeEntity.java
@@ -1,162 +1,162 @@
-
-/**
- * 文件名   :   VolumeEntity.java
- * 版权       :   <版权/公司名>
- * 描述       :   <描述>
- * @author  chen
- * 版本       :   <版本>
- * 修改时间:      2016年9月9日
- * 修改内容:      <修改内容>
- */
-package com.platform.entities;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * <一句话功能简述> gfs的 volume 对象
- * <功能详细描述>
- * @author    chen
- * @version   [版本号,2016年9月9日]
- * @see       [相关类/方法]
- * @since     [产品/模块版本]
- */
-
-public class VolumeEntity {
-
-	/** volume总大小  */
-	private double allSize;
-	
-	/** volume已使用大小  */
-	private double usedSize;
-	
-	/** volume名称  */
-	private String name;
-	
-	/** 挂载点  */
-	private String path;
-	
-	/**  * exist,正常返回状态Started,Stopped,Created */
-	private String status;
-	
-	private String type;
-	
-	/** volume树形目录  */
-	private List<FolderNode> folder = new ArrayList<FolderNode>();
-	
-	/** volume的 块  */
-	private List<Brick> brick = new ArrayList<Brick>();
-
-	/**
-	 * @return the allSize
-	 */
-	public double getAllSize() {
-		return allSize;
-	}
-
-	/**
-	 * @param allSize the allSize to set
-	 */
-	public void setAllSize(double allSize) {
-		this.allSize = allSize;
-	}
-
-	/**
-	 * @return the usedSize
-	 */
-	public double getUsedSize() {
-		return usedSize;
-	}
-
-	/**
-	 * @param usedSize the usedSize to set
-	 */
-	public void setUsedSize(double usedSize) {
-		this.usedSize = usedSize;
-	}
-
-	/**
-	 * @return the name
-	 */
-	public String getName() {
-		return name;
-	}
-
-	/**
-	 * @param name the name to set
-	 */
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	/**
-	 * @return the path
-	 */
-	public String getPath() {
-		return path;
-	}
-
-	/**
-	 * @param path the path to set
-	 */
-	public void setPath(String path) {
-		this.path = path;
-	}
-
-	/**
-	 * @return the status
-	 */
-	public String getStatus() {
-		return status;
-	}
-
-	/**
-	 * @param status the status to set
-	 */
-	public void setStatus(String status) {
-		this.status = status;
-	}
-
-	/**
-	 * @return the type
-	 */
-	public String getType() {
-		return type;
-	}
-
-	/**
-	 * @param type the type to set
-	 */
-	public void setType(String type) {
-		this.type = type;
-	}
-
-	/**
-	 * @return the folder
-	 */
-	public List<FolderNode> getFolder() {
-		return folder;
-	}
-
-	/**
-	 * @param folder the folder to set
-	 */
-	public void setFolder(List<FolderNode> folder) {
-		this.folder = folder;
-	}
-
-	/**
-	 * @return the brick
-	 */
-	public List<Brick> getBrick() {
-		return brick;
-	}
-
-	/**
-	 * @param brick the brick to set
-	 */
-	public void setBrick(List<Brick> brick) {
-		this.brick = brick;
-	}
-
-}
+
+/**
+ * 文件名   :   VolumeEntity.java
+ * 版权       :   <版权/公司名>
+ * 描述       :   <描述>
+ * @author  chen
+ * 版本       :   <版本>
+ * 修改时间:      2016年9月9日
+ * 修改内容:      <修改内容>
+ */
+package com.platform.entities;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * <一句话功能简述> gfs的 volume 对象
+ * <功能详细描述>
+ * @author    chen
+ * @version   [版本号,2016年9月9日]
+ * @see       [相关类/方法]
+ * @since     [产品/模块版本]
+ */
+
+public class VolumeEntity {
+
+	/** volume总大小  */
+	private double allSize;
+	
+	/** volume已使用大小  */
+	private double usedSize;
+	
+	/** volume名称  */
+	private String name;
+	
+	/** 挂载点  */
+	private String path;
+	
+	/**  * exist,正常返回状态Started,Stopped,Created */
+	private String status;
+	
+	private String type;
+	
+	/** volume树形目录  */
+	private List<FolderNode> folder = new ArrayList<FolderNode>();
+	
+	/** volume的 块  */
+	private List<Brick> brick = new ArrayList<Brick>();
+
+	/**
+	 * @return the allSize
+	 */
+	public double getAllSize() {
+		return allSize;
+	}
+
+	/**
+	 * @param allSize the allSize to set
+	 */
+	public void setAllSize(double allSize) {
+		this.allSize = allSize;
+	}
+
+	/**
+	 * @return the usedSize
+	 */
+	public double getUsedSize() {
+		return usedSize;
+	}
+
+	/**
+	 * @param usedSize the usedSize to set
+	 */
+	public void setUsedSize(double usedSize) {
+		this.usedSize = usedSize;
+	}
+
+	/**
+	 * @return the name
+	 */
+	public String getName() {
+		return name;
+	}
+
+	/**
+	 * @param name the name to set
+	 */
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	/**
+	 * @return the path
+	 */
+	public String getPath() {
+		return path;
+	}
+
+	/**
+	 * @param path the path to set
+	 */
+	public void setPath(String path) {
+		this.path = path;
+	}
+
+	/**
+	 * @return the status
+	 */
+	public String getStatus() {
+		return status;
+	}
+
+	/**
+	 * @param status the status to set
+	 */
+	public void setStatus(String status) {
+		this.status = status;
+	}
+
+	/**
+	 * @return the type
+	 */
+	public String getType() {
+		return type;
+	}
+
+	/**
+	 * @param type the type to set
+	 */
+	public void setType(String type) {
+		this.type = type;
+	}
+
+	/**
+	 * @return the folder
+	 */
+	public List<FolderNode> getFolder() {
+		return folder;
+	}
+
+	/**
+	 * @param folder the folder to set
+	 */
+	public void setFolder(List<FolderNode> folder) {
+		this.folder = folder;
+	}
+
+	/**
+	 * @return the brick
+	 */
+	public List<Brick> getBrick() {
+		return brick;
+	}
+
+	/**
+	 * @param brick the brick to set
+	 */
+	public void setBrick(List<Brick> brick) {
+		this.brick = brick;
+	}
+
+}
diff --git a/src/com/platform/glusterfs/CheckoutMD5.java b/src/com/platform/glusterfs/CheckoutMD5.java
index 810ec443..d0be3dad 100644
--- a/src/com/platform/glusterfs/CheckoutMD5.java
+++ b/src/com/platform/glusterfs/CheckoutMD5.java
@@ -1,106 +1,106 @@
-package com.platform.glusterfs;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.log4j.Logger;
-import org.aspectj.weaver.ast.And;
-
-import com.mysql.jdbc.log.Log;
-import com.platform.utils.Constant;
-
-public class CheckoutMD5 {
-	public static Logger log = Logger.getLogger(CheckoutMD5.class);
-	String sourcePath;
-	String destPath;
-	String dataName;
-	// String cmd_crateSourceMD5File="find "+sourcePath+dataName+"/app/ -type f
-	// -print0 | xargs -0 md5sum | sort >"+deskPath+dataName+"_md5.txt";
-	String cmd_getSourceMD5File;
-	// String cmd_crateDestMD5File="find "+destPath+dataName+"/app/ -type f
-	// -print0 | xargs -0 md5sum | sort >"+deskPath+dataName+"_md5.txt";
-	String cmd_getDestMD5File;
-	Map<String, String> source_md5 = new HashMap<String, String>();
-	Map<String, String> dest_md5 = new HashMap<String, String>();
-
-	public CheckoutMD5() {
-		// TODO Auto-generated constructor stub
-	}
-
-	public CheckoutMD5(String sourcePath, String destPath, String dataName) {
-		// TODO Auto-generated constructor stub
-		this.sourcePath = sourcePath;
-		this.destPath = destPath;
-		this.dataName = dataName;
-		cmd_getSourceMD5File = "find " + sourcePath + dataName + "/app/ -type f -print0 | xargs -0 md5sum | sort ";
-		cmd_getDestMD5File = "find " + destPath + dataName + "/app/ -type f -print0 | xargs -0 md5sum | sort ";
-	}
-
-	/**
-	 * 文件夹校验 校验sourcePath和destPath是否完全相同,如果相同,返回1;
-	 * 如果不相同,返回0,如果获取文件MD5出错,返回-1;如何源文件不存在返回-2;目标文件不存在,返回-3;
-	 * 
-	 * @param sourcePath
-	 * @param destPath
-	 * @return
-	 * @see [类、类#方法、类#成员]
-	 */
-	public int checkoutMD5Folder(String sourcePath, String destPath) {
-		log.info("start checkout md5 "+sourcePath+" and "+ destPath);
-		List<String> wrong_files = new ArrayList<String>();
-		String source_cmd = "find " + sourcePath + " -type f -print0 | xargs -0 md5sum";
-		String dest_cmd = "find " + destPath + " -type f -print0 | xargs -0 md5sum";
-		List<String> sourceReStrings = Constant.ganymedSSH.execCmdWaitAcquiescent(source_cmd);
-		if (sourceReStrings == null || sourceReStrings.size() == 0) {
-			log.error("get " + sourcePath + " MD5 error!");
-			return -1;
-		}
-		if(sourceReStrings.get(0).contains(Constant.noSuchFile)){
-			log.error(sourcePath+" is not exist!");
-			return -2;
-		}
-		List<String> destReStrings = Constant.ganymedSSH.execCmdWaitAcquiescent(dest_cmd);
-		if (destReStrings == null || destReStrings.size() == 0) {
-			log.error("get " + destReStrings + " MD5 error!");
-			return -1;
-		}
-		if(destReStrings.get(0).contains(Constant.noSuchFile)){
-			log.error(destPath+" is not exist!");
-			return -3;
-		}
-		Map<String, String> source_md5 = new HashMap<String, String>();
-		Map<String, String> dest_md5 = new HashMap<String, String>();
-		for (String line : sourceReStrings) {
-			String[] lines = line.split("  ");
-			String key = lines[1].replace(sourcePath, "").trim();
-			String value = lines[0].trim();
-			source_md5.put(key, value);
-		}
-		for (String line : destReStrings) {
-			String[] lines = line.split("  ");
-			String key = lines[1].replace(destPath, "").trim();
-			String value = lines[0].trim();
-			dest_md5.put(key, value);
-		}
-		for (Map.Entry<String, String> mapEntry : source_md5.entrySet()) {
-			if (!(dest_md5.containsKey(mapEntry.getKey())
-					&& dest_md5.get(mapEntry.getKey()).equals(mapEntry.getValue()))) {
-				
-				log.info(sourcePath + " and " + destPath + " is not same!");
-				return 0;
-				// System.out.println(mapEntry.getKey());
-			}
-
-		}
-
-		log.info(sourcePath + " and " + destPath + " is  same!");
-		return 1;
-	}
-
-	public static void main(String[] args) {
-		CheckoutMD5 checkoutMD5 = new CheckoutMD5();
-		System.out.println(checkoutMD5.checkoutMD5Folder("/home/v1_copy","/home/ubuntu"));
-	}
-}
+package com.platform.glusterfs;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.log4j.Logger;
+import org.aspectj.weaver.ast.And;
+
+import com.mysql.jdbc.log.Log;
+import com.platform.utils.Constant;
+
+public class CheckoutMD5 {
+	public static Logger log = Logger.getLogger(CheckoutMD5.class);
+	String sourcePath;
+	String destPath;
+	String dataName;
+	// String cmd_crateSourceMD5File="find "+sourcePath+dataName+"/app/ -type f
+	// -print0 | xargs -0 md5sum | sort >"+deskPath+dataName+"_md5.txt";
+	String cmd_getSourceMD5File;
+	// String cmd_crateDestMD5File="find "+destPath+dataName+"/app/ -type f
+	// -print0 | xargs -0 md5sum | sort >"+deskPath+dataName+"_md5.txt";
+	String cmd_getDestMD5File;
+	Map<String, String> source_md5 = new HashMap<String, String>();
+	Map<String, String> dest_md5 = new HashMap<String, String>();
+
+	public CheckoutMD5() {
+		// TODO Auto-generated constructor stub
+	}
+
+	public CheckoutMD5(String sourcePath, String destPath, String dataName) {
+		// TODO Auto-generated constructor stub
+		this.sourcePath = sourcePath;
+		this.destPath = destPath;
+		this.dataName = dataName;
+		cmd_getSourceMD5File = "find " + sourcePath + dataName + "/app/ -type f -print0 | xargs -0 md5sum | sort ";
+		cmd_getDestMD5File = "find " + destPath + dataName + "/app/ -type f -print0 | xargs -0 md5sum | sort ";
+	}
+
+	/**
+	 * 文件夹校验 校验sourcePath和destPath是否完全相同,如果相同,返回1;
+	 * 如果不相同,返回0,如果获取文件MD5出错,返回-1;如何源文件不存在返回-2;目标文件不存在,返回-3;
+	 * 
+	 * @param sourcePath
+	 * @param destPath
+	 * @return
+	 * @see [类、类#方法、类#成员]
+	 */
+	public int checkoutMD5Folder(String sourcePath, String destPath) {
+		log.info("start checkout md5 "+sourcePath+" and "+ destPath);
+		List<String> wrong_files = new ArrayList<String>();
+		String source_cmd = "find " + sourcePath + " -type f -print0 | xargs -0 md5sum";
+		String dest_cmd = "find " + destPath + " -type f -print0 | xargs -0 md5sum";
+		List<String> sourceReStrings = Constant.ganymedSSH.execCmdWaitAcquiescent(source_cmd);
+		if (sourceReStrings == null || sourceReStrings.size() == 0) {
+			log.error("get " + sourcePath + " MD5 error!");
+			return -1;
+		}
+		if(sourceReStrings.get(0).contains(Constant.noSuchFile)){
+			log.error(sourcePath+" is not exist!");
+			return -2;
+		}
+		List<String> destReStrings = Constant.ganymedSSH.execCmdWaitAcquiescent(dest_cmd);
+		if (destReStrings == null || destReStrings.size() == 0) {
+			log.error("get " + destReStrings + " MD5 error!");
+			return -1;
+		}
+		if(destReStrings.get(0).contains(Constant.noSuchFile)){
+			log.error(destPath+" is not exist!");
+			return -3;
+		}
+		Map<String, String> source_md5 = new HashMap<String, String>();
+		Map<String, String> dest_md5 = new HashMap<String, String>();
+		for (String line : sourceReStrings) {
+			String[] lines = line.split("  ");
+			String key = lines[1].replace(sourcePath, "").trim();
+			String value = lines[0].trim();
+			source_md5.put(key, value);
+		}
+		for (String line : destReStrings) {
+			String[] lines = line.split("  ");
+			String key = lines[1].replace(destPath, "").trim();
+			String value = lines[0].trim();
+			dest_md5.put(key, value);
+		}
+		for (Map.Entry<String, String> mapEntry : source_md5.entrySet()) {
+			if (!(dest_md5.containsKey(mapEntry.getKey())
+					&& dest_md5.get(mapEntry.getKey()).equals(mapEntry.getValue()))) {
+				
+				log.info(sourcePath + " and " + destPath + " is not same!");
+				return 0;
+				// System.out.println(mapEntry.getKey());
+			}
+
+		}
+
+		log.info(sourcePath + " and " + destPath + " is  same!");
+		return 1;
+	}
+
+	public static void main(String[] args) {
+		CheckoutMD5 checkoutMD5 = new CheckoutMD5();
+		System.out.println(checkoutMD5.checkoutMD5Folder("/home/v1_copy","/home/ubuntu"));
+	}
+}
diff --git a/src/com/platform/glusterfs/ClusterInfo.java b/src/com/platform/glusterfs/ClusterInfo.java
index 793b86ca..add5e191 100644
--- a/src/com/platform/glusterfs/ClusterInfo.java
+++ b/src/com/platform/glusterfs/ClusterInfo.java
@@ -1,124 +1,124 @@
-
-
-package com.platform.glusterfs;
-
-
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.log4j.Logger;
-import org.apache.log4j.PropertyConfigurator;
-
-import com.platform.utils.Constant;
-
-/**
- * 获取集群信息
- * @author    liliy
- * @version   [版本号,2016年9月12日]
- * @see       [相关类/方法]
- * @since     [产品/模块版本]
- */
-public class ClusterInfo {
-	public static Logger log = Logger.getLogger(ClusterInfo.class);
-
-	/**
-	 * 获取集群节点信息
-	 * 如果获取不正常,则返回null,如果获取正常,返回map表示节点ip和ip的状态
-	 * 如果ip在集群中且联通状态为PeerinCluster(Connected)
-	 * 如果ip在集群中且但不连通为PeerinCluster(Disconnected)
-	 * @return
-	 * @see [类、类#方法、类#成员]
-	 */
-	public Map<String, String> showClusterInfo() {
-		log.info("get cluster info");
-		Map<String, String> peerIps = new HashMap<String, String>();
-
-		List<String> reStrings = Constant.ganymedSSH.execCmdWaitAcquiescent(Constant.glusterPeerStatus);
-		if (reStrings == null) {
-			log.error("1101 command get result is null");
-			return null;
-		}
-		if (reStrings.size() == 0) {
-			log.error("1102 command get result is nothing");
-			return null;
-		}
-
-		if (!(reStrings.get(0).split(":")[0].contains("Number of Peers"))) {
-
-			log.error("1103 get result string wrong");
-			return null;
-		}
-		
-
-		// System.out.print(reStrings.get(0));
-
-		int flag = 0;
-		String ipString = "";
-		String state = "";
-		for (Iterator it2 = reStrings.iterator(); it2.hasNext();) {
-			String line = (String) it2.next();
-			line=line.replaceAll(" +", " ");
-			String keyValue[] = line.split(":");
-			if (keyValue[0].equals("Hostname")) {
-
-				if (keyValue.length < 2) {
-					log.error("1105 command get result is wrong");
-					continue;
-				}
-
-				ipString = keyValue[1].replaceAll(" ", "");
-				flag = 1;
-			} else if (flag == 1 && keyValue[0].equals("State")) {
-
-				if (keyValue.length < 2) {
-					log.error("1106 command get result is wrong");
-					continue;
-				}
-
-				state = keyValue[1].replaceAll(" ", "");
-				flag = 0;
-				peerIps.put(ipString, state);
-			}
-
-		}
-		return peerIps;
-	}
- 
-	/**
-	 * 根据给定的ip获的ip的状态,即是否在集群中并联通
-	 * 如果ip不在集群中,返回null
-	 * 如果ip在集群中且联通状态为PeerinCluster(Connected)
-	 * 如果ip在集群中且但不连通为PeerinCluster(Disconnected)
-	 * @param peerip
-	 * @return
-	 * @see [类、类#方法、类#成员]
-	 */
-	public String getPeerStatus(String peerip){
-		Map<String, String> peerIps=showClusterInfo();
-		if(peerIps==null || peerIps.size()==0){
-			return null;
-		}
-		
-		if(peerip.equals(Constant.hostIp)){
-			return Constant.peerincluster_connected;
-		}
-		if(!peerIps.containsKey(peerip)){
-			return Constant.peerNotinCluster;
-		}
-		return peerIps.get(peerip);
-	}
-	
-	
-	public static void main(String[] args) {
-//		PropertyConfigurator.configure("log4j.properties");
-		System.out.println(new ClusterInfo().showClusterInfo());
-		System.out.println(new ClusterInfo().getPeerStatus("192.168.0.116"));
-	}
-}
-
-
+
+
+package com.platform.glusterfs;
+
+
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.log4j.Logger;
+import org.apache.log4j.PropertyConfigurator;
+
+import com.platform.utils.Constant;
+
+/**
+ * 获取集群信息
+ * @author    liliy
+ * @version   [版本号,2016年9月12日]
+ * @see       [相关类/方法]
+ * @since     [产品/模块版本]
+ */
+public class ClusterInfo {
+	public static Logger log = Logger.getLogger(ClusterInfo.class);
+
+	/**
+	 * 获取集群节点信息
+	 * 如果获取不正常,则返回null,如果获取正常,返回map表示节点ip和ip的状态
+	 * 如果ip在集群中且联通状态为PeerinCluster(Connected)
+	 * 如果ip在集群中且但不连通为PeerinCluster(Disconnected)
+	 * @return
+	 * @see [类、类#方法、类#成员]
+	 */
+	public Map<String, String> showClusterInfo() {
+		log.info("get cluster info");
+		Map<String, String> peerIps = new HashMap<String, String>();
+
+		List<String> reStrings = Constant.ganymedSSH.execCmdWaitAcquiescent(Constant.glusterPeerStatus);
+		if (reStrings == null) {
+			log.error("1101 command get result is null");
+			return null;
+		}
+		if (reStrings.size() == 0) {
+			log.error("1102 command get result is nothing");
+			return null;
+		}
+
+		if (!(reStrings.get(0).split(":")[0].contains("Number of Peers"))) {
+
+			log.error("1103 get result string wrong");
+			return null;
+		}
+		
+
+		// System.out.print(reStrings.get(0));
+
+		int flag = 0;
+		String ipString = "";
+		String state = "";
+		for (Iterator it2 = reStrings.iterator(); it2.hasNext();) {
+			String line = (String) it2.next();
+			line=line.replaceAll(" +", " ");
+			String keyValue[] = line.split(":");
+			if (keyValue[0].equals("Hostname")) {
+
+				if (keyValue.length < 2) {
+					log.error("1105 command get result is wrong");
+					continue;
+				}
+
+				ipString = keyValue[1].replaceAll(" ", "");
+				flag = 1;
+			} else if (flag == 1 && keyValue[0].equals("State")) {
+
+				if (keyValue.length < 2) {
+					log.error("1106 command get result is wrong");
+					continue;
+				}
+
+				state = keyValue[1].replaceAll(" ", "");
+				flag = 0;
+				peerIps.put(ipString, state);
+			}
+
+		}
+		return peerIps;
+	}
+ 
+	/**
+	 * 根据给定的ip获的ip的状态,即是否在集群中并联通
+	 * 如果ip不在集群中,返回null
+	 * 如果ip在集群中且联通状态为PeerinCluster(Connected)
+	 * 如果ip在集群中且但不连通为PeerinCluster(Disconnected)
+	 * @param peerip
+	 * @return
+	 * @see [类、类#方法、类#成员]
+	 */
+	public String getPeerStatus(String peerip){
+		Map<String, String> peerIps=showClusterInfo();
+		if(peerIps==null || peerIps.size()==0){
+			return null;
+		}
+		
+		if(peerip.equals(Constant.hostIp)){
+			return Constant.peerincluster_connected;
+		}
+		if(!peerIps.containsKey(peerip)){
+			return Constant.peerNotinCluster;
+		}
+		return peerIps.get(peerip);
+	}
+	
+	
+	public static void main(String[] args) {
+//		PropertyConfigurator.configure("log4j.properties");
+		System.out.println(new ClusterInfo().showClusterInfo());
+		System.out.println(new ClusterInfo().getPeerStatus("192.168.0.116"));
+	}
+}
+
+
diff --git a/src/com/platform/glusterfs/GetTreeData.java b/src/com/platform/glusterfs/GetTreeData.java
index 4fce07bc..81f3ba5b 100644
--- a/src/com/platform/glusterfs/GetTreeData.java
+++ b/src/com/platform/glusterfs/GetTreeData.java
@@ -1,125 +1,125 @@
-
-
-package com.platform.glusterfs;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-import org.junit.Test;
-import com.platform.entities.FolderNode;
-import com.platform.utils.Constant;
-import com.platform.utils.FileOperateHelper;
-import com.platform.utils.GanymedSSH;
-
-/**
- * <一句话功能简述> 获得GFS某个目录下的子目录
- * <功能详细描述>
- * @author    chen
- * @version   [版本号,2016年9月8日]
- * @see       [相关类/方法]
- * @since     [产品/模块版本]
- */
-public class GetTreeData {
-	ShowData showData = new ShowData();
-
-	/**
-	 * <一句话功能简述> 获得所以子目录
-	 * <功能详细描述>
-	 * @param name
-	 * @return
-	 * @see [类、类#方法、类#成员]
-	 */
-	public FolderNode getDatas(String name) {
-		String names[]=name.split("/");
-		String only_name=names[names.length-1];
-		FolderNode fileNode = new FolderNode(only_name);
-		fileNode.setPath(name);
-		Map<String, String> files = showData.showFolderData(name);
-		if(files==null || files.size()==0){
-			return fileNode;
-		}
-		fileNode.setIsFolder(files.size());
-		List<FolderNode> list = new ArrayList<FolderNode>();
-		fileNode.setChildNodes(list);
-		for (Map.Entry<String, String> entry : files.entrySet()) {
-			if(entry.getKey().equals("app")){
-				continue;
-			}
-			int number = Integer.parseInt(entry.getValue());
-			if (number == 1) {
-				fileNode.getChildNodes().add(new FolderNode(entry.getKey(), number));
-			}
-			if (number > 1) {
-				FolderNode temp=getDatas(name+"/"+entry.getKey());
-				fileNode.getChildNodes().add(temp);
-			}
-		}
-
-		return fileNode;
-	}
-	
-	
-	/**
-	 * <一句话功能简述> 获得所以子目录
-	 * <功能详细描述>
-	 * @param name
-	 * @return
-	 * @see [类、类#方法、类#成员]
-	 */
-	public FolderNode getDatasWithShell(String name) {
-		if(name.endsWith("/")){
-			name=name.substring(0, name.length()-1);
-		}
-//		String names[]=name.split("/");
-//		String only_name=names[names.length-1];
-		FolderNode fileNode = new FolderNode(name);
-		fileNode.setPath(name);
-		
-//		String shellComment= new FileOperateHelper().fileReaderAndendline(Constant.fileGetTreeData);
-		String shellComment= Constant.strGetTreeData;
-		String sh_path="/getTreedata.sh";
-		String cmd="echo -e \""+shellComment+"\" > "+sh_path+" & chmod +x "+sh_path;
-		Constant.ganymedSSH.execCmdWaitAcquiescent(cmd);
-//		Map<String, String> files = showData.showFolderData(name);
-		List<String> files=Constant.ganymedSSH.execCmdWaitAcquiescent(sh_path+" "+name);
-		if(files==null){
-			return null;
-		}
-		if(files.size()==0){
-			return fileNode;
-		}
-		for(String file:files){
-			
-		}
-
-		return fileNode;
-	}
-	@Test
-	public void test_getTreeData() {
-	
-		GetTreeData getTreeData=new GetTreeData();
-//		FolderNode fileOrFolder=getTreeData.getDatas("/home/gfs_ftp_point");
-		FolderNode fileOrFolder=getTreeData.getDatasWithShell("/home/gfs_ftp_point/");
-		System.out.println(fileOrFolder);
-	}
-}
-/*
-class FileOrFolder {
-	String name;
-	int isFolder; // 1 is file and other integer is folder show children number
-	List<FileOrFolder> children;
-
-	public FileOrFolder(String name) {
-		// TODO Auto-generated constructor stub
-		this.name = name;
-	}
-
-	public FileOrFolder(String name, int isFolder) {
-		// TODO Auto-generated constructor stub
-		this.name = name;
-		this.isFolder = isFolder;
-	}
-}
-
-*/
+
+
+package com.platform.glusterfs;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import org.junit.Test;
+import com.platform.entities.FolderNode;
+import com.platform.utils.Constant;
+import com.platform.utils.FileOperateHelper;
+import com.platform.utils.GanymedSSH;
+
+/**
+ * <一句话功能简述> 获得GFS某个目录下的子目录
+ * <功能详细描述>
+ * @author    chen
+ * @version   [版本号,2016年9月8日]
+ * @see       [相关类/方法]
+ * @since     [产品/模块版本]
+ */
+public class GetTreeData {
+	ShowData showData = new ShowData();
+
+	/**
+	 * <一句话功能简述> 获得所以子目录
+	 * <功能详细描述>
+	 * @param name
+	 * @return
+	 * @see [类、类#方法、类#成员]
+	 */
+	public FolderNode getDatas(String name) {
+		String names[]=name.split("/");
+		String only_name=names[names.length-1];
+		FolderNode fileNode = new FolderNode(only_name);
+		fileNode.setPath(name);
+		Map<String, String> files = showData.showFolderData(name);
+		if(files==null || files.size()==0){
+			return fileNode;
+		}
+		fileNode.setIsFolder(files.size());
+		List<FolderNode> list = new ArrayList<FolderNode>();
+		fileNode.setChildNodes(list);
+		for (Map.Entry<String, String> entry : files.entrySet()) {
+			if(entry.getKey().equals("app")){
+				continue;
+			}
+			int number = Integer.parseInt(entry.getValue());
+			if (number == 1) {
+				fileNode.getChildNodes().add(new FolderNode(entry.getKey(), number));
+			}
+			if (number > 1) {
+				FolderNode temp=getDatas(name+"/"+entry.getKey());
+				fileNode.getChildNodes().add(temp);
+			}
+		}
+
+		return fileNode;
+	}
+	
+	
+	/**
+	 * <一句话功能简述> 获得所以子目录
+	 * <功能详细描述>
+	 * @param name
+	 * @return
+	 * @see [类、类#方法、类#成员]
+	 */
+	public FolderNode getDatasWithShell(String name) {
+		if(name.endsWith("/")){
+			name=name.substring(0, name.length()-1);
+		}
+//		String names[]=name.split("/");
+//		String only_name=names[names.length-1];
+		FolderNode fileNode = new FolderNode(name);
+		fileNode.setPath(name);
+		
+//		String shellComment= new FileOperateHelper().fileReaderAndendline(Constant.fileGetTreeData);
+		String shellComment= Constant.strGetTreeData;
+		String sh_path="/getTreedata.sh";
+		String cmd="echo -e \""+shellComment+"\" > "+sh_path+" & chmod +x "+sh_path;
+		Constant.ganymedSSH.execCmdWaitAcquiescent(cmd);
+//		Map<String, String> files = showData.showFolderData(name);
+		List<String> files=Constant.ganymedSSH.execCmdWaitAcquiescent(sh_path+" "+name);
+		if(files==null){
+			return null;
+		}
+		if(files.size()==0){
+			return fileNode;
+		}
+		for(String file:files){
+			
+		}
+
+		return fileNode;
+	}
+	@Test
+	public void test_getTreeData() {
+	
+		GetTreeData getTreeData=new GetTreeData();
+//		FolderNode fileOrFolder=getTreeData.getDatas("/home/gfs_ftp_point");
+		FolderNode fileOrFolder=getTreeData.getDatasWithShell("/home/gfs_ftp_point/");
+		System.out.println(fileOrFolder);
+	}
+}
+/*
+class FileOrFolder {
+	String name;
+	int isFolder; // 1 is file and other integer is folder show children number
+	List<FileOrFolder> children;
+
+	public FileOrFolder(String name) {
+		// TODO Auto-generated constructor stub
+		this.name = name;
+	}
+
+	public FileOrFolder(String name, int isFolder) {
+		// TODO Auto-generated constructor stub
+		this.name = name;
+		this.isFolder = isFolder;
+	}
+}
+
+*/
diff --git a/src/com/platform/glusterfs/RemoveData.java b/src/com/platform/glusterfs/RemoveData.java
index e06cebd3..6f854b26 100644
--- a/src/com/platform/glusterfs/RemoveData.java
+++ b/src/com/platform/glusterfs/RemoveData.java
@@ -1,56 +1,56 @@
-package com.platform.glusterfs;
-
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.log4j.Logger;
-import org.apache.log4j.PropertyConfigurator;
-import org.junit.Test;
-
-import com.platform.utils.Constant;
-
-
-
-public class RemoveData {
-	
-	public static Logger log =   Logger.getLogger ( RemoveData.class); 
-	
-	
-	/**
-	 * -1 :error; 0: the filename is not exists ; 1:  right
-	 * @param folderName
-	 * @param fileName
-	 * @return
-	 */
-	public int deleteFolder(String folderName){
-		log.info("start delete "+folderName);	
-		
-		ShowData showData=new ShowData();
-		Map<String,String> reStrings=showData.showFolderData(folderName);
-		
-		if(reStrings==null){
-			log.error("3301 "+folderName+" is not exists");
-			return -1;
-		}
-		
-		String command="rm -r "+folderName;
-				
-//		int status=runCommand.runCommand(command);
-		Constant.ganymedSSH.execCmdNoWaitAcquiescent(command);
-		
-		log.info("delete "+folderName+" running");	
-		return 1;
-	}
-	
-	
-	
-   
-	@Test
-	public void testDeleteFolderFiles() {
-		PropertyConfigurator.configure("log4j.properties");
-		deleteFolder("/home/ubuntu");
-	}
-	
-}
+package com.platform.glusterfs;
+
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.log4j.Logger;
+import org.apache.log4j.PropertyConfigurator;
+import org.junit.Test;
+
+import com.platform.utils.Constant;
+
+
+
+public class RemoveData {
+	
+	public static Logger log =   Logger.getLogger ( RemoveData.class); 
+	
+	
+	/**
+	 * -1 :error; 0: the filename is not exists ; 1:  right
+	 * @param folderName
+	 * @param fileName
+	 * @return
+	 */
+	public int deleteFolder(String folderName){
+		log.info("start delete "+folderName);	
+		
+		ShowData showData=new ShowData();
+		Map<String,String> reStrings=showData.showFolderData(folderName);
+		
+		if(reStrings==null){
+			log.error("3301 "+folderName+" is not exists");
+			return -1;
+		}
+		
+		String command="rm -r "+folderName;
+				
+//		int status=runCommand.runCommand(command);
+		Constant.ganymedSSH.execCmdNoWaitAcquiescent(command);
+		
+		log.info("delete "+folderName+" running");	
+		return 1;
+	}
+	
+	
+	
+   
+	@Test
+	public void testDeleteFolderFiles() {
+		PropertyConfigurator.configure("log4j.properties");
+		deleteFolder("/home/ubuntu");
+	}
+	
+}
diff --git a/src/com/platform/glusterfs/SetCluster.java b/src/com/platform/glusterfs/SetCluster.java
index 598b8753..8f260e5a 100644
--- a/src/com/platform/glusterfs/SetCluster.java
+++ b/src/com/platform/glusterfs/SetCluster.java
@@ -1,67 +1,67 @@
-
-package com.platform.glusterfs;
-
-import java.util.List;
-
-import org.apache.log4j.Logger;
-import org.hamcrest.core.Is;
-
-import com.platform.utils.Constant;
-import com.platform.utils.Support;
-
-public class SetCluster {
-	public static Logger log =   Logger.getLogger ( SetCluster.class); 
-	
-	/**
-	 * 向集群中添加节点
-	 * 返回1表示添加成功;-1表示ip不合法,-2 表示出错,0表示添加失败
-	 * @param peerip
-	 * @return
-	 * @see [类、类#方法、类#成员]
-	 */
-	public int probePeer(String peerip){
-		if(!Support.checkIP(peerip)){
-			log.error(peerip +"is illegal!" );
-			return -1;
-		}
-		String cmd="gluster peer probe "+peerip;
-		List<String> reStrings=Constant.ganymedSSH.execCmdWaitAcquiescent(cmd);
-		if(reStrings==null || reStrings.size()==0){
-			log.error("detach error! ");
-			return -2;
-		}
-		if(reStrings.contains(Constant.success)){
-			log.info("probe success!");
-			return 1;
-		}
-		log.info("probe failed!");
-		return 0;
-	}
-	
-	/**
-	 * 删除集群中节点
-	 * 返回1表示删除成功;-1表示ip不合法,-2 表示出错,0表示添加失败
-	 * @param peerip
-	 * @return
-	 * @see [类、类#方法、类#成员]
-	 */
-	public int detachPeer(String peerip){
-		if(!Support.checkIP(peerip)){
-			log.error(peerip +"is illegal!" );
-			return -1;
-		}
-		String cmd="gluster peer detach "+peerip;
-		List<String> reStrings=Constant.ganymedSSH.execCmdWaitAcquiescent(cmd);
-		if(reStrings==null || reStrings.size()==0){
-			log.error("detach error! ");
-			return -2;
-		}
-		if(reStrings.contains(Constant.success)){
-			log.info("detach success!");
-			return 1;
-		}
-		log.info("detach failed!");
-		return 0;
-	}
-}
-
+
+package com.platform.glusterfs;
+
+import java.util.List;
+
+import org.apache.log4j.Logger;
+import org.hamcrest.core.Is;
+
+import com.platform.utils.Constant;
+import com.platform.utils.Support;
+
+public class SetCluster {
+	public static Logger log =   Logger.getLogger ( SetCluster.class); 
+	
+	/**
+	 * 向集群中添加节点
+	 * 返回1表示添加成功;-1表示ip不合法,-2 表示出错,0表示添加失败
+	 * @param peerip
+	 * @return
+	 * @see [类、类#方法、类#成员]
+	 */
+	public int probePeer(String peerip){
+		if(!Support.checkIP(peerip)){
+			log.error(peerip +"is illegal!" );
+			return -1;
+		}
+		String cmd="gluster peer probe "+peerip;
+		List<String> reStrings=Constant.ganymedSSH.execCmdWaitAcquiescent(cmd);
+		if(reStrings==null || reStrings.size()==0){
+			log.error("detach error! ");
+			return -2;
+		}
+		if(reStrings.contains(Constant.success)){
+			log.info("probe success!");
+			return 1;
+		}
+		log.info("probe failed!");
+		return 0;
+	}
+	
+	/**
+	 * 删除集群中节点
+	 * 返回1表示删除成功;-1表示ip不合法,-2 表示出错,0表示添加失败
+	 * @param peerip
+	 * @return
+	 * @see [类、类#方法、类#成员]
+	 */
+	public int detachPeer(String peerip){
+		if(!Support.checkIP(peerip)){
+			log.error(peerip +"is illegal!" );
+			return -1;
+		}
+		String cmd="gluster peer detach "+peerip;
+		List<String> reStrings=Constant.ganymedSSH.execCmdWaitAcquiescent(cmd);
+		if(reStrings==null || reStrings.size()==0){
+			log.error("detach error! ");
+			return -2;
+		}
+		if(reStrings.contains(Constant.success)){
+			log.info("detach success!");
+			return 1;
+		}
+		log.info("detach failed!");
+		return 0;
+	}
+}
+
diff --git a/src/com/platform/glusterfs/SetVolume.java b/src/com/platform/glusterfs/SetVolume.java
index 8a361b18..6b4dddcc 100644
--- a/src/com/platform/glusterfs/SetVolume.java
+++ b/src/com/platform/glusterfs/SetVolume.java
@@ -1,540 +1,540 @@
-
-/**
- * @author 李乾坤
- * 进行volume的一系列操作,如创建、开启停止volume,为volume添加或删除brick
- */
-package com.platform.glusterfs;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.log4j.Logger;
-import org.apache.log4j.PropertyConfigurator;
-import org.junit.Test;
-
-import com.platform.utils.Constant;
-
-public class SetVolume {
-	public static Logger log = Logger.getLogger(SetVolume.class);
-
-	/**
-	 * 创建volume 返回值:创建并挂载成功 1 1:可以创建 ;-1:brick的ip不在集群中或者未连接; -2 -3
-	 * -4:类型与brick数目不匹配 ; -5 :volumeName 已经存在;-6:挂载点存在且不为空,不能作为挂载点; -7:未知错误
-	 * 
-	 * @param volumeName
-	 * @param count
-	 * @param type
-	 * @param bricks
-	 * @param mountPoint
-	 * @return
-	 * @see [类、类#方法、类#成员]
-	 */
-	public int createVolume(String volumeName, int count, String type, List bricks, String mountPoint) {
-		log.info("Creat new volume");
-
-		// 判断创建volume的条件是否满足
-		int able = isAbleCreateVolume(volumeName, count, type, bricks, mountPoint);
-
-		if (able == 1) {
-			String command = null;
-			// 将brics从List变量中提取出来并连接成可以在命令行中使用的格式
-			String commandarg = concat(bricks);
-
-			/*
-			 * verify the type
-			 */
-			if (type.equals(Constant.distributed)) {
-				command = "gluster volume create " + volumeName + " " + commandarg + "force";
-			} else if (type.equals(Constant.replica) || type.equals(Constant.stripe)) {
-				command = "gluster volume create " + volumeName + " " + type + " " + count + " " + commandarg + "force";
-			}
-			
-			// 执行命令
-			List<String> reStrings = Constant.ganymedSSH.execCmdWaitAcquiescent(command);
-
-			// 创建成功时返回信息格式:volume create: volumename success:
-			if (reStrings == null || reStrings.size() == 0) {
-				log.error("3106 " + command + " run return error");
-				return -7;
-			}
-			if (reStrings.get(0).contains("volume create: " + volumeName + ": " + "success:")) {
-				log.info("create volume " + volumeName + " successed!");
-				// 创建成功则启动并进行挂载
-				if (startVolume(volumeName) == 0) {
-					log.info("start volume " + volumeName + " successed!");
-					
-					log.info("create "+mountPoint);
-					new CopyData().createFolders(mountPoint);
-					
-					// 进行挂载
-					String command3 = "mount -t glusterfs " + Constant.hostIp + ":" + volumeName + " " + mountPoint;
-					List<String> reStrings3 = Constant.ganymedSSH.execCmdWaitAcquiescent(command3);
-					
-					if (reStrings3.size() == 0 || reStrings.get(0).contains("GlusterFS is already mounted")) {
-						log.info("mount point successed!");
-						String addRecord = "echo \"" + volumeName + ":" + mountPoint + "\" >> " + Constant.MountRecord;
-						Constant.ganymedSSH.execCmdNoWaitAcquiescent(addRecord);
-						return 1;
-					}
-				}
-			} else {
-				log.error("3104 volume create failed with error" + reStrings.get(0));
-				// System.out.println(reStrings.get(0));
-				return -7;
-			}
-			return 1;
-		} else {
-			log.error("给出的参数不满足创建条件");
-			// System.out.println("给出的参数不满足创建条件");
-			return able;
-		}
-
-	}
-
-	/**
-	 * 删除volume 1 表示成功 ;-1表示volume name不存在;-2表示停止volume 失败;
-	 * -3表示删除失败,-4表示/gfsAutoMount/mountPoint.record文件不存在
-	 * @param volumeName
-	 * @return
-	 * @see [类、类#方法、类#成员]
-	 */
-	public int deleteVolume(String volumeName) {
-		int status = 0;
-		VolumeInfo volumeInfo = new VolumeInfo();
-		List<String> volumeNames = volumeInfo.showAllVolumeName();
-		if (!volumeNames.contains(volumeName)) {
-			log.error("3801 " + volumeName + " is not exists !");
-			return -1;
-		}
-
-		List<String> mountPoints = volumeInfo.getVolumeMountPoint(volumeName);
-
-		String cmd = "cat " + Constant.MountRecord;
-		List<String> mountRecord = Constant.ganymedSSH.execCmdWaitAcquiescent(cmd);
-
-		if (stopVolume(volumeName) != 0) {
-
-			return -2;
-		}
-
-		String command = "echo -e \"y\"| gluster volume delete " + volumeName;
-		List<String> reStrings = Constant.ganymedSSH.execCmdWaitAcquiescent(command);
-		if (reStrings == null || reStrings.size() == 0
-				|| !(reStrings.get(0).contains("volume delete: " + volumeName + ": success"))) {
-			log.error("3803 : delete volume " + volumeName + " failed !");
-			return -3;
-		}
-		log.info("delete " + volumeName + " successed!");
-		if (mountRecord.size() != 0 && mountPoints.get(0).contains(Constant.noSuchFile)) {
-			log.error("3804 : " + Constant.MountRecord + " is not exits");
-			return -4;
-		}
-		for (String mountPoint : mountPoints) {
-			command = "umount -l " + mountPoint;
-			Constant.ganymedSSH.execCmdNoWaitAcquiescent(command);
-			log.info("umount  " + mountPoint + " successed!");
-			String oneRecord=volumeName+":"+mountPoint;
-			if (mountRecord.contains(oneRecord)) {
-				mountRecord.remove(oneRecord);
-			}
-
-		}
-		String newRecords="";
-		for(String one:mountRecord){
-			newRecords+=one+"\n";
-		}
-		command="echo -ne \""+newRecords+"\" > "+Constant.MountRecord;
-		Constant.ganymedSSH.execCmdNoWaitAcquiescent(command);
-		return 1;
-	}
-
-	/**
-	 * 为指定的volume添加brick,参数中需要指定类型、数量等 返回值:1成功 ;其他失败
-	 * 过程中需要先检查volume是否存在,还需检查给出的brick数量与类型、count是否相符
-	 * 
-	 * @param volumeName
-	 * @param brickName
-	 * @param count
-	 * @param type
-	 * @return
-	 * @see [类、类#方法、类#成员]
-	 */
-	public int addBrickVolume(String volumeName, List<String> brickName, int count, String type) {
-		// 检查是否满足添加bricks的条件
-		int able = isAble(volumeName, count, type, brickName);
-		if (able != 1) {
-			return able;
-		}
-
-		String command = "";
-		log.info("add brick to the specified volume");
-
-		String brick = concat(brickName);
-
-		if (type.equals(Constant.distributed))
-			command = "gluster volume add-brick " + volumeName + " " + brick + "force";
-		else if (type.equals(Constant.replica))
-			command = "gluster volume add-brick " + volumeName + " " + "replica " + count + " " + brick + "force";
-		else if (type.equals(Constant.stripe))
-			command = "gluster volume add-brick " + volumeName + " " + "stripe " + count + " " + brick + "force";
-
-		List<String> reStrings = Constant.ganymedSSH.execCmdWaitAcquiescent(command);
-
-		// 添加成功的返回信息是:volume add-brick: success
-		if (reStrings != null && reStrings.size() > 0 && reStrings.get(0).contains("volume add-brick: success")) {
-			log.info("添加brick成功!");
-			return 1;
-		} else {
-			log.error("3205 add brick failed,please check the system");
-			// System.out.println("3202 add brick failed,please check the
-			// system");
-			return -5;
-		}
-	}
-
-	/**
-	 * 为指定的volume删除brick,参数中需要指定类型、数量等 返回值:1 成功 ;其他 失败
-	 * 过程中需要先检查volume是否存在,还需检查给出的brick数量与类型、count是否相符
-	 * 
-	 * @param volumeName
-	 * @param brickName
-	 * @param count
-	 * @param type
-	 * @return
-	 * @see [类、类#方法、类#成员]
-	 */
-	public int deleteBrickVolume(String volumeName, List<String> brickName, int count, String type) {
-		int able = isAble(volumeName, count, type, brickName);
-
-		if (able != 1) {
-			return able;
-		}
-		String command = null;
-
-		log.info("delete brick of the specified volume");
-
-		String brick = concat(brickName);
-
-		if (type.equals(Constant.distributed)) {
-			command = "echo -e \"y\" | gluster volume remove-brick " + volumeName + " " + brick + " force";
-		} else if (type.equals(Constant.replica)) {
-			command = "echo -e \"y\" | gluster volume remove-brick " + volumeName + " repli " + count + " " + brick
-					+ " force";
-		} else if (type.equals(Constant.stripe)) {
-			command = "echo -e \"y\" | gluster volume remove-brick " + volumeName + " stripe " + count + " " + brick
-					+ " force";
-		}
-
-		if (command == null) {
-			log.error("3305 remove brick failed,please check the system");
-			return -5;
-		}
-		log.info("即将执行删除命令");
-		List<String> reStrings = Constant.ganymedSSH.execCmdWaitAcquiescent(command);
-		// System.out.println(reStrings);
-		log.info("删除命令执行完毕");
-
-		// 删除成功的返回信息是“volume remove-brick: success”
-		if (reStrings.get(0).contains("volume remove-brick: success")) {
-			{
-				log.info("删除brick成功");
-				return 1;
-			}
-		} else {
-			log.error("3305 remove brick failed,please check the system");
-
-			return -5;
-		}
-
-	}
-
-	/*
-	 * 停止指定volume 参数中需给出volume的名字 返回值: 0 成功 -1 失败
-	 * 需要先检查volume是否存在,然后判断volume的状态是否已经是停止状态
-	 */
-	public int stopVolume(String volumeName) {
-		log.info("stop volume");
-
-		// 首先需要判断volume是否存在,调用其他函数返回所有volume的名字
-		boolean volumeExist = false;
-
-		List<String> volume = new VolumeInfo().showAllVolumeName();
-		for (String temp : volume) {
-			if (temp.equals(volumeName)) {
-				volumeExist = true;
-				break;
-			}
-		}
-
-		if (!volumeExist) {
-			// volume不存在
-			log.error("3501 the volume doesnot exist");
-			System.out.println("3501 the volume doesnot exist");
-			return -1;
-		} else {
-			// volume存在,则需判断volume的状态是否已经为“stop”
-			if (new VolumeInfo().getVolumeStatus(volumeName).equals("Stopped")) {
-				log.error("3502 the volume is already stoped");
-				System.out.println("3502 the volume is already stoped");
-				return -1;
-			} else {
-				String command = "echo -e \"y\"| gluster volume stop " + volumeName;
-				List<String> reStrings = Constant.ganymedSSH.execCmdWaitAcquiescent(command);
-
-				// 标记操作结果:operation = 1 操作成功
-				// operation = 0 操作失败
-				int operation = 0;
-				for (String temp2 : reStrings) {
-					if (temp2.contains("volume stop: " + volumeName + ": " + "success")) {
-						operation = 1;
-						break;
-					}
-					System.out.println("operation: " + operation);
-				}
-
-				if (operation == 1) {
-					return 0;
-				} else {
-					log.error("3503 stop " + volumeName + " failed");
-					System.out.println("3503 stop " + volumeName + " failed");
-					return -1;
-				}
-
-			}
-		}
-	}
-
-	/*
-	 * 开启指定volume 参数中需给出volume的名字 返回值: 0 成功 -1 失败
-	 * 需要先检查volume是否存在,然后判断volume的状态是否已经是开启状态
-	 */
-	public int startVolume(String volumeName) {
-		log.info("start volume");
-		boolean volumeExist = false;
-		List<String> volume = new VolumeInfo().showAllVolumeName();
-
-		for (String temp : volume) {
-			if (temp.equals(volumeName)) {
-				volumeExist = true;
-				break;
-			}
-		}
-
-		if (volumeExist) {
-			if (!(new VolumeInfo().getVolumeStatus(volumeName).equals("Started"))) {
-				String command = "gluster volume start " + volumeName;
-
-				int operation = 0;
-
-				// 执行命令
-				List<String> reStrings = Constant.ganymedSSH.execCmdWaitAcquiescent(command);
-				for (String temp2 : reStrings) {
-					if (temp2.equals("volume start: " + volumeName + ": " + "success")) {
-						operation = 1;
-					}
-				}
-
-				if (operation == 1) {
-					return 0;
-				} else {
-					log.error("3602 start volume failed");
-					System.out.println("3602 start volume failed");
-					return -1;
-				}
-			} else {
-				log.error("volume已经开启");
-				System.out.println("volume已经开启");
-				return -1;
-			}
-		} else {
-			log.error("3601 the volume does not exist");
-			// System.out.println("3601 the volume does not exist");
-			return -1;
-		}
-	}
-
-	// 需要将存于List变量中的brick的位置组装成可以在glusterfs命令行中直接使用的格式
-	public String concat(List<String> brickName) {
-		StringBuffer result = new StringBuffer();
-		int len = brickName.size();
-		for (int i = 0; i < len; i++) {
-			result.append(brickName.get(i));
-			result.append(" ");
-		}
-		return result.toString();
-	}
-
-	/*
-	 * 只在创建volume时使用此函数 创建volume时对不同数据卷,brick的数量需要满足和count的关系
-	 * 首先判断它们是否满足关系,在不满足的关系的情况下是肯定无法完成操作的 1:可以创建 ;-1:brick的ip不在集群中或者未连接; -2 -3
-	 * -4 :类型与brick数目不匹配 ; -5 :volumeName 已经存在;-6:挂载点存在且不为空,不能作为挂载点; -7:未知错误
-	 */
-	public int isAbleCreateVolume(String volumeName, int count, String type, List<String> bricks, String mountPoint) {
-		int status = 0;
-
-		int length = bricks.size();
-
-		if (type.equals(Constant.distributed)) {
-			if (count != 0) {
-				log.error("3101 the kind of distributed requires the arg of count to be 0");
-				return -2;
-			}
-		}
-		if (type.equals(Constant.stripe)) {
-			if (length % count != 0) {
-				log.error("3102 the number of bricks 	 should be the same as  or the times of the stripe count");
-				return -3;
-			}
-		}
-		if (type.equals(Constant.replica)) {
-			if ((length % count) != 0) {
-				log.error(
-						"3103 the number of bricks should be the same as the replicate count or the times of replicate count");
-				return -4;
-			}
-		}
-
-		Map peer_status = new ClusterInfo().showClusterInfo();
-		peer_status.put(Constant.hostIp, Constant.peerincluster_connected);
-		for (String brick : bricks) {
-			brick = brick.split(":")[0];
-			if (!(peer_status.containsKey(brick) && peer_status.get(brick).equals(Constant.peerincluster_connected))) {
-				log.error("3105 birck " + brick + " ip is not in cluster");
-				return -1;
-			}
-
-		}
-
-		List<String> volumeNames = new VolumeInfo().showAllVolumeName();
-		if (volumeNames == null) {
-			log.error("3108 showAllVolumeName return error");
-			return -7;
-		}
-		if (volumeNames.contains(volumeName)) {
-			log.error("3106 " + volumeName + " is already exists! ");
-			return -5;
-		}
-
-		/*
-		Map datas = new ShowData().showFolderData(mountPoint);
-		if (datas != null && datas.size() > 0) {
-			log.error("3107 " + mountPoint + " is not exists or not empty ! ");
-			return -6;
-		}
-		*/
-		return 1;
-	}
-
-	/**
-	 * 添加或删除volume的brick时,首先需要判断volume是否存在,然后需要判断volume类型、count及brick数目
-	 * 
-	 * @param volumeName
-	 * @param count
-	 * @param type
-	 * @param bricks
-	 * @return 1 满足条件,可以添加;-1 :volume name is not exists;-2,-3,-4 类型与brick数量不匹配;
-	 */
-	public int isAble(String volumeName, int count, String type, List bricks) {
-		List<String> volumeNames = new VolumeInfo().showAllVolumeName();
-
-		if (!volumeNames.contains(volumeName)) {
-			log.error("3201:" + volumeName + " is not exists! ");
-			return -1;
-		}
-
-		int length = bricks.size();
-		if (type.equals("distribute")) {
-			if (count == 0)
-				return 1;
-			else {
-				log.error("3202: the kind of distributed requires the arg of count to be 0");
-				// System.out.println(" the kind of distributed requires the
-				// arg of count to be 0");
-				return -2;
-			}
-		}
-
-		if (type.equals("stripe")) {
-			if (length % count == 0)
-				return 1;
-			else {
-				log.error("3203: the number of bricks should be the same as or the times of the stripe count");
-				// System.out.println(" the number of bricks should be the
-				// same as or the times of the stripe count");
-				return -3;
-
-			}
-		}
-		if (type.equals("replicate")) {
-			if ((length % count) == 0)
-				return 1;
-			else {
-				log.error(
-						"3204: the number of bricks should be the same as the replicate count or the times of replicate count");
-
-				return -4;
-			}
-		}
-
-		return 1;
-	}
-
-	@Test
-	public void test_deleteVolume(){
-		System.out.println(deleteVolume("lili_test1"));
-	}
-//	@Test
-	public void test_createVolume(){
-		List<String> bricksToCreate = new ArrayList<String>();
-		bricksToCreate.add("192.168.0.110:/lili_test1");
-		bricksToCreate.add("192.168.0.116:/lili_test1");
-		System.out.println(createVolume("lili_test1", 0, "distributed", bricksToCreate, "/home/lili_test1_point"));
-	}
-	public static void main(String[] args) {
-		SetVolume setVolume = new SetVolume();
-		int operation = 0;
-		// PropertyConfigurator.configure("log4j.properties");
-		// TODO Auto-generated method stub
-		// 测试创建volume的代码
-
-//		List<String> bricksToCreate = new ArrayList<String>();
-//		bricksToCreate.add("192.168.0.110:/v2");
-//		bricksToCreate.add("192.168.0.116:/v2");
-//		operation = setVolume.createVolume("v2", 0, "distributed", bricksToCreate, "/home/v2_point");
-		// operation = setVolume.deleteVolume("v3");
-		//
-		// // 以下是测试添加brick的代码
-		//
-		// List<String> bricksToAdd = new ArrayList<String>();
-		// bricksToAdd.add("192.168.191.23:/v3");
-		// operation = setVolume.addBrickVolume("v3", bricksToAdd, 0,
-		// "distribute");
-		// System.out.println(operation);
-
-		// 以下代码是测试删除brick的代码
-		// List<String> bricksToAdd= new ArrayList<String>();
-		// bricksToAdd.add("192.168.191.23:/v3");
-		// operation =
-		// setVolume.deleteBrickVolume("v3",bricksToAdd,0,"distribute");
-		// System.out.println(operation);
-		// 以下是测试start volume的代码
-		// String volumeToStart = "testcreate" ;
-		// int startOperation = startVolume(volumeToStart);
-		// System.out.println(startOperation);
-		// 以下是测试stop volume
-		String volumeToStop = "v3";
-		// int startOperation = setVolume.stopVolume(volumeToStop);
-		// 以下是测试创建volume并完成挂载的代码
-		// List<String> bricksToCreate= new ArrayList<String>();
-		// bricksToCreate.add("192.168.214.135:/home/create");
-		// bricksToCreate.add("192.168.214.138:/home/create");
-		//
-		// int operation =
-		// createVolume("createAndmount",0,"distribute",bricksToCreate,"/mnt/create");
-		// System.out.println(operation);
-	}
-}
+
+/**
+ * @author 李乾坤
+ * 进行volume的一系列操作,如创建、开启停止volume,为volume添加或删除brick
+ */
+package com.platform.glusterfs;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.log4j.Logger;
+import org.apache.log4j.PropertyConfigurator;
+import org.junit.Test;
+
+import com.platform.utils.Constant;
+
+public class SetVolume {
+	public static Logger log = Logger.getLogger(SetVolume.class);
+
+	/**
+	 * 创建volume 返回值:创建并挂载成功 1 1:可以创建 ;-1:brick的ip不在集群中或者未连接; -2 -3
+	 * -4:类型与brick数目不匹配 ; -5 :volumeName 已经存在;-6:挂载点存在且不为空,不能作为挂载点; -7:未知错误
+	 * 
+	 * @param volumeName
+	 * @param count
+	 * @param type
+	 * @param bricks
+	 * @param mountPoint
+	 * @return
+	 * @see [类、类#方法、类#成员]
+	 */
+	public int createVolume(String volumeName, int count, String type, List bricks, String mountPoint) {
+		log.info("Creat new volume");
+
+		// 判断创建volume的条件是否满足
+		int able = isAbleCreateVolume(volumeName, count, type, bricks, mountPoint);
+
+		if (able == 1) {
+			String command = null;
+			// 将brics从List变量中提取出来并连接成可以在命令行中使用的格式
+			String commandarg = concat(bricks);
+
+			/*
+			 * verify the type
+			 */
+			if (type.equals(Constant.distributed)) {
+				command = "gluster volume create " + volumeName + " " + commandarg + "force";
+			} else if (type.equals(Constant.replica) || type.equals(Constant.stripe)) {
+				command = "gluster volume create " + volumeName + " " + type + " " + count + " " + commandarg + "force";
+			}
+			
+			// 执行命令
+			List<String> reStrings = Constant.ganymedSSH.execCmdWaitAcquiescent(command);
+
+			// 创建成功时返回信息格式:volume create: volumename success:
+			if (reStrings == null || reStrings.size() == 0) {
+				log.error("3106 " + command + " run return error");
+				return -7;
+			}
+			if (reStrings.get(0).contains("volume create: " + volumeName + ": " + "success:")) {
+				log.info("create volume " + volumeName + " successed!");
+				// 创建成功则启动并进行挂载
+				if (startVolume(volumeName) == 0) {
+					log.info("start volume " + volumeName + " successed!");
+					
+					log.info("create "+mountPoint);
+					new CopyData().createFolders(mountPoint);
+					
+					// 进行挂载
+					String command3 = "mount -t glusterfs " + Constant.hostIp + ":" + volumeName + " " + mountPoint;
+					List<String> reStrings3 = Constant.ganymedSSH.execCmdWaitAcquiescent(command3);
+					
+					if (reStrings3.size() == 0 || reStrings.get(0).contains("GlusterFS is already mounted")) {
+						log.info("mount point successed!");
+						String addRecord = "echo \"" + volumeName + ":" + mountPoint + "\" >> " + Constant.MountRecord;
+						Constant.ganymedSSH.execCmdNoWaitAcquiescent(addRecord);
+						return 1;
+					}
+				}
+			} else {
+				log.error("3104 volume create failed with error" + reStrings.get(0));
+				// System.out.println(reStrings.get(0));
+				return -7;
+			}
+			return 1;
+		} else {
+			log.error("给出的参数不满足创建条件");
+			// System.out.println("给出的参数不满足创建条件");
+			return able;
+		}
+
+	}
+
+	/**
+	 * 删除volume 1 表示成功 ;-1表示volume name不存在;-2表示停止volume 失败;
+	 * -3表示删除失败,-4表示/gfsAutoMount/mountPoint.record文件不存在
+	 * @param volumeName
+	 * @return
+	 * @see [类、类#方法、类#成员]
+	 */
+	public int deleteVolume(String volumeName) {
+		int status = 0;
+		VolumeInfo volumeInfo = new VolumeInfo();
+		List<String> volumeNames = volumeInfo.showAllVolumeName();
+		if (!volumeNames.contains(volumeName)) {
+			log.error("3801 " + volumeName + " is not exists !");
+			return -1;
+		}
+
+		List<String> mountPoints = volumeInfo.getVolumeMountPoint(volumeName);
+
+		String cmd = "cat " + Constant.MountRecord;
+		List<String> mountRecord = Constant.ganymedSSH.execCmdWaitAcquiescent(cmd);
+
+		if (stopVolume(volumeName) != 0) {
+
+			return -2;
+		}
+
+		String command = "echo -e \"y\"| gluster volume delete " + volumeName;
+		List<String> reStrings = Constant.ganymedSSH.execCmdWaitAcquiescent(command);
+		if (reStrings == null || reStrings.size() == 0
+				|| !(reStrings.get(0).contains("volume delete: " + volumeName + ": success"))) {
+			log.error("3803 : delete volume " + volumeName + " failed !");
+			return -3;
+		}
+		log.info("delete " + volumeName + " successed!");
+		if (mountRecord.size() != 0 && mountPoints.get(0).contains(Constant.noSuchFile)) {
+			log.error("3804 : " + Constant.MountRecord + " is not exits");
+			return -4;
+		}
+		for (String mountPoint : mountPoints) {
+			command = "umount -l " + mountPoint;
+			Constant.ganymedSSH.execCmdNoWaitAcquiescent(command);
+			log.info("umount  " + mountPoint + " successed!");
+			String oneRecord=volumeName+":"+mountPoint;
+			if (mountRecord.contains(oneRecord)) {
+				mountRecord.remove(oneRecord);
+			}
+
+		}
+		String newRecords="";
+		for(String one:mountRecord){
+			newRecords+=one+"\n";
+		}
+		command="echo -ne \""+newRecords+"\" > "+Constant.MountRecord;
+		Constant.ganymedSSH.execCmdNoWaitAcquiescent(command);
+		return 1;
+	}
+
+	/**
+	 * 为指定的volume添加brick,参数中需要指定类型、数量等 返回值:1成功 ;其他失败
+	 * 过程中需要先检查volume是否存在,还需检查给出的brick数量与类型、count是否相符
+	 * 
+	 * @param volumeName
+	 * @param brickName
+	 * @param count
+	 * @param type
+	 * @return
+	 * @see [类、类#方法、类#成员]
+	 */
+	public int addBrickVolume(String volumeName, List<String> brickName, int count, String type) {
+		// 检查是否满足添加bricks的条件
+		int able = isAble(volumeName, count, type, brickName);
+		if (able != 1) {
+			return able;
+		}
+
+		String command = "";
+		log.info("add brick to the specified volume");
+
+		String brick = concat(brickName);
+
+		if (type.equals(Constant.distributed))
+			command = "gluster volume add-brick " + volumeName + " " + brick + "force";
+		else if (type.equals(Constant.replica))
+			command = "gluster volume add-brick " + volumeName + " " + "replica " + count + " " + brick + "force";
+		else if (type.equals(Constant.stripe))
+			command = "gluster volume add-brick " + volumeName + " " + "stripe " + count + " " + brick + "force";
+
+		List<String> reStrings = Constant.ganymedSSH.execCmdWaitAcquiescent(command);
+
+		// 添加成功的返回信息是:volume add-brick: success
+		if (reStrings != null && reStrings.size() > 0 && reStrings.get(0).contains("volume add-brick: success")) {
+			log.info("添加brick成功!");
+			return 1;
+		} else {
+			log.error("3205 add brick failed,please check the system");
+			// System.out.println("3202 add brick failed,please check the
+			// system");
+			return -5;
+		}
+	}
+
+	/**
+	 * 为指定的volume删除brick,参数中需要指定类型、数量等 返回值:1 成功 ;其他 失败
+	 * 过程中需要先检查volume是否存在,还需检查给出的brick数量与类型、count是否相符
+	 * 
+	 * @param volumeName
+	 * @param brickName
+	 * @param count
+	 * @param type
+	 * @return
+	 * @see [类、类#方法、类#成员]
+	 */
+	public int deleteBrickVolume(String volumeName, List<String> brickName, int count, String type) {
+		int able = isAble(volumeName, count, type, brickName);
+
+		if (able != 1) {
+			return able;
+		}
+		String command = null;
+
+		log.info("delete brick of the specified volume");
+
+		String brick = concat(brickName);
+
+		if (type.equals(Constant.distributed)) {
+			command = "echo -e \"y\" | gluster volume remove-brick " + volumeName + " " + brick + " force";
+		} else if (type.equals(Constant.replica)) {
+			command = "echo -e \"y\" | gluster volume remove-brick " + volumeName + " repli " + count + " " + brick
+					+ " force";
+		} else if (type.equals(Constant.stripe)) {
+			command = "echo -e \"y\" | gluster volume remove-brick " + volumeName + " stripe " + count + " " + brick
+					+ " force";
+		}
+
+		if (command == null) {
+			log.error("3305 remove brick failed,please check the system");
+			return -5;
+		}
+		log.info("即将执行删除命令");
+		List<String> reStrings = Constant.ganymedSSH.execCmdWaitAcquiescent(command);
+		// System.out.println(reStrings);
+		log.info("删除命令执行完毕");
+
+		// 删除成功的返回信息是“volume remove-brick: success”
+		if (reStrings.get(0).contains("volume remove-brick: success")) {
+			{
+				log.info("删除brick成功");
+				return 1;
+			}
+		} else {
+			log.error("3305 remove brick failed,please check the system");
+
+			return -5;
+		}
+
+	}
+
+	/*
+	 * 停止指定volume 参数中需给出volume的名字 返回值: 0 成功 -1 失败
+	 * 需要先检查volume是否存在,然后判断volume的状态是否已经是停止状态
+	 */
+	public int stopVolume(String volumeName) {
+		log.info("stop volume");
+
+		// 首先需要判断volume是否存在,调用其他函数返回所有volume的名字
+		boolean volumeExist = false;
+
+		List<String> volume = new VolumeInfo().showAllVolumeName();
+		for (String temp : volume) {
+			if (temp.equals(volumeName)) {
+				volumeExist = true;
+				break;
+			}
+		}
+
+		if (!volumeExist) {
+			// volume不存在
+			log.error("3501 the volume doesnot exist");
+			System.out.println("3501 the volume doesnot exist");
+			return -1;
+		} else {
+			// volume存在,则需判断volume的状态是否已经为“stop”
+			if (new VolumeInfo().getVolumeStatus(volumeName).equals("Stopped")) {
+				log.error("3502 the volume is already stoped");
+				System.out.println("3502 the volume is already stoped");
+				return -1;
+			} else {
+				String command = "echo -e \"y\"| gluster volume stop " + volumeName;
+				List<String> reStrings = Constant.ganymedSSH.execCmdWaitAcquiescent(command);
+
+				// 标记操作结果:operation = 1 操作成功
+				// operation = 0 操作失败
+				int operation = 0;
+				for (String temp2 : reStrings) {
+					if (temp2.contains("volume stop: " + volumeName + ": " + "success")) {
+						operation = 1;
+						break;
+					}
+					System.out.println("operation: " + operation);
+				}
+
+				if (operation == 1) {
+					return 0;
+				} else {
+					log.error("3503 stop " + volumeName + " failed");
+					System.out.println("3503 stop " + volumeName + " failed");
+					return -1;
+				}
+
+			}
+		}
+	}
+
+	/*
+	 * 开启指定volume 参数中需给出volume的名字 返回值: 0 成功 -1 失败
+	 * 需要先检查volume是否存在,然后判断volume的状态是否已经是开启状态
+	 */
+	public int startVolume(String volumeName) {
+		log.info("start volume");
+		boolean volumeExist = false;
+		List<String> volume = new VolumeInfo().showAllVolumeName();
+
+		for (String temp : volume) {
+			if (temp.equals(volumeName)) {
+				volumeExist = true;
+				break;
+			}
+		}
+
+		if (volumeExist) {
+			if (!(new VolumeInfo().getVolumeStatus(volumeName).equals("Started"))) {
+				String command = "gluster volume start " + volumeName;
+
+				int operation = 0;
+
+				// 执行命令
+				List<String> reStrings = Constant.ganymedSSH.execCmdWaitAcquiescent(command);
+				for (String temp2 : reStrings) {
+					if (temp2.equals("volume start: " + volumeName + ": " + "success")) {
+						operation = 1;
+					}
+				}
+
+				if (operation == 1) {
+					return 0;
+				} else {
+					log.error("3602 start volume failed");
+					System.out.println("3602 start volume failed");
+					return -1;
+				}
+			} else {
+				log.error("volume已经开启");
+				System.out.println("volume已经开启");
+				return -1;
+			}
+		} else {
+			log.error("3601 the volume does not exist");
+			// System.out.println("3601 the volume does not exist");
+			return -1;
+		}
+	}
+
+	// 需要将存于List变量中的brick的位置组装成可以在glusterfs命令行中直接使用的格式
+	public String concat(List<String> brickName) {
+		StringBuffer result = new StringBuffer();
+		int len = brickName.size();
+		for (int i = 0; i < len; i++) {
+			result.append(brickName.get(i));
+			result.append(" ");
+		}
+		return result.toString();
+	}
+
+	/*
+	 * 只在创建volume时使用此函数 创建volume时对不同数据卷,brick的数量需要满足和count的关系
+	 * 首先判断它们是否满足关系,在不满足的关系的情况下是肯定无法完成操作的 1:可以创建 ;-1:brick的ip不在集群中或者未连接; -2 -3
+	 * -4 :类型与brick数目不匹配 ; -5 :volumeName 已经存在;-6:挂载点存在且不为空,不能作为挂载点; -7:未知错误
+	 */
+	public int isAbleCreateVolume(String volumeName, int count, String type, List<String> bricks, String mountPoint) {
+		int status = 0;
+
+		int length = bricks.size();
+
+		if (type.equals(Constant.distributed)) {
+			if (count != 0) {
+				log.error("3101 the kind of distributed requires the arg of count to be 0");
+				return -2;
+			}
+		}
+		if (type.equals(Constant.stripe)) {
+			if (length % count != 0) {
+				log.error("3102 the number of bricks 	 should be the same as  or the times of the stripe count");
+				return -3;
+			}
+		}
+		if (type.equals(Constant.replica)) {
+			if ((length % count) != 0) {
+				log.error(
+						"3103 the number of bricks should be the same as the replicate count or the times of replicate count");
+				return -4;
+			}
+		}
+
+		Map peer_status = new ClusterInfo().showClusterInfo();
+		peer_status.put(Constant.hostIp, Constant.peerincluster_connected);
+		for (String brick : bricks) {
+			brick = brick.split(":")[0];
+			if (!(peer_status.containsKey(brick) && peer_status.get(brick).equals(Constant.peerincluster_connected))) {
+				log.error("3105 birck " + brick + " ip is not in cluster");
+				return -1;
+			}
+
+		}
+
+		List<String> volumeNames = new VolumeInfo().showAllVolumeName();
+		if (volumeNames == null) {
+			log.error("3108 showAllVolumeName return error");
+			return -7;
+		}
+		if (volumeNames.contains(volumeName)) {
+			log.error("3106 " + volumeName + " is already exists! ");
+			return -5;
+		}
+
+		/*
+		Map datas = new ShowData().showFolderData(mountPoint);
+		if (datas != null && datas.size() > 0) {
+			log.error("3107 " + mountPoint + " is not exists or not empty ! ");
+			return -6;
+		}
+		*/
+		return 1;
+	}
+
+	/**
+	 * 添加或删除volume的brick时,首先需要判断volume是否存在,然后需要判断volume类型、count及brick数目
+	 * 
+	 * @param volumeName
+	 * @param count
+	 * @param type
+	 * @param bricks
+	 * @return 1 满足条件,可以添加;-1 :volume name is not exists;-2,-3,-4 类型与brick数量不匹配;
+	 */
+	public int isAble(String volumeName, int count, String type, List bricks) {
+		List<String> volumeNames = new VolumeInfo().showAllVolumeName();
+
+		if (!volumeNames.contains(volumeName)) {
+			log.error("3201:" + volumeName + " is not exists! ");
+			return -1;
+		}
+
+		int length = bricks.size();
+		if (type.equals("distribute")) {
+			if (count == 0)
+				return 1;
+			else {
+				log.error("3202: the kind of distributed requires the arg of count to be 0");
+				// System.out.println(" the kind of distributed requires the
+				// arg of count to be 0");
+				return -2;
+			}
+		}
+
+		if (type.equals("stripe")) {
+			if (length % count == 0)
+				return 1;
+			else {
+				log.error("3203: the number of bricks should be the same as or the times of the stripe count");
+				// System.out.println(" the number of bricks should be the
+				// same as or the times of the stripe count");
+				return -3;
+
+			}
+		}
+		if (type.equals("replicate")) {
+			if ((length % count) == 0)
+				return 1;
+			else {
+				log.error(
+						"3204: the number of bricks should be the same as the replicate count or the times of replicate count");
+
+				return -4;
+			}
+		}
+
+		return 1;
+	}
+
+	@Test
+	public void test_deleteVolume(){
+		System.out.println(deleteVolume("lili_test1"));
+	}
+//	@Test
+	public void test_createVolume(){
+		List<String> bricksToCreate = new ArrayList<String>();
+		bricksToCreate.add("192.168.0.110:/lili_test1");
+		bricksToCreate.add("192.168.0.116:/lili_test1");
+		System.out.println(createVolume("lili_test1", 0, "distributed", bricksToCreate, "/home/lili_test1_point"));
+	}
+	public static void main(String[] args) {
+		SetVolume setVolume = new SetVolume();
+		int operation = 0;
+		// PropertyConfigurator.configure("log4j.properties");
+		// TODO Auto-generated method stub
+		// 测试创建volume的代码
+
+//		List<String> bricksToCreate = new ArrayList<String>();
+//		bricksToCreate.add("192.168.0.110:/v2");
+//		bricksToCreate.add("192.168.0.116:/v2");
+//		operation = setVolume.createVolume("v2", 0, "distributed", bricksToCreate, "/home/v2_point");
+		// operation = setVolume.deleteVolume("v3");
+		//
+		// // 以下是测试添加brick的代码
+		//
+		// List<String> bricksToAdd = new ArrayList<String>();
+		// bricksToAdd.add("192.168.191.23:/v3");
+		// operation = setVolume.addBrickVolume("v3", bricksToAdd, 0,
+		// "distribute");
+		// System.out.println(operation);
+
+		// 以下代码是测试删除brick的代码
+		// List<String> bricksToAdd= new ArrayList<String>();
+		// bricksToAdd.add("192.168.191.23:/v3");
+		// operation =
+		// setVolume.deleteBrickVolume("v3",bricksToAdd,0,"distribute");
+		// System.out.println(operation);
+		// 以下是测试start volume的代码
+		// String volumeToStart = "testcreate" ;
+		// int startOperation = startVolume(volumeToStart);
+		// System.out.println(startOperation);
+		// 以下是测试stop volume
+		String volumeToStop = "v3";
+		// int startOperation = setVolume.stopVolume(volumeToStop);
+		// 以下是测试创建volume并完成挂载的代码
+		// List<String> bricksToCreate= new ArrayList<String>();
+		// bricksToCreate.add("192.168.214.135:/home/create");
+		// bricksToCreate.add("192.168.214.138:/home/create");
+		//
+		// int operation =
+		// createVolume("createAndmount",0,"distribute",bricksToCreate,"/mnt/create");
+		// System.out.println(operation);
+	}
+}
diff --git a/src/com/platform/glusterfs/ShowData.java b/src/com/platform/glusterfs/ShowData.java
index 0ca8b438..ff4180ff 100644
--- a/src/com/platform/glusterfs/ShowData.java
+++ b/src/com/platform/glusterfs/ShowData.java
@@ -1,132 +1,132 @@
-package com.platform.glusterfs;
-
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.log4j.Logger;
-
-
-import org.apache.log4j.PropertyConfigurator;
-import org.junit.Test;
-
-import com.platform.utils.Constant;
-
-
-public class ShowData {
-	
-	public static Logger log =   Logger.getLogger ( ShowData.class); 
-
-	/**
-	 * get the data of volumeName Map<string s1,string s2> s1 is data name and s2 is type file or folder
-	 * <功能详细描述>
-	 * @param volumeName
-	 * @return
-	 * @see [类、类#方法、类#成员]
-	 */
-	public Map<String,String> showVolumeFiles(String volumeName){
-		log.info("start show the data");		
-		Map<String,String> data_type=new HashMap<String, String>();
-		/**
-		 * get mount point of volumeName
-		 */
-		String folderName=volumeName;
-		
-		data_type=showFolderData(volumeName);
-		return data_type;
-}
-	/**
-	 * get the data of folder name
-	 * Map<String,String> is folder name and type 1 is file and others is folder
-
-
-	 * @param FolderName
-	 * @return
-	 */
-	public Map<String,String> showFolderData(String folderName){
-		log.info(" start get "+folderName+" data");		
-
-
-		Map<String,String> data_type=new HashMap<String, String>();
-		String command="ls -l "+folderName;
-		
-		/*
-<<<<<<< HEAD
-		 * RunCommand runCommand=new RunCommand(); List<String>
-		 * reStrings=runCommand.runCommandWait(command);
-		 */
-		List<String> reStrings = Constant.ganymedSSH.execCmdWaitAcquiescent(command);
-		if (reStrings == null) {
-			log.error("2101 command get result is null");
-			return null;
-		}
-		if(reStrings.size()==0){
-			log.info("2102 the folder is empty");
-			return data_type;
-		}
-		if(reStrings.get(0).contains("No such file or directory")){
-			log.info("2103 the "+folderName+" is not exists");
-			return null;
-		}
-		/**
-		 * remove first line total number
-		 */
-		reStrings.remove(0);
-		
-		for(Iterator it2 = reStrings.iterator();it2.hasNext();){
-			String line=(String)it2.next();
-			line=line.replaceAll(" +", " ");
-			String keyValue[]=line.split(" ");
-			if(keyValue.length<9){
-				log.error("2104 "+line+" length is short");
-				continue;
-			}
-			
-			data_type.put(keyValue[8], keyValue[1]);
-						
-		}
-		log.info(" get "+folderName+" data successed");	
-		return data_type;
-	}
-	
-	/**
-	 * 返回folder的大小字节表示
-	 * -2表示获取大小出错,-1表示folder不存在,其他表示folder的大小
-	 * @param folderPath
-	 * @return
-	 * @see [类、类#方法、类#成员]
-	 */
-	public long getFolderSize(String folderPath) {
-		log.info("get " + folderPath + " Size ");
-
-		String command = "du -k -d 0 "+folderPath+" | grep  " + folderPath + "|awk  \'{print $1}\'";
-		List<String> reStrings = Constant.ganymedSSH.execCmdWaitAcquiescent(command);
-		if(reStrings==null || reStrings.size()==0){
-			log.error("get " + folderPath + " Size error!");
-			return -2;
-		}
-		if (reStrings.get(0).contains(Constant.noSuchFile)) {
-			log.error(folderPath+" is not exists");
-			return -1;
-		} 
-		long size = Long.valueOf(reStrings.get(0));
-		
-
-		return size;
-	}
-	
-	
-	/**
-	 * 
-	 * <一句话功能简述>
-	 * <功能详细描述>
-	 * @see [类、类#方法、类#成员]
-	 */
-	@Test
-	public void testShowData(){
-		
-		System.out.println(showFolderData("/home"));
-
-	}
+package com.platform.glusterfs;
+
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.log4j.Logger;
+
+
+import org.apache.log4j.PropertyConfigurator;
+import org.junit.Test;
+
+import com.platform.utils.Constant;
+
+
+public class ShowData {
+	
+	public static Logger log =   Logger.getLogger ( ShowData.class); 
+
+	/**
+	 * get the data of volumeName Map<string s1,string s2> s1 is data name and s2 is type file or folder
+	 * <功能详细描述>
+	 * @param volumeName
+	 * @return
+	 * @see [类、类#方法、类#成员]
+	 */
+	public Map<String,String> showVolumeFiles(String volumeName){
+		log.info("start show the data");		
+		Map<String,String> data_type=new HashMap<String, String>();
+		/**
+		 * get mount point of volumeName
+		 */
+		String folderName=volumeName;
+		
+		data_type=showFolderData(volumeName);
+		return data_type;
+}
+	/**
+	 * get the data of folder name
+	 * Map<String,String> is folder name and type 1 is file and others is folder
+
+
+	 * @param FolderName
+	 * @return
+	 */
+	public Map<String,String> showFolderData(String folderName){
+		log.info(" start get "+folderName+" data");		
+
+
+		Map<String,String> data_type=new HashMap<String, String>();
+		String command="ls -l "+folderName;
+		
+		/*
+<<<<<<< HEAD
+		 * RunCommand runCommand=new RunCommand(); List<String>
+		 * reStrings=runCommand.runCommandWait(command);
+		 */
+		List<String> reStrings = Constant.ganymedSSH.execCmdWaitAcquiescent(command);
+		if (reStrings == null) {
+			log.error("2101 command get result is null");
+			return null;
+		}
+		if(reStrings.size()==0){
+			log.info("2102 the folder is empty");
+			return data_type;
+		}
+		if(reStrings.get(0).contains("No such file or directory")){
+			log.info("2103 the "+folderName+" is not exists");
+			return null;
+		}
+		/**
+		 * remove first line total number
+		 */
+		reStrings.remove(0);
+		
+		for(Iterator it2 = reStrings.iterator();it2.hasNext();){
+			String line=(String)it2.next();
+			line=line.replaceAll(" +", " ");
+			String keyValue[]=line.split(" ");
+			if(keyValue.length<9){
+				log.error("2104 "+line+" length is short");
+				continue;
+			}
+			
+			data_type.put(keyValue[8], keyValue[1]);
+						
+		}
+		log.info(" get "+folderName+" data successed");	
+		return data_type;
+	}
+	
+	/**
+	 * 返回folder的大小字节表示
+	 * -2表示获取大小出错,-1表示folder不存在,其他表示folder的大小
+	 * @param folderPath
+	 * @return
+	 * @see [类、类#方法、类#成员]
+	 */
+	public long getFolderSize(String folderPath) {
+		log.info("get " + folderPath + " Size ");
+
+		String command = "du -k -d 0 "+folderPath+" | grep  " + folderPath + "|awk  \'{print $1}\'";
+		List<String> reStrings = Constant.ganymedSSH.execCmdWaitAcquiescent(command);
+		if(reStrings==null || reStrings.size()==0){
+			log.error("get " + folderPath + " Size error!");
+			return -2;
+		}
+		if (reStrings.get(0).contains(Constant.noSuchFile)) {
+			log.error(folderPath+" is not exists");
+			return -1;
+		} 
+		long size = Long.valueOf(reStrings.get(0));
+		
+
+		return size;
+	}
+	
+	
+	/**
+	 * 
+	 * <一句话功能简述>
+	 * <功能详细描述>
+	 * @see [类、类#方法、类#成员]
+	 */
+	@Test
+	public void testShowData(){
+		
+		System.out.println(showFolderData("/home"));
+
+	}
 }
\ No newline at end of file
diff --git a/src/com/platform/glusterfs/SizeInfo.java b/src/com/platform/glusterfs/SizeInfo.java
index 4d639be2..1aad2969 100644
--- a/src/com/platform/glusterfs/SizeInfo.java
+++ b/src/com/platform/glusterfs/SizeInfo.java
@@ -1,93 +1,93 @@
-package com.platform.glusterfs;
-
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.log4j.Logger;
-import org.apache.log4j.PropertyConfigurator;
-
-import com.platform.utils.Constant;
-
-public class SizeInfo {
-	public static Logger log = Logger.getLogger(ClusterInfo.class);
-	VolumeInfo volumeInfo = new VolumeInfo();
-
-	/**
-	 * 获取集群�?��volume size
-	 * 返回值:-1:错�? 0:没有volume long:size大小
-	 * @return
-	 */
-	public long showAllSize() {
-		log.info("get AllSize ");
-		List<String> volumeNames = volumeInfo.showAllVolumeName();
-		if (volumeNames == null) {
-			log.error("1201 showAllVolumeName error");
-			return -1;
-		}
-		if (volumeNames.size() == 0) {
-			log.error("1202 It is not exist any volume");
-			return 0;
-		}
-		List<String> reStrings = null;
-		long size = 0L;
-
-		for (String str : volumeNames) {
-			String command = "df |grep  " + str + "|awk  \'{print $2}\'";
-			reStrings = Constant.ganymedSSH.execCmdWait(Constant.hostIp, Constant.rootUser, Constant.rootPasswd, Constant.port,
-					command);
-			if (reStrings.isEmpty()) {
-				log.error("1203 The brick is unmount");
-			} else {
-				size += Long.parseLong(reStrings.get(0));
-			}
-
-		}
-
-		return size;
-	}
-	/**
-	 * 返回集群已用大小
-	 * @return
-	 * 返回值:-1:错�? 0:没有volume long:size大小
-	 */
-	public long showUseSize() {
-		log.info("get UseSize ");
-
-		List<String> volumeNames = volumeInfo.showAllVolumeName();
-		List<String> reStrings = null;
-		long size = 0L;
-		if (volumeNames == null) {
-			log.error("1201 showAllVolumeName error");
-			return -1;
-		}
-		if (volumeNames.size() == 0) {
-			log.error("1202 It is not exist any volume");
-			return 0;
-		}
-		
-			for (String str : volumeNames) {
-				String command = "df |grep  " + str + "|awk  \'{print $3}\'";
-				reStrings = Constant.ganymedSSH.execCmdWait(Constant.hostIp, Constant.rootUser, Constant.rootPasswd,
-						Constant.port, command);
-				if (reStrings.isEmpty()) {
-					log.error("1202 The brick is unmount");
-				} else {
-					size += Integer.valueOf(reStrings.get(0));
-				}
-
-			}
-		
-		return size;
-	}
-
-	public static void main(String[] args) {
-		PropertyConfigurator.configure("log4j.properties");
-		System.out.println(new SizeInfo().showAllSize());
-		System.out.println(new SizeInfo().showUseSize());
-	}
+package com.platform.glusterfs;
+
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.log4j.Logger;
+import org.apache.log4j.PropertyConfigurator;
+
+import com.platform.utils.Constant;
+
+public class SizeInfo {
+	public static Logger log = Logger.getLogger(ClusterInfo.class);
+	VolumeInfo volumeInfo = new VolumeInfo();
+
+	/**
+	 * 获取集群�?��volume size
+	 * 返回值:-1:错�? 0:没有volume long:size大小
+	 * @return
+	 */
+	public long showAllSize() {
+		log.info("get AllSize ");
+		List<String> volumeNames = volumeInfo.showAllVolumeName();
+		if (volumeNames == null) {
+			log.error("1201 showAllVolumeName error");
+			return -1;
+		}
+		if (volumeNames.size() == 0) {
+			log.error("1202 It is not exist any volume");
+			return 0;
+		}
+		List<String> reStrings = null;
+		long size = 0L;
+
+		for (String str : volumeNames) {
+			String command = "df |grep  " + str + "|awk  \'{print $2}\'";
+			reStrings = Constant.ganymedSSH.execCmdWait(Constant.hostIp, Constant.rootUser, Constant.rootPasswd, Constant.port,
+					command);
+			if (reStrings.isEmpty()) {
+				log.error("1203 The brick is unmount");
+			} else {
+				size += Long.parseLong(reStrings.get(0));
+			}
+
+		}
+
+		return size;
+	}
+	/**
+	 * 返回集群已用大小
+	 * @return
+	 * 返回值:-1:错�? 0:没有volume long:size大小
+	 */
+	public long showUseSize() {
+		log.info("get UseSize ");
+
+		List<String> volumeNames = volumeInfo.showAllVolumeName();
+		List<String> reStrings = null;
+		long size = 0L;
+		if (volumeNames == null) {
+			log.error("1201 showAllVolumeName error");
+			return -1;
+		}
+		if (volumeNames.size() == 0) {
+			log.error("1202 It is not exist any volume");
+			return 0;
+		}
+		
+			for (String str : volumeNames) {
+				String command = "df |grep  " + str + "|awk  \'{print $3}\'";
+				reStrings = Constant.ganymedSSH.execCmdWait(Constant.hostIp, Constant.rootUser, Constant.rootPasswd,
+						Constant.port, command);
+				if (reStrings.isEmpty()) {
+					log.error("1202 The brick is unmount");
+				} else {
+					size += Integer.valueOf(reStrings.get(0));
+				}
+
+			}
+		
+		return size;
+	}
+
+	public static void main(String[] args) {
+		PropertyConfigurator.configure("log4j.properties");
+		System.out.println(new SizeInfo().showAllSize());
+		System.out.println(new SizeInfo().showUseSize());
+	}
 }
\ No newline at end of file
diff --git a/src/com/platform/glusterfs/VolumeInfo.java b/src/com/platform/glusterfs/VolumeInfo.java
index e2ece069..3c4bfb1d 100644
--- a/src/com/platform/glusterfs/VolumeInfo.java
+++ b/src/com/platform/glusterfs/VolumeInfo.java
@@ -1,406 +1,406 @@
-
-package com.platform.glusterfs;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.log4j.Logger;
-import org.apache.log4j.PropertyConfigurator;
-import org.junit.Test;
-import org.omg.CosNaming.NamingContextExtPackage.StringNameHelper;
-
-import com.platform.utils.Constant;
-import com.platform.utils.GanymedSSH;
-
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-/**
- * 获取volume信息 <功能详细描述>
- * 
- * @author liliy
- * @version [版本号,2016年9月13日]
- * @see [相关类/方法]
- * @since [产品/模块版本]
- */
-public class VolumeInfo {
-	public static Logger log = Logger.getLogger(VolumeInfo.class);
-
-	/**
-	 * 显示所有volume名称 <功能详细描述>
-	 * 
-	 * @return
-	 * @see [类、类#方法、类#成员]
-	 */
-	public List<String> showAllVolumeName() {
-		log.info("get volume name");
-		List<String> volNames = new ArrayList<String>();
-
-		/*
-		 * String command = "echo \"" + Constant.rootPasswd +
-		 * "\"  |sudo -S gluster volume info|grep ^Volume.Name"; RunCommand
-		 * runCommand = new RunCommand(); List<String> reStrings =
-		 * runCommand.runCommandWait(command);
-		 */
-		List<String> reStrings = Constant.ganymedSSH
-				.execCmdWaitAcquiescent(Constant.glusterVolumeInfo + "|grep ^Volume.Name");
-		// System.out.println(reStrings);
-		if (reStrings == null) {
-			log.error("1401 get result is null");
-			return null;
-		}
-		if (reStrings.size() == 0) {
-			log.error("1402 get result is nothing");
-			return null;
-		}
-		if (reStrings.get(0).contains(Constant.noVolume)) {
-			reStrings.clear();
-			return reStrings;
-		}
-		if (!(reStrings.get(0).split(":")[0].contains("Volume Name"))) {
-			log.error("1403 get result string wrong");
-			return null;
-		}
-
-		String nameInfo = "";
-		for (Iterator it = reStrings.iterator(); it.hasNext();) {
-			String line = (String) it.next();
-			String str[] = line.split(":");
-			volNames.add(str[1].replaceAll(" ", ""));
-		}
-		return volNames;
-
-	}
-
-	/**
-	 * 给定参数volume的名称获得volume的类型 
-	 * 
-	 * @param volumeName
-	 * @return
-	 * @see [类、类#方法、类#成员]
-	 */
-	public String getVolumeType(String volumeName) {
-		log.info("get volume type");
-		String volType = "";
-
-		List<String> reStrings = Constant.ganymedSSH
-				.execCmdWaitAcquiescent(Constant.glusterVolumeInfo + volumeName + "|grep ^Type");
-		// System.out.println(reStrings);
-		if (reStrings == null) {
-			log.error("1501 get result is null");
-			return null;
-		}
-		if (reStrings.size() == 0) {
-			log.error("1502 get result is nothing");
-			return null;
-		}
-		if (!(reStrings.get(0).split(":")[0].contains("Type"))) {
-			log.error("1503 get result string wrong");
-			return null;
-		}
-
-		// System.out.println(reStrings);
-
-		for (Iterator it = reStrings.iterator(); it.hasNext();) {
-			String line = (String) it.next();
-			String str[] = line.split(":");
-			volType = str[1];
-		}
-		volType = volType.replaceAll(" ", "");
-		return volType;
-	}
-
-	/**
-	 * 获取volumeName的状态 如果出错返回null,如果volumeName不存在则返回Volume volumeName does not
-	 * exist,正常返回状态Started,Stopped,Created
-	 * 
-	 * @param volumeName
-	 * @return
-	 * @see [类、类#方法、类#成员]
-	 */
-	public String getVolumeStatus(String volumeName) {
-		log.info("get volume status");
-		String volStatus = "";
-		String cmd = Constant.glusterVolumeInfo + " " + volumeName + " |grep ^Status";
-		List<String> reStrings = Constant.ganymedSSH.execCmdWaitAcquiescent(cmd);
-		// System.out.println(reStrings);
-		if (reStrings == null) {
-			log.error("1701 get result is null");
-			return null;
-		}
-		if (reStrings.size() == 0) {
-			log.error("1702 get result is nothing");
-			return null;
-		}
-
-		if (reStrings.get(0).contains("does not exist")) {
-			log.error("1703 " + reStrings.get(0));
-			return reStrings.get(0);
-		}
-		if (!(reStrings.get(0).split(":")[0].contains("Status"))) {
-			log.error("1704 get result string wrong");
-			return null;
-		}
-		for (Iterator it = reStrings.iterator(); it.hasNext();) {
-			String line = (String) it.next();
-			String str[] = line.split(":");
-			volStatus = str[1].replaceAll(" ", "");
-		}
-
-		return volStatus;
-	}
-
-	/**
-	 * 获取volumeName的可用大小
-	 * volumeName不存在返回-1,获取大小错误返回-2 ,正常返回volumeName的可用大小
-	 * @param volumeName
-	 * @return
-	 * @see [类、类#方法、类#成员]
-	 */
-	public Long getVolumeAvailableSize(String volumeName) throws Exception{
-		log.info("get volume availableSize");
-		Long allSize = 0L;
-
-		String cmd = Constant.df + " | grep " + volumeName + "|awk '{print $4}'";
-		List<String> reStrings = Constant.ganymedSSH.execCmdWaitAcquiescent(cmd);
-		// System.out.println(reStrings);
-		if (reStrings == null) {
-			log.error("1802 get result is error");
-			return -2L;
-		}
-		if (reStrings.size() == 0) {
-			log.error("1801 " + volumeName + " is not exists!");
-			return -1L;
-		}
-		allSize = Long.parseLong(reStrings.get(0));
-		return allSize;
-	}
-
-	/**
-	 * 获取volumeName已用空间
-	 * volumeName不存在返回-1,获取大小错误返回-2 ,正常返回volumeName的已用的大小
-	 * @param volumeName
-	 * @return
-	 * @see [类、类#方法、类#成员]
-	 */
-	public Long getVolumeUseSize(String volumeName) throws Exception{
-		log.info("get volume used size");
-		Long usedSize = 0L;
-		if (volumeIsExists(volumeName) == false) {
-			log.error("1901 " + volumeName + " is not exists!");
-			return -1L;
-
-		}
-
-		String cmd = "df | grep " + volumeName + "|awk '{print $3}'";
-		List<String> reStrings = Constant.ganymedSSH.execCmdWaitAcquiescent(cmd);
-		// System.out.println(reStrings);
-		if (reStrings == null) {
-			log.error("1901 get result is null");
-			return -2L;
-		}
-		if (reStrings.size() == 0) {
-			log.error("1902 " + volumeName + " is not exists!");
-			return -1L;
-		}
-		usedSize = Long.parseLong(reStrings.get(0));
-		return usedSize;
-	}
-
-	/**
-	 * 获取volumeName的bricks
-	 * 返回一个bircks的list ip:path,如果volumeName不存在返回null
-	 * @param volumeName
-	 * @return
-	 * @see [类、类#方法、类#成员]
-	 */
-	public List<String> getVolumeBricks(String volumeName) {
-		log.info("get volume bricks");
-
-		String cmd = "gluster volume info " + volumeName + " |grep ^Brick'[0-9]\\+' |awk '{print $2}'";
-		List<String> reStrings = Constant.ganymedSSH.execCmdWaitAcquiescent(cmd);
-		// System.out.println(reStrings);
-		if (reStrings == null) {
-			log.error("1601 get volume bricks wrong");
-			return null;
-		}
-		if (reStrings.size()==0) {
-			log.error("1602 "+volumeName+" is not exists!");
-			return null;
-		}
-		return reStrings;
-	}
-
-	/**
-	 * 获取volumeName所有挂载点
-	 * <功能详细描述>
-	 * @param volumeName
-	 * @return
-	 * @see [类、类#方法、类#成员]
-	 */
-	public List<String> getVolumeMountPoint(String volumeName) {
-		log.info("get volume MountPoint");
-		List<String> mountPoints = new ArrayList<>();
-		String cmd=Constant.df + "|grep " + volumeName + "|awk '{print $6}'";
-		List<String> reStrings = Constant.ganymedSSH.execCmdWaitAcquiescent(cmd);
-		// System.out.println(reStrings);
-		if (reStrings == null) {
-			log.error("11001 get result string wrong");
-			return null;
-		}
-		if (reStrings.size() == 0) {
-			log.error("11002 " + volumeName + " is not exists or no mountpoint");
-			return null;
-		}
-
-		for (String mountPoint : reStrings) {
-			mountPoint = mountPoint.replaceAll(" ", "");
-			mountPoints.add(mountPoint);
-		}
-		return mountPoints;
-	}
-
-	public String getOneVolumeMountPoint(String volumeName) {
-		log.info("get one volume MountPoint");
-		
-		String mountPoint=null;
-		
-		List<String> mountpoints = getVolumeMountPoint(volumeName);
-		// System.out.println(reStrings);
-		if (mountpoints == null || mountpoints.size() == 0) {
-			log.error("11001 get result string wrong");
-			return null;
-		}
-
-		mountPoint=mountpoints.get(0);
-		return mountPoint;
-	}
-
-	/**
-	 * 获取volumeName的所有brick中数据占用空间的大小
-	 * 返回一个map表示bricks和数据大小 <ip:path,data_size>
-	 * @param volumeName
-	 * @return
-	 * @see [类、类#方法、类#成员]
-	 */
-	public Map<String, Double> getVolumebricksDataSize(String volumeName) {
-		List<String> bricks = getVolumeBricks(volumeName);
-		Map<String, Double> brick_size = new HashMap<>();
-		if (bricks == null) {
-			return null;
-		}
-		for (String brick : bricks) {
-			String ipAndpath[] = brick.split(":");
-			String ip = ipAndpath[0];
-			String path = ipAndpath[1];
-			String cmd = "du -d 0 " + path + "|awk '{print $1}'";
-			List<String> reStrings = Constant.ganymedSSH.execCmdWait(ip, Constant.rootUser, Constant.rootPasswd,
-					Constant.port, cmd);
-			// System.out.println(reStrings);
-			if (reStrings == null) {
-				log.error("1901 get result is null");
-				return null;
-			}
-			if (reStrings.size() == 0) {
-				log.error("1902 "+brick+" is not exits!");
-				return null;
-			}
-			Pattern pattern = Pattern.compile("[0-9]*");
-			Matcher isNum = pattern.matcher(reStrings.get(0));
-			if (!isNum.matches()) {
-				log.error("1903 " + reStrings.get(0) + " is unexpect");
-				return null;
-			}
-			brick_size.put(brick, Double.parseDouble(reStrings.get(0)));
-		}
-		return brick_size;
-	}
-
-	/**
-	  * 获取volumeName的所有brick中可用空间大小
-	 * 返回一个map表示bricks和可用空间大小 <ip:path,available_size>
-	 * @param volumeName
-	 * @return
-	 * @see [类、类#方法、类#成员]
-	 */
-	public Map<String, Double> getVolumebricksAvailableSize(String volumeName) {
-		List<String> bricks = getVolumeBricks(volumeName);
-		Map<String, Double> brick_size = new HashMap<>();
-		if (bricks == null) {
-			return null;
-		}
-		for (String brick : bricks) {
-			String ipAndpath[] = brick.split(":");
-			String ip = ipAndpath[0];
-			String path = ipAndpath[1];
-			String cmd = "df " + path + "|awk '{print $4}'";
-			List<String> reStrings = Constant.ganymedSSH.execCmdWait(ip, Constant.rootUser, Constant.rootPasswd,
-					Constant.port, cmd);
-			// System.out.println(reStrings);
-			if (reStrings == null) {
-				log.error("1901 get result is null");
-				return null;
-			}
-			if (reStrings.size() == 0) {
-				log.error("1902 get result is nothing");
-				return null;
-			}
-			Pattern pattern = Pattern.compile("[0-9]*");
-			Matcher isNum = pattern.matcher(reStrings.get(1));
-			if (!isNum.matches()) {
-				log.error("1903 " + reStrings.get(1) + " is unexpect");
-				return null;
-			}
-			brick_size.put(brick, Double.parseDouble(reStrings.get(1)));
-		}
-		return brick_size;
-	}
-
-	/**
-	 * 判断volumeName是否存在,存在返回true,不存在返回false 
-	 * 
-	 * @param volumeName
-	 * @return
-	 * @see [类、类#方法、类#成员]
-	 */
-	public boolean volumeIsExists(String volumeName) {
-		List<String> volumes = showAllVolumeName();
-		if (volumes == null) {
-			return false;
-		}
-		if (volumes.contains(volumeName)) {
-			return true;
-		}
-		return false;
-	}
-
-	// @Test
-	public void test_getVolumebricksDataSize() {
-		System.out.println(getVolumebricksDataSize("gfs_ftp"));
-	}
-
-	// @Test
-	public void test_getVolumebricksAvailableSize() {
-		System.out.println(getVolumebricksAvailableSize("gfs_ftp"));
-	}
-
-	// @Test
-	public void test_getVolumeBricks() {
-		getVolumeBricks("gfs_ftp");
-	}
-
-	@Test
-	public void test_getVolumeStatus() {
-		System.out.println(getVolumeStatus("gs_fp"));
-	}
-
-	// @Test
-	public void test_getVolumeMountPoint() {
-		System.out.println(getVolumeMountPoint("gfs_ftp"));
-		System.out.println(getVolumeMountPoint("v1"));
-	}
-}
+
+package com.platform.glusterfs;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.log4j.Logger;
+import org.apache.log4j.PropertyConfigurator;
+import org.junit.Test;
+import org.omg.CosNaming.NamingContextExtPackage.StringNameHelper;
+
+import com.platform.utils.Constant;
+import com.platform.utils.GanymedSSH;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * 获取volume信息 <功能详细描述>
+ * 
+ * @author liliy
+ * @version [版本号,2016年9月13日]
+ * @see [相关类/方法]
+ * @since [产品/模块版本]
+ */
+public class VolumeInfo {
+	public static Logger log = Logger.getLogger(VolumeInfo.class);
+
+	/**
+	 * 显示所有volume名称 <功能详细描述>
+	 * 
+	 * @return
+	 * @see [类、类#方法、类#成员]
+	 */
+	public List<String> showAllVolumeName() {
+		log.info("get volume name");
+		List<String> volNames = new ArrayList<String>();
+
+		/*
+		 * String command = "echo \"" + Constant.rootPasswd +
+		 * "\"  |sudo -S gluster volume info|grep ^Volume.Name"; RunCommand
+		 * runCommand = new RunCommand(); List<String> reStrings =
+		 * runCommand.runCommandWait(command);
+		 */
+		List<String> reStrings = Constant.ganymedSSH
+				.execCmdWaitAcquiescent(Constant.glusterVolumeInfo + "|grep ^Volume.Name");
+		// System.out.println(reStrings);
+		if (reStrings == null) {
+			log.error("1401 get result is null");
+			return null;
+		}
+		if (reStrings.size() == 0) {
+			log.error("1402 get result is nothing");
+			return null;
+		}
+		if (reStrings.get(0).contains(Constant.noVolume)) {
+			reStrings.clear();
+			return reStrings;
+		}
+		if (!(reStrings.get(0).split(":")[0].contains("Volume Name"))) {
+			log.error("1403 get result string wrong");
+			return null;
+		}
+
+		String nameInfo = "";
+		for (Iterator it = reStrings.iterator(); it.hasNext();) {
+			String line = (String) it.next();
+			String str[] = line.split(":");
+			volNames.add(str[1].replaceAll(" ", ""));
+		}
+		return volNames;
+
+	}
+
+	/**
+	 * 给定参数volume的名称获得volume的类型 
+	 * 
+	 * @param volumeName
+	 * @return
+	 * @see [类、类#方法、类#成员]
+	 */
+	public String getVolumeType(String volumeName) {
+		log.info("get volume type");
+		String volType = "";
+
+		List<String> reStrings = Constant.ganymedSSH
+				.execCmdWaitAcquiescent(Constant.glusterVolumeInfo + volumeName + "|grep ^Type");
+		// System.out.println(reStrings);
+		if (reStrings == null) {
+			log.error("1501 get result is null");
+			return null;
+		}
+		if (reStrings.size() == 0) {
+			log.error("1502 get result is nothing");
+			return null;
+		}
+		if (!(reStrings.get(0).split(":")[0].contains("Type"))) {
+			log.error("1503 get result string wrong");
+			return null;
+		}
+
+		// System.out.println(reStrings);
+
+		for (Iterator it = reStrings.iterator(); it.hasNext();) {
+			String line = (String) it.next();
+			String str[] = line.split(":");
+			volType = str[1];
+		}
+		volType = volType.replaceAll(" ", "");
+		return volType;
+	}
+
+	/**
+	 * 获取volumeName的状态 如果出错返回null,如果volumeName不存在则返回Volume volumeName does not
+	 * exist,正常返回状态Started,Stopped,Created
+	 * 
+	 * @param volumeName
+	 * @return
+	 * @see [类、类#方法、类#成员]
+	 */
+	public String getVolumeStatus(String volumeName) {
+		log.info("get volume status");
+		String volStatus = "";
+		String cmd = Constant.glusterVolumeInfo + " " + volumeName + " |grep ^Status";
+		List<String> reStrings = Constant.ganymedSSH.execCmdWaitAcquiescent(cmd);
+		// System.out.println(reStrings);
+		if (reStrings == null) {
+			log.error("1701 get result is null");
+			return null;
+		}
+		if (reStrings.size() == 0) {
+			log.error("1702 get result is nothing");
+			return null;
+		}
+
+		if (reStrings.get(0).contains("does not exist")) {
+			log.error("1703 " + reStrings.get(0));
+			return reStrings.get(0);
+		}
+		if (!(reStrings.get(0).split(":")[0].contains("Status"))) {
+			log.error("1704 get result string wrong");
+			return null;
+		}
+		for (Iterator it = reStrings.iterator(); it.hasNext();) {
+			String line = (String) it.next();
+			String str[] = line.split(":");
+			volStatus = str[1].replaceAll(" ", "");
+		}
+
+		return volStatus;
+	}
+
+	/**
+	 * 获取volumeName的可用大小
+	 * volumeName不存在返回-1,获取大小错误返回-2 ,正常返回volumeName的可用大小
+	 * @param volumeName
+	 * @return
+	 * @see [类、类#方法、类#成员]
+	 */
+	public Long getVolumeAvailableSize(String volumeName) throws Exception{
+		log.info("get volume availableSize");
+		Long allSize = 0L;
+
+		String cmd = Constant.df + " | grep " + volumeName + "|awk '{print $4}'";
+		List<String> reStrings = Constant.ganymedSSH.execCmdWaitAcquiescent(cmd);
+		// System.out.println(reStrings);
+		if (reStrings == null) {
+			log.error("1802 get result is error");
+			return -2L;
+		}
+		if (reStrings.size() == 0) {
+			log.error("1801 " + volumeName + " is not exists!");
+			return -1L;
+		}
+		allSize = Long.parseLong(reStrings.get(0));
+		return allSize;
+	}
+
+	/**
+	 * 获取volumeName已用空间
+	 * volumeName不存在返回-1,获取大小错误返回-2 ,正常返回volumeName的已用的大小
+	 * @param volumeName
+	 * @return
+	 * @see [类、类#方法、类#成员]
+	 */
+	public Long getVolumeUseSize(String volumeName) throws Exception{
+		log.info("get volume used size");
+		Long usedSize = 0L;
+		if (volumeIsExists(volumeName) == false) {
+			log.error("1901 " + volumeName + " is not exists!");
+			return -1L;
+
+		}
+
+		String cmd = "df | grep " + volumeName + "|awk '{print $3}'";
+		List<String> reStrings = Constant.ganymedSSH.execCmdWaitAcquiescent(cmd);
+		// System.out.println(reStrings);
+		if (reStrings == null) {
+			log.error("1901 get result is null");
+			return -2L;
+		}
+		if (reStrings.size() == 0) {
+			log.error("1902 " + volumeName + " is not exists!");
+			return -1L;
+		}
+		usedSize = Long.parseLong(reStrings.get(0));
+		return usedSize;
+	}
+
+	/**
+	 * 获取volumeName的bricks
+	 * 返回一个bircks的list ip:path,如果volumeName不存在返回null
+	 * @param volumeName
+	 * @return
+	 * @see [类、类#方法、类#成员]
+	 */
+	public List<String> getVolumeBricks(String volumeName) {
+		log.info("get volume bricks");
+
+		String cmd = "gluster volume info " + volumeName + " |grep ^Brick'[0-9]\\+' |awk '{print $2}'";
+		List<String> reStrings = Constant.ganymedSSH.execCmdWaitAcquiescent(cmd);
+		// System.out.println(reStrings);
+		if (reStrings == null) {
+			log.error("1601 get volume bricks wrong");
+			return null;
+		}
+		if (reStrings.size()==0) {
+			log.error("1602 "+volumeName+" is not exists!");
+			return null;
+		}
+		return reStrings;
+	}
+
+	/**
+	 * 获取volumeName所有挂载点
+	 * <功能详细描述>
+	 * @param volumeName
+	 * @return
+	 * @see [类、类#方法、类#成员]
+	 */
+	public List<String> getVolumeMountPoint(String volumeName) {
+		log.info("get volume MountPoint");
+		List<String> mountPoints = new ArrayList<>();
+		String cmd=Constant.df + "|grep " + volumeName + "|awk '{print $6}'";
+		List<String> reStrings = Constant.ganymedSSH.execCmdWaitAcquiescent(cmd);
+		// System.out.println(reStrings);
+		if (reStrings == null) {
+			log.error("11001 get result string wrong");
+			return null;
+		}
+		if (reStrings.size() == 0) {
+			log.error("11002 " + volumeName + " is not exists or no mountpoint");
+			return null;
+		}
+
+		for (String mountPoint : reStrings) {
+			mountPoint = mountPoint.replaceAll(" ", "");
+			mountPoints.add(mountPoint);
+		}
+		return mountPoints;
+	}
+
+	public String getOneVolumeMountPoint(String volumeName) {
+		log.info("get one volume MountPoint");
+		
+		String mountPoint=null;
+		
+		List<String> mountpoints = getVolumeMountPoint(volumeName);
+		// System.out.println(reStrings);
+		if (mountpoints == null || mountpoints.size() == 0) {
+			log.error("11001 get result string wrong");
+			return null;
+		}
+
+		mountPoint=mountpoints.get(0);
+		return mountPoint;
+	}
+
+	/**
+	 * 获取volumeName的所有brick中数据占用空间的大小
+	 * 返回一个map表示bricks和数据大小 <ip:path,data_size>
+	 * @param volumeName
+	 * @return
+	 * @see [类、类#方法、类#成员]
+	 */
+	public Map<String, Double> getVolumebricksDataSize(String volumeName) {
+		List<String> bricks = getVolumeBricks(volumeName);
+		Map<String, Double> brick_size = new HashMap<>();
+		if (bricks == null) {
+			return null;
+		}
+		for (String brick : bricks) {
+			String ipAndpath[] = brick.split(":");
+			String ip = ipAndpath[0];
+			String path = ipAndpath[1];
+			String cmd = "du -d 0 " + path + "|awk '{print $1}'";
+			List<String> reStrings = Constant.ganymedSSH.execCmdWait(ip, Constant.rootUser, Constant.rootPasswd,
+					Constant.port, cmd);
+			// System.out.println(reStrings);
+			if (reStrings == null) {
+				log.error("1901 get result is null");
+				return null;
+			}
+			if (reStrings.size() == 0) {
+				log.error("1902 "+brick+" is not exits!");
+				return null;
+			}
+			Pattern pattern = Pattern.compile("[0-9]*");
+			Matcher isNum = pattern.matcher(reStrings.get(0));
+			if (!isNum.matches()) {
+				log.error("1903 " + reStrings.get(0) + " is unexpect");
+				return null;
+			}
+			brick_size.put(brick, Double.parseDouble(reStrings.get(0)));
+		}
+		return brick_size;
+	}
+
+	/**
+	  * 获取volumeName的所有brick中可用空间大小
+	 * 返回一个map表示bricks和可用空间大小 <ip:path,available_size>
+	 * @param volumeName
+	 * @return
+	 * @see [类、类#方法、类#成员]
+	 */
+	public Map<String, Double> getVolumebricksAvailableSize(String volumeName) {
+		List<String> bricks = getVolumeBricks(volumeName);
+		Map<String, Double> brick_size = new HashMap<>();
+		if (bricks == null) {
+			return null;
+		}
+		for (String brick : bricks) {
+			String ipAndpath[] = brick.split(":");
+			String ip = ipAndpath[0];
+			String path = ipAndpath[1];
+			String cmd = "df " + path + "|awk '{print $4}'";
+			List<String> reStrings = Constant.ganymedSSH.execCmdWait(ip, Constant.rootUser, Constant.rootPasswd,
+					Constant.port, cmd);
+			// System.out.println(reStrings);
+			if (reStrings == null) {
+				log.error("1901 get result is null");
+				return null;
+			}
+			if (reStrings.size() == 0) {
+				log.error("1902 get result is nothing");
+				return null;
+			}
+			Pattern pattern = Pattern.compile("[0-9]*");
+			Matcher isNum = pattern.matcher(reStrings.get(1));
+			if (!isNum.matches()) {
+				log.error("1903 " + reStrings.get(1) + " is unexpect");
+				return null;
+			}
+			brick_size.put(brick, Double.parseDouble(reStrings.get(1)));
+		}
+		return brick_size;
+	}
+
+	/**
+	 * 判断volumeName是否存在,存在返回true,不存在返回false 
+	 * 
+	 * @param volumeName
+	 * @return
+	 * @see [类、类#方法、类#成员]
+	 */
+	public boolean volumeIsExists(String volumeName) {
+		List<String> volumes = showAllVolumeName();
+		if (volumes == null) {
+			return false;
+		}
+		if (volumes.contains(volumeName)) {
+			return true;
+		}
+		return false;
+	}
+
+	// @Test
+	public void test_getVolumebricksDataSize() {
+		System.out.println(getVolumebricksDataSize("gfs_ftp"));
+	}
+
+	// @Test
+	public void test_getVolumebricksAvailableSize() {
+		System.out.println(getVolumebricksAvailableSize("gfs_ftp"));
+	}
+
+	// @Test
+	public void test_getVolumeBricks() {
+		getVolumeBricks("gfs_ftp");
+	}
+
+	@Test
+	public void test_getVolumeStatus() {
+		System.out.println(getVolumeStatus("gs_fp"));
+	}
+
+	// @Test
+	public void test_getVolumeMountPoint() {
+		System.out.println(getVolumeMountPoint("gfs_ftp"));
+		System.out.println(getVolumeMountPoint("v1"));
+	}
+}
diff --git a/src/com/platform/kubernetes/SimpleKubeClient.java b/src/com/platform/kubernetes/SimpleKubeClient.java
index ab1ab367..743623f2 100644
--- a/src/com/platform/kubernetes/SimpleKubeClient.java
+++ b/src/com/platform/kubernetes/SimpleKubeClient.java
@@ -1,154 +1,154 @@
-package com.platform.kubernetes;
-
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.ContainerPort;
-import io.fabric8.kubernetes.api.model.Pod;
-import io.fabric8.kubernetes.api.model.ReplicationController;
-import io.fabric8.kubernetes.client.Config;
-import io.fabric8.kubernetes.client.ConfigBuilder;
-import io.fabric8.kubernetes.client.DefaultKubernetesClient;
-import io.fabric8.kubernetes.client.KubernetesClient;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import com.platform.utils.Configs;
-import com.platform.utils.UtilsHelper;
-
-public class SimpleKubeClient {
-	private KubernetesClient client;
-	private final static String DEFAULT_NAMESPACE = "default";	
-
-	public SimpleKubeClient() {
-		this.client = new DefaultKubernetesClient(Configs.KUBE_MASTER_URL);
-	}
-
-	public SimpleKubeClient(String masterUrl) {
-		this.client = new DefaultKubernetesClient(masterUrl);
-	}
-
-	public SimpleKubeClient(Config config) {
-		Config cf = config;
-		if (null == config) {
-			cf = new ConfigBuilder().withMasterUrl(Configs.KUBE_MASTER_URL).build();
-		}
-		this.client = new DefaultKubernetesClient(cf);
-	}
-
-	public void updateOrAddReplicasLabelById(String namespace,
-			String resourceId, String key, String value) {
-		KubernetesClient kubeClient = client;
-		if (checkClientNull())
-			kubeClient = new DefaultKubernetesClient(Configs.KUBE_MASTER_URL);
-		kubeClient.replicationControllers().inNamespace(namespace)
-				.withName(resourceId).edit().editMetadata()
-				.addToLabels(key, value).endMetadata().done();
-	}
-
-	public void updateOrAddReplicasLabelByEntity(String namespace,
-			ReplicationController replicas, String key, String value) {
-		updateOrAddReplicasLabelById(namespace, replicas.getMetadata()
-				.getName(), key, value);
-	}
-
-	public void updateOrAddReplicasLabelById(String resourceId, String key,
-			String value) {
-		updateOrAddReplicasLabelById(DEFAULT_NAMESPACE, resourceId, key, value);
-	}
-
-	public void updateOrAddReplicasLabelByEntity(
-			ReplicationController replicas, String key, String value) {
-		updateOrAddReplicasLabelByEntity(DEFAULT_NAMESPACE, replicas, key,
-				value);
-	}
-
-	@SuppressWarnings("resource")
-	public ReplicationController getReplicationController(String namespace,
-			String replicasName) {
-		KubernetesClient kubeClient = client;
-		if (checkClientNull())
-			kubeClient = new DefaultKubernetesClient(Configs.KUBE_MASTER_URL);
-		return kubeClient.replicationControllers().inNamespace(namespace)
-				.withName(replicasName).get();
-	}
-
-	public ReplicationController getReplicationController(String replicasName) {
-		return getReplicationController(DEFAULT_NAMESPACE, replicasName);
-	}
-
-	@SuppressWarnings("resource")
-	public List<Pod> getPodsForApplicaList(ReplicationController rc) {
-		Map<String, String> selector = rc.getSpec().getSelector();
-		KubernetesClient kubeClient = client;
-		if (checkClientNull())
-			kubeClient = new DefaultKubernetesClient(Configs.KUBE_MASTER_URL);
-		List<Pod> podList = kubeClient.pods()
-				.inNamespace(rc.getMetadata().getNamespace()).list().getItems();
-		return getPods(podList, selector);
-	}
-
-	private boolean checkClientNull() {
-		return null == client;
-	}
-
-	public List<Pod> getPods(List<Pod> pods, Map<String, String> selector) {
-		List<Pod> result = new ArrayList<Pod>();
-		for (int i = 0; i < pods.size(); i++)
-			if (UtilsHelper.isSubMap(getLabels(pods.get(i)), selector))
-				result.add(pods.get(i));
-		return result;
-	}
-
-	private Map<String, String> getLabels(Pod pod) {
-		return pod.getMetadata().getLabels();
-	}
-
-	public KubernetesClient getClient() {
-		// TODO Auto-generated method stub
-		return client;
-	}
-
-	public int getPodContainerport(Pod pod) {
-		int port = Configs.ORACLE_DEFAULT_PORT;
-		List<Container> containers = pod.getSpec().getContainers();
-		if (null != containers && containers.size() > 0) {
-			List<ContainerPort> ports = containers.get(0).getPorts();
-			if (null != ports && ports.size() > 0)
-				port = ports.get(0).getHostPort();
-		}
-		return port;
-	}
-
-	public String getPodHostIp(Pod pod) {
-		return pod.getSpec().getNodeName();
-	}
-
-	@SuppressWarnings("resource")
-	public Map<String, ReplicationController> getReplicationControllerList(
-			String namespace) {
-		KubernetesClient kubeClient = client;
-		Map<String, ReplicationController> rcMap = new HashMap<String, ReplicationController>();
-		if (checkClientNull())
-			kubeClient = new DefaultKubernetesClient(Configs.KUBE_MASTER_URL);
-		List<ReplicationController> replicasList = kubeClient
-				.replicationControllers().list().getItems();
-		if (replicasList != null)
-			for (int i = 0; i < replicasList.size(); i++) {
-				ReplicationController rController = replicasList.get(i);
-				rcMap.put(rController.getMetadata().getName(), rController);
-			}
-		return rcMap;
-	}
-
-	public Map<String, ReplicationController> getReplicationControllerList() {
-		return getReplicationControllerList(DEFAULT_NAMESPACE);
-	}
-
-	public void close() {
-		if (!checkClientNull())
-			client.close();
-	}
-
-}
+package com.platform.kubernetes;
+
+import io.fabric8.kubernetes.api.model.Container;
+import io.fabric8.kubernetes.api.model.ContainerPort;
+import io.fabric8.kubernetes.api.model.Pod;
+import io.fabric8.kubernetes.api.model.ReplicationController;
+import io.fabric8.kubernetes.client.Config;
+import io.fabric8.kubernetes.client.ConfigBuilder;
+import io.fabric8.kubernetes.client.DefaultKubernetesClient;
+import io.fabric8.kubernetes.client.KubernetesClient;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import com.platform.utils.Configs;
+import com.platform.utils.UtilsHelper;
+
+public class SimpleKubeClient {
+	private KubernetesClient client;
+	private final static String DEFAULT_NAMESPACE = "default";	
+
+	public SimpleKubeClient() {
+		this.client = new DefaultKubernetesClient(Configs.KUBE_MASTER_URL);
+	}
+
+	public SimpleKubeClient(String masterUrl) {
+		this.client = new DefaultKubernetesClient(masterUrl);
+	}
+
+	public SimpleKubeClient(Config config) {
+		Config cf = config;
+		if (null == config) {
+			cf = new ConfigBuilder().withMasterUrl(Configs.KUBE_MASTER_URL).build();
+		}
+		this.client = new DefaultKubernetesClient(cf);
+	}
+
+	public void updateOrAddReplicasLabelById(String namespace,
+			String resourceId, String key, String value) {
+		KubernetesClient kubeClient = client;
+		if (checkClientNull())
+			kubeClient = new DefaultKubernetesClient(Configs.KUBE_MASTER_URL);
+		kubeClient.replicationControllers().inNamespace(namespace)
+				.withName(resourceId).edit().editMetadata()
+				.addToLabels(key, value).endMetadata().done();
+	}
+
+	public void updateOrAddReplicasLabelByEntity(String namespace,
+			ReplicationController replicas, String key, String value) {
+		updateOrAddReplicasLabelById(namespace, replicas.getMetadata()
+				.getName(), key, value);
+	}
+
+	public void updateOrAddReplicasLabelById(String resourceId, String key,
+			String value) {
+		updateOrAddReplicasLabelById(DEFAULT_NAMESPACE, resourceId, key, value);
+	}
+
+	public void updateOrAddReplicasLabelByEntity(
+			ReplicationController replicas, String key, String value) {
+		updateOrAddReplicasLabelByEntity(DEFAULT_NAMESPACE, replicas, key,
+				value);
+	}
+
+	@SuppressWarnings("resource")
+	public ReplicationController getReplicationController(String namespace,
+			String replicasName) {
+		KubernetesClient kubeClient = client;
+		if (checkClientNull())
+			kubeClient = new DefaultKubernetesClient(Configs.KUBE_MASTER_URL);
+		return kubeClient.replicationControllers().inNamespace(namespace)
+				.withName(replicasName).get();
+	}
+
+	public ReplicationController getReplicationController(String replicasName) {
+		return getReplicationController(DEFAULT_NAMESPACE, replicasName);
+	}
+
+	@SuppressWarnings("resource")
+	public List<Pod> getPodsForApplicaList(ReplicationController rc) {
+		Map<String, String> selector = rc.getSpec().getSelector();
+		KubernetesClient kubeClient = client;
+		if (checkClientNull())
+			kubeClient = new DefaultKubernetesClient(Configs.KUBE_MASTER_URL);
+		List<Pod> podList = kubeClient.pods()
+				.inNamespace(rc.getMetadata().getNamespace()).list().getItems();
+		return getPods(podList, selector);
+	}
+
+	private boolean checkClientNull() {
+		return null == client;
+	}
+
+	public List<Pod> getPods(List<Pod> pods, Map<String, String> selector) {
+		List<Pod> result = new ArrayList<Pod>();
+		for (int i = 0; i < pods.size(); i++)
+			if (UtilsHelper.isSubMap(getLabels(pods.get(i)), selector))
+				result.add(pods.get(i));
+		return result;
+	}
+
+	private Map<String, String> getLabels(Pod pod) {
+		return pod.getMetadata().getLabels();
+	}
+
+	public KubernetesClient getClient() {
+		// TODO Auto-generated method stub
+		return client;
+	}
+
+	public int getPodContainerport(Pod pod) {
+		int port = Configs.ORACLE_DEFAULT_PORT;
+		List<Container> containers = pod.getSpec().getContainers();
+		if (null != containers && containers.size() > 0) {
+			List<ContainerPort> ports = containers.get(0).getPorts();
+			if (null != ports && ports.size() > 0)
+				port = ports.get(0).getHostPort();
+		}
+		return port;
+	}
+
+	public String getPodHostIp(Pod pod) {
+		return pod.getSpec().getNodeName();
+	}
+
+	@SuppressWarnings("resource")
+	public Map<String, ReplicationController> getReplicationControllerList(
+			String namespace) {
+		KubernetesClient kubeClient = client;
+		Map<String, ReplicationController> rcMap = new HashMap<String, ReplicationController>();
+		if (checkClientNull())
+			kubeClient = new DefaultKubernetesClient(Configs.KUBE_MASTER_URL);
+		List<ReplicationController> replicasList = kubeClient
+				.replicationControllers().list().getItems();
+		if (replicasList != null)
+			for (int i = 0; i < replicasList.size(); i++) {
+				ReplicationController rController = replicasList.get(i);
+				rcMap.put(rController.getMetadata().getName(), rController);
+			}
+		return rcMap;
+	}
+
+	public Map<String, ReplicationController> getReplicationControllerList() {
+		return getReplicationControllerList(DEFAULT_NAMESPACE);
+	}
+
+	public void close() {
+		if (!checkClientNull())
+			client.close();
+	}
+
+}
diff --git a/src/com/platform/service/DataInfoService.java b/src/com/platform/service/DataInfoService.java
index c2e93ad2..c08d0850 100644
--- a/src/com/platform/service/DataInfoService.java
+++ b/src/com/platform/service/DataInfoService.java
@@ -1,16 +1,16 @@
-
-package com.platform.service;
-
-import org.springframework.ui.ModelMap;
-
-import com.platform.dao.DataInfoDao;
-import com.platform.entities.DataInfoEntity;
-import com.platform.entities.PagerOptions;
-
-public interface DataInfoService {
-	public ModelMap getPagerTableData(PagerOptions pagerOptions);
-
-	void deleteData(String[] id) throws Exception;
-	
-	int save(DataInfoEntity data) throws Exception;
-}
+
+package com.platform.service;
+
+import org.springframework.ui.ModelMap;
+
+import com.platform.dao.DataInfoDao;
+import com.platform.entities.DataInfoEntity;
+import com.platform.entities.PagerOptions;
+
+public interface DataInfoService {
+	public ModelMap getPagerTableData(PagerOptions pagerOptions);
+
+	void deleteData(String[] id) throws Exception;
+	
+	int save(DataInfoEntity data) throws Exception;
+}
diff --git a/src/com/platform/service/DataInfoServiceImp.java b/src/com/platform/service/DataInfoServiceImp.java
index 95f79c0f..7b95f563 100644
--- a/src/com/platform/service/DataInfoServiceImp.java
+++ b/src/com/platform/service/DataInfoServiceImp.java
@@ -1,89 +1,89 @@
-package com.platform.service;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-import javax.annotation.Resource;
-
-import org.springframework.stereotype.Service;
-import org.springframework.ui.ModelMap;
-
-import com.base.CustomException;
-import com.platform.dao.DataInfoDao;
-import com.platform.entities.DataInfoEntity;
-import com.platform.entities.PagerOptions;
-import com.platform.utils.Bean2MapUtils;
-
-@Service(value = "dataInfoService")
-public class DataInfoServiceImp implements DataInfoService {
-	@Resource(name = "dataInfoDao")
-	private DataInfoDao dfdDao;
-
-	public void setDfdDao(DataInfoDao dfdDao) {
-		this.dfdDao = dfdDao;
-	}
-
-	@Override
-	public ModelMap getPagerTableData(PagerOptions pagerOptions) {
-		ModelMap modelMap = new ModelMap();
-		String querystr = pagerOptions.getKeyQuery();
-		String[] querys = null;
-		try {
-			if (null != querystr && !"".equals(querystr)) {
-				querys = querystr.split(" ");
-			}
-			pagerOptions.setArray(querys);
-			int count = dfdDao.getLimitedDataCount(pagerOptions); //获取总记录条数	
-			System.out.println("total colume " + count);
-			int offset = 0;		
-			if (pagerOptions.getCurrentPageNum() > 1) {
-				pagerOptions.setTotalLimit((pagerOptions.getCurrentPageNum() - 1)
-						* pagerOptions.getPriorTableSize());
-				offset = dfdDao.getLimitedBeginId(pagerOptions); //获取起始查询id
-				System.out.println(offset);
-			}
-			pagerOptions.setOffset(offset + 1);
-			List<DataInfoEntity> result = dfdDao
-					.getLimitedDataInfoEntities(pagerOptions);
-			modelMap.addAttribute("data", result);
-			modelMap.addAttribute("length", count);
-		} catch (Exception e) {
-			new CustomException();
-		}
-		return modelMap;
-	}
-	
-	@Override
-	public void deleteData(String[] id) throws Exception {
-		// TODO Auto-generated method stub
-		List<Integer> ids = new ArrayList<Integer>();
-		for(String idx: id){
-			ids.add(Integer.parseInt(idx));
-		}
-		if (ids.size() > 0) {
-			//数据在不在?
-			List<String> paths = dfdDao.getIdIsExist(ids);
-			if(paths.size()>0){
-				//删除文件操作
-				for (int i = 0; i < paths.size(); i++) {
-					System.out.println(paths.get(i));
-				}
-				//删除数据库记录
-				dfdDao.removes(ids);			
-			}
-		}
-	}
-
-	@Override
-	public int save(DataInfoEntity data) throws Exception {
-		int result = 0;
-		try {
-			result = dfdDao.save(data);
-		} catch (Exception e) {
-			// TODO: handle exception
-			System.out.println("");
-		}
-		return result;
-	}
-}
+package com.platform.service;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import javax.annotation.Resource;
+
+import org.springframework.stereotype.Service;
+import org.springframework.ui.ModelMap;
+
+import com.base.CustomException;
+import com.platform.dao.DataInfoDao;
+import com.platform.entities.DataInfoEntity;
+import com.platform.entities.PagerOptions;
+import com.platform.utils.Bean2MapUtils;
+
+@Service(value = "dataInfoService")
+public class DataInfoServiceImp implements DataInfoService {
+	@Resource(name = "dataInfoDao")
+	private DataInfoDao dfdDao;
+
+	public void setDfdDao(DataInfoDao dfdDao) {
+		this.dfdDao = dfdDao;
+	}
+
+	@Override
+	public ModelMap getPagerTableData(PagerOptions pagerOptions) {
+		ModelMap modelMap = new ModelMap();
+		String querystr = pagerOptions.getKeyQuery();
+		String[] querys = null;
+		try {
+			if (null != querystr && !"".equals(querystr)) {
+				querys = querystr.split(" ");
+			}
+			pagerOptions.setArray(querys);
+			int count = dfdDao.getLimitedDataCount(pagerOptions); //获取总记录条数	
+			System.out.println("total colume " + count);
+			int offset = 0;		
+			if (pagerOptions.getCurrentPageNum() > 1) {
+				pagerOptions.setTotalLimit((pagerOptions.getCurrentPageNum() - 1)
+						* pagerOptions.getPriorTableSize());
+				offset = dfdDao.getLimitedBeginId(pagerOptions); //获取起始查询id
+				System.out.println(offset);
+			}
+			pagerOptions.setOffset(offset + 1);
+			List<DataInfoEntity> result = dfdDao
+					.getLimitedDataInfoEntities(pagerOptions);
+			modelMap.addAttribute("data", result);
+			modelMap.addAttribute("length", count);
+		} catch (Exception e) {
+			new CustomException();
+		}
+		return modelMap;
+	}
+	
+	@Override
+	public void deleteData(String[] id) throws Exception {
+		// TODO Auto-generated method stub
+		List<Integer> ids = new ArrayList<Integer>();
+		for(String idx: id){
+			ids.add(Integer.parseInt(idx));
+		}
+		if (ids.size() > 0) {
+			//数据在不在?
+			List<String> paths = dfdDao.getIdIsExist(ids);
+			if(paths.size()>0){
+				//删除文件操作
+				for (int i = 0; i < paths.size(); i++) {
+					System.out.println(paths.get(i));
+				}
+				//删除数据库记录
+				dfdDao.removes(ids);			
+			}
+		}
+	}
+
+	@Override
+	public int save(DataInfoEntity data) throws Exception {
+		int result = 0;
+		try {
+			result = dfdDao.save(data);
+		} catch (Exception e) {
+			// TODO: handle exception
+			System.out.println("");
+		}
+		return result;
+	}
+}
diff --git a/src/com/platform/service/EncodeInfoService.java b/src/com/platform/service/EncodeInfoService.java
index 1da621a2..36a200bc 100644
--- a/src/com/platform/service/EncodeInfoService.java
+++ b/src/com/platform/service/EncodeInfoService.java
@@ -1,20 +1,20 @@
-package com.platform.service;
-
-import java.util.List;
-
-import com.platform.entities.EncodedInfoEntity;
-
-/**
- * 数据库业务逻辑处理接口
- * 
- * @author wuming
- * 
- */
-public interface EncodeInfoService {
-
-	public List<EncodedInfoEntity> getAllEncodeInfo(String tableName);
-
-	public int deleteEncodeByCode(String code, String tableName);
-
-	public String getEncodeNameByCode(String code, String name);
-}
+package com.platform.service;
+
+import java.util.List;
+
+import com.platform.entities.EncodedInfoEntity;
+
+/**
+ * 数据库业务逻辑处理接口
+ * 
+ * @author wuming
+ * 
+ */
+public interface EncodeInfoService {
+
+	public List<EncodedInfoEntity> getAllEncodeInfo(String tableName);
+
+	public int deleteEncodeByCode(String code, String tableName);
+
+	public String getEncodeNameByCode(String code, String name);
+}
diff --git a/src/com/platform/service/EncodeInfoServiceImpl.java b/src/com/platform/service/EncodeInfoServiceImpl.java
index 4a403ec3..8492485d 100644
--- a/src/com/platform/service/EncodeInfoServiceImpl.java
+++ b/src/com/platform/service/EncodeInfoServiceImpl.java
@@ -1,52 +1,52 @@
-package com.platform.service;
-
-import java.util.List;
-
-import javax.annotation.Resource;
-
-import org.springframework.stereotype.Service;
-
-import com.platform.dao.EncodeInfoDao;
-import com.platform.entities.EncodedInfoEntity;
-
-/**
- * 业务逻辑的具体实现类
- * 
- * @author wuming
- * 
- */
-@Service("encodeInfoService")
-public class EncodeInfoServiceImpl implements EncodeInfoService {
-
-	@Resource(name = "encodeInfoDao")
-	private EncodeInfoDao eiDao;
-
-	public void setEiDao(EncodeInfoDao eiDao) {
-		this.eiDao = eiDao;
-	}
-
-	/**
-	 * 根据传递的tableName参数获取对应实体信息(行政区划/系统)
-	 */
-	@Override
-	public List<EncodedInfoEntity> getAllEncodeInfo(String tableName) {
-		return eiDao.getAllEntityInfo(tableName);
-
-	}
-
-	/**
-	 * 测试事物
-	 */
-	@Override
-	public int deleteEncodeByCode(String code, String tableName) {
-		// TODO Auto-generated method stub
-		int cursor = eiDao.deleteEncodeByCode(code, tableName);
-		//cursor = cursor / 0;
-		return cursor;
-	}
-
-	@Override
-	public String getEncodeNameByCode(String code, String tableName) {
-		return eiDao.getEncodeNameByCode(code, tableName);
-	}
-}
+package com.platform.service;
+
+import java.util.List;
+
+import javax.annotation.Resource;
+
+import org.springframework.stereotype.Service;
+
+import com.platform.dao.EncodeInfoDao;
+import com.platform.entities.EncodedInfoEntity;
+
+/**
+ * 业务逻辑的具体实现类
+ * 
+ * @author wuming
+ * 
+ */
+@Service("encodeInfoService")
+public class EncodeInfoServiceImpl implements EncodeInfoService {
+
+	@Resource(name = "encodeInfoDao")
+	private EncodeInfoDao eiDao;
+
+	public void setEiDao(EncodeInfoDao eiDao) {
+		this.eiDao = eiDao;
+	}
+
+	/**
+	 * 根据传递的tableName参数获取对应实体信息(行政区划/系统)
+	 */
+	@Override
+	public List<EncodedInfoEntity> getAllEncodeInfo(String tableName) {
+		return eiDao.getAllEntityInfo(tableName);
+
+	}
+
+	/**
+	 * 测试事物
+	 */
+	@Override
+	public int deleteEncodeByCode(String code, String tableName) {
+		// TODO Auto-generated method stub
+		int cursor = eiDao.deleteEncodeByCode(code, tableName);
+		//cursor = cursor / 0;
+		return cursor;
+	}
+
+	@Override
+	public String getEncodeNameByCode(String code, String tableName) {
+		return eiDao.getEncodeNameByCode(code, tableName);
+	}
+}
diff --git a/src/com/platform/service/ICodeService.java b/src/com/platform/service/ICodeService.java
index 32f13477..a3424052 100644
--- a/src/com/platform/service/ICodeService.java
+++ b/src/com/platform/service/ICodeService.java
@@ -1,40 +1,40 @@
-
-/**
- * 文件名   :   IGfsService.java
- * 版权       :   <版权/公司名>
- * 描述       :   <描述>
- * @author  chen
- * 版本       :   <版本>
- * 修改时间:      2016年9月8日
- * 修改内容:      <修改内容>
- */
-package com.platform.service;
-
-
-import java.util.List;
-import java.util.Map;
-
-import com.platform.entities.FolderNode;
-import com.platform.entities.RegionalismEntity;
-import com.platform.entities.SystemEntity;
-import com.platform.entities.VolumeEntity;
-
-
-/**
- * <一句话功能简述>
- * <功能详细描述>
- * @author    chen
- * @version   [版本号,2016年9月8日]
- * @see       [相关类/方法]
- * @since     [产品/模块版本]
- */
-
-public interface ICodeService {
-
-	public List<SystemEntity> findSystem(SystemEntity sys) throws Exception;
-	
-	public List<RegionalismEntity> findRegionalism(RegionalismEntity region) throws Exception;
-	
-	public Map<String, Object> findAll() throws Exception;
-	
-}
+
+/**
+ * 文件名   :   IGfsService.java
+ * 版权       :   <版权/公司名>
+ * 描述       :   <描述>
+ * @author  chen
+ * 版本       :   <版本>
+ * 修改时间:      2016年9月8日
+ * 修改内容:      <修改内容>
+ */
+package com.platform.service;
+
+
+import java.util.List;
+import java.util.Map;
+
+import com.platform.entities.FolderNode;
+import com.platform.entities.RegionalismEntity;
+import com.platform.entities.SystemEntity;
+import com.platform.entities.VolumeEntity;
+
+
+/**
+ * <一句话功能简述>
+ * <功能详细描述>
+ * @author    chen
+ * @version   [版本号,2016年9月8日]
+ * @see       [相关类/方法]
+ * @since     [产品/模块版本]
+ */
+
+public interface ICodeService {
+
+	public List<SystemEntity> findSystem(SystemEntity sys) throws Exception;
+	
+	public List<RegionalismEntity> findRegionalism(RegionalismEntity region) throws Exception;
+	
+	public Map<String, Object> findAll() throws Exception;
+	
+}
diff --git a/src/com/platform/service/IGfsService.java b/src/com/platform/service/IGfsService.java
index 84a4e21a..e8a693fb 100644
--- a/src/com/platform/service/IGfsService.java
+++ b/src/com/platform/service/IGfsService.java
@@ -1,76 +1,76 @@
-
-/**
- * 文件名   :   IGfsService.java
- * 版权       :   <版权/公司名>
- * 描述       :   <描述>
- * @author  chen
- * 版本       :   <版本>
- * 修改时间:      2016年9月8日
- * 修改内容:      <修改内容>
- */
-package com.platform.service;
-
-
-import java.util.List;
-
-import com.platform.entities.FolderNode;
-import com.platform.entities.VolumeEntity;
-
-
-/**
- * <一句话功能简述>
- * <功能详细描述>
- * @author    chen
- * @version   [版本号,2016年9月8日]
- * @see       [相关类/方法]
- * @since     [产品/模块版本]
- */
-
-public interface IGfsService {
-
-	/**
-	 * <一句话功能简述> 查找path,的所有子目录
-	 * <功能详细描述>
-	 * @param path
-	 * @return
-	 * @throws Exception
-	 * @see [类、类#方法、类#成员]
-	 */
-	public FolderNode getFolder(String path) throws Exception;
-	
-	/**
-	 * <一句话功能简述> 复制path,的所有子目录
-	 * <功能详细描述>
-	 * @param srcPath
-	 * @param dstPath
-	 * @return
-	 * @throws Exception
-	 * @see [类、类#方法、类#成员]
-	 */
-
-	public int copyFolder(List<String> srcFolders, String dstFolder, String name) throws Exception;
-	
-	/**
-	 * <一句话功能简述> 获得volume下的 name \ allsize \ usedsize \ folderTree \ brick
-	 * <功能详细描述>
-	 * @return
-	 * @throws Exception
-	 * @see [类、类#方法、类#成员]
-	 */
-	public List<VolumeEntity> getAllVolumes() throws Exception;
-	
-	/**
-	 * <一句话功能简述>
-	 * <功能详细描述>
-	 * @return
-	 * @throws Exception
-	 * @see [类、类#方法、类#成员]
-	 */
-	public VolumeEntity getOneVolume(String volumeName) throws Exception;
-	
-	public int moveData(String volumeName, String srcPath, String dstPath) throws Exception;
-	
-	public int deleteData(String volumeName, String srcPath) throws Exception;
-
-	
-}
+
+/**
+ * 文件名   :   IGfsService.java
+ * 版权       :   <版权/公司名>
+ * 描述       :   <描述>
+ * @author  chen
+ * 版本       :   <版本>
+ * 修改时间:      2016年9月8日
+ * 修改内容:      <修改内容>
+ */
+package com.platform.service;
+
+
+import java.util.List;
+
+import com.platform.entities.FolderNode;
+import com.platform.entities.VolumeEntity;
+
+
+/**
+ * <一句话功能简述>
+ * <功能详细描述>
+ * @author    chen
+ * @version   [版本号,2016年9月8日]
+ * @see       [相关类/方法]
+ * @since     [产品/模块版本]
+ */
+
+public interface IGfsService {
+
+	/**
+	 * <一句话功能简述> 查找path,的所有子目录
+	 * <功能详细描述>
+	 * @param path
+	 * @return
+	 * @throws Exception
+	 * @see [类、类#方法、类#成员]
+	 */
+	public FolderNode getFolder(String path) throws Exception;
+	
+	/**
+	 * <一句话功能简述> 复制path,的所有子目录
+	 * <功能详细描述>
+	 * @param srcPath
+	 * @param dstPath
+	 * @return
+	 * @throws Exception
+	 * @see [类、类#方法、类#成员]
+	 */
+
+	public int copyFolder(List<String> srcFolders, String dstFolder, String name) throws Exception;
+	
+	/**
+	 * <一句话功能简述> 获得volume下的 name \ allsize \ usedsize \ folderTree \ brick
+	 * <功能详细描述>
+	 * @return
+	 * @throws Exception
+	 * @see [类、类#方法、类#成员]
+	 */
+	public List<VolumeEntity> getAllVolumes() throws Exception;
+	
+	/**
+	 * <一句话功能简述>
+	 * <功能详细描述>
+	 * @return
+	 * @throws Exception
+	 * @see [类、类#方法、类#成员]
+	 */
+	public VolumeEntity getOneVolume(String volumeName) throws Exception;
+	
+	public int moveData(String volumeName, String srcPath, String dstPath) throws Exception;
+	
+	public int deleteData(String volumeName, String srcPath) throws Exception;
+
+	
+}
diff --git a/src/com/platform/service/IMoveDataService.java b/src/com/platform/service/IMoveDataService.java
index 84cb4c5e..bddb1e04 100644
--- a/src/com/platform/service/IMoveDataService.java
+++ b/src/com/platform/service/IMoveDataService.java
@@ -1,40 +1,40 @@
-package com.platform.service;
-
-import java.util.List;
-
-import com.platform.entities.DataInfoEntity;
-import com.platform.entities.DataInfoEntityMoveTmp;
-
-/** 数据迁移
- * @author chen
- *
- */
-public interface IMoveDataService {
-	
-	/** 迁移(新增)
-	 * @param a dataInfo实体
-	 * @param dstPath volume下的某个folder路径(需要补齐路径,eg: XXX/320198_16/1,or XXX/320122KFQ_15/1)
-	 * @return
-	 * @throws Exception
-	 */
-	public boolean moveData(List<DataInfoEntity> data, String dstPath) throws Exception;
-	
-	/** 查询所有进度
-	 * @return 返回所有的实体
-	 * @throws Exception
-	 */
-	public List<DataInfoEntityMoveTmp> findAll() throws Exception;
-	
-	/** 删除
-	 * @return
-	 * @throws Exception
-	 */
-	public int delete(DataInfoEntityMoveTmp dataMove) throws Exception;
-	
-	public int update(DataInfoEntityMoveTmp data) throws Exception;
-	
-	public int save(DataInfoEntityMoveTmp data) throws Exception;
-	
-	public int insertBatch(List<DataInfoEntityMoveTmp> list) throws Exception;
-
-}
+package com.platform.service;
+
+import java.util.List;
+
+import com.platform.entities.DataInfoEntity;
+import com.platform.entities.DataInfoEntityMoveTmp;
+
+/** 数据迁移
+ * @author chen
+ *
+ */
+public interface IMoveDataService {
+	
+	/** 迁移(新增)
+	 * @param a dataInfo实体
+	 * @param dstPath volume下的某个folder路径(需要补齐路径,eg: XXX/320198_16/1,or XXX/320122KFQ_15/1)
+	 * @return
+	 * @throws Exception
+	 */
+	public boolean moveData(List<DataInfoEntity> data, String dstPath) throws Exception;
+	
+	/** 查询所有进度
+	 * @return 返回所有的实体
+	 * @throws Exception
+	 */
+	public List<DataInfoEntityMoveTmp> findAll() throws Exception;
+	
+	/** 删除
+	 * @return
+	 * @throws Exception
+	 */
+	public int delete(DataInfoEntityMoveTmp dataMove) throws Exception;
+	
+	public int update(DataInfoEntityMoveTmp data) throws Exception;
+	
+	public int save(DataInfoEntityMoveTmp data) throws Exception;
+	
+	public int insertBatch(List<DataInfoEntityMoveTmp> list) throws Exception;
+
+}
diff --git a/src/com/platform/service/IMySqlService.java b/src/com/platform/service/IMySqlService.java
index a49dde61..4ab96ab0 100644
--- a/src/com/platform/service/IMySqlService.java
+++ b/src/com/platform/service/IMySqlService.java
@@ -1,25 +1,25 @@
-package com.platform.service;
-
-import java.util.List;
-
-import com.platform.entities.GatherOracleInfo;
-
-public interface IMySqlService {
-	
-	/**
-	 * @return 查询
-	 * @throws Exception
-	 */
-	public List<GatherOracleInfo> findAllMySql() throws Exception;
-	
-	/** 删除
-	 * @return
-	 * @throws Exception
-	 */
-	public int deleteMySql(int id) throws Exception;
-	
-	public int insertOracle(GatherOracleInfo oracle) throws Exception;
-	
-	public int updateOracle(GatherOracleInfo oracle) throws Exception;
-
-}
+package com.platform.service;
+
+import java.util.List;
+
+import com.platform.entities.GatherOracleInfo;
+
+public interface IMySqlService {
+	
+	/**
+	 * @return 查询
+	 * @throws Exception
+	 */
+	public List<GatherOracleInfo> findAllMySql() throws Exception;
+	
+	/** 删除
+	 * @return
+	 * @throws Exception
+	 */
+	public int deleteMySql(int id) throws Exception;
+	
+	public int insertOracle(GatherOracleInfo oracle) throws Exception;
+	
+	public int updateOracle(GatherOracleInfo oracle) throws Exception;
+
+}
diff --git a/src/com/platform/service/IOracleExtractService.java b/src/com/platform/service/IOracleExtractService.java
index 87386f82..7d4e9418 100644
--- a/src/com/platform/service/IOracleExtractService.java
+++ b/src/com/platform/service/IOracleExtractService.java
@@ -1,22 +1,22 @@
-package com.platform.service;
-
-import java.util.List;
-import java.util.Map;
-
-import com.platform.entities.DataInfoEntity;
-import com.platform.entities.GatherOracleInfo;
-import com.platform.entities.OracleConnectorParams;
-
-public interface IOracleExtractService {
-	
-	/** 抽取数据库
-	 * @param name
-	 * @param dataInfo //采集库连接参数
-	 * @param oracleConnect
-	 * @return
-	 * @throws Exception
-	 */
-//	public boolean extractOracle(String name, List<OracleConnectorParams> dataInfos, GatherOracleInfo oracleConnect) throws Exception;
-//	public boolean extractOracle(String name, List<DataInfoEntity> dataInfos, Map<String, String> oracleConnect) throws Exception;
-	public boolean extractOracle(String name, List<Map<String, String>> dataInfo, Map<String, String> oracleConnect) throws Exception;
-}
+package com.platform.service;
+
+import java.util.List;
+import java.util.Map;
+
+import com.platform.entities.DataInfoEntity;
+import com.platform.entities.GatherOracleInfo;
+import com.platform.entities.OracleConnectorParams;
+
+public interface IOracleExtractService {
+	
+	/** 抽取数据库
+	 * @param name
+	 * @param dataInfo //采集库连接参数
+	 * @param oracleConnect
+	 * @return
+	 * @throws Exception
+	 */
+//	public boolean extractOracle(String name, List<OracleConnectorParams> dataInfos, GatherOracleInfo oracleConnect) throws Exception;
+//	public boolean extractOracle(String name, List<DataInfoEntity> dataInfos, Map<String, String> oracleConnect) throws Exception;
+	public boolean extractOracle(String name, List<Map<String, String>> dataInfo, Map<String, String> oracleConnect) throws Exception;
+}
diff --git a/src/com/platform/service/OracleExtractHelper.java b/src/com/platform/service/OracleExtractHelper.java
index 2175e0f3..82228e28 100644
--- a/src/com/platform/service/OracleExtractHelper.java
+++ b/src/com/platform/service/OracleExtractHelper.java
@@ -1,163 +1,163 @@
-package com.platform.service;
-
-import java.sql.Connection;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-
-import com.platform.entities.GatherOracleInfo;
-import com.platform.entities.OracleConnectorParams;
-import com.platform.oracle.OracleConnector;
-import com.platform.utils.Configs;
-import com.platform.utils.FileOperateHelper;
-
-public class OracleExtractHelper {
-
-	private OracleConnector oConnector;
-
-	/**
-	 * 判断dblink是否已经存在
-	 * 
-	 * @param conn
-	 * @param linkName
-	 *            dblink的名称
-	 * @return
-	 */
-	private boolean hasSameNameDBLink(Connection conn, String linkName) {
-		boolean flag = false;
-		String sql = "SELECT * FROM ALL_DB_LINKS WHERE DB_LINK=" + linkName;
-		ResultSet rSet = oConnector.getSQLExecResultSet(conn, sql);
-		try {
-			rSet.last();
-			if (rSet.getRow() > 0)
-				flag = true;
-		} catch (Exception e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		return flag;
-	}
-
-	/**
-	 * 创建dblink
-	 * 
-<<<<<<< HEAD
-<<<<<<< HEAD
-	 * @param conn
-	 * @param oc
-=======
-	 * @param conn 汇总库的连接
-	 * @param oc 采集库
->>>>>>> 355b6e47a4fa8d058029ec939fe4fefdaa751275
-=======
-	 * @param conn 汇总库的连接
-	 * @param oc 采集库
->>>>>>> web_backend_develope
-	 *            dblink连接参数实体
-	 */
-	public void createDBLink(Connection conn, OracleConnectorParams oc) {
-		String linkName = "LinkTo" + oc.getName();
-		String sql = "CREATE PUBLIC DATABASE LINK "
-				+ linkName
-				+ " CONNECT TO "
-				+ oc.getUser()
-				+ " IDENTIFIED BY "
-				+ oc.getPassword()
-				+ " USING '(DESCRIPTION =(ADDRESS_LIST =(ADDRESS = (PROTOCOL = TCP)(HOST = "
-				+ oc.getIp() + ")(PORT = " + oc.getPort()
-				+ ")))(CONNECT_DATA =(SERVICE_NAME =" + oc.getDatabaseName()
-				+ ")))';";
-		if (null != oc) {
-			if (hasSameNameDBLink(conn, linkName)) { // 如果dblink已经存在,先删除dblink,在创建dblink
-				String deleteSql = "DROP PUBLIC DATABASE LINK LinkTo"
-						+ linkName;
-				FileOperateHelper
-						.fileWrite(
-								Configs.EXTRACT_LOG_LOCALTION + oc.getName(),
-								deleteSql);
-				if (oConnector.execOracleSQL(conn, deleteSql)) {
-					FileOperateHelper.fileWrite(Configs.EXTRACT_LOG_LOCALTION
-							+ oc.getName(), sql);
-					oConnector.execOracleSQL(conn, sql);
-				} else {
-					Configs.CONSOLE_LOGGER.error("删除已有的DBLink失败,无法创建新的DBLink!");
-					FileOperateHelper.fileWrite(Configs.EXTRACT_LOG_LOCALTION
-							+ oc.getName(), "删除已有的DBLink失败,无法创建新的DBLink!");
-				}
-
-			} else {
-				// 否则,创建dblink
-				oConnector.execOracleSQL(conn, sql);
-				FileOperateHelper.fileWrite(
-						Configs.EXTRACT_LOG_LOCALTION + oc.getName(), sql);
-			}
-		}
-	}
-
-	/**
-	 * 创建表空间
-	 * 
-	 * @param conn 汇总库连接
-	 * @param oc 汇总库信息
-	 * @return
-	 */
-	public boolean createTableSpace(Connection conn, GatherOracleInfo oc) {
-		String tmpSql = "select TABLESPACE_NAME from dba_tablespaces where TABLESPACE_NAME = '"
-				+ Configs.GATHER_TABLESPACE_NAME + "'";
-		if (oConnector.execOracleSQL(conn, tmpSql)) {
-			return true;
-		} else {
-			String sql = "create tablespace " + Configs.GATHER_TABLESPACE_NAME
-					+ " datafile '" + Configs.GATHER_TABLESPACE_PATH
-					+ Configs.GATHER_TABLESPACE_NAME + ".dbf"
-					+ "' size 512M autoextend on next 512M maxsize unlimited";
-			return oConnector.execOracleSQL(conn, sql);
-		}
-	}
-
-	/**
-	 * 创建用户并授权
-	 * 
-	 * @param conn 汇总库连接
-	 * @param oc  汇总库信息
-	 */
-	public void createUser(Connection conn, GatherOracleInfo oc) {
-		String strTUser = oc.getName() + Configs.TABLE_SUFFIX;
-		String sql = "Create user " + strTUser + " default tablespace "
-				+ Configs.GATHER_TABLESPACE_NAME + " identified by "
-				+ Configs.GATHER_TABLE_PASSWORD;
-		String grantSql = "grant connect, resource, dba to " + strTUser;
-		oConnector.execOracleSQL(conn, sql);
-		oConnector.execOracleSQL(conn, grantSql);
-	}
-
-	/**
-	 * 执行汇总操作
-	 * 
-	 * @param conn 汇总库连接
-	 * @param oc 采集库
-	 */
-	public void extractColleDB(Connection conn, OracleConnectorParams oc) {
-		String strTUser = oc.getName() + Configs.TABLE_SUFFIX;
-		String sql = "SELECT 'create table "
-				+ strTUser
-				+ ".J'|| substr(t.OWNER||'_'||t.TABLE_NAME,0,29)||' as select * from '||t.OWNER||'.'||t.TABLE_NAME||"
-				+ "'@linkTo"
-				+ oc.getName()
-				+ ";' FROM dba_tables@linkTo"
-				+ oc.getName()
-				+ " t WHERE t.TABLESPACE_NAME NOT IN ('SYSTEM','SYSAUX')"
-				+ " and t.owner||t.table_name not in (select owner||table_name from dba_tables@linkTo"
-				+ oc.getName() + " where 'data_type'='CLOB')";
-		ResultSet rsSet = oConnector.getSQLExecResultSet(conn, sql);
-		try {
-			while (rsSet.next()) {
-				String resultSql = rsSet.getString(0);
-				oConnector.execOracleSQL(conn, resultSql);
-			}
-		} catch (SQLException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-
-	}
-}
+package com.platform.service;
+
+import java.sql.Connection;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+
+import com.platform.entities.GatherOracleInfo;
+import com.platform.entities.OracleConnectorParams;
+import com.platform.oracle.OracleConnector;
+import com.platform.utils.Configs;
+import com.platform.utils.FileOperateHelper;
+
+public class OracleExtractHelper {
+
+	private OracleConnector oConnector;
+
+	/**
+	 * 判断dblink是否已经存在
+	 * 
+	 * @param conn
+	 * @param linkName
+	 *            dblink的名称
+	 * @return
+	 */
+	private boolean hasSameNameDBLink(Connection conn, String linkName) {
+		boolean flag = false;
+		String sql = "SELECT * FROM ALL_DB_LINKS WHERE DB_LINK=" + linkName;
+		ResultSet rSet = oConnector.getSQLExecResultSet(conn, sql);
+		try {
+			rSet.last();
+			if (rSet.getRow() > 0)
+				flag = true;
+		} catch (Exception e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+		return flag;
+	}
+
+	/**
+	 * 创建dblink
+	 * 
+<<<<<<< HEAD
+<<<<<<< HEAD
+	 * @param conn
+	 * @param oc
+=======
+	 * @param conn 汇总库的连接
+	 * @param oc 采集库
+>>>>>>> 355b6e47a4fa8d058029ec939fe4fefdaa751275
+=======
+	 * @param conn 汇总库的连接
+	 * @param oc 采集库
+>>>>>>> web_backend_develope
+	 *            dblink连接参数实体
+	 */
+	public void createDBLink(Connection conn, OracleConnectorParams oc) {
+		String linkName = "LinkTo" + oc.getName();
+		String sql = "CREATE PUBLIC DATABASE LINK "
+				+ linkName
+				+ " CONNECT TO "
+				+ oc.getUser()
+				+ " IDENTIFIED BY "
+				+ oc.getPassword()
+				+ " USING '(DESCRIPTION =(ADDRESS_LIST =(ADDRESS = (PROTOCOL = TCP)(HOST = "
+				+ oc.getIp() + ")(PORT = " + oc.getPort()
+				+ ")))(CONNECT_DATA =(SERVICE_NAME =" + oc.getDatabaseName()
+				+ ")))';";
+		if (null != oc) {
+			if (hasSameNameDBLink(conn, linkName)) { // 如果dblink已经存在,先删除dblink,在创建dblink
+				String deleteSql = "DROP PUBLIC DATABASE LINK LinkTo"
+						+ linkName;
+				FileOperateHelper
+						.fileWrite(
+								Configs.EXTRACT_LOG_LOCALTION + oc.getName(),
+								deleteSql);
+				if (oConnector.execOracleSQL(conn, deleteSql)) {
+					FileOperateHelper.fileWrite(Configs.EXTRACT_LOG_LOCALTION
+							+ oc.getName(), sql);
+					oConnector.execOracleSQL(conn, sql);
+				} else {
+					Configs.CONSOLE_LOGGER.error("删除已有的DBLink失败,无法创建新的DBLink!");
+					FileOperateHelper.fileWrite(Configs.EXTRACT_LOG_LOCALTION
+							+ oc.getName(), "删除已有的DBLink失败,无法创建新的DBLink!");
+				}
+
+			} else {
+				// 否则,创建dblink
+				oConnector.execOracleSQL(conn, sql);
+				FileOperateHelper.fileWrite(
+						Configs.EXTRACT_LOG_LOCALTION + oc.getName(), sql);
+			}
+		}
+	}
+
+	/**
+	 * 创建表空间
+	 * 
+	 * @param conn 汇总库连接
+	 * @param oc 汇总库信息
+	 * @return
+	 */
+	public boolean createTableSpace(Connection conn, GatherOracleInfo oc) {
+		String tmpSql = "select TABLESPACE_NAME from dba_tablespaces where TABLESPACE_NAME = '"
+				+ Configs.GATHER_TABLESPACE_NAME + "'";
+		if (oConnector.execOracleSQL(conn, tmpSql)) {
+			return true;
+		} else {
+			String sql = "create tablespace " + Configs.GATHER_TABLESPACE_NAME
+					+ " datafile '" + Configs.GATHER_TABLESPACE_PATH
+					+ Configs.GATHER_TABLESPACE_NAME + ".dbf"
+					+ "' size 512M autoextend on next 512M maxsize unlimited";
+			return oConnector.execOracleSQL(conn, sql);
+		}
+	}
+
+	/**
+	 * 创建用户并授权
+	 * 
+	 * @param conn 汇总库连接
+	 * @param oc  汇总库信息
+	 */
+	public void createUser(Connection conn, GatherOracleInfo oc) {
+		String strTUser = oc.getName() + Configs.TABLE_SUFFIX;
+		String sql = "Create user " + strTUser + " default tablespace "
+				+ Configs.GATHER_TABLESPACE_NAME + " identified by "
+				+ Configs.GATHER_TABLE_PASSWORD;
+		String grantSql = "grant connect, resource, dba to " + strTUser;
+		oConnector.execOracleSQL(conn, sql);
+		oConnector.execOracleSQL(conn, grantSql);
+	}
+
+	/**
+	 * 执行汇总操作
+	 * 
+	 * @param conn 汇总库连接
+	 * @param oc 采集库
+	 */
+	public void extractColleDB(Connection conn, OracleConnectorParams oc) {
+		String strTUser = oc.getName() + Configs.TABLE_SUFFIX;
+		String sql = "SELECT 'create table "
+				+ strTUser
+				+ ".J'|| substr(t.OWNER||'_'||t.TABLE_NAME,0,29)||' as select * from '||t.OWNER||'.'||t.TABLE_NAME||"
+				+ "'@linkTo"
+				+ oc.getName()
+				+ ";' FROM dba_tables@linkTo"
+				+ oc.getName()
+				+ " t WHERE t.TABLESPACE_NAME NOT IN ('SYSTEM','SYSAUX')"
+				+ " and t.owner||t.table_name not in (select owner||table_name from dba_tables@linkTo"
+				+ oc.getName() + " where 'data_type'='CLOB')";
+		ResultSet rsSet = oConnector.getSQLExecResultSet(conn, sql);
+		try {
+			while (rsSet.next()) {
+				String resultSql = rsSet.getString(0);
+				oConnector.execOracleSQL(conn, resultSql);
+			}
+		} catch (SQLException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+
+	}
+}
diff --git a/src/com/platform/service/OracleExtractService.java b/src/com/platform/service/OracleExtractService.java
index 1b23ed7c..9b858706 100644
--- a/src/com/platform/service/OracleExtractService.java
+++ b/src/com/platform/service/OracleExtractService.java
@@ -1,24 +1,24 @@
-package com.platform.service;
-
-
-
-import com.platform.entities.OracleConnectorParams;
-import com.platform.oracle.OracleConnector;
-import com.platform.utils.Configs;
-
-public class OracleExtractService extends Thread implements Runnable {
-	private OracleConnectorParams ocp;
-	private java.sql.Connection conn;
-	
-	public OracleExtractService(OracleConnectorParams ocp){
-		this.ocp=ocp;
-		String url  = "";
-		this.conn=OracleConnector.ConnectionBuilder(url, Configs.GATHER_USER_NAME, Configs.GATHER_USER_PASSWORD);
-	}
-	@Override
-	public void run() {
-		// TODO Auto-generated method stub
-		
-	}
-	
-}
+package com.platform.service;
+
+
+
+import com.platform.entities.OracleConnectorParams;
+import com.platform.oracle.OracleConnector;
+import com.platform.utils.Configs;
+
+public class OracleExtractService extends Thread implements Runnable {
+	private OracleConnectorParams ocp;
+	private java.sql.Connection conn;
+	
+	public OracleExtractService(OracleConnectorParams ocp){
+		this.ocp=ocp;
+		String url  = "";
+		this.conn=OracleConnector.ConnectionBuilder(url, Configs.GATHER_USER_NAME, Configs.GATHER_USER_PASSWORD);
+	}
+	@Override
+	public void run() {
+		// TODO Auto-generated method stub
+		
+	}
+	
+}
diff --git a/src/com/platform/service/SimplePropertyReader.java b/src/com/platform/service/SimplePropertyReader.java
index 4b34cb29..51862917 100644
--- a/src/com/platform/service/SimplePropertyReader.java
+++ b/src/com/platform/service/SimplePropertyReader.java
@@ -1,20 +1,20 @@
-package com.platform.service;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-
-import com.platform.entities.SimpleConfigParamsBean;
-
-public class SimplePropertyReader {
-	@Autowired @Qualifier("simpeConfig")
-	private SimpleConfigParamsBean configParamsBean;
-	
-	public void setConfigParamsBean(SimpleConfigParamsBean configParamsBean) {
-		this.configParamsBean = configParamsBean;
-	}
-
-	public SimpleConfigParamsBean getConfigParamsBean() {
-		return configParamsBean;
-	}
-	
-}
+package com.platform.service;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+
+import com.platform.entities.SimpleConfigParamsBean;
+
+public class SimplePropertyReader {
+	@Autowired @Qualifier("simpeConfig")
+	private SimpleConfigParamsBean configParamsBean;
+	
+	public void setConfigParamsBean(SimpleConfigParamsBean configParamsBean) {
+		this.configParamsBean = configParamsBean;
+	}
+
+	public SimpleConfigParamsBean getConfigParamsBean() {
+		return configParamsBean;
+	}
+	
+}
diff --git a/src/com/platform/service/impl/CodeServiceImpl.java b/src/com/platform/service/impl/CodeServiceImpl.java
index efda3f22..297906ff 100644
--- a/src/com/platform/service/impl/CodeServiceImpl.java
+++ b/src/com/platform/service/impl/CodeServiceImpl.java
@@ -1,66 +1,66 @@
-package com.platform.service.impl;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.annotation.Resource;
-
-import org.springframework.stereotype.Service;
-
-import com.platform.dao.DataInfoDao;
-import com.platform.dao.IRegionalismCodeDao;
-import com.platform.dao.ISystemCodeDao;
-import com.platform.entities.RegionalismEntity;
-import com.platform.entities.SystemEntity;
-import com.platform.service.ICodeService;
-
-@Service(value = "codeService")
-public class CodeServiceImpl implements ICodeService {
-	
-	@Resource(name = "systemCodeDao")
-	private ISystemCodeDao systemCodeDao;
-	
-	@Resource(name = "regionalismCodeDao")
-	private IRegionalismCodeDao regionalismCodeDao;
-	
-	@Override
-	public List<SystemEntity> findSystem(SystemEntity sys) throws Exception {
-		List<SystemEntity> result = null;
-		try {
-			result = new ArrayList<SystemEntity>();
-			result = systemCodeDao.findSubSystem(sys);
-		} catch (Exception e) {
-			// TODO: handle exception
-		}
-		return result;
-	}
-
-	@Override
-	public List<RegionalismEntity> findRegionalism(RegionalismEntity region) throws Exception {
-		List<RegionalismEntity> result = null;
-		try {
-			result = regionalismCodeDao.findSubRegionalism(region);
-		} catch (Exception e) {
-			// TODO: handle exception
-		}
-		return result;
-	}
-
-	@Override
-	public Map<String, Object> findAll() throws Exception {
-		Map<String, Object> result = new HashMap<String, Object>();
-		try {
-			List<RegionalismEntity> regions = regionalismCodeDao.findAllRegionalism();
-			List<SystemEntity> syss = systemCodeDao.findAllSystem();
-			result.put("system", syss);
-			result.put("regionalism", regions);
-		} catch (Exception e) {
-			// TODO: handle exception
-		}
-		return result;
-	}
-	
-
-}
+package com.platform.service.impl;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.annotation.Resource;
+
+import org.springframework.stereotype.Service;
+
+import com.platform.dao.DataInfoDao;
+import com.platform.dao.IRegionalismCodeDao;
+import com.platform.dao.ISystemCodeDao;
+import com.platform.entities.RegionalismEntity;
+import com.platform.entities.SystemEntity;
+import com.platform.service.ICodeService;
+
+@Service(value = "codeService")
+public class CodeServiceImpl implements ICodeService {
+	
+	@Resource(name = "systemCodeDao")
+	private ISystemCodeDao systemCodeDao;
+	
+	@Resource(name = "regionalismCodeDao")
+	private IRegionalismCodeDao regionalismCodeDao;
+	
+	@Override
+	public List<SystemEntity> findSystem(SystemEntity sys) throws Exception {
+		List<SystemEntity> result = null;
+		try {
+			result = new ArrayList<SystemEntity>();
+			result = systemCodeDao.findSubSystem(sys);
+		} catch (Exception e) {
+			// TODO: handle exception
+		}
+		return result;
+	}
+
+	@Override
+	public List<RegionalismEntity> findRegionalism(RegionalismEntity region) throws Exception {
+		List<RegionalismEntity> result = null;
+		try {
+			result = regionalismCodeDao.findSubRegionalism(region);
+		} catch (Exception e) {
+			// TODO: handle exception
+		}
+		return result;
+	}
+
+	@Override
+	public Map<String, Object> findAll() throws Exception {
+		Map<String, Object> result = new HashMap<String, Object>();
+		try {
+			List<RegionalismEntity> regions = regionalismCodeDao.findAllRegionalism();
+			List<SystemEntity> syss = systemCodeDao.findAllSystem();
+			result.put("system", syss);
+			result.put("regionalism", regions);
+		} catch (Exception e) {
+			// TODO: handle exception
+		}
+		return result;
+	}
+	
+
+}
diff --git a/src/com/platform/service/impl/MoveDataServiceImpl.java b/src/com/platform/service/impl/MoveDataServiceImpl.java
index 3576159d..c0a6fbbb 100644
--- a/src/com/platform/service/impl/MoveDataServiceImpl.java
+++ b/src/com/platform/service/impl/MoveDataServiceImpl.java
@@ -1,153 +1,153 @@
-package com.platform.service.impl;
-
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import javax.annotation.Resource;
-
-import org.springframework.scheduling.annotation.Scheduled;
-import org.springframework.stereotype.Component;
-import org.springframework.stereotype.Service;
-
-import com.platform.dao.DataInfoDao;
-import com.platform.dao.DataInfoMoveTmpDao;
-import com.platform.entities.DataInfoEntity;
-import com.platform.entities.DataInfoEntityMoveTmp;
-import com.platform.glusterfs.CheckoutMD5;
-import com.platform.glusterfs.CopyData;
-import com.platform.glusterfs.RemoveData;
-import com.platform.glusterfs.ShowData;
-import com.platform.service.IMoveDataService;
-import com.platform.utils.Bean2MapUtils;
-import com.platform.utils.Constant;
-import com.platform.utils.DateForm;
-
-@Component
-@Service(value = "moveDataService")
-public class MoveDataServiceImpl implements IMoveDataService{
-	
-	@Resource(name = "dataInfoDao")
-	private DataInfoDao dataInfoDao;
-	
-	private RemoveData removeservice = new RemoveData();
-	
-	/**
-	 * 迁移
-	 */
-	CopyData copy = new CopyData();
-	
-	/**
-	 * MD5校验
-	 */
-	CheckoutMD5 check = new CheckoutMD5();
-	
-	@Resource(name = "dataInfoMoveTmpDao")
-	private DataInfoMoveTmpDao dataInfoMoveTmpDao;
-	
-	/**
-	 * 查看数据
-	 */
-	ShowData show = new ShowData();
-
-	@Override
-	public boolean moveData(List<DataInfoEntity> data, String dstPath) throws Exception {
-		boolean isSuccess = false;
-		String tailPath = "";
-		if (null != data) {
-			//XXX/320198_16/1,or XXX/320122KFQ_15/1 ---> /320198_16/1, or /320122KFQ_15/1
-			List<DataInfoEntityMoveTmp> exist = dataInfoMoveTmpDao.findAll();
-			List<String> existIds = new ArrayList<String>();
-			if (null != exist) {
-				for (DataInfoEntityMoveTmp dataInfoEntityMoveTmp : exist) {
-					if ("0".equals(dataInfoEntityMoveTmp.getCompleteStatus()) || "1".equals(dataInfoEntityMoveTmp.getCompleteStatus())) {
-						if (null != dataInfoEntityMoveTmp.getDataPath()) {
-							existIds.add(dataInfoEntityMoveTmp.getDataPath());
-						}
-					}
-				}
-			}
-			Pattern pattern = Pattern.compile("\\/\\d+[a-z]*[A-Z]*_\\d+\\/\\d*\\/*$");
-			// 末尾 含有 /
-			Pattern pattern2 = Pattern.compile("\\/$");
-			Matcher matcher2 = pattern2.matcher(dstPath);
-			//去掉 最后 的 / 符合
-			if (matcher2.find()) {
-				dstPath = dstPath.substring(0, dstPath.length()-1);
-			}
-			List<DataInfoEntityMoveTmp> moveList = new ArrayList<DataInfoEntityMoveTmp>();
-			for (DataInfoEntity dataInfoEntity : data) {
-				if (existIds.contains(dataInfoEntity.getDataPath())) {
-					continue;
-				}
-				//TODO 正则:取出 data 的后面 的 路径,eg: XXX/320198_16/1,or XXX/320122KFQ_15/1)
-				Matcher matcher = pattern.matcher(dataInfoEntity.getDataPath());
-				// tailPath 第一个字符是  /  符号取尾:"\\/\\d+[a-z]*[A-Z]*_\\d+\\/\\d*\\/*$"
-				if (matcher.find()) {
-					tailPath = matcher.group();
-				}
-				String finalDestPath = dstPath + tailPath;
-				Matcher matchertmp2 = pattern2.matcher(finalDestPath);
-				//去掉 最后 的 / 符合
-				if (!matchertmp2.find()) {
-					finalDestPath = finalDestPath + "/";
-				}
-				DataInfoEntityMoveTmp dataMove = new DataInfoEntityMoveTmp();
-				dataMove.setSystemCode(dataInfoEntity.getSystemCode());
-				dataMove.setRegionalismCode(dataInfoEntity.getRegionalismCode());
-				dataMove.setDstPath(finalDestPath);
-				dataMove.setLastTime(DateForm.date2StringBysecond(new Date()));
-				dataMove.setFkid(dataInfoEntity.getId());
-				moveList.add(dataMove);
-			}
-			if (moveList.size() > 0) {
-				dataInfoMoveTmpDao.insertBatch(moveList);
-				isSuccess = true;
-			}
-		}
-		return isSuccess;
-	}
-
-	@Override
-	public List<DataInfoEntityMoveTmp> findAll() throws Exception {
-		List<DataInfoEntityMoveTmp> result = new ArrayList<DataInfoEntityMoveTmp>();
-		try {
-			result = dataInfoMoveTmpDao.findAll();
-			
-		} catch (Exception e) {
-			System.err.println(e);
-		}
-		return result;
-	}
-	
-	@Override
-	public int delete(DataInfoEntityMoveTmp dataMove) throws Exception {
-		if ("1".equals(dataMove.getCompleteStatus())) {
-			removeservice.deleteFolder(dataMove.getDstPath());
-		}
-		int result = dataInfoMoveTmpDao.remove(dataMove.getId());
-		return result;
-	}
-
-
-	@Override
-	public int save(DataInfoEntityMoveTmp data) throws Exception {
-		dataInfoMoveTmpDao.save(data);
-		return 0;
-	}
-
-	@Override
-	public int insertBatch(List<DataInfoEntityMoveTmp> list) throws Exception {
-		// TODO Auto-generated method stub
-		return 0;
-	}
-
-	@Override
-	public int update(DataInfoEntityMoveTmp data) throws Exception {
-		int result = dataInfoMoveTmpDao.update(data);
-		return result;
-	}
-	
-}
+package com.platform.service.impl;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import javax.annotation.Resource;
+
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+import org.springframework.stereotype.Service;
+
+import com.platform.dao.DataInfoDao;
+import com.platform.dao.DataInfoMoveTmpDao;
+import com.platform.entities.DataInfoEntity;
+import com.platform.entities.DataInfoEntityMoveTmp;
+import com.platform.glusterfs.CheckoutMD5;
+import com.platform.glusterfs.CopyData;
+import com.platform.glusterfs.RemoveData;
+import com.platform.glusterfs.ShowData;
+import com.platform.service.IMoveDataService;
+import com.platform.utils.Bean2MapUtils;
+import com.platform.utils.Constant;
+import com.platform.utils.DateForm;
+
+@Component
+@Service(value = "moveDataService")
+public class MoveDataServiceImpl implements IMoveDataService{
+	
+	@Resource(name = "dataInfoDao")
+	private DataInfoDao dataInfoDao;
+	
+	private RemoveData removeservice = new RemoveData();
+	
+	/**
+	 * 迁移
+	 */
+	CopyData copy = new CopyData();
+	
+	/**
+	 * MD5校验
+	 */
+	CheckoutMD5 check = new CheckoutMD5();
+	
+	@Resource(name = "dataInfoMoveTmpDao")
+	private DataInfoMoveTmpDao dataInfoMoveTmpDao;
+	
+	/**
+	 * 查看数据
+	 */
+	ShowData show = new ShowData();
+
+	@Override
+	public boolean moveData(List<DataInfoEntity> data, String dstPath) throws Exception {
+		boolean isSuccess = false;
+		String tailPath = "";
+		if (null != data) {
+			//XXX/320198_16/1,or XXX/320122KFQ_15/1 ---> /320198_16/1, or /320122KFQ_15/1
+			List<DataInfoEntityMoveTmp> exist = dataInfoMoveTmpDao.findAll();
+			List<String> existIds = new ArrayList<String>();
+			if (null != exist) {
+				for (DataInfoEntityMoveTmp dataInfoEntityMoveTmp : exist) {
+					if ("0".equals(dataInfoEntityMoveTmp.getCompleteStatus()) || "1".equals(dataInfoEntityMoveTmp.getCompleteStatus())) {
+						if (null != dataInfoEntityMoveTmp.getDataPath()) {
+							existIds.add(dataInfoEntityMoveTmp.getDataPath());
+						}
+					}
+				}
+			}
+			Pattern pattern = Pattern.compile("\\/\\d+[a-z]*[A-Z]*_\\d+\\/\\d*\\/*$");
+			// 末尾 含有 /
+			Pattern pattern2 = Pattern.compile("\\/$");
+			Matcher matcher2 = pattern2.matcher(dstPath);
+			//去掉 最后 的 / 符合
+			if (matcher2.find()) {
+				dstPath = dstPath.substring(0, dstPath.length()-1);
+			}
+			List<DataInfoEntityMoveTmp> moveList = new ArrayList<DataInfoEntityMoveTmp>();
+			for (DataInfoEntity dataInfoEntity : data) {
+				if (existIds.contains(dataInfoEntity.getDataPath())) {
+					continue;
+				}
+				//TODO 正则:取出 data 的后面 的 路径,eg: XXX/320198_16/1,or XXX/320122KFQ_15/1)
+				Matcher matcher = pattern.matcher(dataInfoEntity.getDataPath());
+				// tailPath 第一个字符是  /  符号取尾:"\\/\\d+[a-z]*[A-Z]*_\\d+\\/\\d*\\/*$"
+				if (matcher.find()) {
+					tailPath = matcher.group();
+				}
+				String finalDestPath = dstPath + tailPath;
+				Matcher matchertmp2 = pattern2.matcher(finalDestPath);
+				//去掉 最后 的 / 符合
+				if (!matchertmp2.find()) {
+					finalDestPath = finalDestPath + "/";
+				}
+				DataInfoEntityMoveTmp dataMove = new DataInfoEntityMoveTmp();
+				dataMove.setSystemCode(dataInfoEntity.getSystemCode());
+				dataMove.setRegionalismCode(dataInfoEntity.getRegionalismCode());
+				dataMove.setDstPath(finalDestPath);
+				dataMove.setLastTime(DateForm.date2StringBysecond(new Date()));
+				dataMove.setFkid(dataInfoEntity.getId());
+				moveList.add(dataMove);
+			}
+			if (moveList.size() > 0) {
+				dataInfoMoveTmpDao.insertBatch(moveList);
+				isSuccess = true;
+			}
+		}
+		return isSuccess;
+	}
+
+	@Override
+	public List<DataInfoEntityMoveTmp> findAll() throws Exception {
+		List<DataInfoEntityMoveTmp> result = new ArrayList<DataInfoEntityMoveTmp>();
+		try {
+			result = dataInfoMoveTmpDao.findAll();
+			
+		} catch (Exception e) {
+			System.err.println(e);
+		}
+		return result;
+	}
+	
+	@Override
+	public int delete(DataInfoEntityMoveTmp dataMove) throws Exception {
+		if ("1".equals(dataMove.getCompleteStatus())) {
+			removeservice.deleteFolder(dataMove.getDstPath());
+		}
+		int result = dataInfoMoveTmpDao.remove(dataMove.getId());
+		return result;
+	}
+
+
+	@Override
+	public int save(DataInfoEntityMoveTmp data) throws Exception {
+		dataInfoMoveTmpDao.save(data);
+		return 0;
+	}
+
+	@Override
+	public int insertBatch(List<DataInfoEntityMoveTmp> list) throws Exception {
+		// TODO Auto-generated method stub
+		return 0;
+	}
+
+	@Override
+	public int update(DataInfoEntityMoveTmp data) throws Exception {
+		int result = dataInfoMoveTmpDao.update(data);
+		return result;
+	}
+	
+}
diff --git a/src/com/platform/service/impl/MySqlServiceImpl.java b/src/com/platform/service/impl/MySqlServiceImpl.java
index 7efaa3f8..b880b9c0 100644
--- a/src/com/platform/service/impl/MySqlServiceImpl.java
+++ b/src/com/platform/service/impl/MySqlServiceImpl.java
@@ -1,56 +1,56 @@
-package com.platform.service.impl;
-
-import java.util.List;
-
-import javax.annotation.Resource;
-
-import org.springframework.stereotype.Service;
-
-import com.platform.dao.GatherOracleDao;
-import com.platform.entities.GatherOracleInfo;
-import com.platform.service.IMySqlService;
-
-@Service(value = "mySqlService")
-public class MySqlServiceImpl implements IMySqlService{
-	
-	@Resource(name = "gatherOracleDao")
-	private GatherOracleDao gatherOracleDao;
-
-	@Override
-	public List<GatherOracleInfo> findAllMySql() throws Exception {
-		List<GatherOracleInfo> result = gatherOracleDao.selectAllOracle();
-		return result;
-	}
-
-	@Override
-	public int deleteMySql(int id) throws Exception {
-		
-		int result = 0;
-		if (id > 0) {
-//			result = gatherOracleDao.deleteOracleById(id);
-			GatherOracleInfo oracle = new GatherOracleInfo();
-			oracle.setId(id);
-			oracle.setRemove("1");
-			result = gatherOracleDao.updateOracleById(oracle );
-		}
-		return result;
-	}
-	
-	public int insertOracle(GatherOracleInfo oracle) throws Exception {
-		int result = gatherOracleDao.insertOracle(oracle);
-		return result;
-	}
-
-	@Override
-	public int updateOracle(GatherOracleInfo oracle) throws Exception {
-		int result;
-		if (oracle.getId() > 0) {
-			result = gatherOracleDao.updateOracleById(oracle);
-		}
-		else {
-			result = gatherOracleDao.insertOracle(oracle);
-		}
-		return result;
-	}
-
-}
+package com.platform.service.impl;
+
+import java.util.List;
+
+import javax.annotation.Resource;
+
+import org.springframework.stereotype.Service;
+
+import com.platform.dao.GatherOracleDao;
+import com.platform.entities.GatherOracleInfo;
+import com.platform.service.IMySqlService;
+
+@Service(value = "mySqlService")
+public class MySqlServiceImpl implements IMySqlService{
+	
+	@Resource(name = "gatherOracleDao")
+	private GatherOracleDao gatherOracleDao;
+
+	@Override
+	public List<GatherOracleInfo> findAllMySql() throws Exception {
+		List<GatherOracleInfo> result = gatherOracleDao.selectAllOracle();
+		return result;
+	}
+
+	@Override
+	public int deleteMySql(int id) throws Exception {
+		
+		int result = 0;
+		if (id > 0) {
+//			result = gatherOracleDao.deleteOracleById(id);
+			GatherOracleInfo oracle = new GatherOracleInfo();
+			oracle.setId(id);
+			oracle.setRemove("1");
+			result = gatherOracleDao.updateOracleById(oracle );
+		}
+		return result;
+	}
+	
+	public int insertOracle(GatherOracleInfo oracle) throws Exception {
+		int result = gatherOracleDao.insertOracle(oracle);
+		return result;
+	}
+
+	@Override
+	public int updateOracle(GatherOracleInfo oracle) throws Exception {
+		int result;
+		if (oracle.getId() > 0) {
+			result = gatherOracleDao.updateOracleById(oracle);
+		}
+		else {
+			result = gatherOracleDao.insertOracle(oracle);
+		}
+		return result;
+	}
+
+}
diff --git a/src/com/platform/service/impl/OracleExtractServiceImpl.java b/src/com/platform/service/impl/OracleExtractServiceImpl.java
index 26c5ba86..9cf58a00 100644
--- a/src/com/platform/service/impl/OracleExtractServiceImpl.java
+++ b/src/com/platform/service/impl/OracleExtractServiceImpl.java
@@ -1,94 +1,94 @@
-package com.platform.service.impl;
-
-import java.sql.Connection;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-import org.springframework.stereotype.Service;
-
-import com.platform.entities.DataInfoEntity;
-import com.platform.entities.GatherOracleInfo;
-import com.platform.entities.OracleConnectorParams;
-import com.platform.oracle.OracleConnector;
-import com.platform.service.IOracleExtractService;
-import com.platform.service.OracleExtractHelper;
-import com.platform.utils.Bean2MapUtils;
-
-@Service(value = "OracleExtract")
-public class OracleExtractServiceImpl implements IOracleExtractService {
-	
-	/**
-	 * 抽取
-	 */
-	private OracleExtractHelper oracleExtract = new OracleExtractHelper(); 
-	
-	/**
-	 * 数据库连接实现类
-	 */
-	private OracleConnector connect = new OracleConnector();
-	
-	@Override
-	public boolean extractOracle(String name, List<Map<String, String>> dataInfoMap,
-			Map<String, String> oracleConnect) throws Exception {
-		boolean isSuccess = false;
-		try{
-			//map转  bean(汇总库信息-带tableName的)
-			GatherOracleInfo oracleModel = (GatherOracleInfo) Bean2MapUtils.convertMap(GatherOracleInfo.class, oracleConnect);
-			
-			//采集库连接参数
-			List<OracleConnectorParams> datainfos = new ArrayList<OracleConnectorParams>();
-			for (Map<String, String> map : dataInfoMap) {
-				OracleConnectorParams dataInfoEntity = (OracleConnectorParams) Bean2MapUtils.convertMap(OracleConnectorParams.class, oracleConnect);
-				datainfos.add(dataInfoEntity);
-			}
-			
-			Connection conn = OracleConnector.ConnectionBuilder("jdbc:oracle:thin:@" + oracleModel.getIp() + ":" + oracleModel.getPort() + "/"
-					+ oracleModel.getDatabaseName(), oracleModel.getUser(), oracleModel.getPassword());
-			
-			for (OracleConnectorParams collectOracle : datainfos) {
-				
-				oracleExtract.createDBLink(conn, collectOracle);
-				oracleExtract.createTableSpace(conn, oracleModel);
-				oracleExtract.createUser(conn, oracleModel);
-				oracleExtract.extractColleDB(conn, collectOracle);
-			}
-			isSuccess = true;
-		}catch(Exception e){
-			
-		}
-		return false;
-	}
-
-//	@Override
-//	public boolean extractOracle(String name, List<OracleConnectorParams> dataInfos, GatherOracleInfo oracleConnect) throws Exception {
-//		boolean isSuccess = false;
-//		try{
-//			//map转  bean(汇总库信息-带tableName的)
-////			GatherOracleInfo oracleModel = (GatherOracleInfo) Bean2MapUtils.convertMap(GatherOracleInfo.class, oracleConnect);
-//			
-//			//采集库连接参数
-////			List<OracleConnectorParams> datainfos = new ArrayList<OracleConnectorParams>();
-////			for (Map<String, String> map : dataInfoMap) {
-////				OracleConnectorParams dataInfoEntity = (OracleConnectorParams) Bean2MapUtils.convertMap(OracleConnectorParams.class, oracleConnect);
-////				datainfos.add(dataInfoEntity);
-////			}
-//			
-//			Connection conn = OracleConnector.ConnectionBuilder("jdbc:oracle:thin:@" + oracleConnect.getIp() + ":" + oracleConnect.getPort() + "/"
-//					+ oracleConnect.getDatabaseName(), oracleConnect.getUser(), oracleConnect.getPassword());
-//			
-//			for (OracleConnectorParams collectOracle : dataInfos) {
-//				
-//				oracleExtract.createDBLink(conn, collectOracle);
-//				oracleExtract.createTableSpace(conn, oracleConnect);
-//				oracleExtract.createUser(conn, oracleConnect);
-//				oracleExtract.extractColleDB(conn, collectOracle);
-//			}
-//			isSuccess = true;
-//		}catch(Exception e){
-//			
-//		}
-//		return false;
-//	}
-
-}
+package com.platform.service.impl;
+
+import java.sql.Connection;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import org.springframework.stereotype.Service;
+
+import com.platform.entities.DataInfoEntity;
+import com.platform.entities.GatherOracleInfo;
+import com.platform.entities.OracleConnectorParams;
+import com.platform.oracle.OracleConnector;
+import com.platform.service.IOracleExtractService;
+import com.platform.service.OracleExtractHelper;
+import com.platform.utils.Bean2MapUtils;
+
+@Service(value = "OracleExtract")
+public class OracleExtractServiceImpl implements IOracleExtractService {
+	
+	/**
+	 * 抽取
+	 */
+	private OracleExtractHelper oracleExtract = new OracleExtractHelper(); 
+	
+	/**
+	 * 数据库连接实现类
+	 */
+	private OracleConnector connect = new OracleConnector();
+	
+	@Override
+	public boolean extractOracle(String name, List<Map<String, String>> dataInfoMap,
+			Map<String, String> oracleConnect) throws Exception {
+		boolean isSuccess = false;
+		try{
+			//map转  bean(汇总库信息-带tableName的)
+			GatherOracleInfo oracleModel = (GatherOracleInfo) Bean2MapUtils.convertMap(GatherOracleInfo.class, oracleConnect);
+			
+			//采集库连接参数
+			List<OracleConnectorParams> datainfos = new ArrayList<OracleConnectorParams>();
+			for (Map<String, String> map : dataInfoMap) {
+				OracleConnectorParams dataInfoEntity = (OracleConnectorParams) Bean2MapUtils.convertMap(OracleConnectorParams.class, oracleConnect);
+				datainfos.add(dataInfoEntity);
+			}
+			
+			Connection conn = OracleConnector.ConnectionBuilder("jdbc:oracle:thin:@" + oracleModel.getIp() + ":" + oracleModel.getPort() + "/"
+					+ oracleModel.getDatabaseName(), oracleModel.getUser(), oracleModel.getPassword());
+			
+			for (OracleConnectorParams collectOracle : datainfos) {
+				
+				oracleExtract.createDBLink(conn, collectOracle);
+				oracleExtract.createTableSpace(conn, oracleModel);
+				oracleExtract.createUser(conn, oracleModel);
+				oracleExtract.extractColleDB(conn, collectOracle);
+			}
+			isSuccess = true;
+		}catch(Exception e){
+			
+		}
+		return false;
+	}
+
+//	@Override
+//	public boolean extractOracle(String name, List<OracleConnectorParams> dataInfos, GatherOracleInfo oracleConnect) throws Exception {
+//		boolean isSuccess = false;
+//		try{
+//			//map转  bean(汇总库信息-带tableName的)
+////			GatherOracleInfo oracleModel = (GatherOracleInfo) Bean2MapUtils.convertMap(GatherOracleInfo.class, oracleConnect);
+//			
+//			//采集库连接参数
+////			List<OracleConnectorParams> datainfos = new ArrayList<OracleConnectorParams>();
+////			for (Map<String, String> map : dataInfoMap) {
+////				OracleConnectorParams dataInfoEntity = (OracleConnectorParams) Bean2MapUtils.convertMap(OracleConnectorParams.class, oracleConnect);
+////				datainfos.add(dataInfoEntity);
+////			}
+//			
+//			Connection conn = OracleConnector.ConnectionBuilder("jdbc:oracle:thin:@" + oracleConnect.getIp() + ":" + oracleConnect.getPort() + "/"
+//					+ oracleConnect.getDatabaseName(), oracleConnect.getUser(), oracleConnect.getPassword());
+//			
+//			for (OracleConnectorParams collectOracle : dataInfos) {
+//				
+//				oracleExtract.createDBLink(conn, collectOracle);
+//				oracleExtract.createTableSpace(conn, oracleConnect);
+//				oracleExtract.createUser(conn, oracleConnect);
+//				oracleExtract.extractColleDB(conn, collectOracle);
+//			}
+//			isSuccess = true;
+//		}catch(Exception e){
+//			
+//		}
+//		return false;
+//	}
+
+}
diff --git a/src/com/platform/service/thread/ThreadMoveData.java b/src/com/platform/service/thread/ThreadMoveData.java
index 4096107d..bd36220b 100644
--- a/src/com/platform/service/thread/ThreadMoveData.java
+++ b/src/com/platform/service/thread/ThreadMoveData.java
@@ -1,189 +1,189 @@
-package com.platform.service.thread;
-
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import javax.annotation.Resource;
-
-import org.apache.log4j.Logger;
-import org.springframework.scheduling.annotation.Scheduled;
-import org.springframework.stereotype.Component;
-import org.springframework.stereotype.Service;
-
-import com.platform.dao.DataInfoDao;
-import com.platform.dao.DataInfoMoveTmpDao;
-import com.platform.dao.GatherOracleDao;
-import com.platform.entities.DataInfoEntity;
-import com.platform.entities.DataInfoEntityMoveTmp;
-import com.platform.entities.GatherOracleInfo;
-import com.platform.glusterfs.CheckoutMD5;
-import com.platform.glusterfs.CopyData;
-import com.platform.glusterfs.ShowData;
-import com.platform.service.DataInfoService;
-import com.platform.service.DataInfoServiceImp;
-import com.platform.service.IMoveDataService;
-import com.platform.service.impl.MoveDataServiceImpl;
-import com.platform.utils.Bean2MapUtils;
-import com.platform.utils.Constant;
-import com.platform.utils.DateForm;
-
-@Component
-public class ThreadMoveData{
-	
-	public static Logger log = Logger.getLogger(ThreadMoveData.class);
-	
-	@Resource(name = "dataInfoDao")
-	private DataInfoDao dataInfoDao;
-	
-	/**
-	 * 迁移
-	 */
-	CopyData copy = new CopyData();
-	
-	/**
-	 * MD5校验
-	 */
-	CheckoutMD5 check = new CheckoutMD5();
-	
-	@Resource(name = "dataInfoMoveTmpDao")
-	private DataInfoMoveTmpDao dataInfoMoveTmpDao;
-	
-	/**
-	 * 查看数据
-	 */
-	ShowData show = new ShowData();
-	
-	/**
-	 * : 实时更新数据库--根据查询到的 正则迁移的数据
-	 */
-	public ThreadMoveData() {
-	}
-	
-	//5秒
-	@Scheduled(fixedDelay = 5000)
-	public void doSomething() { 
-
-		try {
-			List<DataInfoEntityMoveTmp> result = null;
-			//查询  表  move_data_tmp
-			result = dataInfoMoveTmpDao.findAll();
-			if (null != result) {
-				//gfs  获取size,
-				int rsize = result.size();
-				boolean isNoMove = true;
-				//该循环必须  循环每个,不能有 break;
-				//  rate:大小:假的,待换成真实比例
-				double realRate = 0.00;
-				int moveFileCurrNum = 0;
-				for (int i = 0; i < rsize; i++) {
-					DataInfoEntityMoveTmp dataMove = result.get(i);
-					//如果拷贝进度超过20分钟未进行-- 判断为 迁移失败。
-					// "1" :正在上传,0:等待 迁移, 2:成功 3:失败
-					if ("1".equals(dataMove.getCompleteStatus())) {
-						long nowTime = new Date().getTime();
-						long timelong = nowTime - DateForm.string2DateBysecond(dataMove.getLastTime()).getTime();
-						if (timelong > 1000*60*20) {
-							dataMove.setCompleteStatus("3");
-							dataInfoMoveTmpDao.update(dataMove);
-						}
-						//正在上传的个数。
-						moveFileCurrNum++;
-						if (moveFileCurrNum >= Constant.moveFileMaxNum) {
-							isNoMove = false;
-						}
-						// 查询大小:。//gfs  获取size,
-						long srcSize = show.getFolderSize(dataMove.getDataPath());
-						long dstSize = show.getFolderSize(dataMove.getDstPath());
-						if (srcSize < 0) {
-							log.error(dataMove.getDataPath() + " : 路径不存在! ");
-							continue;
-						}
-						if (dstSize < 0) {
-							log.error(dataMove.getDstPath() + " : 路径不存在! ");
-							continue;
-						}
-						if (srcSize > 0 && dstSize > 0) {
-							realRate = (dstSize*100 / srcSize );
-							dataMove.setLastTime(DateForm.date2StringBysecond(new Date()));
-						}
-						if (srcSize == dstSize) {
-							realRate = 100;
-						}
-						dataMove.setRate((int) realRate);
-					}
-					if("1".equals(dataMove.getCompleteStatus()) && dataMove.getRate() > 0){
-						//传输完毕:进行校验
-						if (realRate == 100) {
-							//TODO 进行MD5校验
-							int resl = check.checkoutMD5Folder(dataMove.getDataPath(), dataMove.getDstPath());
-							//TODO 校验成功--则删除数据库记录
-							if(resl == 1){
-								//校验成功--修改 数据库记录--
-								dataMove.setCompleteStatus("2");
-								dataMove.setLastTime(DateForm.date2StringBysecond(new Date()));
-								dataInfoMoveTmpDao.update(dataMove);
-								//TODO 新增 一条数据-到-dataInfo
-								DataInfoEntity data = (DataInfoEntity) Bean2MapUtils.convertMap(
-										DataInfoEntity.class, Bean2MapUtils.convertBean(dataMove));
-								data.setDataPath(dataMove.getDstPath());
-								data.setVolumeIp(dataMove.getDstVolumeIp());
-								data.setVolumePath(dataMove.getDstVolumePath());
-								data.setYear(DateForm.date2StringByMin(new Date()));
-								dataInfoDao.save(data);
-							}
-							else {
-								// 3:表示 迁移失败
-								dataMove.setCompleteStatus("3");
-							}
-						}
-						dataMove.setLastTime(DateForm.date2StringBysecond(new Date()));
-						dataInfoMoveTmpDao.update(dataMove);
-					}
-				}
-				//循环 完了, 确定没有上传的 ,没有正在上传的
-				if (isNoMove) {
-					//查询  表  move_data_tmp
-					result = dataInfoMoveTmpDao.findAll();
-					if (null != result) {
-						
-						int tmpsize = result.size();
-						// 上传下一个后
-						for (int i = 0; i < tmpsize; i++) {
-							DataInfoEntityMoveTmp next2move = result.get(i);
-							//如果是  待 迁移状态的 
-							if ("0".equals(next2move.getCompleteStatus())) {
-								//待迁移的数据 -- 开始迁移
-								// 末尾 含有 /
-								Pattern pattern2 = Pattern.compile("\\/$");
-								String dstPath = next2move.getDataPath();
-								Matcher matcher2 = pattern2.matcher(dstPath);
-								//去掉 最后 的 / 符合
-								if (matcher2.find()) {
-									dstPath = dstPath.substring(0, dstPath.length()-1);
-								}
-								//数据迁移。
-								copy.copyFolder(dstPath+"/app", next2move.getDstPath());
-								// "1" :正在上传,0:等待 迁移, 2:成功 3:失败
-								next2move.setCompleteStatus("1");
-								next2move.setLastTime(DateForm.date2StringBysecond(new Date()));
-								//更新sql
-								dataInfoMoveTmpDao.update(next2move);
-								break;
-							}
-						}
-					}
-				}
-			}
-		
-			Thread.sleep(Constant.update_dataInfo_sleep_time);
-		} catch (Exception e) {
-			System.err.println(e);
-		}
-		
-	}
-
-}
+package com.platform.service.thread;
+
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import javax.annotation.Resource;
+
+import org.apache.log4j.Logger;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+import org.springframework.stereotype.Service;
+
+import com.platform.dao.DataInfoDao;
+import com.platform.dao.DataInfoMoveTmpDao;
+import com.platform.dao.GatherOracleDao;
+import com.platform.entities.DataInfoEntity;
+import com.platform.entities.DataInfoEntityMoveTmp;
+import com.platform.entities.GatherOracleInfo;
+import com.platform.glusterfs.CheckoutMD5;
+import com.platform.glusterfs.CopyData;
+import com.platform.glusterfs.ShowData;
+import com.platform.service.DataInfoService;
+import com.platform.service.DataInfoServiceImp;
+import com.platform.service.IMoveDataService;
+import com.platform.service.impl.MoveDataServiceImpl;
+import com.platform.utils.Bean2MapUtils;
+import com.platform.utils.Constant;
+import com.platform.utils.DateForm;
+
+@Component
+public class ThreadMoveData{
+	
+	public static Logger log = Logger.getLogger(ThreadMoveData.class);
+	
+	@Resource(name = "dataInfoDao")
+	private DataInfoDao dataInfoDao;
+	
+	/**
+	 * 迁移
+	 */
+	CopyData copy = new CopyData();
+	
+	/**
+	 * MD5校验
+	 */
+	CheckoutMD5 check = new CheckoutMD5();
+	
+	@Resource(name = "dataInfoMoveTmpDao")
+	private DataInfoMoveTmpDao dataInfoMoveTmpDao;
+	
+	/**
+	 * 查看数据
+	 */
+	ShowData show = new ShowData();
+	
+	/**
+	 * : 实时更新数据库--根据查询到的 正则迁移的数据
+	 */
+	public ThreadMoveData() {
+	}
+	
+	//5秒
+	@Scheduled(fixedDelay = 5000)
+	public void doSomething() { 
+
+		try {
+			List<DataInfoEntityMoveTmp> result = null;
+			//查询  表  move_data_tmp
+			result = dataInfoMoveTmpDao.findAll();
+			if (null != result) {
+				//gfs  获取size,
+				int rsize = result.size();
+				boolean isNoMove = true;
+				//该循环必须  循环每个,不能有 break;
+				//  rate:大小:假的,待换成真实比例
+				double realRate = 0.00;
+				int moveFileCurrNum = 0;
+				for (int i = 0; i < rsize; i++) {
+					DataInfoEntityMoveTmp dataMove = result.get(i);
+					//如果拷贝进度超过20分钟未进行-- 判断为 迁移失败。
+					// "1" :正在上传,0:等待 迁移, 2:成功 3:失败
+					if ("1".equals(dataMove.getCompleteStatus())) {
+						long nowTime = new Date().getTime();
+						long timelong = nowTime - DateForm.string2DateBysecond(dataMove.getLastTime()).getTime();
+						if (timelong > 1000*60*20) {
+							dataMove.setCompleteStatus("3");
+							dataInfoMoveTmpDao.update(dataMove);
+						}
+						//正在上传的个数。
+						moveFileCurrNum++;
+						if (moveFileCurrNum >= Constant.moveFileMaxNum) {
+							isNoMove = false;
+						}
+						// 查询大小:。//gfs  获取size,
+						long srcSize = show.getFolderSize(dataMove.getDataPath());
+						long dstSize = show.getFolderSize(dataMove.getDstPath());
+						if (srcSize < 0) {
+							log.error(dataMove.getDataPath() + " : 路径不存在! ");
+							continue;
+						}
+						if (dstSize < 0) {
+							log.error(dataMove.getDstPath() + " : 路径不存在! ");
+							continue;
+						}
+						if (srcSize > 0 && dstSize > 0) {
+							realRate = (dstSize*100 / srcSize );
+							dataMove.setLastTime(DateForm.date2StringBysecond(new Date()));
+						}
+						if (srcSize == dstSize) {
+							realRate = 100;
+						}
+						dataMove.setRate((int) realRate);
+					}
+					if("1".equals(dataMove.getCompleteStatus()) && dataMove.getRate() > 0){
+						//传输完毕:进行校验
+						if (realRate == 100) {
+							//TODO 进行MD5校验
+							int resl = check.checkoutMD5Folder(dataMove.getDataPath(), dataMove.getDstPath());
+							//TODO 校验成功--则删除数据库记录
+							if(resl == 1){
+								//校验成功--修改 数据库记录--
+								dataMove.setCompleteStatus("2");
+								dataMove.setLastTime(DateForm.date2StringBysecond(new Date()));
+								dataInfoMoveTmpDao.update(dataMove);
+								//TODO 新增 一条数据-到-dataInfo
+								DataInfoEntity data = (DataInfoEntity) Bean2MapUtils.convertMap(
+										DataInfoEntity.class, Bean2MapUtils.convertBean(dataMove));
+								data.setDataPath(dataMove.getDstPath());
+								data.setVolumeIp(dataMove.getDstVolumeIp());
+								data.setVolumePath(dataMove.getDstVolumePath());
+								data.setYear(DateForm.date2StringByMin(new Date()));
+								dataInfoDao.save(data);
+							}
+							else {
+								// 3:表示 迁移失败
+								dataMove.setCompleteStatus("3");
+							}
+						}
+						dataMove.setLastTime(DateForm.date2StringBysecond(new Date()));
+						dataInfoMoveTmpDao.update(dataMove);
+					}
+				}
+				//循环 完了, 确定没有上传的 ,没有正在上传的
+				if (isNoMove) {
+					//查询  表  move_data_tmp
+					result = dataInfoMoveTmpDao.findAll();
+					if (null != result) {
+						
+						int tmpsize = result.size();
+						// 上传下一个后
+						for (int i = 0; i < tmpsize; i++) {
+							DataInfoEntityMoveTmp next2move = result.get(i);
+							//如果是  待 迁移状态的 
+							if ("0".equals(next2move.getCompleteStatus())) {
+								//待迁移的数据 -- 开始迁移
+								// 末尾 含有 /
+								Pattern pattern2 = Pattern.compile("\\/$");
+								String dstPath = next2move.getDataPath();
+								Matcher matcher2 = pattern2.matcher(dstPath);
+								//去掉 最后 的 / 符合
+								if (matcher2.find()) {
+									dstPath = dstPath.substring(0, dstPath.length()-1);
+								}
+								//数据迁移。
+								copy.copyFolder(dstPath+"/app", next2move.getDstPath());
+								// "1" :正在上传,0:等待 迁移, 2:成功 3:失败
+								next2move.setCompleteStatus("1");
+								next2move.setLastTime(DateForm.date2StringBysecond(new Date()));
+								//更新sql
+								dataInfoMoveTmpDao.update(next2move);
+								break;
+							}
+						}
+					}
+				}
+			}
+		
+			Thread.sleep(Constant.update_dataInfo_sleep_time);
+		} catch (Exception e) {
+			System.err.println(e);
+		}
+		
+	}
+
+}
diff --git a/src/com/platform/service/thread/TreadMoveData2Start.java b/src/com/platform/service/thread/TreadMoveData2Start.java
index 0e403186..91f9bb92 100644
--- a/src/com/platform/service/thread/TreadMoveData2Start.java
+++ b/src/com/platform/service/thread/TreadMoveData2Start.java
@@ -1,47 +1,47 @@
-package com.platform.service.thread;
-
-import java.util.List;
-
-import javax.annotation.Resource;
-
-import org.springframework.stereotype.Service;
-
-import com.platform.dao.DataInfoMoveTmpDao;
-import com.platform.entities.DataInfoEntityMoveTmp;
-import com.platform.service.IMoveDataService;
-import com.platform.service.impl.MoveDataServiceImpl;
-import com.platform.utils.Constant;
-
-public class TreadMoveData2Start extends Thread{
-	
-	
-	private IMoveDataService dataInfoMove= new MoveDataServiceImpl();
-	
-	public TreadMoveData2Start() {
-	}
-	
-	@Override
-	public void run() {
-		boolean isBreak = false;
-		while(true){
-			if (isBreak) {
-				break;
-			}
-			try {
-				List<DataInfoEntityMoveTmp> resultlist = dataInfoMove.findAll();
-				for (DataInfoEntityMoveTmp moveEntity : resultlist) {
-					if ("1".equals(moveEntity.getCompleteStatus())) {
-						moveEntity.setCompleteStatus("3");
-						dataInfoMove.update(moveEntity);
-					}
-				}
-				isBreak = true;
-				Thread.sleep(Constant.update_dataInfo_sleep_time);
-			} catch (Exception e) {
-				// TODO Auto-generated catch block
-				e.printStackTrace();
-			}
-		}
-	}
-
-}
+package com.platform.service.thread;
+
+import java.util.List;
+
+import javax.annotation.Resource;
+
+import org.springframework.stereotype.Service;
+
+import com.platform.dao.DataInfoMoveTmpDao;
+import com.platform.entities.DataInfoEntityMoveTmp;
+import com.platform.service.IMoveDataService;
+import com.platform.service.impl.MoveDataServiceImpl;
+import com.platform.utils.Constant;
+
+public class TreadMoveData2Start extends Thread{
+	
+	
+	private IMoveDataService dataInfoMove= new MoveDataServiceImpl();
+	
+	public TreadMoveData2Start() {
+	}
+	
+	@Override
+	public void run() {
+		boolean isBreak = false;
+		while(true){
+			if (isBreak) {
+				break;
+			}
+			try {
+				List<DataInfoEntityMoveTmp> resultlist = dataInfoMove.findAll();
+				for (DataInfoEntityMoveTmp moveEntity : resultlist) {
+					if ("1".equals(moveEntity.getCompleteStatus())) {
+						moveEntity.setCompleteStatus("3");
+						dataInfoMove.update(moveEntity);
+					}
+				}
+				isBreak = true;
+				Thread.sleep(Constant.update_dataInfo_sleep_time);
+			} catch (Exception e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			}
+		}
+	}
+
+}
diff --git a/src/com/platform/utils/Bean2MapUtils.java b/src/com/platform/utils/Bean2MapUtils.java
index fd479317..7fea556d 100644
--- a/src/com/platform/utils/Bean2MapUtils.java
+++ b/src/com/platform/utils/Bean2MapUtils.java
@@ -1,87 +1,87 @@
-package com.platform.utils;
-
-import java.beans.BeanInfo;
-import java.beans.IntrospectionException;
-import java.beans.Introspector;
-import java.beans.PropertyDescriptor;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.util.HashMap;
-import java.util.Map;
-
-public class Bean2MapUtils {
-	    
-    /**
-     * 将一个 Map 对象转化为一个 JavaBean
-     * @param type 要转化的类型
-     * @param map 包含属性值的 map
-     * @return 转化出来的 JavaBean 对象
-     * @throws IntrospectionException
-     *             如果分析类属性失败
-     * @throws IllegalAccessException
-     *             如果实例化 JavaBean 失败
-     * @throws InstantiationException
-     *             如果实例化 JavaBean 失败
-     * @throws InvocationTargetException
-     *             如果调用属性的 setter 方法失败
-     */
-    public static Object convertMap(Class type, Map map)
-            throws IntrospectionException, IllegalAccessException,
-            InstantiationException, InvocationTargetException {
-        BeanInfo beanInfo = Introspector.getBeanInfo(type); // 获取类属性
-        Object obj = type.newInstance(); // 创建 JavaBean 对象
-
-        // 给 JavaBean 对象的属性赋值
-        PropertyDescriptor[] propertyDescriptors =  beanInfo.getPropertyDescriptors();
-        for (int i = 0; i< propertyDescriptors.length; i++) {
-            PropertyDescriptor descriptor = propertyDescriptors[i];
-            String propertyName = descriptor.getName();
-            try{
-	            if (map.containsKey(propertyName)) {
-	                // 下面一句可以 try 起来,这样当一个属性赋值失败的时候就不会影响其他属性赋值。
-	                Object value = map.get(propertyName);
-
-	                Object[] args = new Object[1];
-	                args[0] = value;
-
-	                descriptor.getWriteMethod().invoke(obj, args);
-	            }
-            }
-            catch(Exception e){
-            	
-            }
-        }
-        return obj;
-    }
-
-    /**
-     * 将一个 JavaBean 对象转化为一个  Map
-     * @param bean 要转化的JavaBean 对象
-     * @return 转化出来的  Map 对象
-     * @throws IntrospectionException 如果分析类属性失败
-     * @throws IllegalAccessException 如果实例化 JavaBean 失败
-     * @throws InvocationTargetException 如果调用属性的 setter 方法失败
-     */
-    public static Map convertBean(Object bean)
-            throws IntrospectionException, IllegalAccessException, InvocationTargetException {
-        Class type = bean.getClass();
-        Map returnMap = new HashMap();
-        BeanInfo beanInfo = Introspector.getBeanInfo(type);
-
-        PropertyDescriptor[] propertyDescriptors =  beanInfo.getPropertyDescriptors();
-        for (int i = 0; i< propertyDescriptors.length; i++) {
-            PropertyDescriptor descriptor = propertyDescriptors[i];
-            String propertyName = descriptor.getName();
-            if (!propertyName.equals("class")) {
-                Method readMethod = descriptor.getReadMethod();
-                Object result = readMethod.invoke(bean, new Object[0]);
-                if (result != null) {
-                    returnMap.put(propertyName, result);
-                } else {
-                    returnMap.put(propertyName, "");
-                }
-            }
-        }
-        return returnMap;
-    }
-}
+package com.platform.utils;
+
+import java.beans.BeanInfo;
+import java.beans.IntrospectionException;
+import java.beans.Introspector;
+import java.beans.PropertyDescriptor;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.HashMap;
+import java.util.Map;
+
+public class Bean2MapUtils {
+	    
+    /**
+     * 将一个 Map 对象转化为一个 JavaBean
+     * @param type 要转化的类型
+     * @param map 包含属性值的 map
+     * @return 转化出来的 JavaBean 对象
+     * @throws IntrospectionException
+     *             如果分析类属性失败
+     * @throws IllegalAccessException
+     *             如果实例化 JavaBean 失败
+     * @throws InstantiationException
+     *             如果实例化 JavaBean 失败
+     * @throws InvocationTargetException
+     *             如果调用属性的 setter 方法失败
+     */
+    public static Object convertMap(Class type, Map map)
+            throws IntrospectionException, IllegalAccessException,
+            InstantiationException, InvocationTargetException {
+        BeanInfo beanInfo = Introspector.getBeanInfo(type); // 获取类属性
+        Object obj = type.newInstance(); // 创建 JavaBean 对象
+
+        // 给 JavaBean 对象的属性赋值
+        PropertyDescriptor[] propertyDescriptors =  beanInfo.getPropertyDescriptors();
+        for (int i = 0; i< propertyDescriptors.length; i++) {
+            PropertyDescriptor descriptor = propertyDescriptors[i];
+            String propertyName = descriptor.getName();
+            try{
+	            if (map.containsKey(propertyName)) {
+	                // 下面一句可以 try 起来,这样当一个属性赋值失败的时候就不会影响其他属性赋值。
+	                Object value = map.get(propertyName);
+
+	                Object[] args = new Object[1];
+	                args[0] = value;
+
+	                descriptor.getWriteMethod().invoke(obj, args);
+	            }
+            }
+            catch(Exception e){
+            	
+            }
+        }
+        return obj;
+    }
+
+    /**
+     * 将一个 JavaBean 对象转化为一个  Map
+     * @param bean 要转化的JavaBean 对象
+     * @return 转化出来的  Map 对象
+     * @throws IntrospectionException 如果分析类属性失败
+     * @throws IllegalAccessException 如果实例化 JavaBean 失败
+     * @throws InvocationTargetException 如果调用属性的 setter 方法失败
+     */
+    public static Map convertBean(Object bean)
+            throws IntrospectionException, IllegalAccessException, InvocationTargetException {
+        Class type = bean.getClass();
+        Map returnMap = new HashMap();
+        BeanInfo beanInfo = Introspector.getBeanInfo(type);
+
+        PropertyDescriptor[] propertyDescriptors =  beanInfo.getPropertyDescriptors();
+        for (int i = 0; i< propertyDescriptors.length; i++) {
+            PropertyDescriptor descriptor = propertyDescriptors[i];
+            String propertyName = descriptor.getName();
+            if (!propertyName.equals("class")) {
+                Method readMethod = descriptor.getReadMethod();
+                Object result = readMethod.invoke(bean, new Object[0]);
+                if (result != null) {
+                    returnMap.put(propertyName, result);
+                } else {
+                    returnMap.put(propertyName, "");
+                }
+            }
+        }
+        return returnMap;
+    }
+}
diff --git a/src/com/platform/utils/ConfigLoder.java b/src/com/platform/utils/ConfigLoder.java
index 3d1e470a..ce3b30a0 100644
--- a/src/com/platform/utils/ConfigLoder.java
+++ b/src/com/platform/utils/ConfigLoder.java
@@ -1,84 +1,84 @@
-package com.platform.utils;
-
-import java.io.BufferedInputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Properties;
-
-import org.apache.commons.lang.StringUtils;
-
-public class ConfigLoder {
-	private String configPath;
-	private volatile static ConfigLoder configLoder;
-
-	private ConfigLoder(String configPath) {
-		this.configPath = configPath;
-	}
-
-	public static ConfigLoder Builder(String configPtah) {
-		if (null == configLoder) {
-			synchronized (ConfigLoder.class) {
-				if (null == configLoder)
-					configLoder = new ConfigLoder(configPtah);
-			}
-		}
-		return configLoder;
-	}
-
-	/**
-	 * 读取文Property中的属性值
-	 * 
-	 * @param key
-	 * @return
-	 */
-	public String getProperty(String key) {
-		String value = null;
-		if (StringUtils.isEmpty(key))
-			return value;
-
-		try {
-			InputStream is = new BufferedInputStream(new FileInputStream(
-					new File(configPath)));
-			Properties properties = new Properties();
-			properties.load(is);
-			value = properties.getProperty(key);
-		} catch (FileNotFoundException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		} catch (IOException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		return value;
-	}
-
-	public Properties getProperties() {
-		Properties properties = null;
-		try {
-			InputStream is;
-			properties = new Properties();
-			is = new BufferedInputStream(new FileInputStream(new File(
-					configPath)));
-			properties.load(is);
-		} catch (FileNotFoundException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		} catch (IOException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		return properties;
-	}
-
-	public String getConfigPath() {
-		return configPath;
-	}
-
-	public void setConfigPath(String configPath) {
-		this.configPath = configPath;
-	}
-
-}
+package com.platform.utils;
+
+import java.io.BufferedInputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Properties;
+
+import org.apache.commons.lang.StringUtils;
+
+public class ConfigLoder {
+	private String configPath;
+	private volatile static ConfigLoder configLoder;
+
+	private ConfigLoder(String configPath) {
+		this.configPath = configPath;
+	}
+
+	public static ConfigLoder Builder(String configPtah) {
+		if (null == configLoder) {
+			synchronized (ConfigLoder.class) {
+				if (null == configLoder)
+					configLoder = new ConfigLoder(configPtah);
+			}
+		}
+		return configLoder;
+	}
+
+	/**
+	 * 读取文Property中的属性值
+	 * 
+	 * @param key
+	 * @return
+	 */
+	public String getProperty(String key) {
+		String value = null;
+		if (StringUtils.isEmpty(key))
+			return value;
+
+		try {
+			InputStream is = new BufferedInputStream(new FileInputStream(
+					new File(configPath)));
+			Properties properties = new Properties();
+			properties.load(is);
+			value = properties.getProperty(key);
+		} catch (FileNotFoundException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		} catch (IOException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+		return value;
+	}
+
+	public Properties getProperties() {
+		Properties properties = null;
+		try {
+			InputStream is;
+			properties = new Properties();
+			is = new BufferedInputStream(new FileInputStream(new File(
+					configPath)));
+			properties.load(is);
+		} catch (FileNotFoundException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		} catch (IOException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+		return properties;
+	}
+
+	public String getConfigPath() {
+		return configPath;
+	}
+
+	public void setConfigPath(String configPath) {
+		this.configPath = configPath;
+	}
+
+}
diff --git a/src/com/platform/utils/ConfigPropertyReader.java b/src/com/platform/utils/ConfigPropertyReader.java
index 880a9c34..d2a3bd9b 100644
--- a/src/com/platform/utils/ConfigPropertyReader.java
+++ b/src/com/platform/utils/ConfigPropertyReader.java
@@ -1,84 +1,84 @@
-package com.platform.utils;
-
-import java.io.BufferedInputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Properties;
-
-import org.apache.commons.lang.StringUtils;
-
-public class ConfigPropertyReader {
-	private String configPath;
-	private volatile static ConfigPropertyReader configLoder;
-
-	private ConfigPropertyReader(String configPath) {
-		this.configPath = configPath;
-	}
-
-	public static ConfigPropertyReader Builder(String configPtah) {
-		if (null == configLoder) {
-			synchronized (ConfigPropertyReader.class) {
-				if (null == configLoder)
-					configLoder = new ConfigPropertyReader(configPtah);
-			}
-		}
-		return configLoder;
-	}
-
-	/**
-	 * 读取文Property中的属性值
-	 * 
-	 * @param key
-	 * @return
-	 */
-	public synchronized String getProperty(String key) {
-		String value = null;
-		if (StringUtils.isEmpty(key))
-			return value;
-
-		try {
-			InputStream is = new BufferedInputStream(new FileInputStream(
-					new File(configPath)));
-			Properties properties = new Properties();
-			properties.load(is);
-			value = properties.getProperty(key);
-		} catch (FileNotFoundException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		} catch (IOException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		return value;
-	}
-
-	public Properties getProperties() {
-		Properties properties = null;
-		try {
-			InputStream is;
-			properties = new Properties();
-			is = new BufferedInputStream(new FileInputStream(new File(
-					configPath)));
-			properties.load(is);
-		} catch (FileNotFoundException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		} catch (IOException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		return properties;
-	}
-
-	public String getConfigPath() {
-		return configPath;
-	}
-
-	public void setConfigPath(String configPath) {
-		this.configPath = configPath;
-	}
-
-}
+package com.platform.utils;
+
+import java.io.BufferedInputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Properties;
+
+import org.apache.commons.lang.StringUtils;
+
+public class ConfigPropertyReader {
+	private String configPath;
+	private volatile static ConfigPropertyReader configLoder;
+
+	private ConfigPropertyReader(String configPath) {
+		this.configPath = configPath;
+	}
+
+	public static ConfigPropertyReader Builder(String configPtah) {
+		if (null == configLoder) {
+			synchronized (ConfigPropertyReader.class) {
+				if (null == configLoder)
+					configLoder = new ConfigPropertyReader(configPtah);
+			}
+		}
+		return configLoder;
+	}
+
+	/**
+	 * 读取文Property中的属性值
+	 * 
+	 * @param key
+	 * @return
+	 */
+	public synchronized String getProperty(String key) {
+		String value = null;
+		if (StringUtils.isEmpty(key))
+			return value;
+
+		try {
+			InputStream is = new BufferedInputStream(new FileInputStream(
+					new File(configPath)));
+			Properties properties = new Properties();
+			properties.load(is);
+			value = properties.getProperty(key);
+		} catch (FileNotFoundException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		} catch (IOException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+		return value;
+	}
+
+	public Properties getProperties() {
+		Properties properties = null;
+		try {
+			InputStream is;
+			properties = new Properties();
+			is = new BufferedInputStream(new FileInputStream(new File(
+					configPath)));
+			properties.load(is);
+		} catch (FileNotFoundException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		} catch (IOException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+		return properties;
+	}
+
+	public String getConfigPath() {
+		return configPath;
+	}
+
+	public void setConfigPath(String configPath) {
+		this.configPath = configPath;
+	}
+
+}
diff --git a/src/com/platform/utils/Configs.java b/src/com/platform/utils/Configs.java
index 2160662d..bb2afede 100644
--- a/src/com/platform/utils/Configs.java
+++ b/src/com/platform/utils/Configs.java
@@ -1,52 +1,52 @@
-package com.platform.utils;
-
-import org.apache.log4j.Logger;
-
-public class Configs {
-	
-	/** 全局自定义异常--编码  */
-	public static final String GLOBAL_EXP_CUSTOM = "3001001001";
-	
-	/** 全局非自定义异常--编码  */
-	public static final String GLOBAL_EXP_NOT_CUSTOM = "3001001002";
-	
-	public static final String CONFIG_LOCALTION = "WebContent/WEB-INF/config/config.properties";
-
-	public static final Logger CONSOLE_LOGGER = Logger.getLogger("console");
-
-	public static final Logger DAILY_ROLLING_LOGGER = Logger
-			.getLogger("dailyRollingFile");
-
-	public static final Logger DAILY_LOGGER = Logger.getLogger("railyFile");
-
-	public static final Logger LOGGER = Logger.getLogger(Configs.class);
-
-	public static String KUBE_MASTER_URL = "http://192.168.0.113:8080/"; // kubernetes集群的maser
-																			// URl
-
-	public static int ORACLE_DEFAULT_PORT = 1521; // oracle的默认端口号
-
-	public static String COLLECT_USER_NAME = "system"; //采集统一的登入用户名
-
-	public static String COLLECT_PASSWORD = "oracle"; //采集统一的登入密码
-
-	public static String COLLECT_SERVICE_NAME = "orcl"; //采集库统一的服务名
-	
-	public static String GATHER_PORT ="1521"; //汇总库的端口号
-	
-	public static String GATHER_USER_NAME = "system"; //汇总库的登入用户名
-	
-	public static String GATHER_USER_PASSWORD = "1"; //汇总库的登入密码
-	
-	public static String GATHER_SERVICE_NAME = "orcl"; //汇总库的服务名
-	
-	public static String TABLE_SUFFIX = "_20152016";  //汇总库汇总表的后缀名	
-	
-	public static String EXTRACT_LOG_LOCALTION = "/home/log"; //数据汇总日志保存位置
-	
-	public static String GATHER_TABLESPACE_NAME=""; //表空间名
-	
-	public static String GATHER_TABLESPACE_PATH=""; //表空间路径
-	
-	public static String GATHER_TABLE_PASSWORD=""; //登入密码
-}
+package com.platform.utils;
+
+import org.apache.log4j.Logger;
+
+public class Configs {
+	
+	/** 全局自定义异常--编码  */
+	public static final String GLOBAL_EXP_CUSTOM = "3001001001";
+	
+	/** 全局非自定义异常--编码  */
+	public static final String GLOBAL_EXP_NOT_CUSTOM = "3001001002";
+	
+	public static final String CONFIG_LOCALTION = "WebContent/WEB-INF/config/config.properties";
+
+	public static final Logger CONSOLE_LOGGER = Logger.getLogger("console");
+
+	public static final Logger DAILY_ROLLING_LOGGER = Logger
+			.getLogger("dailyRollingFile");
+
+	public static final Logger DAILY_LOGGER = Logger.getLogger("railyFile");
+
+	public static final Logger LOGGER = Logger.getLogger(Configs.class);
+
+	public static String KUBE_MASTER_URL = "http://192.168.0.113:8080/"; // kubernetes集群的maser
+																			// URl
+
+	public static int ORACLE_DEFAULT_PORT = 1521; // oracle的默认端口号
+
+	public static String COLLECT_USER_NAME = "system"; //采集统一的登入用户名
+
+	public static String COLLECT_PASSWORD = "oracle"; //采集统一的登入密码
+
+	public static String COLLECT_SERVICE_NAME = "orcl"; //采集库统一的服务名
+	
+	public static String GATHER_PORT ="1521"; //汇总库的端口号
+	
+	public static String GATHER_USER_NAME = "system"; //汇总库的登入用户名
+	
+	public static String GATHER_USER_PASSWORD = "1"; //汇总库的登入密码
+	
+	public static String GATHER_SERVICE_NAME = "orcl"; //汇总库的服务名
+	
+	public static String TABLE_SUFFIX = "_20152016";  //汇总库汇总表的后缀名	
+	
+	public static String EXTRACT_LOG_LOCALTION = "/home/log"; //数据汇总日志保存位置
+	
+	public static String GATHER_TABLESPACE_NAME=""; //表空间名
+	
+	public static String GATHER_TABLESPACE_PATH=""; //表空间路径
+	
+	public static String GATHER_TABLE_PASSWORD=""; //登入密码
+}
diff --git a/src/com/platform/utils/DateForm.java b/src/com/platform/utils/DateForm.java
index db66520f..c6531466 100644
--- a/src/com/platform/utils/DateForm.java
+++ b/src/com/platform/utils/DateForm.java
@@ -1,137 +1,137 @@
-package com.platform.utils;
-
-import java.text.DateFormat;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
-public class DateForm {
-	
-	private static final String date_format_second = "yyyy-MM-dd HH:mm:ss";
-	
-	private static final String date_format_second_non = "yyyy-MM-dd_HH-mm-ss";
-	
-	private static final String data_format_min = "yyyy-MM-dd HH:mm";
-	
-	private static final String data_format_day = "yyyy-MM-dd";
-	
-    private static ThreadLocal<DateFormat> threadLocal_second = new ThreadLocal<DateFormat>();
-    
-    private static ThreadLocal<DateFormat> threadLocal_second_non = new ThreadLocal<DateFormat>();
-    
-    private static ThreadLocal<DateFormat> threadLocal_min = new ThreadLocal<DateFormat>();
-    
-    private static ThreadLocal<DateFormat> threadLocal_day = new ThreadLocal<DateFormat>();
- 
-	public static String date2StringBysecond(Date date) {
-		if (date == null) {
-			return null;
-		}
-		DateFormat format = threadLocal_second.get();
-		if(format == null){  
-			format = new SimpleDateFormat(date_format_second);  
-			threadLocal_second.set(format);  
-        }
-		return format.format(date);
-	}
-	
-	public static String date2StringBysecondNon(Date date) {
-		if (date == null) {
-			return null;
-		}
-		DateFormat format = threadLocal_second_non.get();
-		if(format == null){  
-			format = new SimpleDateFormat(date_format_second_non);  
-			threadLocal_second_non.set(format);  
-        }
-		return format.format(date);
-	}
-	
-	public static String date2StringByMin(Date date) {
-		if (date == null) {
-			return null;
-		}
-		DateFormat format = threadLocal_min.get();
-		if(format == null){  
-			format = new SimpleDateFormat(data_format_min);  
-			threadLocal_min.set(format);  
-        }
-		return format.format(date);
-	}
-	
-	public static String date2StringByDay(Date date) {
-		if (date == null) {
-			return null;
-		}
-		DateFormat format = threadLocal_day.get();
-		if(format == null){  
-			format = new SimpleDateFormat(data_format_day);  
-			threadLocal_day.set(format);  
-        }
-		return format.format(date);
-	}
-	
-	public static Date string2DateBysecond(String date) {
-		if (date == null) {
-			return null;
-		}
-		date = date.trim();
-		if (date.isEmpty()) {
-			return null;
-		}
-		DateFormat format = threadLocal_second.get();
-		try {
-			if(format == null){  
-				format = new SimpleDateFormat(date_format_second);
-				threadLocal_second.set(format);  
-			}
-			return format.parse(date);
-		} catch (ParseException e) {
-			e.printStackTrace();
-		}
-		return null;
-	}
-	
-	public static Date string2DateByMin(String date) {
-		if (date == null) {
-			return null;
-		}
-		date = date.trim();
-		if (date.isEmpty()) {
-			return null;
-		}
-		DateFormat format = threadLocal_min.get();
-		try {
-			if(format == null){  
-				format = new SimpleDateFormat(data_format_min);
-				threadLocal_min.set(format);  
-			}
-			return format.parse(date);
-		} catch (ParseException e) {
-			e.printStackTrace();
-		}
-		return null;
-	}
-	
-	public static Date string2DateByDay(String date) {
-		if (date == null) {
-			return null;
-		}
-		date = date.trim();
-		if (date.isEmpty()) {
-			return null;
-		}
-		DateFormat format = threadLocal_day.get();
-		try {
-			if(format == null){  
-				format = new SimpleDateFormat(data_format_day);
-				threadLocal_day.set(format);  
-			}
-			return format.parse(date);
-		} catch (ParseException e) {
-			e.printStackTrace();
-		}
-		return null;
-	}
-	
-}
+package com.platform.utils;
+
+import java.text.DateFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+public class DateForm {
+	
+	private static final String date_format_second = "yyyy-MM-dd HH:mm:ss";
+	
+	private static final String date_format_second_non = "yyyy-MM-dd_HH-mm-ss";
+	
+	private static final String data_format_min = "yyyy-MM-dd HH:mm";
+	
+	private static final String data_format_day = "yyyy-MM-dd";
+	
+    private static ThreadLocal<DateFormat> threadLocal_second = new ThreadLocal<DateFormat>();
+    
+    private static ThreadLocal<DateFormat> threadLocal_second_non = new ThreadLocal<DateFormat>();
+    
+    private static ThreadLocal<DateFormat> threadLocal_min = new ThreadLocal<DateFormat>();
+    
+    private static ThreadLocal<DateFormat> threadLocal_day = new ThreadLocal<DateFormat>();
+ 
+	public static String date2StringBysecond(Date date) {
+		if (date == null) {
+			return null;
+		}
+		DateFormat format = threadLocal_second.get();
+		if(format == null){  
+			format = new SimpleDateFormat(date_format_second);  
+			threadLocal_second.set(format);  
+        }
+		return format.format(date);
+	}
+	
+	public static String date2StringBysecondNon(Date date) {
+		if (date == null) {
+			return null;
+		}
+		DateFormat format = threadLocal_second_non.get();
+		if(format == null){  
+			format = new SimpleDateFormat(date_format_second_non);  
+			threadLocal_second_non.set(format);  
+        }
+		return format.format(date);
+	}
+	
+	public static String date2StringByMin(Date date) {
+		if (date == null) {
+			return null;
+		}
+		DateFormat format = threadLocal_min.get();
+		if(format == null){  
+			format = new SimpleDateFormat(data_format_min);  
+			threadLocal_min.set(format);  
+        }
+		return format.format(date);
+	}
+	
+	public static String date2StringByDay(Date date) {
+		if (date == null) {
+			return null;
+		}
+		DateFormat format = threadLocal_day.get();
+		if(format == null){  
+			format = new SimpleDateFormat(data_format_day);  
+			threadLocal_day.set(format);  
+        }
+		return format.format(date);
+	}
+	
+	public static Date string2DateBysecond(String date) {
+		if (date == null) {
+			return null;
+		}
+		date = date.trim();
+		if (date.isEmpty()) {
+			return null;
+		}
+		DateFormat format = threadLocal_second.get();
+		try {
+			if(format == null){  
+				format = new SimpleDateFormat(date_format_second);
+				threadLocal_second.set(format);  
+			}
+			return format.parse(date);
+		} catch (ParseException e) {
+			e.printStackTrace();
+		}
+		return null;
+	}
+	
+	public static Date string2DateByMin(String date) {
+		if (date == null) {
+			return null;
+		}
+		date = date.trim();
+		if (date.isEmpty()) {
+			return null;
+		}
+		DateFormat format = threadLocal_min.get();
+		try {
+			if(format == null){  
+				format = new SimpleDateFormat(data_format_min);
+				threadLocal_min.set(format);  
+			}
+			return format.parse(date);
+		} catch (ParseException e) {
+			e.printStackTrace();
+		}
+		return null;
+	}
+	
+	public static Date string2DateByDay(String date) {
+		if (date == null) {
+			return null;
+		}
+		date = date.trim();
+		if (date.isEmpty()) {
+			return null;
+		}
+		DateFormat format = threadLocal_day.get();
+		try {
+			if(format == null){  
+				format = new SimpleDateFormat(data_format_day);
+				threadLocal_day.set(format);  
+			}
+			return format.parse(date);
+		} catch (ParseException e) {
+			e.printStackTrace();
+		}
+		return null;
+	}
+	
+}
diff --git a/src/com/platform/utils/DateHandle.java b/src/com/platform/utils/DateHandle.java
index ca51e11d..90ebb9d7 100644
--- a/src/com/platform/utils/DateHandle.java
+++ b/src/com/platform/utils/DateHandle.java
@@ -1,9 +1,9 @@
-package com.platform.utils;
-import java.util.Date;
-import java.text.SimpleDateFormat;
-public class DateHandle {
-public static String getNow() {
-	SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");//设置日期格式
-	return df.format(new Date());// new Date()为获取当前系统时�?
-}
-}
+package com.platform.utils;
+import java.util.Date;
+import java.text.SimpleDateFormat;
+public class DateHandle {
+public static String getNow() {
+	SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");//设置日期格式
+	return df.format(new Date());// new Date()为获取当前系统时�?
+}
+}
diff --git a/src/com/platform/utils/FileOperateHelper.java b/src/com/platform/utils/FileOperateHelper.java
index 6773436c..3236c597 100644
--- a/src/com/platform/utils/FileOperateHelper.java
+++ b/src/com/platform/utils/FileOperateHelper.java
@@ -1,95 +1,95 @@
-package com.platform.utils;
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStreamReader;
-
-import org.junit.Test;
-
-/**
- * 文件读写操作帮助类
- * 
- * @author wuming
- * 
- */
-public class FileOperateHelper {
-
-	/**
-	 * 以追加的方式将信息写入文件
-	 * 
-	 * @param path
-	 * @param message
-	 */
-	@SuppressWarnings("resource")
-	public static void fileWrite(String path, String message) {
-		try {
-			File file = new File(path);
-			if (file.exists())
-				file.createNewFile();
-			FileOutputStream out = new FileOutputStream(file, true); // 如果追加方式用true
-			StringBuffer sb = new StringBuffer();
-			sb.append(message).append("\n");
-			out.write(sb.toString().getBytes("utf-8"));
-		} catch (IOException e) {
-			// TODO: handle exception
-		}
-	}
-
-	/**
-	 * 文件读取方法
-	 * @param path
-	 * @return
-	 */
-	@SuppressWarnings("resource")
-	public static String fileReader(String path) {
-		StringBuffer sb = new StringBuffer();
-		String tempString = "";
-		try {
-			File file = new File(path);
-			if (!file.exists())
-				return "";
-			FileInputStream fis = new FileInputStream(file);
-			BufferedReader br = new BufferedReader(new InputStreamReader(fis));
-			while ((tempString = br.readLine()) != null) {
-				sb.append(tempString);
-			}
-		} catch (Exception e) {
-			// TODO: handle exception
-		}
-		return sb.toString();
-	}
-	
-	/**
-	 * 文件读取方法
-	 * @param path
-	 * @return
-	 */
-
-	@SuppressWarnings("resource")
-	public static String fileReaderAndendline(String path) {
-
-		StringBuffer sb = new StringBuffer();
-		String tempString = "";
-		try {
-			File file = new File(path);
-			if (!file.exists())
-
-				return "";
-
-			FileInputStream fis = new FileInputStream(file);
-			BufferedReader br = new BufferedReader(new InputStreamReader(fis));
-			while ((tempString = br.readLine()) != null) {
-				sb.append(tempString+"\n");
-			}
-		} catch (Exception e) {
-			// TODO: handle exception
-		}
-		return sb.toString();
-	}
-
-	
-
-}
+package com.platform.utils;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStreamReader;
+
+import org.junit.Test;
+
+/**
+ * 文件读写操作帮助类
+ * 
+ * @author wuming
+ * 
+ */
+public class FileOperateHelper {
+
+	/**
+	 * 以追加的方式将信息写入文件
+	 * 
+	 * @param path
+	 * @param message
+	 */
+	@SuppressWarnings("resource")
+	public static void fileWrite(String path, String message) {
+		try {
+			File file = new File(path);
+			if (file.exists())
+				file.createNewFile();
+			FileOutputStream out = new FileOutputStream(file, true); // 如果追加方式用true
+			StringBuffer sb = new StringBuffer();
+			sb.append(message).append("\n");
+			out.write(sb.toString().getBytes("utf-8"));
+		} catch (IOException e) {
+			// TODO: handle exception
+		}
+	}
+
+	/**
+	 * 文件读取方法
+	 * @param path
+	 * @return
+	 */
+	@SuppressWarnings("resource")
+	public static String fileReader(String path) {
+		StringBuffer sb = new StringBuffer();
+		String tempString = "";
+		try {
+			File file = new File(path);
+			if (!file.exists())
+				return "";
+			FileInputStream fis = new FileInputStream(file);
+			BufferedReader br = new BufferedReader(new InputStreamReader(fis));
+			while ((tempString = br.readLine()) != null) {
+				sb.append(tempString);
+			}
+		} catch (Exception e) {
+			// TODO: handle exception
+		}
+		return sb.toString();
+	}
+	
+	/**
+	 * 文件读取方法
+	 * @param path
+	 * @return
+	 */
+
+	@SuppressWarnings("resource")
+	public static String fileReaderAndendline(String path) {
+
+		StringBuffer sb = new StringBuffer();
+		String tempString = "";
+		try {
+			File file = new File(path);
+			if (!file.exists())
+
+				return "";
+
+			FileInputStream fis = new FileInputStream(file);
+			BufferedReader br = new BufferedReader(new InputStreamReader(fis));
+			while ((tempString = br.readLine()) != null) {
+				sb.append(tempString+"\n");
+			}
+		} catch (Exception e) {
+			// TODO: handle exception
+		}
+		return sb.toString();
+	}
+
+	
+
+}
diff --git a/src/com/platform/utils/GanymedSSH.java b/src/com/platform/utils/GanymedSSH.java
index 194be049..31598f93 100644
--- a/src/com/platform/utils/GanymedSSH.java
+++ b/src/com/platform/utils/GanymedSSH.java
@@ -1,268 +1,268 @@
-
-package com.platform.utils;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.log4j.Logger;
-import org.apache.log4j.PropertyConfigurator;
-
-import ch.ethz.ssh2.Connection;
-import ch.ethz.ssh2.Session;
-import ch.ethz.ssh2.StreamGobbler;
-
-import ch.ethz.ssh2.*;
-
-
-
-public class GanymedSSH {
-	public static Logger log = Logger.getLogger(GanymedSSH.class);
-	 Connection conn;
-
-	public boolean status = true;// 锟角凤拷锟斤拷锟街达拷锟斤拷锟斤拷锟阶刺�
-
-	public GanymedSSH() {
-		// TODO Auto-generated constructor stub
-		
-	}
-
-	public GanymedSSH(String host, String username, String password, int port) {
-		// TODO Auto-generated constructor stub
-		try {
-			conn = getOpenedConnection(host, username, password, port);
-		} catch (IOException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-
-	}
-
-
-	public  Connection getOpenedConnection(String host, String username, String password, int port)
-			throws IOException {
-
-		conn = new Connection(host, port);
-		conn.connect(); // make sure the connection is opened
-		boolean isAuthenticated = conn.authenticateWithPassword(username, password);
-		if (isAuthenticated == false)
-			throw new IOException("Authentication failed.");
-		return conn;
-	}
-	
-	public  void execCmdNoWaitAcquiescent(String cmd) {
-		String host=Constant.hostIp;
-		String username=Constant.rootUser;
-		String password=Constant.rootPasswd;
-		int port=Constant.port;
-		
-		Session sess = null;
-		try {
-			
-			sess = conn.openSession();
-			// 执锟斤拷cmd
-			sess.execCommand(cmd);
-		} catch (IOException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		} finally {
-			sess.close();
-			
-		}
-	}
-	
-	public  void execCmdNoWait(String host, String username, String password, int port, String cmd) {
-		
-		Session sess = null;
-		try {
-			conn = getOpenedConnection(host, username, password, port);
-			sess = conn.openSession();
-			// 执锟斤拷cmd
-			sess.execCommand(cmd);
-		} catch (IOException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		} finally {
-			sess.close();
-			
-		}
-	}
-
-	public  List<String> execCmdWaitAcquiescent(String cmd) {
-		String host=Constant.hostIp;
-		String username=Constant.rootUser;
-		String password=Constant.rootPasswd;
-		int port=Constant.port;
-		List<String> reStrings = new ArrayList<String>();
-		
-		Session sess = null;
-		try {
-			
-			sess = conn.openSession();
-			// 执锟斤拷cmd
-			sess.execCommand(cmd);
-
-			InputStream stdout = new StreamGobbler(sess.getStdout());
-			InputStream stderr = new StreamGobbler(sess.getStderr());
-			BufferedReader stdoutReader = new BufferedReader(new InputStreamReader(stdout));
-			BufferedReader stderrReader = new BufferedReader(new InputStreamReader(stderr));
-			while (true) {
-				String line = stderrReader.readLine();
-
-				if (line != null) {
-//					System.out.println(line);
-					reStrings.add(line);
-				} else {
-					break;
-				}
-			}
-			
-			if(reStrings.size()==0){		
-				while (true) {
-					String line = stdoutReader.readLine();
-
-					if (line != null) {
-//						System.out.println(line);
-						reStrings.add(line);
-					} else {
-						break;
-					}
-				}
-			}
-		} catch (IOException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		} finally {
-			sess.close();
-			
-		}
-		return reStrings;
-	}
-	
-	public  List<String> execCmdWait(String host, String username, String password, int port, String cmd) {
-		List<String> reStrings = new ArrayList<String>();
-		
-		Session sess = null;
-		try {
-			
-			sess = conn.openSession();
-			// 执锟斤拷cmd
-			sess.execCommand(cmd);
-
-			InputStream stdout = new StreamGobbler(sess.getStdout());
-			InputStream stderr = new StreamGobbler(sess.getStderr());
-			BufferedReader stdoutReader = new BufferedReader(new InputStreamReader(stdout));
-			BufferedReader stderrReader = new BufferedReader(new InputStreamReader(stderr));
-			while (true) {
-				String line = stdoutReader.readLine();
-
-				if (line != null) {
-//					System.out.println(line);
-					reStrings.add(line);
-				} else {
-					break;
-				}
-			}
-			if(reStrings.size()==0){			
-			while (true) {
-				String line = stderrReader.readLine();
-
-				if (line != null) {
-//					System.out.println(line);
-					reStrings.add(line);
-				} else {
-					break;
-				}
-			}
-			}
-		} catch (IOException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		} finally {
-			sess.close();
-			
-		}
-		return reStrings;
-	}
-
-	public  Map<String, String> execMD5cmd(String cmd) {
-		Map<String, String> md5 = new HashMap<String, String>();
-
-		
-		Session sess = null;
-		try {
-			
-			sess = conn.openSession();
-			// 执锟斤拷cmd
-			sess.execCommand(cmd);
-			
-			InputStream stdout = new StreamGobbler(sess.getStdout());
-			InputStream stderr = new StreamGobbler(sess.getStderr());
-			BufferedReader stdoutReader = new BufferedReader(new InputStreamReader(stdout));
-			BufferedReader stderrReader = new BufferedReader(new InputStreamReader(stderr));
-			while (true) {
-				String line = stdoutReader.readLine();
-
-				if (line != null) {
-					String[] lines = line.split("  ");
-					String key = lines[1].trim();
-					String value = lines[0].trim();
-					md5.put(key, value);
-				} else {
-					break;
-				}
-			}
-		} catch (IOException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		} finally {
-			sess.close();
-			
-		}
-		return md5;
-	}
-
-	public String execGetSize(String cmd) {
-		status = false;
-		String str_size = "0";
-		Session sess = null;
-		try {
-
-			// 执锟斤拷cmd
-			sess = conn.openSession();
-			sess.execCommand(cmd);
-			InputStream stdout = new StreamGobbler(sess.getStdout());
-
-			@SuppressWarnings("resource")
-			BufferedReader br = new BufferedReader(new InputStreamReader(stdout));
-			while (true) {
-				String line = br.readLine();
-				if (line != null) {
-					// String[] lines=line.split(" ");
-					// str_size=lines[0];
-
-					str_size = line;
-				} else {
-					break;
-				}
-
-			}
-		} catch (IOException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		} finally {
-			sess.close();
-		}
-		status = true;
-		return str_size;
-	}
-	public static void main(String[] args) {
-		PropertyConfigurator.configure("log4j.properties");
-	}
-
-}
+
+package com.platform.utils;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.log4j.Logger;
+import org.apache.log4j.PropertyConfigurator;
+
+import ch.ethz.ssh2.Connection;
+import ch.ethz.ssh2.Session;
+import ch.ethz.ssh2.StreamGobbler;
+
+import ch.ethz.ssh2.*;
+
+
+
+public class GanymedSSH {
+	public static Logger log = Logger.getLogger(GanymedSSH.class);
+	 Connection conn;
+
+	public boolean status = true;// 锟角凤拷锟斤拷锟街达拷锟斤拷锟斤拷锟阶刺�
+
+	public GanymedSSH() {
+		// TODO Auto-generated constructor stub
+		
+	}
+
+	public GanymedSSH(String host, String username, String password, int port) {
+		// TODO Auto-generated constructor stub
+		try {
+			conn = getOpenedConnection(host, username, password, port);
+		} catch (IOException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+
+	}
+
+
+	public  Connection getOpenedConnection(String host, String username, String password, int port)
+			throws IOException {
+
+		conn = new Connection(host, port);
+		conn.connect(); // make sure the connection is opened
+		boolean isAuthenticated = conn.authenticateWithPassword(username, password);
+		if (isAuthenticated == false)
+			throw new IOException("Authentication failed.");
+		return conn;
+	}
+	
+	public  void execCmdNoWaitAcquiescent(String cmd) {
+		String host=Constant.hostIp;
+		String username=Constant.rootUser;
+		String password=Constant.rootPasswd;
+		int port=Constant.port;
+		
+		Session sess = null;
+		try {
+			
+			sess = conn.openSession();
+			// 执锟斤拷cmd
+			sess.execCommand(cmd);
+		} catch (IOException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		} finally {
+			sess.close();
+			
+		}
+	}
+	
+	public  void execCmdNoWait(String host, String username, String password, int port, String cmd) {
+		
+		Session sess = null;
+		try {
+			conn = getOpenedConnection(host, username, password, port);
+			sess = conn.openSession();
+			// 执锟斤拷cmd
+			sess.execCommand(cmd);
+		} catch (IOException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		} finally {
+			sess.close();
+			
+		}
+	}
+
+	public  List<String> execCmdWaitAcquiescent(String cmd) {
+		String host=Constant.hostIp;
+		String username=Constant.rootUser;
+		String password=Constant.rootPasswd;
+		int port=Constant.port;
+		List<String> reStrings = new ArrayList<String>();
+		
+		Session sess = null;
+		try {
+			
+			sess = conn.openSession();
+			// 执锟斤拷cmd
+			sess.execCommand(cmd);
+
+			InputStream stdout = new StreamGobbler(sess.getStdout());
+			InputStream stderr = new StreamGobbler(sess.getStderr());
+			BufferedReader stdoutReader = new BufferedReader(new InputStreamReader(stdout));
+			BufferedReader stderrReader = new BufferedReader(new InputStreamReader(stderr));
+			while (true) {
+				String line = stderrReader.readLine();
+
+				if (line != null) {
+//					System.out.println(line);
+					reStrings.add(line);
+				} else {
+					break;
+				}
+			}
+			
+			if(reStrings.size()==0){		
+				while (true) {
+					String line = stdoutReader.readLine();
+
+					if (line != null) {
+//						System.out.println(line);
+						reStrings.add(line);
+					} else {
+						break;
+					}
+				}
+			}
+		} catch (IOException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		} finally {
+			sess.close();
+			
+		}
+		return reStrings;
+	}
+	
+	public  List<String> execCmdWait(String host, String username, String password, int port, String cmd) {
+		List<String> reStrings = new ArrayList<String>();
+		
+		Session sess = null;
+		try {
+			
+			sess = conn.openSession();
+			// 执锟斤拷cmd
+			sess.execCommand(cmd);
+
+			InputStream stdout = new StreamGobbler(sess.getStdout());
+			InputStream stderr = new StreamGobbler(sess.getStderr());
+			BufferedReader stdoutReader = new BufferedReader(new InputStreamReader(stdout));
+			BufferedReader stderrReader = new BufferedReader(new InputStreamReader(stderr));
+			while (true) {
+				String line = stdoutReader.readLine();
+
+				if (line != null) {
+//					System.out.println(line);
+					reStrings.add(line);
+				} else {
+					break;
+				}
+			}
+			if(reStrings.size()==0){			
+			while (true) {
+				String line = stderrReader.readLine();
+
+				if (line != null) {
+//					System.out.println(line);
+					reStrings.add(line);
+				} else {
+					break;
+				}
+			}
+			}
+		} catch (IOException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		} finally {
+			sess.close();
+			
+		}
+		return reStrings;
+	}
+
+	public  Map<String, String> execMD5cmd(String cmd) {
+		Map<String, String> md5 = new HashMap<String, String>();
+
+		
+		Session sess = null;
+		try {
+			
+			sess = conn.openSession();
+			// 执锟斤拷cmd
+			sess.execCommand(cmd);
+			
+			InputStream stdout = new StreamGobbler(sess.getStdout());
+			InputStream stderr = new StreamGobbler(sess.getStderr());
+			BufferedReader stdoutReader = new BufferedReader(new InputStreamReader(stdout));
+			BufferedReader stderrReader = new BufferedReader(new InputStreamReader(stderr));
+			while (true) {
+				String line = stdoutReader.readLine();
+
+				if (line != null) {
+					String[] lines = line.split("  ");
+					String key = lines[1].trim();
+					String value = lines[0].trim();
+					md5.put(key, value);
+				} else {
+					break;
+				}
+			}
+		} catch (IOException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		} finally {
+			sess.close();
+			
+		}
+		return md5;
+	}
+
+	public String execGetSize(String cmd) {
+		status = false;
+		String str_size = "0";
+		Session sess = null;
+		try {
+
+			// 执锟斤拷cmd
+			sess = conn.openSession();
+			sess.execCommand(cmd);
+			InputStream stdout = new StreamGobbler(sess.getStdout());
+
+			@SuppressWarnings("resource")
+			BufferedReader br = new BufferedReader(new InputStreamReader(stdout));
+			while (true) {
+				String line = br.readLine();
+				if (line != null) {
+					// String[] lines=line.split(" ");
+					// str_size=lines[0];
+
+					str_size = line;
+				} else {
+					break;
+				}
+
+			}
+		} catch (IOException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		} finally {
+			sess.close();
+		}
+		status = true;
+		return str_size;
+	}
+	public static void main(String[] args) {
+		PropertyConfigurator.configure("log4j.properties");
+	}
+
+}
diff --git a/src/com/platform/utils/RunCommand.java b/src/com/platform/utils/RunCommand.java
index 126c4453..66292a2a 100644
--- a/src/com/platform/utils/RunCommand.java
+++ b/src/com/platform/utils/RunCommand.java
@@ -1,60 +1,60 @@
-package com.platform.utils;
-
-import java.io.BufferedReader;
-import java.io.InputStreamReader;
-import java.util.ArrayList;
-import java.util.List;
-import org.apache.log4j.*;
-
-public class RunCommand {
-
-
-	public static Logger log = Logger.getLogger(RunCommand.class);
-
-	public List<String> runCommandWait(String command) {
-		List<String> reStrings = null;
-		String cmds[] = { "/bin/bash", "-c", command };
-		try {
-			Process ps = Runtime.getRuntime().exec(cmds);
-			ps.waitFor();
-			BufferedReader br = new BufferedReader(new InputStreamReader(ps.getInputStream()));
-			reStrings = new ArrayList<String>();
-			String line;
-			while ((line = br.readLine()) != null) {
-				reStrings.add(line);
-				// System.out.println(line);
-			}
-			
-			br = new BufferedReader(new InputStreamReader(ps.getErrorStream()));
-			reStrings = new ArrayList<String>();
-			
-			while ((line = br.readLine()) != null) {
-				reStrings.add(line);
-				// System.out.println(line);
-			}
-		} catch (Exception e) {
-
-			log.error("0001 runCommandWait is error");
-
-			e.printStackTrace();
-		}
-		return reStrings;
-	}
-
-	public int runCommand(String command) {
-		List<String> reStrings = null;
-		String cmds[] = { "/bin/bash", "-c", command };
-		try {
-			Process ps = Runtime.getRuntime().exec(cmds);
-		} catch (Exception e) {
-
-			log.error("0002 runCommand execute " + command + " is error");
-
-			e.printStackTrace();
-			return -1;
-		}
-		return 1;
-	}
-
-
-}
+package com.platform.utils;
+
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
+import java.util.ArrayList;
+import java.util.List;
+import org.apache.log4j.*;
+
+public class RunCommand {
+
+
+	public static Logger log = Logger.getLogger(RunCommand.class);
+
+	public List<String> runCommandWait(String command) {
+		List<String> reStrings = null;
+		String cmds[] = { "/bin/bash", "-c", command };
+		try {
+			Process ps = Runtime.getRuntime().exec(cmds);
+			ps.waitFor();
+			BufferedReader br = new BufferedReader(new InputStreamReader(ps.getInputStream()));
+			reStrings = new ArrayList<String>();
+			String line;
+			while ((line = br.readLine()) != null) {
+				reStrings.add(line);
+				// System.out.println(line);
+			}
+			
+			br = new BufferedReader(new InputStreamReader(ps.getErrorStream()));
+			reStrings = new ArrayList<String>();
+			
+			while ((line = br.readLine()) != null) {
+				reStrings.add(line);
+				// System.out.println(line);
+			}
+		} catch (Exception e) {
+
+			log.error("0001 runCommandWait is error");
+
+			e.printStackTrace();
+		}
+		return reStrings;
+	}
+
+	public int runCommand(String command) {
+		List<String> reStrings = null;
+		String cmds[] = { "/bin/bash", "-c", command };
+		try {
+			Process ps = Runtime.getRuntime().exec(cmds);
+		} catch (Exception e) {
+
+			log.error("0002 runCommand execute " + command + " is error");
+
+			e.printStackTrace();
+			return -1;
+		}
+		return 1;
+	}
+
+
+}
diff --git a/src/com/platform/utils/Support.java b/src/com/platform/utils/Support.java
index 4288021e..1b4cdc92 100644
--- a/src/com/platform/utils/Support.java
+++ b/src/com/platform/utils/Support.java
@@ -1,31 +1,31 @@
-
-/**
- * 文件名   :   Support.java
- * 版权       :   <版权/公司名>
- * 描述       :   <描述>
- * @author  liliy
- * 版本       :   <版本>
- * 修改时间:      2016年9月12日
- * 修改内容:      <修改内容>
- */
-package com.platform.utils;
-
-import java.util.regex.Pattern;
-
-/**
- * <一句话功能简述>
- * <功能详细描述>
- * @author    liliy
- * @version   [版本号,2016年9月12日]
- * @see       [相关类/方法]
- * @since     [产品/模块版本]
- */
-
-public class Support {
-	 public static boolean checkIP(String str) {
-	        Pattern pattern = Pattern
-	                .compile("^((\\d|[1-9]\\d|1\\d\\d|2[0-4]\\d|25[0-5]"
-	                        + "|[*])\\.){3}(\\d|[1-9]\\d|1\\d\\d|2[0-4]\\d|25[0-5]|[*])$");
-	        return pattern.matcher(str).matches();
-	    }
-}
+
+/**
+ * 文件名   :   Support.java
+ * 版权       :   <版权/公司名>
+ * 描述       :   <描述>
+ * @author  liliy
+ * 版本       :   <版本>
+ * 修改时间:      2016年9月12日
+ * 修改内容:      <修改内容>
+ */
+package com.platform.utils;
+
+import java.util.regex.Pattern;
+
+/**
+ * <一句话功能简述>
+ * <功能详细描述>
+ * @author    liliy
+ * @version   [版本号,2016年9月12日]
+ * @see       [相关类/方法]
+ * @since     [产品/模块版本]
+ */
+
+public class Support {
+	 public static boolean checkIP(String str) {
+	        Pattern pattern = Pattern
+	                .compile("^((\\d|[1-9]\\d|1\\d\\d|2[0-4]\\d|25[0-5]"
+	                        + "|[*])\\.){3}(\\d|[1-9]\\d|1\\d\\d|2[0-4]\\d|25[0-5]|[*])$");
+	        return pattern.matcher(str).matches();
+	    }
+}
diff --git a/src/com/platform/utils/TestSupport.java b/src/com/platform/utils/TestSupport.java
index a4e6f79d..74d938cb 100644
--- a/src/com/platform/utils/TestSupport.java
+++ b/src/com/platform/utils/TestSupport.java
@@ -1,14 +1,14 @@
-package com.platform.utils;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class TestSupport {
-public  List<String> strToList(String str) {
-	List<String> reStrings=new ArrayList<String>();
-	for(String one:str.split("\n")){
-		reStrings.add(one);
-	}
-	return reStrings;
-}
-}
+package com.platform.utils;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class TestSupport {
+public  List<String> strToList(String str) {
+	List<String> reStrings=new ArrayList<String>();
+	for(String one:str.split("\n")){
+		reStrings.add(one);
+	}
+	return reStrings;
+}
+}
diff --git a/src/com/platform/utils/ThreadVolume.java b/src/com/platform/utils/ThreadVolume.java
index 03832e9e..6894b2d6 100644
--- a/src/com/platform/utils/ThreadVolume.java
+++ b/src/com/platform/utils/ThreadVolume.java
@@ -1,133 +1,133 @@
-package com.platform.utils;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-import org.springframework.stereotype.Service;
-
-import com.base.Custom4exception;
-import com.base.CustomException;
-import com.platform.entities.Brick;
-import com.platform.entities.FolderNode;
-import com.platform.entities.VolumeEntity;
-import com.platform.glusterfs.ClusterInfo;
-import com.platform.glusterfs.GetTreeData;
-import com.platform.glusterfs.VolumeInfo;
-
-public class ThreadVolume extends Thread implements Runnable{
-	
-	/**
-	 * 挂载点路径 -- 暂时无用的
-	 */
-	private static String pointPath = "/home";
-	
-	/**  Volume信息查询  */
-	private VolumeInfo volumeInfo = new VolumeInfo();
-	
-	private ClusterInfo cluster = new ClusterInfo();
-	
-	public ThreadVolume() {
-		// TODO Auto-generated constructor stub
-	}
-	
-	public ThreadVolume(String path) {
-		if (null != path && !"".equals(path.trim())) {
-			ThreadVolume.pointPath = path;
-		}
-	}
-	
-	/** gfs目录树形展示  */
-	private GetTreeData gfsTree = new GetTreeData();
-	
-	@Override
-	public void run() {
-		super.run();
-		while(true){
-				List<FolderNode> folderlist = new ArrayList<FolderNode>();
-				List<VolumeEntity> volumeList = new ArrayList<VolumeEntity>();
-				// brick状态 map集合
-				Map<String, String> brickStatusMap = cluster.showClusterInfo();
-				
-				//查询 volume name
-				List<String> volumeNameList = volumeInfo.showAllVolumeName();
-				if (null != volumeNameList) {
-					for (String volumeName : volumeNameList) {
-						try {
-							VolumeEntity volume = new VolumeEntity();
-							volume.setName(volumeName);
-							List<String> path = volumeInfo.getVolumeMountPoint(volumeName);
-							//默认加载第一个路径
-							if (null != path && path.size() > 0) {
-								volume.setPath(path.get(0));
-							}
-							volume.setAllSize(volumeInfo.getVolumeAvailableSize(volumeName));
-							volume.setStatus(volumeInfo.getVolumeStatus(volumeName));
-							volume.setUsedSize(volumeInfo.getVolumeUseSize(volumeName));
-							volume.setType(volumeInfo.getVolumeType(volumeName));
-							//TODO 查询brick--
-							//返回     ip:path
-							List<String> brickStrs = volumeInfo.getVolumeBricks(volumeName);
-							//brick已用大小:
-							Map<String, Double> usedSize = volumeInfo.getVolumebricksDataSize(volumeName);
-							Map<String, Double> availableSize = volumeInfo.getVolumebricksAvailableSize(volumeName);
-							
-							List<Brick> brickList = new ArrayList<Brick>();
-							for (String brickIpPath : brickStrs) {
-								Brick b = new Brick();
-								String ipAndpath[] = brickIpPath.split(":");
-								String brickip = ipAndpath[0];
-								String brickpath = ipAndpath[1];
-								//iP ,  path ,  
-								b.setIp(brickip);
-								if(brickStatusMap==null || brickStatusMap.size()==0){
-									b.setStatus(false);
-								}else if (brickStatusMap.containsKey(brickip)) {
-									b.setStatus(true);
-								}
-								else {
-									b.setStatus(false);
-								}
-								b.setPath(brickpath);
-								b.setAvailableSize(availableSize.get(brickIpPath));
-								b.setUsedSize(usedSize.get(brickIpPath));
-								brickList.add(b);
-							}
-							volume.setBrick(brickList);
-							
-							
-							//默认加载第一个路径
-							if (null != path && path.size() > 0) {
-								//装入 folder:
-								//查询 每个 volume 下的 folder
-								FolderNode foldertmp = gfsTree.getDatas(path.get(0));
-								folderlist.add(foldertmp);
-							}
-							volumeList.add(volume);
-						}catch (Exception e) {
-							new CustomException(Custom4exception.threadVolume_class_Except,e);
-						}
-					}
-				}
-				//TODO 更新folder 目录
-				CacheTreeData.setFolders(folderlist);
-				CacheTreeData.setVolumeList(volumeList);
-				try {
-					Thread.sleep(Constant.get_volume_sleep_time);
-				} catch (InterruptedException e) {
-					new CustomException(Custom4exception.threadVolume_Thread_Except,e);
-				}
-				
-		}
-		
-	}
-
-	public static String getPointPath() {
-		return pointPath;
-	}
-
-	public static void setPointPath(String pointPath) {
-		ThreadVolume.pointPath = pointPath;
-	}
-	
-}
+package com.platform.utils;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import org.springframework.stereotype.Service;
+
+import com.base.Custom4exception;
+import com.base.CustomException;
+import com.platform.entities.Brick;
+import com.platform.entities.FolderNode;
+import com.platform.entities.VolumeEntity;
+import com.platform.glusterfs.ClusterInfo;
+import com.platform.glusterfs.GetTreeData;
+import com.platform.glusterfs.VolumeInfo;
+
+public class ThreadVolume extends Thread implements Runnable{
+	
+	/**
+	 * 挂载点路径 -- 暂时无用的
+	 */
+	private static String pointPath = "/home";
+	
+	/**  Volume信息查询  */
+	private VolumeInfo volumeInfo = new VolumeInfo();
+	
+	private ClusterInfo cluster = new ClusterInfo();
+	
+	public ThreadVolume() {
+		// TODO Auto-generated constructor stub
+	}
+	
+	public ThreadVolume(String path) {
+		if (null != path && !"".equals(path.trim())) {
+			ThreadVolume.pointPath = path;
+		}
+	}
+	
+	/** gfs目录树形展示  */
+	private GetTreeData gfsTree = new GetTreeData();
+	
+	@Override
+	public void run() {
+		super.run();
+		while(true){
+				List<FolderNode> folderlist = new ArrayList<FolderNode>();
+				List<VolumeEntity> volumeList = new ArrayList<VolumeEntity>();
+				// brick状态 map集合
+				Map<String, String> brickStatusMap = cluster.showClusterInfo();
+				
+				//查询 volume name
+				List<String> volumeNameList = volumeInfo.showAllVolumeName();
+				if (null != volumeNameList) {
+					for (String volumeName : volumeNameList) {
+						try {
+							VolumeEntity volume = new VolumeEntity();
+							volume.setName(volumeName);
+							List<String> path = volumeInfo.getVolumeMountPoint(volumeName);
+							//默认加载第一个路径
+							if (null != path && path.size() > 0) {
+								volume.setPath(path.get(0));
+							}
+							volume.setAllSize(volumeInfo.getVolumeAvailableSize(volumeName));
+							volume.setStatus(volumeInfo.getVolumeStatus(volumeName));
+							volume.setUsedSize(volumeInfo.getVolumeUseSize(volumeName));
+							volume.setType(volumeInfo.getVolumeType(volumeName));
+							//TODO 查询brick--
+							//返回     ip:path
+							List<String> brickStrs = volumeInfo.getVolumeBricks(volumeName);
+							//brick已用大小:
+							Map<String, Double> usedSize = volumeInfo.getVolumebricksDataSize(volumeName);
+							Map<String, Double> availableSize = volumeInfo.getVolumebricksAvailableSize(volumeName);
+							
+							List<Brick> brickList = new ArrayList<Brick>();
+							for (String brickIpPath : brickStrs) {
+								Brick b = new Brick();
+								String ipAndpath[] = brickIpPath.split(":");
+								String brickip = ipAndpath[0];
+								String brickpath = ipAndpath[1];
+								//iP ,  path ,  
+								b.setIp(brickip);
+								if(brickStatusMap==null || brickStatusMap.size()==0){
+									b.setStatus(false);
+								}else if (brickStatusMap.containsKey(brickip)) {
+									b.setStatus(true);
+								}
+								else {
+									b.setStatus(false);
+								}
+								b.setPath(brickpath);
+								b.setAvailableSize(availableSize.get(brickIpPath));
+								b.setUsedSize(usedSize.get(brickIpPath));
+								brickList.add(b);
+							}
+							volume.setBrick(brickList);
+							
+							
+							//默认加载第一个路径
+							if (null != path && path.size() > 0) {
+								//装入 folder:
+								//查询 每个 volume 下的 folder
+								FolderNode foldertmp = gfsTree.getDatas(path.get(0));
+								folderlist.add(foldertmp);
+							}
+							volumeList.add(volume);
+						}catch (Exception e) {
+							new CustomException(Custom4exception.threadVolume_class_Except,e);
+						}
+					}
+				}
+				//TODO 更新folder 目录
+				CacheTreeData.setFolders(folderlist);
+				CacheTreeData.setVolumeList(volumeList);
+				try {
+					Thread.sleep(Constant.get_volume_sleep_time);
+				} catch (InterruptedException e) {
+					new CustomException(Custom4exception.threadVolume_Thread_Except,e);
+				}
+				
+		}
+		
+	}
+
+	public static String getPointPath() {
+		return pointPath;
+	}
+
+	public static void setPointPath(String pointPath) {
+		ThreadVolume.pointPath = pointPath;
+	}
+	
+}
diff --git a/src/com/platform/utils/UtilsHelper.java b/src/com/platform/utils/UtilsHelper.java
index 1c040bbc..3da84c22 100644
--- a/src/com/platform/utils/UtilsHelper.java
+++ b/src/com/platform/utils/UtilsHelper.java
@@ -1,113 +1,113 @@
-package com.platform.utils;
-
-import java.lang.reflect.Field;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Map.Entry;
-
-public class UtilsHelper {
-	/**
-	 * 
-	 * @param clazz
-	 * @param req
-	 * @return
-	 */
-	public static Object newObjAndSetAttrsByClass(Class<?> clazz,
-			Map<String, String> paramMap) {
-		Object object = null;
-		try {
-			object = clazz.newInstance();
-			Field[] fileds = clazz.getDeclaredFields();			
-			for (Field fs : fileds) {
-				String fieldName = fs.getName();
-				String fieldType = fs.getGenericType().toString()
-						.replace("class ", ""); // 如果type是类类型,则前面包含"class ",后面跟类名
-				if (paramMap.containsKey(fieldName)) {
-					Method method = clazz.getDeclaredMethod(
-							getAttributeSetName(fs), Class.forName(fieldType));
-					String value = paramMap.get(fieldName);					
-					if ("java.lang.Integer".equals(fieldType)) {
-						method.invoke(object, Integer.valueOf(value));
-					} else {
-						method.invoke(object, value);
-					}
-				}
-			}
-		} catch (InstantiationException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		} catch (IllegalAccessException e) {
-			// TODO Auto-generated catch blockAQA
-			e.printStackTrace();
-		} catch (NoSuchMethodException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		} catch (SecurityException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		} catch (IllegalArgumentException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		} catch (InvocationTargetException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		} catch (ClassNotFoundException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}		
-		return object;
-	};
-
-	/**
-	 * 
-	 * @param object
-	 * @param req
-	 * @return
-	 */
-	public static Object newObjAndSetAttrsByInstance(Object object,
-			Map<String, String> mapParam) {
-		return newObjAndSetAttrsByClass(object.getClass(), mapParam);
-	}
-
-	/**
-	 * 生成属性{@fs}的set方法的名字
-	 * 
-	 * @param fs
-	 *            属性对象
-	 * @return set方法的名字
-	 */
-	private static String getAttributeSetName(Field fs) {
-		String fieldName = fs.getName();
-		char[] cs = fieldName.toCharArray();
-		cs[0] -= 32;
-		return "set" + String.valueOf(cs);
-	}
-
-	public static <K, V> Map<K, V> updateMap(Map<K, V> map1, Map<K, V> map2) {
-		if (null == map1 || map1.size() <= 0)
-			return map2;
-		Iterator<Entry<K, V>> iterator = map2.entrySet().iterator();
-		while (iterator.hasNext()) {
-			Map.Entry<K, V> entry = iterator.next();
-			map1.put(entry.getKey(), entry.getValue());
-		}
-		return map1;
-	}
-
-	public static <K, V> boolean isSubMap(Map<K, V> map1, Map<K, V> map2) {
-		boolean flag = true;
-		if (null == map2 || map2.size() <= 0 || null == map1)
-			return false;
-		Iterator<Map.Entry<K, V>> iterator = map1.entrySet().iterator();
-		while (iterator.hasNext()) {
-			Map.Entry<K, V> entry = iterator.next();
-			if (!map2.containsKey(entry.getKey())
-					|| !map2.containsValue(entry.getValue()))
-				return false;
-		}
-		return flag;
-	}
-
-}
+package com.platform.utils;
+
+import java.lang.reflect.Field;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Map.Entry;
+
+public class UtilsHelper {
+	/**
+	 * 
+	 * @param clazz
+	 * @param req
+	 * @return
+	 */
+	public static Object newObjAndSetAttrsByClass(Class<?> clazz,
+			Map<String, String> paramMap) {
+		Object object = null;
+		try {
+			object = clazz.newInstance();
+			Field[] fileds = clazz.getDeclaredFields();			
+			for (Field fs : fileds) {
+				String fieldName = fs.getName();
+				String fieldType = fs.getGenericType().toString()
+						.replace("class ", ""); // 如果type是类类型,则前面包含"class ",后面跟类名
+				if (paramMap.containsKey(fieldName)) {
+					Method method = clazz.getDeclaredMethod(
+							getAttributeSetName(fs), Class.forName(fieldType));
+					String value = paramMap.get(fieldName);					
+					if ("java.lang.Integer".equals(fieldType)) {
+						method.invoke(object, Integer.valueOf(value));
+					} else {
+						method.invoke(object, value);
+					}
+				}
+			}
+		} catch (InstantiationException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		} catch (IllegalAccessException e) {
+			// TODO Auto-generated catch blockAQA
+			e.printStackTrace();
+		} catch (NoSuchMethodException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		} catch (SecurityException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		} catch (IllegalArgumentException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		} catch (InvocationTargetException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		} catch (ClassNotFoundException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}		
+		return object;
+	};
+
+	/**
+	 * 
+	 * @param object
+	 * @param req
+	 * @return
+	 */
+	public static Object newObjAndSetAttrsByInstance(Object object,
+			Map<String, String> mapParam) {
+		return newObjAndSetAttrsByClass(object.getClass(), mapParam);
+	}
+
+	/**
+	 * 生成属性{@fs}的set方法的名字
+	 * 
+	 * @param fs
+	 *            属性对象
+	 * @return set方法的名字
+	 */
+	private static String getAttributeSetName(Field fs) {
+		String fieldName = fs.getName();
+		char[] cs = fieldName.toCharArray();
+		cs[0] -= 32;
+		return "set" + String.valueOf(cs);
+	}
+
+	public static <K, V> Map<K, V> updateMap(Map<K, V> map1, Map<K, V> map2) {
+		if (null == map1 || map1.size() <= 0)
+			return map2;
+		Iterator<Entry<K, V>> iterator = map2.entrySet().iterator();
+		while (iterator.hasNext()) {
+			Map.Entry<K, V> entry = iterator.next();
+			map1.put(entry.getKey(), entry.getValue());
+		}
+		return map1;
+	}
+
+	public static <K, V> boolean isSubMap(Map<K, V> map1, Map<K, V> map2) {
+		boolean flag = true;
+		if (null == map2 || map2.size() <= 0 || null == map1)
+			return false;
+		Iterator<Map.Entry<K, V>> iterator = map1.entrySet().iterator();
+		while (iterator.hasNext()) {
+			Map.Entry<K, V> entry = iterator.next();
+			if (!map2.containsKey(entry.getKey())
+					|| !map2.containsValue(entry.getValue()))
+				return false;
+		}
+		return flag;
+	}
+
+}