Author: dblevins
Date: Sun Sep 16 07:42:29 2012
New Revision: 1385221
URL: http://svn.apache.org/viewvc?rev=1385221&view=rev
Log:
trimmed unused imports. upgraded xbean version. fixed tentacles refs
Modified:
openejb/trunk/sandbox/release-tools/pom.xml
openejb/trunk/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/cmd/AdvanceVersions.java
openejb/trunk/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/cmd/Binaries.java
openejb/trunk/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/cmd/CommitsPerDay.java
openejb/trunk/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/cmd/Help.java
openejb/trunk/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/cmd/Legal.java
openejb/trunk/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/cmd/Preview.java
openejb/trunk/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/cmd/Revote.java
openejb/trunk/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/cmd/UpdateJiras.java
openejb/trunk/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/cmd/UpdateVersions.java
openejb/trunk/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/cmd/Vote.java
openejb/trunk/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/util/Commands.java
Modified: openejb/trunk/sandbox/release-tools/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/sandbox/release-tools/pom.xml?rev=1385221&r1=1385220&r2=1385221&view=diff
==============================================================================
--- openejb/trunk/sandbox/release-tools/pom.xml (original)
+++ openejb/trunk/sandbox/release-tools/pom.xml Sun Sep 16 07:42:29 2012
@@ -115,15 +115,15 @@
</dependency>
<dependency>
- <groupId>org.apache.rat.tentacles</groupId>
- <artifactId>apache-rat-tentacles</artifactId>
+ <groupId>org.apache.tentacles</groupId>
+ <artifactId>apache-tentacles</artifactId>
<version>0.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.xbean</groupId>
<artifactId>xbean-finder</artifactId>
- <version>3.10-SNAPSHOT</version>
+ <version>3.11</version>
</dependency>
<dependency>
Modified:
openejb/trunk/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/cmd/AdvanceVersions.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/cmd/AdvanceVersions.java?rev=1385221&r1=1385220&r2=1385221&view=diff
==============================================================================
---
openejb/trunk/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/cmd/AdvanceVersions.java
(original)
+++
openejb/trunk/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/cmd/AdvanceVersions.java
Sun Sep 16 07:42:29 2012
@@ -27,12 +27,10 @@ import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
-import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
-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;
Modified:
openejb/trunk/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/cmd/Binaries.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/cmd/Binaries.java?rev=1385221&r1=1385220&r2=1385221&view=diff
==============================================================================
---
openejb/trunk/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/cmd/Binaries.java
(original)
+++
openejb/trunk/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/cmd/Binaries.java
Sun Sep 16 07:42:29 2012
@@ -20,7 +20,7 @@ import org.apache.openejb.tools.release.
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.rat.tentacles.NexusClient;
+import org.apache.creadur.tentacles.NexusClient;
import org.apache.xbean.finder.UriSet;
import java.io.File;
Modified:
openejb/trunk/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/cmd/CommitsPerDay.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/cmd/CommitsPerDay.java?rev=1385221&r1=1385220&r2=1385221&view=diff
==============================================================================
---
openejb/trunk/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/cmd/CommitsPerDay.java
(original)
+++
openejb/trunk/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/cmd/CommitsPerDay.java
Sun Sep 16 07:42:29 2012
@@ -18,31 +18,15 @@ package org.apache.openejb.tools.release
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.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 javax.xml.bind.JAXBContext;
import javax.xml.bind.Unmarshaller;
-import java.io.BufferedReader;
-import java.io.IOException;
import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.lang.reflect.Field;
import java.text.SimpleDateFormat;
-import java.util.ArrayList;
import java.util.Date;
-import java.util.Iterator;
-import java.util.List;
import java.util.ListIterator;
-import java.util.Map;
import java.util.concurrent.TimeUnit;
/**
Modified:
openejb/trunk/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/cmd/Help.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/cmd/Help.java?rev=1385221&r1=1385220&r2=1385221&view=diff
==============================================================================
---
openejb/trunk/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/cmd/Help.java
(original)
+++
openejb/trunk/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/cmd/Help.java
Sun Sep 16 07:42:29 2012
@@ -25,7 +25,6 @@ import org.apache.openejb.tools.release.
import java.lang.reflect.Field;
import java.util.ArrayList;
import java.util.List;
-import java.util.Map;
/**
* @version $Rev$ $Date$
Modified:
openejb/trunk/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/cmd/Legal.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/cmd/Legal.java?rev=1385221&r1=1385220&r2=1385221&view=diff
==============================================================================
---
openejb/trunk/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/cmd/Legal.java
(original)
+++
openejb/trunk/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/cmd/Legal.java
Sun Sep 16 07:42:29 2012
@@ -27,7 +27,7 @@ import org.apache.openejb.tools.release.
public class Legal {
public static void main(String[] args) throws Exception {
- org.apache.rat.tentacles.Main.main(new String[]{
+ org.apache.creadur.tentacles.Main.main(new String[]{
Release.staging,
Files.file(Release.builddir, "staging-" + Release.build,
"legal").getAbsolutePath()
});
Modified:
openejb/trunk/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/cmd/Preview.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/cmd/Preview.java?rev=1385221&r1=1385220&r2=1385221&view=diff
==============================================================================
---
openejb/trunk/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/cmd/Preview.java
(original)
+++
openejb/trunk/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/cmd/Preview.java
Sun Sep 16 07:42:29 2012
@@ -19,7 +19,7 @@ package org.apache.openejb.tools.release
import org.apache.openejb.tools.release.Command;
import org.apache.openejb.tools.release.Release;
import org.apache.openejb.tools.release.util.Exec;
-import org.apache.rat.tentacles.Templates;
+import org.apache.creadur.tentacles.Templates;
import java.io.IOException;
import java.io.OutputStream;
Modified:
openejb/trunk/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/cmd/Revote.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/cmd/Revote.java?rev=1385221&r1=1385220&r2=1385221&view=diff
==============================================================================
---
openejb/trunk/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/cmd/Revote.java
(original)
+++
openejb/trunk/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/cmd/Revote.java
Sun Sep 16 07:42:29 2012
@@ -21,11 +21,10 @@ 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.ObjectList;
-import org.apache.rat.tentacles.Templates;
+import org.apache.creadur.tentacles.Templates;
import javax.xml.bind.JAXBContext;
import javax.xml.bind.Unmarshaller;
-import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.lang.reflect.Field;
Modified:
openejb/trunk/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/cmd/UpdateJiras.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/cmd/UpdateJiras.java?rev=1385221&r1=1385220&r2=1385221&view=diff
==============================================================================
---
openejb/trunk/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/cmd/UpdateJiras.java
(original)
+++
openejb/trunk/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/cmd/UpdateJiras.java
Sun Sep 16 07:42:29 2012
@@ -28,9 +28,7 @@ import org.codehaus.swizzle.jira.Version
import javax.xml.bind.JAXBContext;
import javax.xml.bind.Unmarshaller;
-import java.io.BufferedReader;
import java.io.InputStream;
-import java.io.InputStreamReader;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.text.SimpleDateFormat;
@@ -48,14 +46,21 @@ import java.util.Vector;
@Command
public class UpdateJiras {
- private static BufferedReader in = new BufferedReader(new
InputStreamReader(System.in));
private static SimpleDateFormat date = new SimpleDateFormat("yyyy-MM-dd");
- public static void main(String... args) throws Exception {
+ public static void _main(String... args) throws Exception {
final String tag = Release.tags + Release.openejbVersionName;
- final InputStream in = Exec.read("svn", "log", "--verbose", "--xml",
"-rHEAD:{" + Release.lastReleaseDate + "}", tag);
+ updateJiraFixVersions(tag, "HEAD", "{" + Release.lastReleaseDate +
"}", Release.tomeeVersion, Release.openejbVersion);
+ }
+
+ public static void main(String[] args) throws Exception {
+
updateJiraFixVersions("http://svn.apache.org/repos/asf/openejb/trunk/openejb/";,
"1364034","1364034", "1.1.0" ,"4.1.0");
+ }
+
+ private static void updateJiraFixVersions(String repo, final String start,
final String end, final String tomeeVersion, final String openejbVersion)
throws Exception {
+ final InputStream in = Exec.read("svn", "log", "--verbose", "--xml",
"-r" + start + ":" + end, repo);
final JAXBContext context = JAXBContext.newInstance(Commit.Log.class);
final Unmarshaller unmarshaller = context.createUnmarshaller();
@@ -96,7 +101,7 @@ public class UpdateJiras {
try {
System.out.println("\n\n" + comment);
System.out.printf("Adding comment to %s\n", issue.getKey());
- state.jira.addComment(issue.getKey(), comment.toString());
+// state.jira.addComment(issue.getKey(), comment.toString());
} catch (Exception e) {
synchronized (System.out) {
e.printStackTrace();
@@ -110,9 +115,9 @@ public class UpdateJiras {
final Version version;
if (issue.getKey().startsWith("TOMEE-")) {
- version = state.jira.getVersion("TOMEE", Release.tomeeVersion);
+ version = state.jira.getVersion("TOMEE", tomeeVersion);
} else if (issue.getKey().startsWith("OPENEJB-")) {
- version = state.jira.getVersion("OPENEJB",
Release.openejbVersion);
+ version = state.jira.getVersion("OPENEJB", openejbVersion);
} else {
continue;
}
@@ -139,19 +144,6 @@ public class UpdateJiras {
}
}
- public static void updateIssue(Jira jira, Issue i) throws Exception {
- Hashtable issue = new Hashtable();
- Vector v = new Vector();
-
- v = new Vector();
- for (Version version : i.getFixVersions()) {
- v.add(version.getId() + ""); // version's ID
- }
- issue.put("fixVersions", v);
-
- call(jira, "updateIssue", i.getKey(), issue);
- }
-
private static void call(Jira jira, String command, Object... args) throws
NoSuchMethodException, IllegalAccessException, InvocationTargetException {
final Method method = Jira.class.getDeclaredMethod("call",
String.class, Object[].class);
method.setAccessible(true);
Modified:
openejb/trunk/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/cmd/UpdateVersions.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/cmd/UpdateVersions.java?rev=1385221&r1=1385220&r2=1385221&view=diff
==============================================================================
---
openejb/trunk/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/cmd/UpdateVersions.java
(original)
+++
openejb/trunk/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/cmd/UpdateVersions.java
Sun Sep 16 07:42:29 2012
@@ -17,25 +17,18 @@
package org.apache.openejb.tools.release.cmd;
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.codehaus.swizzle.stream.DelimitedTokenReplacementInputStream;
-import org.codehaus.swizzle.stream.FixedTokenReplacementInputStream;
import org.codehaus.swizzle.stream.ReplaceStringInputStream;
-import org.codehaus.swizzle.stream.StreamLexer;
import org.codehaus.swizzle.stream.StringTokenHandler;
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
-import java.util.HashSet;
import java.util.List;
-import java.util.Set;
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;
/**
Modified:
openejb/trunk/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/cmd/Vote.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/cmd/Vote.java?rev=1385221&r1=1385220&r2=1385221&view=diff
==============================================================================
---
openejb/trunk/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/cmd/Vote.java
(original)
+++
openejb/trunk/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/cmd/Vote.java
Sun Sep 16 07:42:29 2012
@@ -19,7 +19,7 @@ package org.apache.openejb.tools.release
import org.apache.openejb.tools.release.Command;
import org.apache.openejb.tools.release.Release;
import org.apache.openejb.tools.release.util.Exec;
-import org.apache.rat.tentacles.Templates;
+import org.apache.creadur.tentacles.Templates;
import java.io.IOException;
import java.io.OutputStream;
Modified:
openejb/trunk/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/util/Commands.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/util/Commands.java?rev=1385221&r1=1385220&r2=1385221&view=diff
==============================================================================
---
openejb/trunk/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/util/Commands.java
(original)
+++
openejb/trunk/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/util/Commands.java
Sun Sep 16 07:42:29 2012
@@ -21,7 +21,6 @@ import org.apache.openejb.tools.release.
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.util.ArrayList;
-import java.util.Collection;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
