Author: tom.baeyens(a)jboss.com Date: 2009-11-02 15:56:55 -0500 (Mon, 02 Nov 2009) New Revision: 5876 Added: projects/bbq/projects/bbq-core/java/org/bbq/commands/Junit.java projects/bbq/projects/bbq-core/java/org/bbq/system/Artifact.java projects/bbq/projects/bbq-test-project/java/com/myproject/Add.java projects/bbq/projects/bbq-test-project/test/ projects/bbq/projects/bbq-test-project/test/com/ projects/bbq/projects/bbq-test-project/test/com/myproject/ projects/bbq/projects/bbq-test-project/test/com/myproject/AddTest.java Removed: projects/bbq/projects/bbq-test-project/java/com/myproject/Tool.java Modified: projects/bbq/projects/bbq-core/java/org/bbq/commands/ClassPath.java projects/bbq/projects/bbq-core/java/org/bbq/commands/Exec.java projects/bbq/projects/bbq-core/java/org/bbq/commands/Java.java projects/bbq/projects/bbq-core/java/org/bbq/commands/Javac.java projects/bbq/projects/bbq-core/java/org/bbq/system/Path.java projects/bbq/projects/bbq-core/java/org/bbq/system/Repository.java projects/bbq/projects/bbq-test-project/.classpath projects/bbq/projects/bbq-test-project/build/Build.java Log: Modified: projects/bbq/projects/bbq-core/java/org/bbq/commands/ClassPath.java =================================================================== --- projects/bbq/projects/bbq-core/java/org/bbq/commands/ClassPath.java 2009-11-02 12:14:39 UTC (rev 5875) +++ projects/bbq/projects/bbq-core/java/org/bbq/commands/ClassPath.java 2009-11-02 20:56:55 UTC (rev 5876) @@ -25,7 +25,7 @@ import java.util.List; import java.util.StringTokenizer; -import org.bbq.system.Console; +import org.bbq.system.Artifact; import org.bbq.system.Repository; @@ -35,9 +35,12 @@ public class ClassPath { List<String> elements = new ArrayList<String>(); + List<Artifact> artifacts = new ArrayList<Artifact>(); public ClassPath add(Repository repository, String path) { - add(repository.getArtifactPath(path)); + Artifact artifact = repository.getArtifact(path); + artifacts.add(artifact); + add(artifact.getLocalPath()); return this; } @@ -59,9 +62,13 @@ return elements.isEmpty(); } - public String toString() { + public String resolve() { + for (Artifact artifact: artifacts) { + artifact.resolve(); + } return toString(";"); } + public String toString(String separator) { StringBuilder stringBuilder = new StringBuilder(); for (int i=0; i<(elements.size()-1); i++) { Modified: projects/bbq/projects/bbq-core/java/org/bbq/commands/Exec.java =================================================================== --- projects/bbq/projects/bbq-core/java/org/bbq/commands/Exec.java 2009-11-02 12:14:39 UTC (rev 5875) +++ projects/bbq/projects/bbq-core/java/org/bbq/commands/Exec.java 2009-11-02 20:56:55 UTC (rev 5876) @@ -23,6 +23,7 @@ import java.io.BufferedReader; import java.io.InputStreamReader; +import java.util.ArrayList; import java.util.List; import org.bbq.BbqException; @@ -34,13 +35,21 @@ */ public class Exec { - List<String> cmd; + List<String> cmd = new ArrayList<String>(); String description; + public Exec() { + } + public Exec(List<String> cmd) { this.cmd = cmd; } + public Exec add(String cmdElement) { + cmd.add(cmdElement); + return this; + } + public void execute() { try { String msg = description; Modified: projects/bbq/projects/bbq-core/java/org/bbq/commands/Java.java =================================================================== --- projects/bbq/projects/bbq-core/java/org/bbq/commands/Java.java 2009-11-02 12:14:39 UTC (rev 5875) +++ projects/bbq/projects/bbq-core/java/org/bbq/commands/Java.java 2009-11-02 20:56:55 UTC (rev 5876) @@ -32,7 +32,8 @@ */ public class Java { - static String JAVA_HOME = System.getenv("JAVA_HOME"); + public static String JAVA_HOME = System.getenv("JAVA_HOME"); + public static final String JAVA_EXECUTABLE = Java.JAVA_HOME+Os.FILE_SEPARATOR+"bin"+Os.FILE_SEPARATOR+"javac"; String classPath; String className; Modified: projects/bbq/projects/bbq-core/java/org/bbq/commands/Javac.java =================================================================== --- projects/bbq/projects/bbq-core/java/org/bbq/commands/Javac.java 2009-11-02 12:14:39 UTC (rev 5875) +++ projects/bbq/projects/bbq-core/java/org/bbq/commands/Javac.java 2009-11-02 20:56:55 UTC (rev 5876) @@ -92,7 +92,7 @@ // build up the compile command List<String> cmd = new ArrayList<String>(); - cmd.add(Java.JAVA_HOME+Os.FILE_SEPARATOR+"bin"+Os.FILE_SEPARATOR+"javac"); + cmd.add(Java.JAVA_EXECUTABLE); cmd.add("-d"); cmd.add(destDir); String description = "javac -d "+destDir; Added: projects/bbq/projects/bbq-core/java/org/bbq/commands/Junit.java =================================================================== --- projects/bbq/projects/bbq-core/java/org/bbq/commands/Junit.java (rev 0) +++ projects/bbq/projects/bbq-core/java/org/bbq/commands/Junit.java 2009-11-02 20:56:55 UTC (rev 5876) @@ -0,0 +1,84 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.bbq.commands; + +import java.util.ArrayList; +import java.util.List; + +import org.bbq.system.FileList; +import org.bbq.system.FileScan; +import org.junit.runner.JUnitCore; +import org.junit.runner.Request; + +import junit.textui.TestRunner; + + +/** + * @author Tom Baeyens + */ +public class Junit { + + FileList sourceTestFiles = null; + ClassPath classPath = new ClassPath(); + String name = "bbq test run"; + + public Junit tests(String srcDir, String suffix) { + FileList sourceTestFiles = new FileScan(srcDir) + .filterEnd(suffix) + .execute(); + + if (this.sourceTestFiles==null) { + this.sourceTestFiles = sourceTestFiles; + } else { + this.sourceTestFiles.add( sourceTestFiles ); + } + + return this; + } + + public Junit classPath(ClassPath classPath) { + this.classPath.add(classPath); + return this; + } + + public void execute() { + List<String> cmd = new ArrayList<String>(); + + new Java() + TODO... + .execute(); + } + + public static class Run { + public static void main(String[] args) { + JUnitCore junitCore = new JUnitCore(); + for (String srcTestFile: sourceTestFiles.list()) { + String testClassName = srcTestFile + .substring(0, srcTestFile.length()-5) + .replace('/', '.'); + + Class< ? > testClass = null; + junitCore.run(testClass); + } + } + } +} Property changes on: projects/bbq/projects/bbq-core/java/org/bbq/commands/Junit.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: projects/bbq/projects/bbq-core/java/org/bbq/system/Artifact.java =================================================================== --- projects/bbq/projects/bbq-core/java/org/bbq/system/Artifact.java (rev 0) +++ projects/bbq/projects/bbq-core/java/org/bbq/system/Artifact.java 2009-11-02 20:56:55 UTC (rev 5876) @@ -0,0 +1,119 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.bbq.system; + +import java.io.File; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.net.URL; + +import org.bbq.BbqException; + + +/** + * @author Tom Baeyens + */ +public class Artifact { + + String path; + String localPath; + String remoteUrl; + Repository repository; + + public Artifact(Repository repository, String path) { + this.path = path; + this.localPath = repository.getLocalRepositoryPath()+"/"+path; + this.remoteUrl = repository.getRemoteUrl()+"/"+path; + this.repository = repository; + } + + public void resolve() { + File artifactFile = new File(localPath); + if (!artifactFile.exists()) { + Console.log("downloading "+path+" from "+repository.getName()); + + // first make sure the directory exists + int index = localPath.lastIndexOf('/'); + String artifactDirPath = localPath.substring(0, index); + File artifactDir = new File(artifactDirPath); + artifactDir.mkdirs(); + + // download the artifact + try { + FileOutputStream fileStream = new FileOutputStream(artifactFile); + URL artifactUrl = new URL(remoteUrl); + pump(artifactUrl, fileStream); + } catch (Exception e) { + throw new BbqException("couldn't fetch repo artifact "+path); + } + } + } + + protected void pump(URL artifactUrl, OutputStream out) throws Exception { + int bufferSize = 1024*10; // 10K + int total = 0; + int dotCount = 0; + byte[] buffer = new byte[bufferSize]; + InputStream in = null; + try { + in = artifactUrl.openStream(); + int bytesRead = in.read( buffer ); + while ( bytesRead != -1 ) { + if (dotCount<80) { + Console.print("."); + dotCount++; + } else { + dotCount = 0; + Console.log(" "+(total/1024)+" KBytes"); + } + out.write( buffer, 0, bytesRead ); + total += bytesRead; + bytesRead = in.read( buffer ); + } + } finally { + Console.log("done"); + if (in!=null) { + try { + in.close(); + } catch (IOException e) { + e.printStackTrace(); + } + } + } + } + + + public String getPath() { + return path; + } + public String getLocalPath() { + return localPath; + } + public String getRemoteUrl() { + return remoteUrl; + } + public Repository getRepository() { + return repository; + } +} Property changes on: projects/bbq/projects/bbq-core/java/org/bbq/system/Artifact.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: projects/bbq/projects/bbq-core/java/org/bbq/system/Path.java =================================================================== --- projects/bbq/projects/bbq-core/java/org/bbq/system/Path.java 2009-11-02 12:14:39 UTC (rev 5875) +++ projects/bbq/projects/bbq-core/java/org/bbq/system/Path.java 2009-11-02 20:56:55 UTC (rev 5876) @@ -43,13 +43,4 @@ } return absolutePath; } - -// public static String toOsSpecific(String path) { -// } -// -// public static String toGeneric(String path) { -// } -// -// public static String toAbsolute(String path) { -// } } Modified: projects/bbq/projects/bbq-core/java/org/bbq/system/Repository.java =================================================================== --- projects/bbq/projects/bbq-core/java/org/bbq/system/Repository.java 2009-11-02 12:14:39 UTC (rev 5875) +++ projects/bbq/projects/bbq-core/java/org/bbq/system/Repository.java 2009-11-02 20:56:55 UTC (rev 5876) @@ -21,15 +21,7 @@ */ package org.bbq.system; -import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; -import java.net.URL; - import org.bbq.Bbq; -import org.bbq.BbqException; /** @@ -47,62 +39,17 @@ this.localRepositoryPath = Bbq.properties.getProperty("local.repo.dir")+"/"+name; } - public String getArtifactPath(String path) { - String absoluteArtifactPath = localRepositoryPath+"/"+path; - - File artifactFile = new File(absoluteArtifactPath); - if (!artifactFile.exists()) { - Console.log("downloading "+path+" from "+name); - - // first make sure the directory exists - int index = absoluteArtifactPath.lastIndexOf('/'); - String artifactDirPath = absoluteArtifactPath.substring(0, index); - File artifactDir = new File(artifactDirPath); - artifactDir.mkdirs(); - - // download the artifact - try { - FileOutputStream fileStream = new FileOutputStream(artifactFile); - URL artifactUrl = new URL(remoteUrl+"/"+path); - pump(artifactUrl, fileStream); - } catch (Exception e) { - throw new BbqException("couldn't fetch repo artifact "+path); - } - } - - return absoluteArtifactPath; + public Artifact getArtifact(String path) { + return new Artifact(this, path); } - protected void pump(URL artifactUrl, OutputStream out) throws Exception { - int bufferSize = 1024*10; // 10K - int total = 0; - int dotCount = 0; - byte[] buffer = new byte[bufferSize]; - InputStream in = null; - try { - in = artifactUrl.openStream(); - int bytesRead = in.read( buffer ); - while ( bytesRead != -1 ) { - if (dotCount<80) { - Console.print("."); - dotCount++; - } else { - dotCount = 0; - Console.log(" "+(total/1024)+" KBytes"); - } - out.write( buffer, 0, bytesRead ); - total += bytesRead; - bytesRead = in.read( buffer ); - } - } finally { - Console.log("done"); - if (in!=null) { - try { - in.close(); - } catch (IOException e) { - e.printStackTrace(); - } - } - } + public String getName() { + return name; } + public String getRemoteUrl() { + return remoteUrl; + } + public String getLocalRepositoryPath() { + return localRepositoryPath; + } } Modified: projects/bbq/projects/bbq-test-project/.classpath =================================================================== --- projects/bbq/projects/bbq-test-project/.classpath 2009-11-02 12:14:39 UTC (rev 5875) +++ projects/bbq/projects/bbq-test-project/.classpath 2009-11-02 20:56:55 UTC (rev 5876) @@ -1,8 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> <classpathentry kind="src" path="java"/> - <classpathentry kind="src" path="build"/> + <classpathentry kind="src" output="gen/test-classes" path="test"/> + <classpathentry kind="src" output="gen/build-classes" path="build"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry combineaccessrules="false" kind="src" path="/bbq-core"/> + <classpathentry kind="lib" path="C:/Documents and Settings/tom/.m2/repository/junit/junit/4.4/junit-4.4.jar"/> <classpathentry kind="output" path="gen/classes"/> </classpath> Modified: projects/bbq/projects/bbq-test-project/build/Build.java =================================================================== --- projects/bbq/projects/bbq-test-project/build/Build.java 2009-11-02 12:14:39 UTC (rev 5875) +++ projects/bbq/projects/bbq-test-project/build/Build.java 2009-11-02 20:56:55 UTC (rev 5876) @@ -1,5 +1,6 @@ import org.bbq.commands.ClassPath; import org.bbq.commands.Javac; +import org.bbq.commands.Junit; import org.bbq.system.Repository; @@ -30,22 +31,59 @@ */ public class Build { - static Repository jbossRepository = new Repository("jboss", "http://repository.jboss.com/maven2/"); + Repository jbossRepository = new Repository("jboss", "http://repository.jboss.com/maven2/"); + + ClassPath compileClassPath = new ClassPath() + .add(jbossRepository, "org/hibernate/hibernate-core/3.3.2.GA/hibernate-core-3.3.2.GA.jar"); - public static void compile() { - ClassPath classPath = new ClassPath() - .add(jbossRepository, "org/hibernate/hibernate-core/3.3.2.GA/hibernate-core-3.3.2.GA.jar"); - + ClassPath testCompileClassPath = new ClassPath() + .add(getCompileClassPath()) + .add(jbossRepository, "junit/junit/4.4/junit-4.4.jar"); + + ClassPath testRuntimeClassPath = testCompileClassPath; + + public void compile() { new Javac() - .classPath(classPath) + .classPath(getCompileClassPath()) .execute(); } - public static void publish() { - + public void compileTest() { + compile(); + new Javac() + .srcDir("test") + .destDir("gen/test-classes") + .classPath(getTestCompileClassPath()) + .execute(); } - public static void test() { - + public void test() { + compileTest(); + + new Junit() + .execute(); } + + public void publish() { + } + + + public ClassPath getCompileClassPath() { + if (compileClassPath==null) { + + } + return compileClassPath; + } + + + public ClassPath getTestCompileClassPath() { + if (testCompileClassPath==null) { + } + return testCompileClassPath; + } + + + public ClassPath getTestRuntimeClassPath() { + return testRuntimeClassPath; + } } Copied: projects/bbq/projects/bbq-test-project/java/com/myproject/Add.java (from rev 5870, projects/bbq/projects/bbq-test-project/java/com/myproject/Tool.java) =================================================================== --- projects/bbq/projects/bbq-test-project/java/com/myproject/Add.java (rev 0) +++ projects/bbq/projects/bbq-test-project/java/com/myproject/Add.java 2009-11-02 20:56:55 UTC (rev 5876) @@ -0,0 +1,33 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package com.myproject; + + +/** + * @author Tom Baeyens + */ +public class Add { + + public int add(int a, int b) { + return a+b; + } +} Property changes on: projects/bbq/projects/bbq-test-project/java/com/myproject/Add.java ___________________________________________________________________ Name: svn:mime-type + text/plain Deleted: projects/bbq/projects/bbq-test-project/java/com/myproject/Tool.java =================================================================== --- projects/bbq/projects/bbq-test-project/java/com/myproject/Tool.java 2009-11-02 12:14:39 UTC (rev 5875) +++ projects/bbq/projects/bbq-test-project/java/com/myproject/Tool.java 2009-11-02 20:56:55 UTC (rev 5876) @@ -1,30 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package com.myproject; - - -/** - * @author Tom Baeyens - */ -public class Tool { - -} Added: projects/bbq/projects/bbq-test-project/test/com/myproject/AddTest.java =================================================================== --- projects/bbq/projects/bbq-test-project/test/com/myproject/AddTest.java (rev 0) +++ projects/bbq/projects/bbq-test-project/test/com/myproject/AddTest.java 2009-11-02 20:56:55 UTC (rev 5876) @@ -0,0 +1,34 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package com.myproject; + + +/** + * @author Tom Baeyens + */ +public class AddTest { + + public void testAddition() { + Add add = new Add(); + assertEquals(5, add.add(2, 3)); + } +} Property changes on: projects/bbq/projects/bbq-test-project/test/com/myproject/AddTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain