p78543092
/
haflow
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

delete module.util package.

This commit is contained in:
zhaowei8188127 2013-12-09 16:17:49 +08:00
parent 4968be0595
commit 8c6b39ad67
8 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/haflow/engine/oozie/OozieEngine.java
View File

@ -14,8 +14,8 @@ import haflow.module.DataType;
import haflow.module.Module; import haflow.module.Module;
import haflow.module.ModuleConfiguration; import haflow.module.ModuleConfiguration;
import haflow.module.ModuleEndpoint; import haflow.module.ModuleEndpoint;
import haflow.module.util.ModuleUtil;
import haflow.service.HdfsService; import haflow.service.HdfsService;
import haflow.service.ModuleService;
import haflow.service.NodeConfigurationService; import haflow.service.NodeConfigurationService;
import haflow.util.ClusterConfiguration; import haflow.util.ClusterConfiguration;
@ -331,7 +331,7 @@ public class OozieEngine extends AbstractEngine {
} }
@Autowired @Autowired
private void setModuleUtil(ModuleUtil moduleUtil) { private void setModuleUtil(ModuleService moduleUtil) {
this.moduleUtil = moduleUtil; this.moduleUtil = moduleUtil;
} }
@ -352,7 +352,7 @@ public class OozieEngine extends AbstractEngine {
private Logger logger = Logger.getLogger(this.getClass().getName()); private Logger logger = Logger.getLogger(this.getClass().getName());
private ModuleUtil moduleUtil; private ModuleService moduleUtil;
private HdfsService hdfsService; private HdfsService hdfsService;
private OozieService oozieService; private OozieService oozieService;
private FlowDeployService flowDeployService; private FlowDeployService flowDeployService;

4
src/main/java/haflow/module/util/ModuleUtil.java → src/main/java/haflow/service/ModuleService.java
View File

@ -1,5 +1,5 @@
package haflow.module.util; package haflow.service;
import haflow.module.AbstractModule; import haflow.module.AbstractModule;
import haflow.module.Module; import haflow.module.Module;
@ -16,7 +16,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
@Component @Component
public class ModuleUtil { public class ModuleService {
private ClassHelper classHelper; private ClassHelper classHelper;
private ClassHelper getClassHelper() { private ClassHelper getClassHelper() {

6
src/main/java/haflow/ui/controller/AdminLogonController.java
View File

@ -3,8 +3,8 @@ package haflow.ui.controller;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import haflow.module.util.Md5Util;
import haflow.ui.helper.UserHelper; import haflow.ui.helper.UserHelper;
import haflow.util.Md5Util;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller; 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) { public String post(RedirectAttributes redirectAttributes,HttpServletRequest request,@RequestParam("username") String username,@RequestParam("password") String password) {
if(username==""||password==""){ if(username==""||password==""){
redirectAttributes.addFlashAttribute("message", "请填写用户名密码"); redirectAttributes.addFlashAttribute("message", "<EFBFBD><EFBFBD><EFBFBD><EFBFBD>д<EFBFBD>û<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>");
return "redirect:/"; return "redirect:/";
} }
password=Md5Util.getMd5Hex(password); password=Md5Util.getMd5Hex(password);
@ -71,7 +71,7 @@ public class AdminLogonController {
return "redirect:/adminhome"; return "redirect:/adminhome";
} }
else{ else{
redirectAttributes.addFlashAttribute("message","用户名密码错误"); redirectAttributes.addFlashAttribute("message","<EFBFBD>û<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>");
return "redirect:/"; return "redirect:/";
} }

2
src/main/java/haflow/ui/controller/MainLogonController.java
View File

@ -3,9 +3,9 @@ package haflow.ui.controller;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import haflow.module.util.Md5Util;
import haflow.ui.helper.HdfsHelper; import haflow.ui.helper.HdfsHelper;
import haflow.ui.helper.UserHelper; import haflow.ui.helper.UserHelper;
import haflow.util.Md5Util;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;

8
src/main/java/haflow/ui/helper/ModuleHelper.java
View File

@ -3,7 +3,7 @@ package haflow.ui.helper;
import haflow.module.Module; import haflow.module.Module;
import haflow.module.ModuleConfiguration; import haflow.module.ModuleConfiguration;
import haflow.module.ModuleEndpoint; import haflow.module.ModuleEndpoint;
import haflow.module.util.ModuleUtil; import haflow.service.ModuleService;
import haflow.ui.model.ModuleConfigurationModel; import haflow.ui.model.ModuleConfigurationModel;
import haflow.ui.model.ModuleBriefModel; import haflow.ui.model.ModuleBriefModel;
import haflow.ui.model.ModuleEndpointModel; import haflow.ui.model.ModuleEndpointModel;
@ -20,7 +20,7 @@ import org.springframework.stereotype.Component;
@Component @Component
public class ModuleHelper { public class ModuleHelper {
private static ModuleHelper moduleHelper; private static ModuleHelper moduleHelper;
private ModuleUtil moduleUtil; private ModuleService moduleUtil;
public static ModuleHelper getModuleHelper() { public static ModuleHelper getModuleHelper() {
return moduleHelper; return moduleHelper;
@ -30,12 +30,12 @@ public class ModuleHelper {
ModuleHelper.moduleHelper = moduleHelper; ModuleHelper.moduleHelper = moduleHelper;
} }
private ModuleUtil getModuleUtil() { private ModuleService getModuleUtil() {
return moduleUtil; return moduleUtil;
} }
@Autowired @Autowired
private void setModuleUtil(ModuleUtil moduleUtil) { private void setModuleUtil(ModuleService moduleUtil) {
this.moduleUtil = moduleUtil; this.moduleUtil = moduleUtil;
} }

2
src/main/java/haflow/module/util/Md5Util.java → src/main/java/haflow/util/Md5Util.java
View File

@ -1,4 +1,4 @@
package haflow.module.util; package haflow.util;
import java.io.UnsupportedEncodingException; import java.io.UnsupportedEncodingException;
import java.security.MessageDigest; import java.security.MessageDigest;

2
src/main/webapp/WEB-INF/views/admin.jsp
View File

@ -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.model.ModuleBriefModel"%>
<%@page import="haflow.ui.helper.ModuleHelper"%> <%@page import="haflow.ui.helper.ModuleHelper"%>
<%@ page language="java" contentType="text/html; charset=utf-8" <%@ page language="java" contentType="text/html; charset=utf-8"

8
src/test/java/haflow/test/ModuleUtilTest.java
View File

@ -5,7 +5,7 @@ import java.util.UUID;
import haflow.module.Module; import haflow.module.Module;
import haflow.module.AbstractModule; import haflow.module.AbstractModule;
import haflow.module.util.ModuleUtil; import haflow.service.ModuleService;
import org.junit.Assert; import org.junit.Assert;
import org.junit.Test; import org.junit.Test;
@ -15,14 +15,14 @@ import org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests;
@ContextConfiguration(locations = "classpath:servlet-context.xml") @ContextConfiguration(locations = "classpath:servlet-context.xml")
public class ModuleUtilTest extends AbstractJUnit4SpringContextTests { public class ModuleUtilTest extends AbstractJUnit4SpringContextTests {
private ModuleUtil moduleUtil; private ModuleService moduleUtil;
private ModuleUtil getModuleUtil() { private ModuleService getModuleUtil() {
return moduleUtil; return moduleUtil;
} }
@Autowired @Autowired
private void setModuleUtil(ModuleUtil moduleUtil) { private void setModuleUtil(ModuleService moduleUtil) {
this.moduleUtil = moduleUtil; this.moduleUtil = moduleUtil;
} }