diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..d8037859 --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +/target/ +/build diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs index d1ff3f7e..544ad1e4 100644 --- a/.settings/org.eclipse.core.resources.prefs +++ b/.settings/org.eclipse.core.resources.prefs @@ -1,2 +1,5 @@ eclipse.preferences.version=1 encoding//WebContent/WEB-INF/config/config.properties=UTF-8 +encoding//src/com/platform/utils/GanymedSSH.java=UTF-8 +encoding/=UTF-8 +separateDerivedEncodings=true diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs index f42de363..68c704e1 100644 --- a/.settings/org.eclipse.jdt.core.prefs +++ b/.settings/org.eclipse.jdt.core.prefs @@ -1,7 +1,101 @@ 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 new file mode 100644 index 00000000..4fd5f244 --- /dev/null +++ b/.settings/org.eclipse.jpt.core.prefs @@ -0,0 +1,3 @@ +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 new file mode 100644 index 00000000..f897a7f1 --- /dev/null +++ b/.settings/org.eclipse.m2e.core.prefs @@ -0,0 +1,4 @@ +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 index d5dd44d5..a576e830 100644 --- a/.settings/org.eclipse.wst.common.component +++ b/.settings/org.eclipse.wst.common.component @@ -1,8 +1,6 @@ - - diff --git a/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml b/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml new file mode 100644 index 00000000..7961132f --- /dev/null +++ b/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/.settings/org.eclipse.wst.common.project.facet.core.xml b/.settings/org.eclipse.wst.common.project.facet.core.xml index 834b6d6b..ba1bfbde 100644 --- a/.settings/org.eclipse.wst.common.project.facet.core.xml +++ b/.settings/org.eclipse.wst.common.project.facet.core.xml @@ -7,4 +7,5 @@ + diff --git a/build/classes/.gitignore b/build/classes/.gitignore deleted file mode 100644 index c2d9872a..00000000 --- a/build/classes/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/com/ diff --git a/build/classes/com/dao/mapper/data-detaisl-mapper.xml b/build/classes/com/dao/mapper/data-detaisl-mapper.xml deleted file mode 100644 index 52b98767..00000000 --- a/build/classes/com/dao/mapper/data-detaisl-mapper.xml +++ /dev/null @@ -1,108 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - and data_details.data_type=#{PagerOptions.dataType} - - - and - data_details.submitted_batch=#{PagerOptions.submittedBatch} - - - and data_details.city_name=#{PagerOptions.cityName} - - - and - data_details.district_name=#{PagerOptions.districtName} - - - and data_details.data_version=#{PagerOptions.dataVersion} - - - and data_details=#{PagerOptions.systemName} - - - and data_details.data_year=#{PagerOptions.dataYear} - - - - - - - - - - - - - \ No newline at end of file diff --git a/build/classes/com/platform/controller/DataModelController.class b/build/classes/com/platform/controller/DataModelController.class deleted file mode 100644 index 837dcfde..00000000 Binary files a/build/classes/com/platform/controller/DataModelController.class and /dev/null differ diff --git a/build/classes/com/platform/dao/DataInfoDao.class b/build/classes/com/platform/dao/DataInfoDao.class deleted file mode 100644 index b2c3bfed..00000000 Binary files a/build/classes/com/platform/dao/DataInfoDao.class and /dev/null differ diff --git a/build/classes/com/platform/dao/EncodeInfoDao.class b/build/classes/com/platform/dao/EncodeInfoDao.class deleted file mode 100644 index f6b44c7b..00000000 Binary files a/build/classes/com/platform/dao/EncodeInfoDao.class and /dev/null differ diff --git a/build/classes/com/platform/entities/BasedType.class b/build/classes/com/platform/entities/BasedType.class deleted file mode 100644 index 30ba1020..00000000 Binary files a/build/classes/com/platform/entities/BasedType.class and /dev/null differ diff --git a/build/classes/com/platform/entities/DataInfoEntity.class b/build/classes/com/platform/entities/DataInfoEntity.class deleted file mode 100644 index 0bc0b835..00000000 Binary files a/build/classes/com/platform/entities/DataInfoEntity.class and /dev/null differ diff --git a/build/classes/com/platform/entities/EncodedInfoEntity.class b/build/classes/com/platform/entities/EncodedInfoEntity.class deleted file mode 100644 index ca2439bd..00000000 Binary files a/build/classes/com/platform/entities/EncodedInfoEntity.class and /dev/null differ diff --git a/build/classes/com/platform/entities/FolderNode.class b/build/classes/com/platform/entities/FolderNode.class deleted file mode 100644 index f5bb0dee..00000000 Binary files a/build/classes/com/platform/entities/FolderNode.class and /dev/null differ diff --git a/build/classes/com/platform/entities/OracleConnectorParams.class b/build/classes/com/platform/entities/OracleConnectorParams.class deleted file mode 100644 index 2d57408c..00000000 Binary files a/build/classes/com/platform/entities/OracleConnectorParams.class and /dev/null differ diff --git a/build/classes/com/platform/entities/PagerOptions.class b/build/classes/com/platform/entities/PagerOptions.class deleted file mode 100644 index 0f0a2176..00000000 Binary files a/build/classes/com/platform/entities/PagerOptions.class and /dev/null differ diff --git a/build/classes/com/platform/entities/SimpleConfigParamsBean.class b/build/classes/com/platform/entities/SimpleConfigParamsBean.class deleted file mode 100644 index 8e274e5f..00000000 Binary files a/build/classes/com/platform/entities/SimpleConfigParamsBean.class and /dev/null differ diff --git a/build/classes/com/platform/kubernetes/SimpleKubeClient.class b/build/classes/com/platform/kubernetes/SimpleKubeClient.class deleted file mode 100644 index 78331ee3..00000000 Binary files a/build/classes/com/platform/kubernetes/SimpleKubeClient.class and /dev/null differ diff --git a/build/classes/com/platform/oracle/OracleConnector.class b/build/classes/com/platform/oracle/OracleConnector.class deleted file mode 100644 index 04a516c4..00000000 Binary files a/build/classes/com/platform/oracle/OracleConnector.class and /dev/null differ diff --git a/build/classes/com/platform/service/DataInfoService.class b/build/classes/com/platform/service/DataInfoService.class deleted file mode 100644 index 95758eba..00000000 Binary files a/build/classes/com/platform/service/DataInfoService.class and /dev/null differ diff --git a/build/classes/com/platform/service/DataInfoServiceImp.class b/build/classes/com/platform/service/DataInfoServiceImp.class deleted file mode 100644 index 2b8ecde7..00000000 Binary files a/build/classes/com/platform/service/DataInfoServiceImp.class and /dev/null differ diff --git a/build/classes/com/platform/service/EncodeInfoService.class b/build/classes/com/platform/service/EncodeInfoService.class deleted file mode 100644 index 4e7ea229..00000000 Binary files a/build/classes/com/platform/service/EncodeInfoService.class and /dev/null differ diff --git a/build/classes/com/platform/service/EncodeInfoServiceImpl.class b/build/classes/com/platform/service/EncodeInfoServiceImpl.class deleted file mode 100644 index 56590e83..00000000 Binary files a/build/classes/com/platform/service/EncodeInfoServiceImpl.class and /dev/null differ diff --git a/build/classes/com/platform/service/OracleExtractHelper.class b/build/classes/com/platform/service/OracleExtractHelper.class deleted file mode 100644 index cd929b15..00000000 Binary files a/build/classes/com/platform/service/OracleExtractHelper.class and /dev/null differ diff --git a/build/classes/com/platform/service/OracleExtractService.class b/build/classes/com/platform/service/OracleExtractService.class deleted file mode 100644 index cc6bcadf..00000000 Binary files a/build/classes/com/platform/service/OracleExtractService.class and /dev/null differ diff --git a/build/classes/com/platform/service/OracleStatusService$connectTask.class b/build/classes/com/platform/service/OracleStatusService$connectTask.class deleted file mode 100644 index 84eef078..00000000 Binary files a/build/classes/com/platform/service/OracleStatusService$connectTask.class and /dev/null differ diff --git a/build/classes/com/platform/service/OracleStatusService.class b/build/classes/com/platform/service/OracleStatusService.class deleted file mode 100644 index b61344b5..00000000 Binary files a/build/classes/com/platform/service/OracleStatusService.class and /dev/null differ diff --git a/build/classes/com/platform/service/SimplePropertyReader.class b/build/classes/com/platform/service/SimplePropertyReader.class deleted file mode 100644 index d54c4934..00000000 Binary files a/build/classes/com/platform/service/SimplePropertyReader.class and /dev/null differ diff --git a/build/classes/com/platform/test/SMBasedTest.class b/build/classes/com/platform/test/SMBasedTest.class deleted file mode 100644 index e64ea7a7..00000000 Binary files a/build/classes/com/platform/test/SMBasedTest.class and /dev/null differ diff --git a/build/classes/com/platform/test/TestController.class b/build/classes/com/platform/test/TestController.class deleted file mode 100644 index 3abc9c41..00000000 Binary files a/build/classes/com/platform/test/TestController.class and /dev/null differ diff --git a/build/classes/com/platform/test/TestEncodeInfoDao.class b/build/classes/com/platform/test/TestEncodeInfoDao.class deleted file mode 100644 index bdfb87d9..00000000 Binary files a/build/classes/com/platform/test/TestEncodeInfoDao.class and /dev/null differ diff --git a/build/classes/com/platform/test/TestEncodeService.class b/build/classes/com/platform/test/TestEncodeService.class deleted file mode 100644 index c4656f12..00000000 Binary files a/build/classes/com/platform/test/TestEncodeService.class and /dev/null differ diff --git a/build/classes/com/platform/test/User.class b/build/classes/com/platform/test/User.class deleted file mode 100644 index a38adbfb..00000000 Binary files a/build/classes/com/platform/test/User.class and /dev/null differ diff --git a/build/classes/com/platform/test/testSystemInfoDao.class b/build/classes/com/platform/test/testSystemInfoDao.class deleted file mode 100644 index f86a419c..00000000 Binary files a/build/classes/com/platform/test/testSystemInfoDao.class and /dev/null differ diff --git a/build/classes/com/platform/utils/ConfigLoder.class b/build/classes/com/platform/utils/ConfigLoder.class deleted file mode 100644 index 9c600c3d..00000000 Binary files a/build/classes/com/platform/utils/ConfigLoder.class and /dev/null differ diff --git a/build/classes/com/platform/utils/ConfigPropertyReader.class b/build/classes/com/platform/utils/ConfigPropertyReader.class deleted file mode 100644 index 81d2b1c3..00000000 Binary files a/build/classes/com/platform/utils/ConfigPropertyReader.class and /dev/null differ diff --git a/build/classes/com/platform/utils/Configs.class b/build/classes/com/platform/utils/Configs.class deleted file mode 100644 index ef6f24b0..00000000 Binary files a/build/classes/com/platform/utils/Configs.class and /dev/null differ diff --git a/build/classes/com/platform/utils/ConfigsLoader.class b/build/classes/com/platform/utils/ConfigsLoader.class deleted file mode 100644 index c37ec21a..00000000 Binary files a/build/classes/com/platform/utils/ConfigsLoader.class and /dev/null differ diff --git a/build/classes/com/platform/utils/FileOperateHelper.class b/build/classes/com/platform/utils/FileOperateHelper.class deleted file mode 100644 index 40db4e3d..00000000 Binary files a/build/classes/com/platform/utils/FileOperateHelper.class and /dev/null differ diff --git a/build/classes/com/platform/utils/UtilsHelper.class b/build/classes/com/platform/utils/UtilsHelper.class deleted file mode 100644 index e06cff03..00000000 Binary files a/build/classes/com/platform/utils/UtilsHelper.class and /dev/null differ diff --git a/build/classes/spring-applicationContext-test.xml b/build/classes/spring-applicationContext-test.xml deleted file mode 100644 index 27b1248b..00000000 --- a/build/classes/spring-applicationContext-test.xml +++ /dev/null @@ -1,64 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/pom.xml b/pom.xml new file mode 100644 index 00000000..ad1b8ccd --- /dev/null +++ b/pom.xml @@ -0,0 +1,37 @@ + + 4.0.0 + + extendGlusterfs + extendGlusterfs + 0.0.1-SNAPSHOT + jar + + extendGlusterfs + http://maven.apache.org + + + UTF-8 + + + + + log4j + log4j + 1.2.17 + + + junit + junit + 3.8.1 + test + + + + + ch.ethz.ganymed + ganymed-ssh2 + build209 + + + diff --git a/src/META-INF/persistence.xml b/src/META-INF/persistence.xml new file mode 100644 index 00000000..2ad4aeca --- /dev/null +++ b/src/META-INF/persistence.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/src/com/platform/controller/DefaultController.java b/src/com/platform/controller/DefaultController.java index d66fa86d..e8ac7479 100644 --- a/src/com/platform/controller/DefaultController.java +++ b/src/com/platform/controller/DefaultController.java @@ -1,29 +1,30 @@ -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; -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 void test(HttpServletRequest req, HttpServletResponse res){ - //System.out.println(Class.class.getClass().getResource("/").getPath()); - System.out.println(Configs.EXTRACT_LOG_LOCALTION); - } - -} +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 684ca93a..aa28e728 100644 --- a/src/com/platform/controller/FolderController.java +++ b/src/com/platform/controller/FolderController.java @@ -35,7 +35,6 @@ public class FolderController extends BaseController { if (null != path && !"".equals(path)) { System.out.println(path); result = gfsService.getFolder(path); - throw new CustomException("3211", null); } return result; } diff --git a/src/com/platform/glusterfs/CopyData.java b/src/com/platform/glusterfs/CopyData.java index 782da868..1e9972ea 100644 --- a/src/com/platform/glusterfs/CopyData.java +++ b/src/com/platform/glusterfs/CopyData.java @@ -1,78 +1,80 @@ -package com.platform.glusterfs; - -import java.util.Map; - -import org.apache.log4j.Logger; -import org.apache.log4j.PropertyConfigurator; -import org.junit.Test; - -import com.platform.utils.Constant; - - - -/** - * <一句话功能简述> 复制数据 - * <功能详细描述> - * @author chen - * @version [版本号,2016年9月8日] - * @see [相关类/方法] - * @since [产品/模块版本] - */ -public class CopyData { - public static Logger log = Logger.getLogger(CopyData.class); - - public int copyVolumeFiles(String sourceVolumeName, String destVolumeName, String fileName) { - log.info("start copy " + fileName + " from " + sourceVolumeName + " to " + destVolumeName); - int status = -1; - /** - * get mount point of volumeName - */ - - String sourceFolderName = sourceVolumeName; - String destFolderName = destVolumeName; - status = copyFolderFiles(sourceFolderName, destFolderName, fileName); - return status; - } - - /** - * -1 :error; -2: the filename is not exists ;-3 :destFolderName ; 1: right - * not exists - * - * @param folderName - * @param fileName - * @return - */ - public int copyFolderFiles(String sourceFolderName, String destFolderName, String fileName) { - int progress=0; - log.info("start copy " + fileName + " from " + sourceFolderName + " to " + destFolderName); - ShowData showData=new ShowData(); - Map reStrings=showData.showFolderData(destFolderName); - if(reStrings==null){ - log.info("3201 "+destFolderName+" is not exists"); - return -3; - } - - reStrings=showData.showFolderData(sourceFolderName+"/"+fileName); - if(reStrings==null){ - log.info("3202 "+sourceFolderName+"/"+fileName+" is not exists"); - return -2; - } - String command = "cp -r " + sourceFolderName + "/" + fileName+" "+destFolderName; - /* - * RunCommand runCommand = new RunCommand(); - - List reStrings = runCommand.runCommandWait(command); - */ - Constant.ganymedSSH.execCmdNoWaitAcquiescent(command); - - log.info("copy " + sourceFolderName +"/" + fileName+ " to " + destFolderName + " running"); - return 1; - } - - - @Test - public void testCopyFolderFiles() { - PropertyConfigurator.configure("log4j.properties"); - copyFolderFiles("/home", "/home/ubuntu", "system_data"); - } -} +package com.platform.glusterfs; + +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; + + +/** + * <一句话功能简述> 复制数据 + * <功能详细描述> + * @author chen + * @version [版本号,2016年9月8日] + * @see [相关类/方法] + * @since [产品/模块版本] + */ + +public class CopyData { + public static Logger log = Logger.getLogger(CopyData.class); + + public int copyVolumeFiles(String sourceVolumeName, String destVolumeName, String fileName) { + log.info("start copy " + fileName + " from " + sourceVolumeName + " to " + destVolumeName); + int status = -1; + /** + * get mount point of volumeName + */ + + String sourceFolderName = sourceVolumeName; + String destFolderName = destVolumeName; + status = copyFolderFiles(sourceFolderName, destFolderName, fileName); + return status; + } + + /** + * -1 :error; -2: the filename is not exists ;-3 :destFolderName ; 1: right + * not exists + * + * @param folderName + * @param fileName + * @return + */ + public int copyFolderFiles(String sourceFolderName, String destFolderName, String fileName) { + int progress=0; + log.info("start copy " + fileName + " from " + sourceFolderName + " to " + destFolderName); + ShowData showData=new ShowData(); + Map reStrings=showData.showFolderData(destFolderName); + if(reStrings==null){ + log.info("3201 "+destFolderName+" is not exists"); + return -3; + } + + reStrings=showData.showFolderData(sourceFolderName+"/"+fileName); + if(reStrings==null){ + log.info("3202 "+sourceFolderName+"/"+fileName+" is not exists"); + return -2; + } + String command = "cp -r " + sourceFolderName + "/" + fileName+" "+destFolderName; + /* + * RunCommand runCommand = new RunCommand(); + + List reStrings = runCommand.runCommandWait(command); + */ + Constant.ganymedSSH.execCmdNoWaitAcquiescent(command); + + log.info("copy " + sourceFolderName +"/" + fileName+ " to " + destFolderName + " running"); + return 1; + } + + + @Test + public void testCopyFolderFiles() { + PropertyConfigurator.configure("log4j.properties"); + copyFolderFiles("/home", "/home/ubuntu", "system_data"); + } +} diff --git a/src/com/platform/glusterfs/GetTreeData.java b/src/com/platform/glusterfs/GetTreeData.java index 14409b77..96b3f98f 100644 --- a/src/com/platform/glusterfs/GetTreeData.java +++ b/src/com/platform/glusterfs/GetTreeData.java @@ -1,78 +1,77 @@ -package com.platform.glusterfs; - -import java.util.ArrayList; -import java.util.List; -import java.util.Map; - -import org.apache.log4j.PropertyConfigurator; -import org.junit.Test; -import org.springframework.stereotype.Service; - -import com.platform.entities.FolderNode; - -/** - * <一句话功能简述> 获得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) { - FolderNode fileNode = new FolderNode(name); - Map files = showData.showFolderData(name); - if(files==null || files.size()==0){ - return fileNode; - } - fileNode.setIsFolder(files.size()); - List list = new ArrayList(); - fileNode.setChildNodes(list); - for (Map.Entry entry : files.entrySet()) { - 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; - } - -// public static void main(String[] args) { -// GetTreeData getTreeData=new GetTreeData(); -// FileOrFolder fileOrFolder=getTreeData.getDatas("/home"); -// System.out.println(fileOrFolder); -// } -} - -//class FileOrFolder { -// String name; -// int isFolder; // 1 is file and other integer is folder show children number -// List 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.apache.log4j.PropertyConfigurator; +import org.junit.Test; +import org.springframework.stereotype.Service; + +import com.platform.entities.FolderNode; + +/** + * <一句话功能简述> 获得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) { + FolderNode fileNode = new FolderNode(name); + Map files = showData.showFolderData(name); + if(files==null || files.size()==0){ + return fileNode; + } + fileNode.setIsFolder(files.size()); + List list = new ArrayList(); + fileNode.setChildNodes(list); + for (Map.Entry entry : files.entrySet()) { + 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; + } + +// public static void main(String[] args) { +// GetTreeData getTreeData=new GetTreeData(); +// FileOrFolder fileOrFolder=getTreeData.getDatas("/home"); +// System.out.println(fileOrFolder); +// } +} + +//class FileOrFolder { +// String name; +// int isFolder; // 1 is file and other integer is folder show children number +// List 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; +// } +//} +