You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by db...@apache.org on 2012/01/17 03:37:43 UTC
svn commit: r1232277 - in /openejb/trunk/sandbox/release-tools: ./
src/main/java/org/apache/openejb/tools/release/
src/main/java/org/apache/openejb/tools/release/cmd/
Author: dblevins
Date: Tue Jan 17 02:37:42 2012
New Revision: 1232277
URL: http://svn.apache.org/viewvc?rev=1232277&view=rev
Log:
more tweaks
Modified:
openejb/trunk/sandbox/release-tools/pom.xml
openejb/trunk/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/Main.java
openejb/trunk/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/Release.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/Legal.java
openejb/trunk/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/cmd/Vote.java
Modified: openejb/trunk/sandbox/release-tools/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/sandbox/release-tools/pom.xml?rev=1232277&r1=1232276&r2=1232277&view=diff
==============================================================================
--- openejb/trunk/sandbox/release-tools/pom.xml (original)
+++ openejb/trunk/sandbox/release-tools/pom.xml Tue Jan 17 02:37:42 2012
@@ -139,12 +139,6 @@
</dependency>
<dependency>
- <groupId>org.sonatype.nexus</groupId>
- <artifactId>nexus-rest-api</artifactId>
- <version>1.9.2.4</version>
- </dependency>
-
- <dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<version>4.1.2</version>
Modified: openejb/trunk/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/Main.java
URL: http://svn.apache.org/viewvc/openejb/trunk/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/Main.java?rev=1232277&r1=1232276&r2=1232277&view=diff
==============================================================================
--- openejb/trunk/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/Main.java (original)
+++ openejb/trunk/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/Main.java Tue Jan 17 02:37:42 2012
@@ -74,7 +74,7 @@ public class Main {
}
}
- final String command = list.remove(0);
+ final String command = (list.size() == 0) ? "help" : list.remove(0);
args = (String[]) list.toArray(new String[list.size()]);
final Class clazz = commands.get(command);
Modified: openejb/trunk/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/Release.java
URL: http://svn.apache.org/viewvc/openejb/trunk/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/Release.java?rev=1232277&r1=1232276&r2=1232277&view=diff
==============================================================================
--- openejb/trunk/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/Release.java (original)
+++ openejb/trunk/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/Release.java Tue Jan 17 02:37:42 2012
@@ -16,8 +16,10 @@
*/
package org.apache.openejb.tools.release;
+import org.apache.openejb.tools.release.util.Files;
import org.apache.openejb.tools.release.util.Options;
+import java.io.File;
import java.lang.reflect.Field;
/**
@@ -33,16 +35,22 @@ public class Release {
public static String tckBranches = "https://svn.apache.org/repos/tck/openejb-tck/branches/";
public static String tckTrunk = "https://svn.apache.org/repos/tck/openejb-tck/trunk";
public static String staging = "https://repository.apache.org/content/repositories/orgapacheopenejb-075";
- public static String downloads = "/tmp/downloads";
+ public static String builddir = "/tmp/downloads";
public static String workdir = "/tmp/release";
public static String mavenOpts = "-Xmx2048m -XX:MaxPermSize=1024m";
public static String from = "dblevins@apache.org";
-// public static String to = from;
+ // public static String to = from;
public static String to = "dev@openejb.apache.org";
-
public static String user = System.getProperty("user.name");
+ public static String build = "075";
static {
+ final File public_html = Files.file(System.getProperty("user.home"), "public_html");
+
+ if (public_html.exists()) {
+ builddir = public_html.getAbsolutePath();
+ }
+
final Options options = new Options(System.getProperties());
for (Field field : Release.class.getFields()) {
@@ -53,10 +61,9 @@ public class Release {
e.printStackTrace();
}
}
- }
- public static void main(String[] args) {
- System.out.println("openejbVersion = " + openejbVersion);
- System.out.println("staging = " + staging);
+ build = Release.staging.replaceAll(".*-", "");
}
+
+
}
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=1232277&r1=1232276&r2=1232277&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 Tue Jan 17 02:37:42 2012
@@ -18,6 +18,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.Files;
import org.apache.rat.tentacles.NexusClient;
import org.apache.xbean.finder.UriSet;
@@ -33,7 +34,7 @@ public class Binaries {
public static void main(String[] args) throws Exception {
final NexusClient client = new NexusClient();
- final File dir = new File(Release.downloads + File.separator + Release.openejbVersion);
+ final File dir = Files.file(Release.builddir, "staging-" + Release.build, Release.openejbVersion);
final URI repo = URI.create(Release.staging);
System.out.println("Downloads: " + dir.getAbsolutePath());
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=1232277&r1=1232276&r2=1232277&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 Tue Jan 17 02:37:42 2012
@@ -17,6 +17,8 @@
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;
/**
* @version $Rev$ $Date$
@@ -25,6 +27,9 @@ import org.apache.openejb.tools.release.
public class Legal {
public static void main(String[] args) throws Exception {
- org.apache.rat.tentacles.Main.main(args);
+ org.apache.rat.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/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=1232277&r1=1232276&r2=1232277&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 Tue Jan 17 02:37:42 2012
@@ -43,8 +43,6 @@ public class Vote {
}
}
- template.add("build", Release.staging.replaceAll(".*-", ""));
-
final String email = template.apply();
System.out.println(email);