Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2012-07-24 17:07:22 +0000
committerEike Stepper2012-07-24 17:07:22 +0000
commit469211a9aed849fb4c20647541fb7112fd68d553 (patch)
treefef644836cf337f3289fede3966f187b005c6621 /plugins
parent6d75ec2c2d8de94f5baaed8c481cd06f4d8c3370 (diff)
downloadcdo-469211a9aed849fb4c20647541fb7112fd68d553.tar.gz
cdo-469211a9aed849fb4c20647541fb7112fd68d553.tar.xz
cdo-469211a9aed849fb4c20647541fb7112fd68d553.zip
Create UUID tags in release.xml
Diffstat (limited to 'plugins')
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.version.digest/src/org/eclipse/emf/cdo/releng/version/digest/DigestValidator.java3
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.version/src/org/eclipse/emf/cdo/releng/version/Release.java20
2 files changed, 16 insertions, 7 deletions
diff --git a/plugins/org.eclipse.emf.cdo.releng.version.digest/src/org/eclipse/emf/cdo/releng/version/digest/DigestValidator.java b/plugins/org.eclipse.emf.cdo.releng.version.digest/src/org/eclipse/emf/cdo/releng/version/digest/DigestValidator.java
index 0837b13315..adc82913cb 100644
--- a/plugins/org.eclipse.emf.cdo.releng.version.digest/src/org/eclipse/emf/cdo/releng/version/digest/DigestValidator.java
+++ b/plugins/org.eclipse.emf.cdo.releng.version.digest/src/org/eclipse/emf/cdo/releng/version/digest/DigestValidator.java
@@ -270,7 +270,7 @@ public class DigestValidator extends VersionValidator
return digest.digest();
}
- private byte[] getFileDigest(IFile file) throws Exception
+ public static byte[] getFileDigest(IFile file) throws Exception
{
InputStream stream = null;
@@ -293,7 +293,6 @@ public class DigestValidator extends VersionValidator
case 10:
case 13:
continue;
-
}
digest.update((byte)ch);
diff --git a/plugins/org.eclipse.emf.cdo.releng.version/src/org/eclipse/emf/cdo/releng/version/Release.java b/plugins/org.eclipse.emf.cdo.releng.version/src/org/eclipse/emf/cdo/releng/version/Release.java
index b76aa3c990..8839aa3298 100644
--- a/plugins/org.eclipse.emf.cdo.releng.version/src/org/eclipse/emf/cdo/releng/version/Release.java
+++ b/plugins/org.eclipse.emf.cdo.releng.version/src/org/eclipse/emf/cdo/releng/version/Release.java
@@ -32,6 +32,7 @@ import java.util.Comparator;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.UUID;
/**
* @author Eike Stepper
@@ -56,17 +57,17 @@ public class Release implements ElementResolver
private IFile file;
- private String tag;
-
private boolean integration;
+ private String tag;
+
private Map<Element, Element> elements = new HashMap<Element, Element>();
public Release(IFile file)
{
this.file = file;
- tag = "";
integration = true;
+ initTag();
}
Release(SAXParser parser, IFile file) throws CoreException, IOException, SAXException
@@ -80,6 +81,7 @@ public class Release implements ElementResolver
{
contents = file.getContents();
parser.parse(contents, handler);
+ initTag();
}
finally
{
@@ -97,6 +99,14 @@ public class Release implements ElementResolver
}
}
+ private void initTag()
+ {
+ if (tag == null)
+ {
+ tag = UUID.randomUUID().toString();
+ }
+ }
+
public IFile getFile()
{
return file;
@@ -147,8 +157,8 @@ public class Release implements ElementResolver
private void writeRelease(StringBuilder builder)
{
builder.append("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n");
- builder.append("<" + RELEASE_TAG + " " + TAG_ATTRIBUTE + "=\"\" " + INTEGRATION_ATTRIBUTE + "=\"" + integration
- + "\">\n");
+ builder.append("<" + RELEASE_TAG + " " + INTEGRATION_ATTRIBUTE + "=\"+integration+\" " + TAG_ATTRIBUTE + "=\""
+ + tag + "\">\n");
List<Element> list = new ArrayList<Element>(elements.keySet());
Collections.sort(list, new Comparator<Element>()

Back to the top