diff --git a/src/main/java/haflow/engine/oozie/OozieEngine.java b/src/main/java/haflow/engine/oozie/OozieEngine.java index 33a34b0..f8290ad 100644 --- a/src/main/java/haflow/engine/oozie/OozieEngine.java +++ b/src/main/java/haflow/engine/oozie/OozieEngine.java @@ -14,8 +14,8 @@ import haflow.module.DataType; import haflow.module.Module; import haflow.module.ModuleConfiguration; import haflow.module.ModuleEndpoint; -import haflow.module.util.ModuleUtil; import haflow.service.HdfsService; +import haflow.service.ModuleService; import haflow.service.NodeConfigurationService; import haflow.util.ClusterConfiguration; @@ -331,7 +331,7 @@ public class OozieEngine extends AbstractEngine { } @Autowired - private void setModuleUtil(ModuleUtil moduleUtil) { + private void setModuleUtil(ModuleService moduleUtil) { this.moduleUtil = moduleUtil; } @@ -352,7 +352,7 @@ public class OozieEngine extends AbstractEngine { private Logger logger = Logger.getLogger(this.getClass().getName()); - private ModuleUtil moduleUtil; + private ModuleService moduleUtil; private HdfsService hdfsService; private OozieService oozieService; private FlowDeployService flowDeployService; diff --git a/src/main/java/haflow/module/util/ModuleUtil.java b/src/main/java/haflow/service/ModuleService.java similarity index 98% rename from src/main/java/haflow/module/util/ModuleUtil.java rename to src/main/java/haflow/service/ModuleService.java index b7e0cc4..f9686de 100644 --- a/src/main/java/haflow/module/util/ModuleUtil.java +++ b/src/main/java/haflow/service/ModuleService.java @@ -1,5 +1,5 @@ -package haflow.module.util; +package haflow.service; import haflow.module.AbstractModule; import haflow.module.Module; @@ -16,7 +16,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @Component -public class ModuleUtil { +public class ModuleService { private ClassHelper classHelper; private ClassHelper getClassHelper() { diff --git a/src/main/java/haflow/ui/controller/AdminLogonController.java b/src/main/java/haflow/ui/controller/AdminLogonController.java index a0badab..97bf3fb 100644 --- a/src/main/java/haflow/ui/controller/AdminLogonController.java +++ b/src/main/java/haflow/ui/controller/AdminLogonController.java @@ -3,8 +3,8 @@ package haflow.ui.controller; import javax.servlet.http.HttpServletRequest; -import haflow.module.util.Md5Util; import haflow.ui.helper.UserHelper; +import haflow.util.Md5Util; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; @@ -58,7 +58,7 @@ public class AdminLogonController { public String post(RedirectAttributes redirectAttributes,HttpServletRequest request,@RequestParam("username") String username,@RequestParam("password") String password) { if(username==""||password==""){ - redirectAttributes.addFlashAttribute("message", "ÇëÌîдÓû§ÃûÃÜÂë"); + redirectAttributes.addFlashAttribute("message", "����д�û�������"); return "redirect:/"; } password=Md5Util.getMd5Hex(password); @@ -71,7 +71,7 @@ public class AdminLogonController { return "redirect:/adminhome"; } else{ - redirectAttributes.addFlashAttribute("message","Óû§ÃûÃÜÂë´íÎó"); + redirectAttributes.addFlashAttribute("message","�û����������"); return "redirect:/"; } diff --git a/src/main/java/haflow/ui/controller/MainLogonController.java b/src/main/java/haflow/ui/controller/MainLogonController.java index 7f0042c..4081c49 100644 --- a/src/main/java/haflow/ui/controller/MainLogonController.java +++ b/src/main/java/haflow/ui/controller/MainLogonController.java @@ -3,9 +3,9 @@ package haflow.ui.controller; import javax.servlet.http.HttpServletRequest; -import haflow.module.util.Md5Util; import haflow.ui.helper.HdfsHelper; import haflow.ui.helper.UserHelper; +import haflow.util.Md5Util; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; diff --git a/src/main/java/haflow/ui/helper/ModuleHelper.java b/src/main/java/haflow/ui/helper/ModuleHelper.java index 0a09fda..017afab 100644 --- a/src/main/java/haflow/ui/helper/ModuleHelper.java +++ b/src/main/java/haflow/ui/helper/ModuleHelper.java @@ -3,7 +3,7 @@ package haflow.ui.helper; import haflow.module.Module; import haflow.module.ModuleConfiguration; import haflow.module.ModuleEndpoint; -import haflow.module.util.ModuleUtil; +import haflow.service.ModuleService; import haflow.ui.model.ModuleConfigurationModel; import haflow.ui.model.ModuleBriefModel; import haflow.ui.model.ModuleEndpointModel; @@ -20,7 +20,7 @@ import org.springframework.stereotype.Component; @Component public class ModuleHelper { private static ModuleHelper moduleHelper; - private ModuleUtil moduleUtil; + private ModuleService moduleUtil; public static ModuleHelper getModuleHelper() { return moduleHelper; @@ -30,12 +30,12 @@ public class ModuleHelper { ModuleHelper.moduleHelper = moduleHelper; } - private ModuleUtil getModuleUtil() { + private ModuleService getModuleUtil() { return moduleUtil; } @Autowired - private void setModuleUtil(ModuleUtil moduleUtil) { + private void setModuleUtil(ModuleService moduleUtil) { this.moduleUtil = moduleUtil; } diff --git a/src/main/java/haflow/module/util/Md5Util.java b/src/main/java/haflow/util/Md5Util.java similarity index 96% rename from src/main/java/haflow/module/util/Md5Util.java rename to src/main/java/haflow/util/Md5Util.java index cb01647..995f8a7 100644 --- a/src/main/java/haflow/module/util/Md5Util.java +++ b/src/main/java/haflow/util/Md5Util.java @@ -1,4 +1,4 @@ -package haflow.module.util; +package haflow.util; import java.io.UnsupportedEncodingException; import java.security.MessageDigest; diff --git a/src/main/webapp/WEB-INF/views/admin.jsp b/src/main/webapp/WEB-INF/views/admin.jsp index 26bd3d0..32e7962 100644 --- a/src/main/webapp/WEB-INF/views/admin.jsp +++ b/src/main/webapp/WEB-INF/views/admin.jsp @@ -1,4 +1,4 @@ -<%@page import="haflow.module.util.ModuleUtil"%> +<%@page import="haflow.service.ModuleService"%> <%@page import="haflow.ui.model.ModuleBriefModel"%> <%@page import="haflow.ui.helper.ModuleHelper"%> <%@ page language="java" contentType="text/html; charset=utf-8" diff --git a/src/test/java/haflow/test/ModuleUtilTest.java b/src/test/java/haflow/test/ModuleUtilTest.java index 63b70bc..dba2efb 100644 --- a/src/test/java/haflow/test/ModuleUtilTest.java +++ b/src/test/java/haflow/test/ModuleUtilTest.java @@ -5,7 +5,7 @@ import java.util.UUID; import haflow.module.Module; import haflow.module.AbstractModule; -import haflow.module.util.ModuleUtil; +import haflow.service.ModuleService; import org.junit.Assert; import org.junit.Test; @@ -15,14 +15,14 @@ import org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests; @ContextConfiguration(locations = "classpath:servlet-context.xml") public class ModuleUtilTest extends AbstractJUnit4SpringContextTests { - private ModuleUtil moduleUtil; + private ModuleService moduleUtil; - private ModuleUtil getModuleUtil() { + private ModuleService getModuleUtil() { return moduleUtil; } @Autowired - private void setModuleUtil(ModuleUtil moduleUtil) { + private void setModuleUtil(ModuleService moduleUtil) { this.moduleUtil = moduleUtil; }