You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by an...@apache.org on 2014/04/15 18:49:10 UTC
svn commit: r1587634 - in /tomee/sandbox/release-tools: ./
src/main/java/org/apache/openejb/tools/release/
src/main/java/org/apache/openejb/tools/release/cmd/
src/main/java/org/apache/openejb/tools/release/util/ src/main/resources/
Author: andygumbrecht
Date: Tue Apr 15 16:49:09 2014
New Revision: 1587634
URL: http://svn.apache.org/r1587634
Log:
Formatting
Added:
tomee/sandbox/release-tools/run.sh (with props)
Modified:
tomee/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/Commit.java
tomee/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/Main.java
tomee/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/Maven.java
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/Templates.java
tomee/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/Upgrades.java
tomee/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/cmd/AddVersion.java
tomee/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/cmd/AdvanceVersions.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/Close.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/cmd/Deploy.java
tomee/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/cmd/FinalizeVersions.java
tomee/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/cmd/ReleaseNotes.java
tomee/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/cmd/ReleaseTasks.java
tomee/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/cmd/ReviewCommits.java
tomee/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/cmd/Revote.java
tomee/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/cmd/Settings.java
tomee/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/cmd/Tck.java
tomee/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/cmd/UpdateJiras.java
tomee/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/cmd/UpdateVersions.java
tomee/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/util/Base64.java
tomee/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/util/Exec.java
tomee/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/util/IO.java
tomee/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/util/Join.java
tomee/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/util/ObjectList.java
tomee/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/util/ObjectMap.java
tomee/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/util/Options.java
tomee/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/util/References.java
tomee/sandbox/release-tools/src/main/resources/release-tasks.xml
Added: tomee/sandbox/release-tools/run.sh
URL: http://svn.apache.org/viewvc/tomee/sandbox/release-tools/run.sh?rev=1587634&view=auto
==============================================================================
--- tomee/sandbox/release-tools/run.sh (added)
+++ tomee/sandbox/release-tools/run.sh Tue Apr 15 16:49:09 2014
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+clear
+
+MAVEN_OPTS="-Xmx1024m -XX:MaxPermSize=256M -XX:ReservedCodeCacheSize=64m -Xss2048k"
+
+java -cp target/release-tools-1.0-SNAPSHOT-jar-with-dependencies.jar org.apache.openejb.tools.release.Main $1
Propchange: tomee/sandbox/release-tools/run.sh
------------------------------------------------------------------------------
svn:executable = *
Modified: tomee/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/Commit.java
URL: http://svn.apache.org/viewvc/tomee/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/Commit.java?rev=1587634&r1=1587633&r2=1587634&view=diff
==============================================================================
--- tomee/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/Commit.java (original)
+++ tomee/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/Commit.java Tue Apr 15 16:49:09 2014
@@ -18,13 +18,7 @@ package org.apache.openejb.tools.release
import org.apache.openejb.tools.release.util.ObjectList;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElementWrapper;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlValue;
+import javax.xml.bind.annotation.*;
import java.util.Date;
/**
Modified: tomee/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/Main.java
URL: http://svn.apache.org/viewvc/tomee/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/Main.java?rev=1587634&r1=1587633&r2=1587634&view=diff
==============================================================================
--- tomee/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/Main.java (original)
+++ tomee/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/Main.java Tue Apr 15 16:49:09 2014
@@ -20,7 +20,6 @@ import org.apache.log4j.ConsoleAppender;
import org.apache.log4j.Level;
import org.apache.log4j.Logger;
import org.apache.log4j.PatternLayout;
-import org.apache.openejb.tools.release.cmd.Settings;
import org.apache.openejb.tools.release.util.Commands;
import org.apache.openejb.tools.release.util.JarLocation;
import org.apache.xbean.finder.AnnotationFinder;
Modified: tomee/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/Maven.java
URL: http://svn.apache.org/viewvc/tomee/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/Maven.java?rev=1587634&r1=1587633&r2=1587634&view=diff
==============================================================================
--- tomee/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/Maven.java (original)
+++ tomee/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/Maven.java Tue Apr 15 16:49:09 2014
@@ -19,12 +19,10 @@ package org.apache.openejb.tools.release
import org.apache.maven.settings.Settings;
import org.apache.maven.settings.io.xpp3.SettingsXpp3Reader;
import org.apache.openejb.tools.release.util.Files;
-import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
import java.io.BufferedInputStream;
import java.io.File;
import java.io.FileInputStream;
-import java.io.IOException;
/**
* Utility class for Maven.
@@ -52,5 +50,4 @@ public class Maven {
}
-
}
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=1587634&r1=1587633&r2=1587634&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 Tue Apr 15 16:49:09 2014
@@ -38,14 +38,14 @@ public class Release {
public static String openejbVersionName = "openejb-${openejbVersion}";
public static String tomeeVersionName = "tomee-${tomeeVersion}";
- public static String trunk = "https://svn.apache.org/repos/asf/tomee/tomee/branches/tomee-1.6.0.1/";
+ public static String trunk = "StagingRepositories/";
public static String branches = "https://svn.apache.org/repos/asf/tomee/tomee/branches/";
public static String tags = "https://svn.apache.org/repos/asf/tomee/tomee/tags/";
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-008";
- public static String build = "008";
+ public static String staging = "https://dist.apache.org/repos/dist/dev/tomee/staging-1012/";
+ public static String build = "1012";
//public static String ciBuilder = "openejb-4.5.1";
//public static String ciBuildNumber = "1";
@@ -54,13 +54,13 @@ public class Release {
public static String builddir = "/tmp/downloads";
public static String workdir = "/tmp/release";
- public static String mavenOpts = "-Xmx2048m -XX:MaxPermSize=1024m";
+ public static String mavenOpts = "-Xmx1024m -XX:MaxPermSize=512m";
public static String user = System.getProperty("user.name");
public static String to = "dev@tomee.apache.org";
public static String from = "${user}@apache.org";
- public static String lastReleaseDate = "2012-09-28";
+ public static String lastReleaseDate = "2014-04-15";
private static final Pattern PATTERN = Pattern.compile("(\\$\\{)(\\w+)(})");
@@ -124,7 +124,6 @@ public class Release {
return new ObjectMap(Release.class);
-
// @Override
// public int size() {
// return clazz.getFields().length;
Modified: tomee/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/Templates.java
URL: http://svn.apache.org/viewvc/tomee/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/Templates.java?rev=1587634&r1=1587633&r2=1587634&view=diff
==============================================================================
--- tomee/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/Templates.java (original)
+++ tomee/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/Templates.java Tue Apr 15 16:49:09 2014
@@ -21,11 +21,7 @@ import org.apache.velocity.VelocityConte
import org.apache.velocity.app.VelocityEngine;
import org.apache.velocity.runtime.log.CommonsLogLogChute;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.StringWriter;
-import java.io.Writer;
+import java.io.*;
import java.net.URL;
import java.util.HashMap;
import java.util.Map;
Modified: tomee/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/Upgrades.java
URL: http://svn.apache.org/viewvc/tomee/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/Upgrades.java?rev=1587634&r1=1587633&r2=1587634&view=diff
==============================================================================
--- tomee/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/Upgrades.java (original)
+++ tomee/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/Upgrades.java Tue Apr 15 16:49:09 2014
@@ -16,14 +16,9 @@
*/
package org.apache.openejb.tools.release;
-import org.apache.maven.settings.Server;
-import org.apache.openejb.tools.release.util.Options;
import org.codehaus.swizzle.jira.Issue;
-import org.codehaus.swizzle.jira.Jira;
import org.codehaus.swizzle.jira.JiraRss;
import org.codehaus.swizzle.jira.MapObjectList;
-import org.codehaus.swizzle.jira.Project;
-import org.codehaus.swizzle.jira.Version;
import java.util.ArrayList;
import java.util.Arrays;
Modified: tomee/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/cmd/AddVersion.java
URL: http://svn.apache.org/viewvc/tomee/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/cmd/AddVersion.java?rev=1587634&r1=1587633&r2=1587634&view=diff
==============================================================================
--- tomee/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/cmd/AddVersion.java (original)
+++ tomee/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/cmd/AddVersion.java Tue Apr 15 16:49:09 2014
@@ -28,17 +28,14 @@ import org.apache.openejb.tools.release.
import org.codehaus.swizzle.stream.FixedTokenReplacementInputStream;
import org.codehaus.swizzle.stream.StreamTokenHandler;
-import java.io.ByteArrayInputStream;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
+import java.io.*;
import java.util.Collection;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
/**
* TODO Add the next revision
+ *
* @version $Rev$ $Date$
*/
@Command
@@ -51,11 +48,11 @@ public class AddVersion {
/**
* can be ran in 2 cases:
* 1) replacing -SNAPSHOT
- * -> arg = set-snapshot
+ * -> arg = set-snapshot
* 2) setting new versions
- * -> to inc last digit and add snapshot to the version: arg = replace-snapshot
- * -> to simply inc last digit no arg is enough
- *
+ * -> to inc last digit and add snapshot to the version: arg = replace-snapshot
+ * -> to simply inc last digit no arg is enough
+ * <p/>
* Note: version is replace like a sed so if another lib is using this version it will be replaced too
*
* @param args
@@ -73,11 +70,11 @@ public class AddVersion {
}
final File workingDir = new File(Release.builddir, Release.openejbVersionName);
- final String[][] replacements = new String[][] {
- new String[] { currentVersion(Release.openejbVersion, replaceSnapshot),
- nextVersion("openejb next version", Release.openejbVersion, replaceSnapshot, setSnapshot) },
- new String[] { currentVersion(Release.tomeeVersion, replaceSnapshot),
- nextVersion("openejb next version", Release.tomeeVersion, replaceSnapshot, setSnapshot) }
+ final String[][] replacements = new String[][]{
+ new String[]{currentVersion(Release.openejbVersion, replaceSnapshot),
+ nextVersion("openejb next version", Release.openejbVersion, replaceSnapshot, setSnapshot)},
+ new String[]{currentVersion(Release.tomeeVersion, replaceSnapshot),
+ nextVersion("openejb next version", Release.tomeeVersion, replaceSnapshot, setSnapshot)}
};
// we hardcode the tomee or openejb version in some java, properties, pom (of course ;))...so simply take eveything we can
@@ -86,12 +83,14 @@ public class AddVersion {
final Collection<File> files = FileUtils.listFiles(workingDir,
new AndFileFilter(
new AndFileFilter(
- new NotFileFilter(new SuffixFileFilter(".gif", IOCase.INSENSITIVE)),
- new NotFileFilter(new SuffixFileFilter(".png", IOCase.INSENSITIVE))),
- new NotFileFilter(new SuffixFileFilter(".exe", IOCase.INSENSITIVE))),
+ new NotFileFilter(new SuffixFileFilter(".gif", IOCase.INSENSITIVE)),
+ new NotFileFilter(new SuffixFileFilter(".png", IOCase.INSENSITIVE))),
+ new NotFileFilter(new SuffixFileFilter(".exe", IOCase.INSENSITIVE))
+ ),
new AndFileFilter(
new NotFileFilter(new NameFileFilter(".svn", IOCase.INSENSITIVE)),
- new NotFileFilter(new NameFileFilter("target", IOCase.INSENSITIVE))));
+ new NotFileFilter(new NameFileFilter("target", IOCase.INSENSITIVE)))
+ );
for (File file : files) {
for (String[] replacement : replacements) {
Modified: tomee/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/cmd/AdvanceVersions.java
URL: http://svn.apache.org/viewvc/tomee/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/cmd/AdvanceVersions.java?rev=1587634&r1=1587633&r2=1587634&view=diff
==============================================================================
--- tomee/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/cmd/AdvanceVersions.java (original)
+++ tomee/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/cmd/AdvanceVersions.java Tue Apr 15 16:49:09 2014
@@ -78,7 +78,8 @@ public class AdvanceVersions {
final String artifactId = lexer.peek("<artifactId>", "</artifactId>");
final String version = lexer.peek("<version>", "</version>");
lexer.unmark();
- if (version != null && version.contains("-SNAPSHOT")) versions.add(String.format("%s:%s:%s", groupId, artifactId, version));
+ if (version != null && version.contains("-SNAPSHOT"))
+ versions.add(String.format("%s:%s:%s", groupId, artifactId, version));
}
read.close();
@@ -118,6 +119,7 @@ public class AdvanceVersions {
out.write(i);
}
out.close();
- if (!tmp.renameTo(dest)) throw new RuntimeException(String.format("Rename failed: mv \"%s\" \"%s\"", tmp.getAbsolutePath(), dest.getAbsolutePath()));
+ if (!tmp.renameTo(dest))
+ throw new RuntimeException(String.format("Rename failed: mv \"%s\" \"%s\"", tmp.getAbsolutePath(), dest.getAbsolutePath()));
}
}
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=1587634&r1=1587633&r2=1587634&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 Tue Apr 15 16:49:09 2014
@@ -16,12 +16,12 @@
*/
package org.apache.openejb.tools.release.cmd;
+import org.apache.creadur.tentacles.NexusClient;
import org.apache.creadur.tentacles.Platform;
import org.apache.openejb.tools.release.Command;
import org.apache.openejb.tools.release.Release;
import org.apache.openejb.tools.release.util.Files;
import org.apache.openejb.tools.release.util.IO;
-import org.apache.creadur.tentacles.NexusClient;
import org.apache.xbean.finder.UriSet;
import java.io.File;
@@ -94,7 +94,7 @@ public class Binaries {
final Enumeration<? extends ZipEntry> enumeration = zip.entries();
while (enumeration.hasMoreElements()) {
ZipEntry entry = enumeration.nextElement();
- out.printf("%1$7s %2$2s %3$2s", entry.getSize(), format.format(entry.getTime()), entry.getName() );
+ out.printf("%1$7s %2$2s %3$2s", entry.getSize(), format.format(entry.getTime()), entry.getName());
out.println();
}
}
Modified: tomee/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/cmd/Close.java
URL: http://svn.apache.org/viewvc/tomee/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/cmd/Close.java?rev=1587634&r1=1587633&r2=1587634&view=diff
==============================================================================
--- tomee/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/cmd/Close.java (original)
+++ tomee/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/cmd/Close.java Tue Apr 15 16:49:09 2014
@@ -17,14 +17,8 @@
package org.apache.openejb.tools.release.cmd;
import org.apache.maven.settings.Server;
-import org.apache.maven.settings.Settings;
import org.apache.openejb.tools.release.*;
-import org.apache.openejb.tools.release.util.Files;
-import org.apache.openejb.tools.release.util.IO;
import org.apache.openejb.tools.release.util.ObjectList;
-import org.codehaus.swizzle.stream.StreamLexer;
-
-import java.io.File;
/**
* @version $Rev$ $Date$
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=1587634&r1=1587633&r2=1587634&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 Tue Apr 15 16:49:09 2014
@@ -23,11 +23,7 @@ import org.apache.openejb.tools.release.
import java.io.File;
import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.TreeMap;
+import java.util.*;
import java.util.zip.ZipEntry;
import java.util.zip.ZipFile;
@@ -150,7 +146,7 @@ public class CompareLibraries {
for (ZipEntry entry : list) {
if (entry.isDirectory()) continue;
if (!entry.getName().endsWith(".jar")) continue;
- files.add(new FileData(new File(entry.getName()), entry.getSize() * 0.001 ));
+ files.add(new FileData(new File(entry.getName()), entry.getSize() * 0.001));
}
return files;
}
Modified: tomee/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/cmd/Deploy.java
URL: http://svn.apache.org/viewvc/tomee/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/cmd/Deploy.java?rev=1587634&r1=1587633&r2=1587634&view=diff
==============================================================================
--- tomee/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/cmd/Deploy.java (original)
+++ tomee/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/cmd/Deploy.java Tue Apr 15 16:49:09 2014
@@ -43,10 +43,13 @@ public class Deploy {
Exec.exec("svn", "co", tag);
- Exec.cd(new File(dir + File.separator + Release.tomeeVersionName));
+ Exec.cd(new File(dir, Release.tomeeVersionName));
Exec.export("JAVA_HOME", System.getProperty("java.home"));
Exec.export("MAVEN_OPTS", Release.mavenOpts);
+
+ //mvn -rf :bval-tomee -Darguments=-Dmaven.test.skip=true -DfailIfNoTests=false release:perform -DconnectionUrl=scm:svn:https://svn.apache.org/repos/asf/tomee/tomee/branches/tomee-1.6.0.1
+
final int exec = Exec.exec("mvn",
"-Darguments=-Dmaven.test.skip=true -DfailIfNoTests=false",
"release:perform",
@@ -54,9 +57,11 @@ public class Deploy {
);
if (exec == 0) {
- Exec.exec("/usr/bin/say", "Deploy Succeeded");
+ //try{Exec.exec("/usr/bin/say", "Deploy Succeeded");}catch (Exception e){}
+ System.out.println("Deploy Succeeded");
} else {
- Exec.exec("/usr/bin/say", "Deploy Failed");
+ //try{Exec.exec("/usr/bin/say", "Deploy Failed");}catch (Exception e){}
+ System.out.println("Deploy Failed");
}
}
}
Modified: tomee/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/cmd/FinalizeVersions.java
URL: http://svn.apache.org/viewvc/tomee/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/cmd/FinalizeVersions.java?rev=1587634&r1=1587633&r2=1587634&view=diff
==============================================================================
--- tomee/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/cmd/FinalizeVersions.java (original)
+++ tomee/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/cmd/FinalizeVersions.java Tue Apr 15 16:49:09 2014
@@ -28,7 +28,6 @@ import java.io.InputStream;
import java.io.OutputStream;
import java.util.List;
-import static java.lang.String.format;
import static org.apache.openejb.tools.release.util.Exec.cd;
import static org.apache.openejb.tools.release.util.Exec.exec;
import static org.apache.openejb.tools.release.util.Files.collect;
@@ -107,6 +106,7 @@ public class FinalizeVersions {
out.write(i);
}
out.close();
- if (!tmp.renameTo(dest)) throw new RuntimeException(String.format("Rename failed: mv \"%s\" \"%s\"", tmp.getAbsolutePath(), dest.getAbsolutePath()));
+ if (!tmp.renameTo(dest))
+ throw new RuntimeException(String.format("Rename failed: mv \"%s\" \"%s\"", tmp.getAbsolutePath(), dest.getAbsolutePath()));
}
}
Modified: tomee/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/cmd/ReleaseNotes.java
URL: http://svn.apache.org/viewvc/tomee/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/cmd/ReleaseNotes.java?rev=1587634&r1=1587633&r2=1587634&view=diff
==============================================================================
--- tomee/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/cmd/ReleaseNotes.java (original)
+++ tomee/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/cmd/ReleaseNotes.java Tue Apr 15 16:49:09 2014
@@ -44,6 +44,6 @@ public class ReleaseNotes {
}
}
- org.codehaus.swizzle.jirareport.Main.main((String[]) argsList.toArray(new String[] {}));
+ org.codehaus.swizzle.jirareport.Main.main((String[]) argsList.toArray(new String[]{}));
}
}
Modified: tomee/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/cmd/ReleaseTasks.java
URL: http://svn.apache.org/viewvc/tomee/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/cmd/ReleaseTasks.java?rev=1587634&r1=1587633&r2=1587634&view=diff
==============================================================================
--- tomee/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/cmd/ReleaseTasks.java (original)
+++ tomee/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/cmd/ReleaseTasks.java Tue Apr 15 16:49:09 2014
@@ -38,12 +38,7 @@ import org.apache.openejb.tools.release.
import javax.xml.bind.JAXBContext;
import javax.xml.bind.JAXBException;
import javax.xml.bind.Unmarshaller;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlValue;
+import javax.xml.bind.annotation.*;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import java.io.IOException;
import java.net.URL;
Modified: tomee/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/cmd/ReviewCommits.java
URL: http://svn.apache.org/viewvc/tomee/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/cmd/ReviewCommits.java?rev=1587634&r1=1587633&r2=1587634&view=diff
==============================================================================
--- tomee/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/cmd/ReviewCommits.java (original)
+++ tomee/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/cmd/ReviewCommits.java Tue Apr 15 16:49:09 2014
@@ -25,11 +25,7 @@ import org.apache.openejb.tools.release.
import org.apache.openejb.tools.release.util.Join;
import org.apache.openejb.tools.release.util.ObjectList;
import org.apache.openejb.tools.release.util.Options;
-import org.codehaus.swizzle.jira.Issue;
-import org.codehaus.swizzle.jira.IssueType;
-import org.codehaus.swizzle.jira.Jira;
-import org.codehaus.swizzle.jira.MapObject;
-import org.codehaus.swizzle.jira.Version;
+import org.codehaus.swizzle.jira.*;
import javax.xml.bind.JAXBContext;
import javax.xml.bind.Unmarshaller;
Modified: tomee/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/cmd/Revote.java
URL: http://svn.apache.org/viewvc/tomee/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/cmd/Revote.java?rev=1587634&r1=1587633&r2=1587634&view=diff
==============================================================================
--- tomee/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/cmd/Revote.java (original)
+++ tomee/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/cmd/Revote.java Tue Apr 15 16:49:09 2014
@@ -17,13 +17,13 @@
package org.apache.openejb.tools.release.cmd;
import org.apache.creadur.tentacles.Platform;
+import org.apache.creadur.tentacles.TemplateBuilder;
+import org.apache.creadur.tentacles.Templates;
import org.apache.openejb.tools.release.Command;
import org.apache.openejb.tools.release.Commit;
import org.apache.openejb.tools.release.Release;
import org.apache.openejb.tools.release.util.Exec;
import org.apache.openejb.tools.release.util.ObjectList;
-import org.apache.creadur.tentacles.Templates;
-import org.apache.creadur.tentacles.TemplateBuilder;
import javax.xml.bind.JAXBContext;
import javax.xml.bind.Unmarshaller;
Modified: tomee/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/cmd/Settings.java
URL: http://svn.apache.org/viewvc/tomee/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/cmd/Settings.java?rev=1587634&r1=1587633&r2=1587634&view=diff
==============================================================================
--- tomee/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/cmd/Settings.java (original)
+++ tomee/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/cmd/Settings.java Tue Apr 15 16:49:09 2014
@@ -35,7 +35,7 @@ public class Settings {
@Command
public static class Save {
public static void main(String... args) throws IOException {
- final Map<String,Object> map = Release.map();
+ final Map<String, Object> map = Release.map();
final File file = Files.file(System.getProperty("user.home"), ".tomee-release.properties");
final OutputStream write = IO.write(file);
Modified: tomee/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/cmd/Tck.java
URL: http://svn.apache.org/viewvc/tomee/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/cmd/Tck.java?rev=1587634&r1=1587633&r2=1587634&view=diff
==============================================================================
--- tomee/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/cmd/Tck.java (original)
+++ tomee/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/cmd/Tck.java Tue Apr 15 16:49:09 2014
@@ -159,6 +159,7 @@ public class Tck {
out.write(i);
}
out.close();
- if (!tmp.renameTo(dest)) throw new RuntimeException(String.format("Rename failed: mv \"%s\" \"%s\"", tmp.getAbsolutePath(), dest.getAbsolutePath()));
+ if (!tmp.renameTo(dest))
+ throw new RuntimeException(String.format("Rename failed: mv \"%s\" \"%s\"", tmp.getAbsolutePath(), dest.getAbsolutePath()));
}
}
Modified: tomee/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/cmd/UpdateJiras.java
URL: http://svn.apache.org/viewvc/tomee/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/cmd/UpdateJiras.java?rev=1587634&r1=1587633&r2=1587634&view=diff
==============================================================================
--- tomee/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/cmd/UpdateJiras.java (original)
+++ tomee/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/cmd/UpdateJiras.java Tue Apr 15 16:49:09 2014
@@ -23,29 +23,16 @@ import org.apache.openejb.tools.release.
import org.apache.openejb.tools.release.Release;
import org.apache.openejb.tools.release.util.Exec;
import org.apache.openejb.tools.release.util.IO;
-import org.apache.openejb.tools.release.util.ObjectList;
import org.apache.openejb.tools.release.util.Options;
import org.codehaus.swizzle.jira.Issue;
import org.codehaus.swizzle.jira.Jira;
-import org.codehaus.swizzle.jira.Status;
import org.codehaus.swizzle.jira.Version;
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.Unmarshaller;
import java.io.InputStream;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Hashtable;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.Vector;
-import java.util.concurrent.Semaphore;
+import java.util.*;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -71,7 +58,7 @@ public class UpdateJiras {
// System.out.println(jiraKey);
// }
- updateJiraFixVersions("http://svn.apache.org/repos/asf/tomee/tomee/branches/tomee-1.5.2", "1417791","HEAD", "1.5.2" ,"4.5.2");
+ updateJiraFixVersions("http://svn.apache.org/repos/asf/tomee/tomee/branches/tomee-1.5.2", "1417791", "HEAD", "1.5.2", "4.5.2");
}
static final Pattern pattern = Pattern.compile("((OPENEJB|TOMEE)-[0-9]+)");
@@ -92,7 +79,8 @@ public class UpdateJiras {
final Version openejb = state.jira.getVersion("OPENEJB", openejbVersion);
- jiras: for (String key : keys) {
+ jiras:
+ for (String key : keys) {
if ("TOMEE-1".equals(key)) continue;
final Issue issue = state.jira.getIssue(key);
Modified: tomee/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/cmd/UpdateVersions.java
URL: http://svn.apache.org/viewvc/tomee/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/cmd/UpdateVersions.java?rev=1587634&r1=1587633&r2=1587634&view=diff
==============================================================================
--- tomee/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/cmd/UpdateVersions.java (original)
+++ tomee/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/cmd/UpdateVersions.java Tue Apr 15 16:49:09 2014
@@ -39,7 +39,7 @@ public class UpdateVersions {
public static void main(String... args) throws Exception {
- final File workingCopy = cd(new File("/Users/dblevins/work/openejb-4.0.0-branch"));
+ final File workingCopy = cd(new File("/home/andy/tck/release-tools/tomee-1.6.0.1.staging"));
updateVersions2(workingCopy);
@@ -156,6 +156,7 @@ public class UpdateVersions {
out.write(i);
}
out.close();
- if (!tmp.renameTo(dest)) throw new RuntimeException(String.format("Rename failed: mv \"%s\" \"%s\"", tmp.getAbsolutePath(), dest.getAbsolutePath()));
+ if (!tmp.renameTo(dest))
+ throw new RuntimeException(String.format("Rename failed: mv \"%s\" \"%s\"", tmp.getAbsolutePath(), dest.getAbsolutePath()));
}
}
Modified: tomee/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/util/Base64.java
URL: http://svn.apache.org/viewvc/tomee/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/util/Base64.java?rev=1587634&r1=1587633&r2=1587634&view=diff
==============================================================================
--- tomee/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/util/Base64.java (original)
+++ tomee/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/util/Base64.java Tue Apr 15 16:49:09 2014
@@ -37,21 +37,21 @@ import java.io.IOException;
/**
* Provides Base64 encoding and decoding as defined by RFC 2045.
- *
+ * <p/>
* <p>This class implements section <cite>6.8. Base64 Content-Transfer-Encoding</cite>
* from RFC 2045 <cite>Multipurpose Internet Mail Extensions (MIME) Part One:
* Format of Internet Message Bodies</cite> by Freed and Borenstein.</p>
*
- * @see <a href="http://www.ietf.org/rfc/rfc2045.txt">RFC 2045</a>
* @author Apache Software Foundation
- * @since 1.0-dev
* @version $Id: Base64.java 1153797 2011-08-04 09:09:44Z rmannibucau $
+ * @see <a href="http://www.ietf.org/rfc/rfc2045.txt">RFC 2045</a>
+ * @since 1.0-dev
*/
public class Base64 {
/**
* Chunk size per RFC 2045 section 6.8.
- *
+ * <p/>
* <p>The {@value} character limit does not count the trailing CRLF, but counts
* all other characters, including any equal signs.</p>
*
@@ -189,7 +189,7 @@ public class Base64 {
*
* @param arrayOctect byte array to test
* @return <code>true</code> if all bytes are valid characters in the Base64
- * alphabet or if the byte array is empty; false, otherwise
+ * alphabet or if the byte array is empty; false, otherwise
*/
public static boolean isArrayByteBase64(byte[] arrayOctect) {
@@ -240,9 +240,9 @@ public class Base64 {
*
* @param pObject Object to decode
* @return An object (of type byte[]) containing the
- * binary data which corresponds to the byte[] supplied.
+ * binary data which corresponds to the byte[] supplied.
* @throws IOException if the parameter supplied is not
- * of type byte[]
+ * of type byte[]
*/
public Object decode(Object pObject) throws IOException {
if (!(pObject instanceof byte[])) {
@@ -267,8 +267,8 @@ public class Base64 {
* chunking the output into 76 character blocks.
*
* @param binaryData Array containing binary data to encode.
- * @param isChunked if <code>true</code> this encoder will chunk
- * the base64 output into 76 character blocks
+ * @param isChunked if <code>true</code> this encoder will chunk
+ * the base64 output into 76 character blocks
* @return Base64-encoded data.
*/
public static byte[] encodeBase64(byte[] binaryData, boolean isChunked) {
@@ -477,7 +477,7 @@ public class Base64 {
* Discards any whitespace from a base-64 encoded block.
*
* @param data The base-64 encoded data to discard the whitespace
- * from.
+ * from.
* @return The data, less whitespace (see RFC 2045).
*/
static byte[] discardWhitespace(byte[] data) {
@@ -540,9 +540,9 @@ public class Base64 {
*
* @param pObject Object to encode
* @return An object (of type byte[]) containing the
- * base64 encoded data which corresponds to the byte[] supplied.
+ * base64 encoded data which corresponds to the byte[] supplied.
* @throws IOException if the parameter supplied is not
- * of type byte[]
+ * of type byte[]
*/
public Object encode(Object pObject) throws IOException {
if (!(pObject instanceof byte[])) {
Modified: tomee/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/util/Exec.java
URL: http://svn.apache.org/viewvc/tomee/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/util/Exec.java?rev=1587634&r1=1587633&r2=1587634&view=diff
==============================================================================
--- tomee/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/util/Exec.java (original)
+++ tomee/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/util/Exec.java Tue Apr 15 16:49:09 2014
@@ -16,17 +16,8 @@
*/
package org.apache.openejb.tools.release.util;
-import java.io.BufferedInputStream;
-import java.io.BufferedOutputStream;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.io.*;
+import java.util.*;
/**
* @version $Rev$ $Date$
Modified: tomee/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/util/IO.java
URL: http://svn.apache.org/viewvc/tomee/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/util/IO.java?rev=1587634&r1=1587633&r2=1587634&view=diff
==============================================================================
--- tomee/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/util/IO.java (original)
+++ tomee/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/util/IO.java Tue Apr 15 16:49:09 2014
@@ -16,25 +16,7 @@
*/
package org.apache.openejb.tools.release.util;
-import java.io.BufferedInputStream;
-import java.io.BufferedOutputStream;
-import java.io.BufferedReader;
-import java.io.BufferedWriter;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.Closeable;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.FileReader;
-import java.io.FileWriter;
-import java.io.Flushable;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.OutputStream;
-import java.io.UnsupportedEncodingException;
+import java.io.*;
import java.net.URL;
import java.util.Properties;
import java.util.zip.ZipInputStream;
@@ -74,7 +56,7 @@ public class IO {
if (properties == null) throw new NullPointerException("Properties is null");
try {
properties.load(in);
- } finally{
+ } finally {
close(in);
}
return properties;
Modified: tomee/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/util/Join.java
URL: http://svn.apache.org/viewvc/tomee/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/util/Join.java?rev=1587634&r1=1587633&r2=1587634&view=diff
==============================================================================
--- tomee/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/util/Join.java (original)
+++ tomee/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/util/Join.java Tue Apr 15 16:49:09 2014
@@ -29,25 +29,25 @@ public class Join {
public static final ClassCallback CLASS_CALLBACK = new ClassCallback();
public static String join(String delimiter, Collection collection) {
- if(collection.size() == 0) {
+ if (collection.size() == 0) {
return "";
}
StringBuilder sb = new StringBuilder();
for (Object obj : collection) {
sb.append(obj).append(delimiter);
}
- return sb.substring(0, sb.length()-delimiter.length());
+ return sb.substring(0, sb.length() - delimiter.length());
}
public static String join(String delimiter, Object... collection) {
- if(collection.length ==0) {
+ if (collection.length == 0) {
return "";
}
StringBuilder sb = new StringBuilder();
for (Object obj : collection) {
sb.append(obj).append(delimiter);
}
- return sb.substring(0, sb.length()-delimiter.length());
+ return sb.substring(0, sb.length() - delimiter.length());
}
public static <T> String join(String delimiter, NameCallback<T> nameCallback, T... collection) {
Modified: tomee/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/util/ObjectList.java
URL: http://svn.apache.org/viewvc/tomee/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/util/ObjectList.java?rev=1587634&r1=1587633&r2=1587634&view=diff
==============================================================================
--- tomee/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/util/ObjectList.java (original)
+++ tomee/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/util/ObjectList.java Tue Apr 15 16:49:09 2014
@@ -18,11 +18,7 @@ package org.apache.openejb.tools.release
import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.List;
+import java.util.*;
import java.util.regex.Pattern;
/**
@@ -127,7 +123,7 @@ public class ObjectList<E> extends Array
/**
* Returns returns a new list with both lists added together.
- *
+ * <p/>
* http://en.wikipedia.org/wiki/Set#Unions
*
* @param list
@@ -146,9 +142,9 @@ public class ObjectList<E> extends Array
/**
* Returns a new list containing the common items from this list and the specified list.
- *
+ * <p/>
* Put another way, returns only the items in a and b that overlap.
- *
+ * <p/>
* http://en.wikipedia.org/wiki/Set#Intersections
*
* @param list
@@ -177,7 +173,7 @@ public class ObjectList<E> extends Array
/**
* Returns a new list containing only the items from list a not present in list b.
- *
+ * <p/>
* http://en.wikipedia.org/wiki/Set#Complements
*
* @param list
@@ -194,13 +190,13 @@ public class ObjectList<E> extends Array
/**
* Returns a new list containing only the items from list a not present in list b.
- *
+ * <p/>
* This is logically equivalent to:
- *
+ * <p/>
* a.union(b).subtract(a.common(b))
- *
+ * <p/>
* Though this method is more efficient.
- *
+ * <p/>
* http://en.wikipedia.org/wiki/Symmetric_difference
*
* @param list
Modified: tomee/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/util/ObjectMap.java
URL: http://svn.apache.org/viewvc/tomee/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/util/ObjectMap.java?rev=1587634&r1=1587633&r2=1587634&view=diff
==============================================================================
--- tomee/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/util/ObjectMap.java (original)
+++ tomee/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/util/ObjectMap.java Tue Apr 15 16:49:09 2014
@@ -19,21 +19,16 @@ package org.apache.openejb.tools.release
import java.lang.reflect.Field;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
-import java.util.AbstractMap;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
/**
-* @version $Rev$ $Date$
-*/
+ * @version $Rev$ $Date$
+ */
public class ObjectMap extends AbstractMap<String, Object> {
private final Object object;
- private Map<String,Entry<String,Object>> attributes;
- private Set<Entry<String,Object>> entries;
+ private Map<String, Entry<String, Object>> attributes;
+ private Set<Entry<String, Object>> entries;
public ObjectMap(Object object) {
this(object.getClass(), object);
@@ -101,7 +96,7 @@ public class ObjectMap extends AbstractM
return entries;
}
- public class FieldEntry implements Entry<String, Object> {
+ public class FieldEntry implements Entry<String, Object> {
private final Field field;
Modified: tomee/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/util/Options.java
URL: http://svn.apache.org/viewvc/tomee/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/util/Options.java?rev=1587634&r1=1587633&r2=1587634&view=diff
==============================================================================
--- tomee/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/util/Options.java (original)
+++ tomee/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/util/Options.java Tue Apr 15 16:49:09 2014
@@ -17,14 +17,7 @@
package org.apache.openejb.tools.release.util;
import java.lang.reflect.Constructor;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.EnumSet;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Properties;
-import java.util.Set;
+import java.util.*;
/**
* The purpose of this class is to provide a more strongly typed version of a
@@ -42,26 +35,26 @@ import java.util.Set;
* with all possible values (enums only). Debug level.
* - When a property is found: the property name and value. Info level.
* - When a property value cannot be parsed: the property name and invalid value. Warn level.
- *
+ * <p/>
* Logging the user supplied values onto INFO is really nice as it shows up in the standard
* log output and allows us to easily see which values the user has changed from the default.
* It's rather impossible to diagnose issues without this information.
- *
+ * <p/>
* ENUM SETS:
- *
+ * <p/>
* Properties that accept a Set of enum values automatically accept ALL and NONE in
* addition to the explicitly created enum items.
- *
+ * <p/>
* Using ALL. This allows users to have an easy way to imply "all" without having to
* hardcode an the entire list of enum items and protects against the case where that
* list may grow in the future.
- *
+ * <p/>
* Using NONE. This allows users an alternative to using an empty string when explicitly
* specifying that none of the options should be used.
- *
+ * <p/>
* In the internal code, this allows us to have these concepts in all enum options
* without us having to add NONE or ALL enum items explicitly which leads to strange code.
- *
+ * <p/>
* Additionally TRUE is an alias for ALL and FALSE an alias for NONE. This allows options
* that used to support only true/false values to be further defined in the future without
* breaking compatibility.
Modified: tomee/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/util/References.java
URL: http://svn.apache.org/viewvc/tomee/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/util/References.java?rev=1587634&r1=1587633&r2=1587634&view=diff
==============================================================================
--- tomee/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/util/References.java (original)
+++ tomee/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/util/References.java Tue Apr 15 16:49:09 2014
@@ -17,15 +17,7 @@
package org.apache.openejb.tools.release.util;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
/**
* @version $Rev: 1153797 $ $Date: 2011-08-04 02:09:44 -0700 (Thu, 04 Aug 2011) $
@@ -57,7 +49,7 @@ public class References {
for (Node node : nodes.values()) {
for (String name : visitor.getReferences((T) node.object)) {
Node ref = nodes.get(name);
- if (ref == null) throw new IllegalArgumentException("No such object in list: "+name);
+ if (ref == null) throw new IllegalArgumentException("No such object in list: " + name);
node.references.add(ref);
node.initialReferences.add(ref);
}
@@ -109,9 +101,9 @@ public class References {
}
}
- List sortedList= new ArrayList(nodes.size());
+ List sortedList = new ArrayList(nodes.size());
Node currentNode = rootNode.next;
- while(currentNode != rootNode) {
+ while (currentNode != rootNode) {
sortedList.add(currentNode.object);
currentNode = currentNode.next;
}
@@ -136,8 +128,8 @@ public class References {
private static void swap(Node shouldAfterNode, Node shouldBeforeNode, Node rootNode) {
Node currentNode = shouldBeforeNode;
- while(currentNode.next != rootNode) {
- if(currentNode.next == shouldAfterNode) {
+ while (currentNode.next != rootNode) {
+ if (currentNode.next == shouldAfterNode) {
return;
}
currentNode = currentNode.next;
@@ -228,7 +220,7 @@ public class References {
public Circuit(List<Node> nodes) {
this.nodes = nodes;
atomic = new ArrayList<Node>(nodes);
- atomic.remove(atomic.size()-1);
+ atomic.remove(atomic.size() - 1);
Collections.sort(atomic);
}
Modified: tomee/sandbox/release-tools/src/main/resources/release-tasks.xml
URL: http://svn.apache.org/viewvc/tomee/sandbox/release-tools/src/main/resources/release-tasks.xml?rev=1587634&r1=1587633&r2=1587634&view=diff
==============================================================================
--- tomee/sandbox/release-tools/src/main/resources/release-tasks.xml (original)
+++ tomee/sandbox/release-tools/src/main/resources/release-tasks.xml Tue Apr 15 16:49:09 2014
@@ -77,6 +77,7 @@
<task summary="Ensure Build passes with preview" commands=""/>
<task summary="TCK test preview binaries (NDA)"/>
<task summary="Prepare blog announcement" commands=""/>
+ <task summary="Prepare blog announcement" commands=""/>
<!-- vote rolling (usually repeated several times) -->