From 8698925e0303ccf1c42bb46c74e15fb6b39b1dbf Mon Sep 17 00:00:00 2001 From: zhaowei8188127 <18810460332@163.com> Date: Thu, 6 Jun 2013 15:59:00 +0800 Subject: [PATCH] change java7 to java6 --- haflow.module.jar | Bin 1416 -> 1419 bytes maven-install/haflow-demo-module.jar | Bin 0 -> 11815 bytes ...ava7-module.pom => haflow-demo-module.pom} | 7 +- maven-install/java7-module.jar | Bin 11954 -> 0 bytes pom.xml | 29 +++--- .../java/haflow/hdfs/client/HdfsHelper.java | 13 +-- .../haflow/hdfs/client/HdfsStaticHelper.java | 49 +++++++--- .../haflow/hdfs/client/TestClassPath.java | 8 +- .../{JavaClient.java => OozieHelper.java} | 17 +++- .../haflow/service/FlowDeployService.java | 92 +++++++++++++++++- .../haflow/service/FlowExecuteService.java | 43 ++++---- .../service/FlowExecuteServiceTest.java | 4 - .../java/haflow/utility/ModuleLoader.java | 10 +- src/main/resources/hibernate.cfg.xml | 4 +- 14 files changed, 197 insertions(+), 79 deletions(-) create mode 100644 maven-install/haflow-demo-module.jar rename maven-install/{java7-module.pom => haflow-demo-module.pom} (69%) delete mode 100644 maven-install/java7-module.jar rename src/main/java/haflow/oozie/client/{JavaClient.java => OozieHelper.java} (79%) diff --git a/haflow.module.jar b/haflow.module.jar index 1c2004933deb62d42e4f197bbcedbc88e7b785d8..c4458e6ff48ad353ed614b947d11c2b59114a70b 100644 GIT binary patch delta 946 zcmeC+?&jtV@MdNaVc_84VCb$oHjy`u*%3(P+0-)|inRJ?z0RoJYUd#Maihkr!h*M6 zTbeSmGu<6`c^$uPs5*H{<}#!Dv#s_A^GTamHK;f&AN4(YLA<8Jb1*Lr-#Kp(3qb)IeCh;TK0bh-PNHp3}0-WKkHy@b8P?p zl=$1__VdoYeBPrSFmtEfH#QNg#>00O+?2k;!osyj?8kgAS2-pd)rQxPmTY?D`(0J1 z`0n#{XWn>;H*M%LUE}Z9!W&Y@5a7+uvF87YY(+)}hSxxh2u5J|O@7L#Tfg7$uz|oa z`^(d&OtWV_)F8lQ7_vdY(AZFfv(srRo63^~+Nx6$XBEN)5euc!7FB#M!nd5>Go$zOz4ZAWKx7r|RKd-;%58 z;r}D;GJi`g`FySEJs+zT_u|_ZTawfZ0$%RT*sXow^3%}AGq1mjF_&U^{i(ldsnNwb z@3oCGHohyo@@&pkcaB3+*ER;u?m z7O-bdxO9nqRz%>b?iET}Yec@Y&bCf|_hhs3>9%_BiTn>13$%#{Dr}oI^KRvC`#*n} zDvl<%1-2O~UO%OE-cfK~`s!)hb&@iACj5y#6MimxWA$p6w^kn?uDYQq&2?x+&X%VF zwOJ=uU;91ZG-ssYoYbU zxzitgYBTs*|NZCHRa!ipEpmR&wTGC0o#dbNI&nrwS=diOkpBeVg>dX+U|^5|`;U=H zgaMwvCi}5Ca{?2H6FBKip2gw==7B?G@_QChrt6H8H?oLLmSGhFOMs1 delta 959 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 vl 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 ZA)BHM;CZ2gfS^48_&k4$6aV;f{2#()P=^2j literal 0 HcmV?d00001 diff --git a/maven-install/java7-module.pom b/maven-install/haflow-demo-module.pom similarity index 69% rename from maven-install/java7-module.pom rename to maven-install/haflow-demo-module.pom index 0a8dc92..7d42af5 100644 --- a/maven-install/java7-module.pom +++ b/maven-install/haflow-demo-module.pom @@ -3,10 +3,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 1.0 com.otcaix.haflow - java7-module + haflow-demo-module jar - java7 - java7 module - http://www.baidu.com + demo + haflow-demo-module 1.0 \ No newline at end of file diff --git a/maven-install/java7-module.jar b/maven-install/java7-module.jar deleted file mode 100644 index f2aaeadf372a4a92c92db026072e4574b49004ba..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 11954 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 diff --git a/pom.xml b/pom.xml index b9c5577..7514333 100644 --- a/pom.xml +++ b/pom.xml @@ -43,7 +43,7 @@ org.hibernate hibernate-core - 4.3.0.Beta2 + 4.3.0.Beta3 @@ -95,7 +95,7 @@ com.otcaix.haflow - java7-module + haflow-demo-module 1.0 @@ -105,18 +105,23 @@ - - haflow - - - org.eclipse.jetty - jetty-maven-plugin - 9.0.3.v20130506 - - - + + + + + org.mortbay.jetty + maven-jetty-plugin + 8.1.11.v20130520 + + + org.kohsuke.jetty + jetty-maven-plugin + 7.0.0pre1 + + + diff --git a/src/main/java/haflow/hdfs/client/HdfsHelper.java b/src/main/java/haflow/hdfs/client/HdfsHelper.java index 7fd9ee7..30b14dc 100644 --- a/src/main/java/haflow/hdfs/client/HdfsHelper.java +++ b/src/main/java/haflow/hdfs/client/HdfsHelper.java @@ -14,6 +14,7 @@ import org.apache.hadoop.fs.FileStatus; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; import org.apache.hadoop.io.IOUtils; +import org.springframework.stereotype.Component; /** * Read top 10 lines, from files on hadoop @@ -21,6 +22,7 @@ import org.apache.hadoop.io.IOUtils; * @author ZhaoWei * */ +@Component public class HdfsHelper { public static final String filePath = "hdfs://m150:9000/ztest/split/part-r-00000"; public static final String newFile = "hdfs://m150:9000/ztest/test/part-r-00000"; @@ -29,14 +31,13 @@ public class HdfsHelper { private FileSystem hdfs; public static void main(String[] args) throws IOException { - Configuration conf = new Configuration(); - - HdfsHelper reader = new HdfsHelper(conf); + HdfsHelper reader = new HdfsHelper(); reader.ReadFile(filePath); } - - public HdfsHelper(Configuration conf){ + + public HdfsHelper(){ try { + Configuration conf = new Configuration(); hdfs = FileSystem.get(conf); } catch (IOException e) { e.printStackTrace(); @@ -94,7 +95,7 @@ public class HdfsHelper { try { Path srcPath = new Path(srcFile); Path dstPath = new Path(dstFile); - hdfs.copyFromLocalFile(srcPath, dstPath); + hdfs.copyFromLocalFile(false, true, srcPath, dstPath); } catch (IOException e) { e.printStackTrace(); } diff --git a/src/main/java/haflow/hdfs/client/HdfsStaticHelper.java b/src/main/java/haflow/hdfs/client/HdfsStaticHelper.java index fb61db1..69ed24b 100644 --- a/src/main/java/haflow/hdfs/client/HdfsStaticHelper.java +++ b/src/main/java/haflow/hdfs/client/HdfsStaticHelper.java @@ -21,18 +21,20 @@ import org.apache.hadoop.util.Progressable; public class HdfsStaticHelper { public static void main(String[] args) { - try { - uploadTohdfs(); - } catch (FileNotFoundException e) { - e.printStackTrace(); - } catch (IOException e) { - e.printStackTrace(); - }; +// try { +// uploadTohdfs(); +// } catch (FileNotFoundException e) { +// e.printStackTrace(); +// } catch (IOException e) { +// e.printStackTrace(); +// }; + + PutFile("D:/haflow/flows/NewFlow", "hdfs://m150:9000/ztest/test1"); } public static void uploadTohdfs() throws FileNotFoundException, IOException { - String localSrc = "D://a.txt"; - String dst = "hdfs://m150:9000/ztest/test/a.txt"; + String localSrc = "D:/haflow/flows/NewFlow/workflow.xml"; + String dst = "hdfs://m150:9000/ztest/test/newflow"; InputStream in = new BufferedInputStream(new FileInputStream(localSrc)); Configuration conf = new Configuration(); FileSystem fs = FileSystem.get(URI.create(dst), conf); @@ -41,11 +43,26 @@ public class HdfsStaticHelper { System.out.println("."); } }); - System.out.println("上传文件成功"); + System.out.println("finised uploading!"); IOUtils.copyBytes(in, out, 4096, true); } - /** 从HDFS上读取文件 */ + public static void PutFile( String srcFile, String dstFile) { + + FileSystem hdfs; + + Configuration conf = new Configuration(); + try { + hdfs = FileSystem.get(conf); + Path srcPath = new Path(srcFile); + Path dstPath = new Path(dstFile); + hdfs.copyFromLocalFile(srcPath, dstPath); + } catch (IOException e) { + e.printStackTrace(); + } + + } + public static void readHdfs() throws FileNotFoundException, IOException { String dst = "hdfs://192.168.1.11:9000/usr/yujing/test.txt"; Configuration conf = new Configuration(); @@ -60,15 +77,18 @@ public class HdfsStaticHelper { out.write(ioBuffer, 0, readLen); readLen = hdfsInStream.read(ioBuffer); } - System.out.println("读文件成功"); + System.out.println("finished reading!"); out.close(); hdfsInStream.close(); fs.close(); } /** - * 以append方式将内容添加到HDFS上文件的末尾;注意：文件更新，需要在hdfs-site.xml中添dfs. - * append.supporttrue + * 以append方式将内容添加到HDFS上文件的末尾;注意：文件更新，需要在hdfs-site.xml中添 + * + * dfs.append.support + * true + * */ public static void appendToHdfs() throws FileNotFoundException, IOException { String dst = "hdfs://192.168.1.11:9000/usr/yujing/test.txt"; @@ -85,7 +105,6 @@ public class HdfsStaticHelper { fs.close(); } - /** 从HDFS上删除文件 */ public static void deleteFromHdfs() throws FileNotFoundException, IOException { String dst = "hdfs://192.168.1.11:9000/usr/yujing"; diff --git a/src/main/java/haflow/hdfs/client/TestClassPath.java b/src/main/java/haflow/hdfs/client/TestClassPath.java index 5ad5941..c1dc250 100644 --- a/src/main/java/haflow/hdfs/client/TestClassPath.java +++ b/src/main/java/haflow/hdfs/client/TestClassPath.java @@ -1,14 +1,12 @@ package haflow.hdfs.client; -import haflow.module.general.JavaModule; - import java.io.File; public class TestClassPath { public static void main(String[] args) { - String path = JavaModule.class.getProtectionDomain().getCodeSource().getLocation().getFile(); - File jarFile = new File(path); - System.out.println(path); +// String path = JavaModule.class.getProtectionDomain().getCodeSource().getLocation().getFile(); +// File jarFile = new File(path); +// System.out.println(path); } } diff --git a/src/main/java/haflow/oozie/client/JavaClient.java b/src/main/java/haflow/oozie/client/OozieHelper.java similarity index 79% rename from src/main/java/haflow/oozie/client/JavaClient.java rename to src/main/java/haflow/oozie/client/OozieHelper.java index 8d06a4c..06feb6a 100644 --- a/src/main/java/haflow/oozie/client/JavaClient.java +++ b/src/main/java/haflow/oozie/client/OozieHelper.java @@ -6,7 +6,7 @@ import org.apache.oozie.client.OozieClient; import org.apache.oozie.client.OozieClientException; import org.apache.oozie.client.WorkflowJob; -public class JavaClient { +public class OozieHelper { public static void main(String[] args) throws OozieClientException, InterruptedException { @@ -42,4 +42,19 @@ public class JavaClient { System.out.println(wc.getJobInfo(jobId)); } + + // get a OozieClient for local Oozie + OozieClient wc = new OozieClient("http://m150:11000/oozie/"); + + // create a workflow job configuration + Properties conf = wc.createConfiguration(); + + public OozieHelper(){ + + } + + public String runJob(String flowName){ + + return null; + } } diff --git a/src/main/java/haflow/service/FlowDeployService.java b/src/main/java/haflow/service/FlowDeployService.java index 77b5887..4770cc2 100644 --- a/src/main/java/haflow/service/FlowDeployService.java +++ b/src/main/java/haflow/service/FlowDeployService.java @@ -1,26 +1,67 @@ package haflow.service; +import haflow.hdfs.client.HdfsHelper; + import java.io.File; import java.io.FileInputStream; import java.io.FileNotFoundException; import java.io.FileOutputStream; import java.io.IOException; +import java.io.OutputStreamWriter; import java.nio.channels.FileChannel; +import java.util.Set; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @Component public class FlowDeployService { - public long copyJarFile(File srcFile, File dstPath, String dstName){ + private final String workspace = "D:/haflow/flows/"; + private final String workspace_hdfs = "hdfs://m150:9000/user/root/examples/apps/"; + + private HdfsHelper hdfsHelper; + + public HdfsHelper getHdfsHelper() { + return hdfsHelper; + } + + @Autowired + public void setHdfsHelper(HdfsHelper hdfsHelper) { + this.hdfsHelper = hdfsHelper; + } + + public boolean deployFlow(String flowName, String workflowXml, Set jarPaths){ + String deployPath = workspace + flowName; + this.rmr(new File(deployPath)); + this.saveXmlToFlow(workflowXml, deployPath); + + for (String jarPath : jarPaths) { + if(jarPath.endsWith(".jar")){ + File jarFile = new File(jarPath); + File dstPath = new File(deployPath + "/lib"); + System.out.println(jarPath); + this.copyJarFile(jarFile, dstPath, jarFile.getName()); + } + } + + this.hdfsHelper.PutFile(deployPath, workspace_hdfs + flowName); + return true; + } + + private long copyJarFile(File srcFile, File dstPath, String dstName){ File dst = new File(dstPath, dstName); if(!srcFile.exists()){ System.out.println(srcFile.getAbsolutePath() + " do not exist!"); - }else if( !dstPath.exists()){ - System.out.println(dstPath.getAbsolutePath() + " do not exist!"); }else if(dst.exists()){ System.out.println(dst.getAbsolutePath() + " already exists!"); }else{ + if( !dstPath.exists()){ + boolean made = mkdir(dstPath); + if( made ) + System.out.println(dstPath.getAbsolutePath() + " created!"); + } + //start copy file try { @SuppressWarnings("resource") @@ -40,4 +81,49 @@ public class FlowDeployService { } return 0; } + + private boolean saveXmlToFlow(String xml, String filePath){ + File dir = new File(filePath); + mkdir(dir); + OutputStreamWriter fw; + try { + fw = new OutputStreamWriter(new FileOutputStream(new File(filePath, "workflow.xml"))); + fw.write(xml); + fw.close(); + return true; + } catch (FileNotFoundException e) { + e.printStackTrace(); + } catch (IOException e) { + e.printStackTrace(); + } + return false; + } + + private boolean rmr(File dir){ + if( dir != null && dir.exists()){ + if( dir.isDirectory()){ + File[] subs = dir.listFiles(); + for( File sub : subs){ + rmr(sub); + } + return dir.delete(); + }else if( dir.isFile()){ + return dir.delete(); + } + } + return true; + } + + private boolean mkdir(File dir){ + if( !dir.exists() ){ + boolean made = dir.mkdirs(); + if(made){ + System.out.println("made dir " + dir.getAbsolutePath()); + }else{ + System.err.println("failed to make dir " + dir.getAbsolutePath()); + return false; + } + } + return true; + } } diff --git a/src/main/java/haflow/service/FlowExecuteService.java b/src/main/java/haflow/service/FlowExecuteService.java index cc8f071..b9a9d17 100644 --- a/src/main/java/haflow/service/FlowExecuteService.java +++ b/src/main/java/haflow/service/FlowExecuteService.java @@ -7,16 +7,15 @@ import haflow.flow.entity.Topological; import haflow.module.ModuleMetadata; import haflow.module.basic.EndModule; import haflow.module.basic.StartModule; -import haflow.module.general.JavaModule; import haflow.profile.NodeConfigurationProfile; import haflow.ui.model.RunFlowResultModel; import haflow.utility.ModuleLoader; import haflow.utility.SessionHelper; import haflow.utility.XmlHelper; -import java.io.File; import java.util.ArrayList; import java.util.HashMap; +import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Set; @@ -125,8 +124,8 @@ public class FlowExecuteService { startNodes.get(0)); Topological topo = new Topological(graph); List sorted = topo.getOrder(); - StringBuilder sb = new StringBuilder(); - sb.append("" + "\n"); if (sorted != null) { for (int i = 0; i < sorted.size(); i++) {//move end node to the end @@ -142,7 +141,13 @@ public class FlowExecuteService { break; } } - for (int i = 0; i < sorted.size(); i++) { + for (int i = 0; i < sorted.size(); i++) {//generate xml + if( i == sorted.size()-1 ){ + workflowXml.append("" + + "Work flow failed, " + + "error message[${wf:errorMessage(wf:lastErrorNode())}]" + + "" + "\n"); + } int w = sorted.get(i); Node node = graph.getNode(w); Class moduleClass = moduleClasses.get(node @@ -169,32 +174,24 @@ public class FlowExecuteService { } Document doc = module.generate(configurations); String part = this.xmlHelper.getXmlString(doc); - sb.append(part + "\n"); + workflowXml.append(part + "\n"); } }else{ messageBuilder.append("Error: Flow is has Circles!"); - } -// sb.append("" + -// "Work flow failed, " + -// "error message[${wf:errorMessage(wf:lastErrorNode())}]" + -// "" + "\n"); - sb.append("" + "\n"); - System.out.println(sb.toString()); - messageBuilder.append("Generated xml : \n" + sb.toString()); + } + workflowXml.append("" + "\n"); + System.out.println(workflowXml.toString()); +// messageBuilder.append("Generated xml : \n" + workflowXml.toString()); - //deploy workflow - String flowName = flow.getName(); + //deploy workflow + Set jarPaths = new HashSet(); for (Node node : nodes) { Class module = moduleClasses.get(node.getModuleId() .toString()); - String path = JavaModule.class.getProtectionDomain().getCodeSource().getLocation().getFile(); - if(path.endsWith(".jar")){ - File jarFile = new File(path); - File dstPath = new File("D:/haflow/flows/" + flowName); - System.out.println(path); - this.flowDeployService.copyJarFile(jarFile, dstPath, jarFile.getName()); - } + String path = module.getProtectionDomain().getCodeSource().getLocation().getFile(); + jarPaths.add(path); } +// this.flowDeployService.deployFlow(flow.getName(), workflowXml.toString(), jarPaths); } diff --git a/src/main/java/haflow/service/FlowExecuteServiceTest.java b/src/main/java/haflow/service/FlowExecuteServiceTest.java index d1cdc84..397ccce 100644 --- a/src/main/java/haflow/service/FlowExecuteServiceTest.java +++ b/src/main/java/haflow/service/FlowExecuteServiceTest.java @@ -1,10 +1,7 @@ package haflow.service; -import haflow.service.FlowExecuteService; - import java.util.UUID; -import org.junit.Test; import org.springframework.context.ApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; @@ -12,7 +9,6 @@ public class FlowExecuteServiceTest { private ApplicationContext context; - @Test public void test() { context = new ClassPathXmlApplicationContext(new String[] {"servlet-context.xml"}); FlowExecuteService fes = context.getBean(FlowExecuteService.class); diff --git a/src/main/java/haflow/utility/ModuleLoader.java b/src/main/java/haflow/utility/ModuleLoader.java index 7784622..4e885bf 100644 --- a/src/main/java/haflow/utility/ModuleLoader.java +++ b/src/main/java/haflow/utility/ModuleLoader.java @@ -1,15 +1,15 @@ package haflow.utility; +import haflow.entity.Module; +import haflow.entity.ModuleConfiguration; +import haflow.module.ModuleMetadata; + import java.util.HashMap; import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.UUID; -import haflow.entity.Module; -import haflow.entity.ModuleConfiguration; -import haflow.module.ModuleMetadata; - import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -31,6 +31,7 @@ public class ModuleLoader { Map modules = new HashMap(); List classNames = this.getClassHelper().getClassNames( "haflow", true); + classNames.addAll(this.getClassHelper().getClassNames("hmodule", true)); for (String className : classNames) { Class moduleClass = Class.forName(className); if (moduleClass.isAnnotationPresent(haflow.module.Module.class)) { @@ -78,6 +79,7 @@ public class ModuleLoader { Map> moduleClasses = new HashMap>(); List classNames = this.getClassHelper().getClassNames( "haflow", true); + classNames.addAll(this.getClassHelper().getClassNames("hmodule", true)); for (String className : classNames) { Class moduleClass = Class.forName(className); if (moduleClass.isAnnotationPresent(haflow.module.Module.class)) { diff --git a/src/main/resources/hibernate.cfg.xml b/src/main/resources/hibernate.cfg.xml index aa92dce..09b1cfd 100644 --- a/src/main/resources/hibernate.cfg.xml +++ b/src/main/resources/hibernate.cfg.xml @@ -8,8 +8,8 @@ root 123456 20 - true - true + false + false true utf-8 org.hibernate.dialect.MySQLDialect