Author: dblevins Date: Thu Mar 21 03:59:11 2013 New Revision: 1459145 URL: http://svn.apache.org/r1459145 Log: updated Binaries command to check binaries into svn as per the new dist.apache.org setup
Modified: tomee/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/Release.java tomee/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/cmd/Binaries.java tomee/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/cmd/CompareLibraries.java tomee/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/util/Files.java Modified: tomee/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/Release.java URL: http://svn.apache.org/viewvc/tomee/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/Release.java?rev=1459145&r1=1459144&r2=1459145&view=diff ============================================================================== --- tomee/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/Release.java (original) +++ tomee/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/Release.java Thu Mar 21 03:59:11 2013 @@ -46,8 +46,8 @@ public class Release { public static String tckBranches = "https://svn.apache.org/repos/tck/tomee-tck/branches/"; public static String tckTrunk = "https://svn.apache.org/repos/tck/tomee-tck/trunk"; - public static String staging = "https://repository.apache.org/content/repositories/orgapachetomee-${build}"; - public static String build = "001"; + public static String staging = "https://repository.apache.org/content/repositories/orgapachetomee-008"; + public static String build = "008"; public static String ciBuilder = "openejb-4.5.1"; public static String ciBuildNumber = "1"; Modified: tomee/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/cmd/Binaries.java URL: http://svn.apache.org/viewvc/tomee/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/cmd/Binaries.java?rev=1459145&r1=1459144&r2=1459145&view=diff ============================================================================== --- tomee/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/cmd/Binaries.java (original) +++ tomee/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/cmd/Binaries.java Thu Mar 21 03:59:11 2013 @@ -32,6 +32,9 @@ import java.util.Enumeration; import java.util.zip.ZipEntry; import java.util.zip.ZipFile; +import static java.lang.String.format; +import static org.apache.openejb.tools.release.util.Exec.exec; + /** * Little utility that downloads the binaries into */ @@ -39,27 +42,40 @@ import java.util.zip.ZipFile; public class Binaries { public static void main(String[] args) throws Exception { - final NexusClient client = new NexusClient(); final File dir = Files.file(Release.builddir, "staging-" + Release.build, Release.tomeeVersionName); - final URI repo = URI.create(Release.staging); - System.out.println("Downloads: " + dir.getAbsolutePath()); + { // Make and checkout the binaries dir in svn + if (dir.exists()) { + Files.remove(dir); + } + + Files.mkdirs(dir.getParentFile()); + + final String svnBinaryLocation = format("https://dist.apache.org/repos/dist/dev/tomee/staging-%s/%s", Release.build, Release.tomeeVersionName); + exec("svn", "-m", format("[release-tools] staged binary dir for %s", Release.tomeeVersionName), "mkdir", "--parents", svnBinaryLocation); + exec("svn", "co", svnBinaryLocation, dir.getAbsolutePath()); + } - if (!dir.exists() && !dir.mkdirs()) throw new IllegalStateException("Cannot make directory: " + dir.getAbsolutePath()); + final URI repo = URI.create(Release.staging); + System.out.println("Downloads: " + dir.getAbsolutePath()); + final NexusClient client = new NexusClient(); final UriSet all = new UriSet(client.crawl(repo)); UriSet binaries = all.include(".*\\.(zip|gz|war).*"); binaries = binaries.exclude(".*\\.asc\\.(sha1|md5)"); + binaries = binaries.exclude(".*itests.*"); + binaries = binaries.exclude(".*karafee.*"); - - for (URI uri : binaries.include(".*\\/(tomee|openejb-|apache-tomee|examples)-.*|.*source-release.*")) { + for (URI uri : binaries) { final File file = new File(dir, uri.getPath().replaceAll(".*/", "")); System.out.println("Downloading " + file.getName()); client.download(uri, file); + exec("svn", "add", file.getAbsolutePath()); + if (file.getName().endsWith(".zip")) { final PrintStream out = new PrintStream(IO.write(new File(file.getAbsolutePath() + ".txt"))); @@ -67,6 +83,8 @@ public class Binaries { out.close(); } } + + exec("svn", "-m", format("[release-tools] staged binaries for %s", Release.tomeeVersionName), "ci", dir.getAbsolutePath()); } private static void list(File file, PrintStream out) throws IOException { Modified: tomee/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/cmd/CompareLibraries.java URL: http://svn.apache.org/viewvc/tomee/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/cmd/CompareLibraries.java?rev=1459145&r1=1459144&r2=1459145&view=diff ============================================================================== --- tomee/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/cmd/CompareLibraries.java (original) +++ tomee/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/cmd/CompareLibraries.java Thu Mar 21 03:59:11 2013 @@ -42,12 +42,11 @@ public class CompareLibraries { // /Users/dblevins/.m2/repository/org/apache/openejb/apache-tomee/1.0.0/apache-tomee-1.0.0-webprofile.zip - diff(repository, "apache-tomee", "1.5.0", "1.5.1", "webprofile"); - diff(repository, "apache-tomee", "1.5.0", "1.5.1", "jaxrs"); + diff(repository, "apache-tomee", "1.5.1", "1.5.2", "webprofile"); + diff(repository, "apache-tomee", "1.5.1", "1.5.2", "jaxrs"); + diff(repository, "apache-tomee", "1.5.1", "1.5.2", "plus"); - diff(repository, "apache-tomee", "1.5.0", "1.5.1", "plus"); - - diff(repository, "openejb-standalone", "4.5.0", "4.5.1", null); + diff(repository, "openejb-standalone", "4.5.1", "4.5.2", null); } Modified: tomee/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/util/Files.java URL: http://svn.apache.org/viewvc/tomee/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/util/Files.java?rev=1459145&r1=1459144&r2=1459145&view=diff ============================================================================== --- tomee/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/util/Files.java (original) +++ tomee/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/util/Files.java Thu Mar 21 03:59:11 2013 @@ -92,6 +92,23 @@ public class Files { return accepted; } + public static void remove(final File file) { + if (file == null) return; + if (!file.exists()) return; + + if (file.isDirectory()) { + final File[] files = file.listFiles(); + if (files != null) { + for (final File child : files) { + remove(child); + } + } + } + if (!file.delete()) { + throw new IllegalStateException("Could not delete file: " + file.getAbsolutePath()); + } + } + public static void exists(File file, String s) { if (!file.exists()) throw new RuntimeException(s + " does not exist: " + file.getAbsolutePath()); }