Implemented updating of md5 hashes in artifacts.xml, removed timestampPrefix option

Author: spoenemann

build.gradle

@@ -52,7 +52,6 @@ osspub {
 		namespace 'org.eclipse.xtend'
 		namespace 'org.eclipse.lsp4j'
 		referenceFeature 'org.eclipse.xtext.sdk'
-		timestampPrefix 'v'
 	}
 
 	p2Repository {
@@ -61,6 +60,5 @@ osspub {
 		url "http://services.typefox.io/open-source/jenkins/job/lsp4j/job/${osspub.branch}/lastStableBuild/artifact/build/lsp4j.p2-repository-${osspub.version}.zip"
 		namespace 'org.eclipse.lsp4j'
 		referenceFeature 'org.eclipse.lsp4j.sdk'
-		timestampPrefix 'v'
 	}
 }

buildSrc/src/main/java/io/typefox/publishing/EclipsePublishing.xtend

@@ -7,17 +7,29 @@
  *******************************************************************************/
 package io.typefox.publishing
 
+import com.google.common.collect.AbstractIterator
 import com.google.common.io.Files
 import java.io.File
+import java.io.FileOutputStream
 import java.io.FilenameFilter
+import java.io.IOException
 import java.nio.charset.Charset
 import java.util.concurrent.Callable
+import java.util.jar.JarFile
+import java.util.jar.JarOutputStream
+import java.util.zip.ZipEntry
+import javax.xml.parsers.DocumentBuilderFactory
+import javax.xml.transform.TransformerFactory
+import javax.xml.transform.dom.DOMSource
+import javax.xml.transform.stream.StreamResult
 import org.eclipse.xtend.lib.annotations.FinalFieldsConstructor
+import org.gradle.api.GradleException
 import org.gradle.api.InvalidUserDataException
 import org.gradle.api.Project
 import org.gradle.api.tasks.Copy
 import org.gradle.api.tasks.Delete
 import org.gradle.api.tasks.bundling.Zip
+import org.w3c.dom.Element
 import pw.prok.download.Download
 
 @FinalFieldsConstructor
@@ -99,6 +111,13 @@ class EclipsePublishing {
 					] as Callable<File[]>)
 					outputDir = file('''«rootDir»/build-result/p2.repository/features''')
 				]
+				
+				task('''update«repoName»ArtifactsChecksum''') => [
+					doLast [
+						updateArtifactsXml('''«buildDir»/p2-«repoName.toLowerCase»/repository-unsigned''',
+							'''«rootDir»/build-result/p2.repository''')
+					]
+				]
 			}
 
 			val copyP2MetadataTask = task(#{'type' -> Copy}, '''copy«repoName»P2Metadata''') => [ task |
@@ -109,6 +128,7 @@ class EclipsePublishing {
 				from = '''«buildDir»/p2-«repoName.toLowerCase»/repository-unsigned'''
 				into = '''«rootDir»/build-result/p2.repository'''
 				if (osspub.signJars) {
+					exclude('**/artifacts.jar')
 					for (namespace : repository.namespaces) {
 						exclude('''**/«namespace»*.jar''')
 					}
@@ -121,7 +141,7 @@ class EclipsePublishing {
 				description = '''Create a zip file from the «repoName» P2 repository'''
 				dependsOn(copyP2MetadataTask)
 				if (osspub.signJars)
-					dependsOn('''sign«repoName»P2Plugins''', '''sign«repoName»P2Features''')
+					dependsOn('''sign«repoName»P2Plugins''', '''sign«repoName»P2Features''', '''update«repoName»ArtifactsChecksum''')
 				from = '''«rootDir»/build-result/p2.repository'''
 				destinationDir = file('''«rootDir»/build-result/downloads''')
 				doFirst[ task2 |
@@ -189,15 +209,22 @@ class EclipsePublishing {
 
 	private def getBuildTimestamp(P2Repository repository) {
 		if (!repository.referenceFeature.nullOrEmpty) {
-			val referencePrefix = '''«repository.referenceFeature»_«mainVersion».«repository.timestampPrefix»'''
+			val referencePrefix = '''«repository.referenceFeature»_«mainVersion».'''
 			val bundleDir = new File(buildDir, '''p2-«repository.name.toLowerCase»/repository-unsigned/features''')
 			val FilenameFilter filter = [ dir, name |
 				name.startsWith(referencePrefix) && name.endsWith('.jar')
 			]
 			val referenceFeatureFiles = bundleDir.listFiles(filter)
 			if (referenceFeatureFiles.length > 0) {
 				val fileName = referenceFeatureFiles.get(0).name
-				return fileName.substring(referencePrefix.length, fileName.length - '.jar'.length).replace('-', '')
+				val qualifier = fileName.substring(referencePrefix.length, fileName.length - '.jar'.length)
+				val timestamp = new StringBuilder
+				for (var i = 0; i < qualifier.length; i++) {
+					val c = qualifier.charAt(i)
+					if (Character.isDigit(c))
+						timestamp.append(c)
+				}
+				return timestamp.toString
 			}
 		}
 	}
@@ -210,4 +237,72 @@ class EclipsePublishing {
 		}
 	}
 
+	private def updateArtifactsXml(String sourceDir, String destDir) {
+		var JarFile sourceJar
+		var JarOutputStream targetJar
+		try {
+			sourceJar = new JarFile('''«sourceDir»/artifacts.jar''')
+			val artifactsEntry = sourceJar.getEntry('artifacts.xml')
+			if (artifactsEntry === null)
+				throw new GradleException('artifacts.jar does not contain artifacts.xml')
+			val builder = DocumentBuilderFactory.newInstance.newDocumentBuilder
+			val document = builder.parse(sourceJar.getInputStream(artifactsEntry))
+			val xmlRoot = document.documentElement
+			if (xmlRoot.tagName == 'repository') {
+				for (artifacts : xmlRoot.getElements('artifacts')) {
+					for (artifact : artifacts.getElements('artifact')) {
+						for (properties : artifact.getElements('properties')) {
+							for (property : properties.getElements('property')) {
+								if (property.getAttribute('name') == 'download.md5') {
+									val id = artifact.getAttribute('id')
+									val version = artifact.getAttribute('version')
+									val classifier = artifact.getAttribute('classifier')
+									if (!id.empty && !version.empty && !classifier.empty) {
+										val md5 = computeMd5Checksum(sourceDir, id, version, classifier)
+										property.setAttribute('value', md5)
+									}
+								}
+							}
+						}
+					}
+				}
+			}
+			
+			targetJar = new JarOutputStream(new FileOutputStream('''«destDir»/artifacts.jar'''))
+			targetJar.putNextEntry(new ZipEntry('artifacts.xml'))
+			val transformer = TransformerFactory.newInstance.newTransformer
+			transformer.transform(new DOMSource(document), new StreamResult(targetJar))
+			targetJar.closeEntry()
+		} finally {
+			try {
+				sourceJar?.close()
+				targetJar?.close()
+			} catch (IOException e) {}
+		}
+	}
+	
+	private def Iterable<Element> getElements(Element e, String name) {
+		val nodeList = e.getElementsByTagName(name)
+		return [
+			new AbstractIterator<Element> {
+				int i = 0
+				override protected computeNext() {
+					if (i < nodeList.length)
+						return nodeList.item(i++) as Element
+					else
+						return endOfData
+				}
+			}
+		]
+	}
+	
+	private def computeMd5Checksum(String sourceDir, String id, String version, String classifier) {
+		val sourcePath = switch classifier {
+			case 'osgi.bundle': '''«sourceDir»/plugins/«id»_«version».jar'''
+			case 'org.eclipse.update.feature': '''«sourceDir»/features/«id»_«version».jar'''
+		}
+		val bytes = FileChecksums.getMd5Checksum(new File(sourcePath))
+		return FileChecksums.toString(bytes)
+	}
+	
 }

buildSrc/src/main/java/io/typefox/publishing/FileChecksums.xtend

@@ -12,11 +12,13 @@ import java.io.FileInputStream
 import java.io.FileNotFoundException
 import java.io.IOException
 import java.io.InputStream
+import java.security.DigestInputStream
+import java.security.MessageDigest
 import java.util.zip.CRC32
 
 class FileChecksums {
 
-	static def long getChecksum(File file) throws FileNotFoundException, IOException {
+	static def long getCrcChecksum(File file) throws FileNotFoundException, IOException {
 		val checksum = new CRC32
 		var InputStream inputStream
 		try {
@@ -35,4 +37,33 @@ class FileChecksums {
 		}
 	}
 
+	static def byte[] getMd5Checksum(File file) throws FileNotFoundException, IOException {
+		val messageDigest = MessageDigest.getInstance('MD5')
+		var DigestInputStream digestInputStream
+		try {
+			digestInputStream = new DigestInputStream(new FileInputStream(file), messageDigest)
+			val buffer = newByteArrayOfSize(4096)
+			var int bytesRead
+			do {
+				bytesRead = digestInputStream.read(buffer)
+			} while (bytesRead > 0)
+		} finally {
+			try {
+				digestInputStream?.close()
+			} catch (IOException e) {}
+		}
+		return messageDigest.digest()
+	}
+	
+	static def String toString(byte[] bytes) {
+		val result = new StringBuilder
+		for (var i = 0; i < bytes.length; i++) {
+			var value = bytes.get(i) as int
+			if (value < 0)
+				value += 0x100
+			result.append(Integer.toString(value, 16))
+		}
+		return result.toString
+	}
+	
 }

buildSrc/src/main/java/io/typefox/publishing/JarSignTask.xtend

@@ -61,9 +61,9 @@ class JarSignTask extends DefaultTask {
 			val sourceIdentifier = source.name.identifier
 			val FilenameFilter filter = [dir, name | name.identifier == sourceIdentifier]
 			val matching = alternateSourceDir.listFiles(filter)
-			if (matching.length > 0) {
-				val sourceChecksum = source.checksum
-				val equalSourceFile = matching.findFirst[checksum == sourceChecksum]
+			if (matching !== null && matching.length > 0) {
+				val sourceChecksum = source.crcChecksum
+				val equalSourceFile = matching.findFirst[crcChecksum == sourceChecksum]
 				if (equalSourceFile === null) {
 					val message = '''The artifact «source.withoutRootPath» matches «matching.map[withoutRootPath].join(', ')», but their content is unequal.'''
 					if (failOnInconsistency)

buildSrc/src/main/java/io/typefox/publishing/MavenPublishing.xtend

@@ -12,7 +12,7 @@ import org.apache.maven.settings.building.DefaultSettingsBuilderFactory
 import org.apache.maven.settings.building.DefaultSettingsBuildingRequest
 import org.apache.maven.settings.building.SettingsBuildingException
 import org.eclipse.xtend.lib.annotations.FinalFieldsConstructor
-import org.gradle.api.GradleScriptException
+import org.gradle.api.GradleException
 import org.gradle.api.InvalidUserDataException
 import org.gradle.api.Project
 import org.gradle.api.artifacts.ConfigurablePublishArtifact
@@ -265,7 +265,7 @@ class MavenPublishing {
 						username = server.username
 						if (cipher.isEncryptedString(server.password)) {
 							if (decryptionKey === null)
-								throw new GradleScriptException('Missing settings-security.xml file.', null)
+								throw new GradleException('Missing settings-security.xml file.')
 							logger.info('''Maven Settings: using encrypted server entry for «repository.name» repository''')
 							password = cipher.decryptDecorated(server.password, decryptionKey)
 						} else {
@@ -281,7 +281,7 @@ class MavenPublishing {
 			if (gpgServer !== null) {
 				if (cipher.isEncryptedString(gpgServer.passphrase)) {
 					if (decryptionKey === null)
-						throw new GradleScriptException('Missing settings-security.xml file.', null)
+						throw new GradleException('Missing settings-security.xml file.')
 					logger.info('Maven Settings: using encrypted server entry for pgp signing')
 					ext.set(PublishingPlugin.SIGNING_PASSWORD, cipher.decryptDecorated(gpgServer.passphrase, decryptionKey))
 				} else {
@@ -290,7 +290,7 @@ class MavenPublishing {
 				}
 			}
 		} catch (SettingsBuildingException e) {
-			throw new GradleScriptException('Error while loading Maven settings.', e)
+			throw new GradleException('Error while loading Maven settings.', e)
 		}
 	}
 

buildSrc/src/main/java/io/typefox/publishing/P2Repository.xtend

@@ -23,8 +23,6 @@ class P2Repository {
 
 	String referenceFeature
 
-	String timestampPrefix
-	
 	def void name(Object input) {
 		this.name = input.toString
 	}
@@ -45,8 +43,4 @@ class P2Repository {
 		this.referenceFeature = input.toString
 	}
 
-	def void timestampPrefix(Object input) {
-		this.timestampPrefix = input.toString
-	}
-	
 }