Change promoter to use HTTP to access build artifacts
diff --git a/org.eclipse.emf.cdo.releng.promotion/promotion/promoter/classes/promoter/BuildCopier.class b/org.eclipse.emf.cdo.releng.promotion/promotion/promoter/classes/promoter/BuildCopier.class
index 7329192..c5ab61a 100644
--- a/org.eclipse.emf.cdo.releng.promotion/promotion/promoter/classes/promoter/BuildCopier.class
+++ b/org.eclipse.emf.cdo.releng.promotion/promotion/promoter/classes/promoter/BuildCopier.class
Binary files differ
diff --git a/org.eclipse.emf.cdo.releng.promotion/promotion/promoter/classes/promoter/util/IO$OutputHandler$1.class b/org.eclipse.emf.cdo.releng.promotion/promotion/promoter/classes/promoter/util/IO$OutputHandler$1.class
index c1f9467..effb9e1 100644
--- a/org.eclipse.emf.cdo.releng.promotion/promotion/promoter/classes/promoter/util/IO$OutputHandler$1.class
+++ b/org.eclipse.emf.cdo.releng.promotion/promotion/promoter/classes/promoter/util/IO$OutputHandler$1.class
Binary files differ
diff --git a/org.eclipse.emf.cdo.releng.promotion/promotion/promoter/classes/promoter/util/IO$OutputHandler.class b/org.eclipse.emf.cdo.releng.promotion/promotion/promoter/classes/promoter/util/IO$OutputHandler.class
index f2c522d..d5a9bf4 100644
--- a/org.eclipse.emf.cdo.releng.promotion/promotion/promoter/classes/promoter/util/IO$OutputHandler.class
+++ b/org.eclipse.emf.cdo.releng.promotion/promotion/promoter/classes/promoter/util/IO$OutputHandler.class
Binary files differ
diff --git a/org.eclipse.emf.cdo.releng.promotion/promotion/promoter/classes/promoter/util/IO.class b/org.eclipse.emf.cdo.releng.promotion/promotion/promoter/classes/promoter/util/IO.class
index 20bcd82..b506e1b 100644
--- a/org.eclipse.emf.cdo.releng.promotion/promotion/promoter/classes/promoter/util/IO.class
+++ b/org.eclipse.emf.cdo.releng.promotion/promotion/promoter/classes/promoter/util/IO.class
Binary files differ
diff --git a/org.eclipse.emf.cdo.releng.promotion/src/promoter/BuildCopier.java b/org.eclipse.emf.cdo.releng.promotion/src/promoter/BuildCopier.java
index 0c5d077..6158acf 100644
--- a/org.eclipse.emf.cdo.releng.promotion/src/promoter/BuildCopier.java
+++ b/org.eclipse.emf.cdo.releng.promotion/src/promoter/BuildCopier.java
@@ -168,7 +168,7 @@
try
{
- IO.unzip(new URL(buildURL + "/artifact/*zip*/archive.zip"), drop);
+ IO.unzip(new URL(buildURL + "/artifact/*zip*/archive.zip"), drop, "archive/");
}
catch (MalformedURLException ex)
{
diff --git a/org.eclipse.emf.cdo.releng.promotion/src/promoter/util/IO.java b/org.eclipse.emf.cdo.releng.promotion/src/promoter/util/IO.java
index f5549a6..290033f 100644
--- a/org.eclipse.emf.cdo.releng.promotion/src/promoter/util/IO.java
+++ b/org.eclipse.emf.cdo.releng.promotion/src/promoter/util/IO.java
@@ -608,13 +608,13 @@
}
}
- public static void unzip(File zipFile, File targetFolder)
+ public static void unzip(File zipFile, File targetFolder, String prefix)
{
FileInputStream fis = openInputStream(zipFile);
try
{
- unzip(fis, targetFolder);
+ unzip(fis, targetFolder, prefix);
}
finally
{
@@ -622,14 +622,14 @@
}
}
- public static void unzip(URL url, File targetFolder)
+ public static void unzip(URL url, File targetFolder, String prefix)
{
InputStream in = null;
try
{
in = url.openStream();
- unzip(in, targetFolder);
+ unzip(in, targetFolder, prefix);
}
catch (IOException ex)
{
@@ -641,7 +641,7 @@
}
}
- public static void unzip(InputStream inputStream, File targetFolder)
+ public static void unzip(InputStream inputStream, File targetFolder, String prefix)
{
final byte[] buffer = new byte[DEFAULT_BUFFER_SIZE];
ZipInputStream zis = null;
@@ -654,6 +654,22 @@
while ((entry = zis.getNextEntry()) != null)
{
String name = entry.getName();
+ if (prefix != null)
+ {
+ if (name.startsWith(prefix))
+ {
+ name = name.substring(prefix.length());
+ if (name.length() == 0)
+ {
+ continue;
+ }
+ }
+ else
+ {
+ continue;
+ }
+ }
+
File target = new File(targetFolder, name);
if (entry.isDirectory())
