Improve workspace normalization

[gpl/argeo-slc.git] / runtime / org.argeo.slc.repo / src / main / java / org / argeo / slc / repo / ArtifactIndexer.java

diff --git a/runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/ArtifactIndexer.java b/runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/ArtifactIndexer.java
index fe8c00d2517d937af7e470a8ef8e917ba1ae20fa..acb05b48395206f615efe3bb1308524faee1df95 100644 (file)
--- a/runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/ArtifactIndexer.java
+++ b/runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/ArtifactIndexer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2012 Mathieu Baudier
+ * Copyright (C) 2007-2012 Argeo GmbH
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -73,6 +73,20 @@ public class ArtifactIndexer implements NodeIndexer {
                                        artifact.getClassifier());
                        JcrUtils.updateLastModified(fileNode);
 
+                       // make sure there are checksums
+                       String shaNodeName = fileNode.getName() + ".sha1";
+                       if (!fileNode.getParent().hasNode(shaNodeName)) {
+                               String sha = JcrUtils.checksumFile(fileNode, "SHA-1");
+                               JcrUtils.copyBytesAsFile(fileNode.getParent(), shaNodeName,
+                                               sha.getBytes());
+                       }
+                       String md5NodeName = fileNode.getName() + ".md5";
+                       if (!fileNode.getParent().hasNode(md5NodeName)) {
+                               String md5 = JcrUtils.checksumFile(fileNode, "MD5");
+                               JcrUtils.copyBytesAsFile(fileNode.getParent(), md5NodeName,
+                                               md5.getBytes());
+                       }
+
                        // set higher levels
                        Node artifactVersionBase = fileNode.getParent();
                        if (!artifactVersionBase
@@ -114,7 +128,7 @@ public class ArtifactIndexer implements NodeIndexer {
                                                artifact.getGroupId());
                        }
                        JcrUtils.updateLastModifiedAndParents(groupBase,
-                                       RepoConstants.ARTIFACTS_BASE_PATH);
+                                       RepoConstants.DEFAULT_ARTIFACTS_BASE_PATH);
 
                        if (log.isTraceEnabled())
                                log.trace("Indexed artifact " + artifact + " on " + fileNode);
@@ -125,7 +139,7 @@ public class ArtifactIndexer implements NodeIndexer {
        }
 
        private String getRelativePath(String nodePath) {
-               String basePath = RepoConstants.ARTIFACTS_BASE_PATH;
+               String basePath = RepoConstants.DEFAULT_ARTIFACTS_BASE_PATH;
                if (!nodePath.startsWith(basePath))
                        return null;
                String relativePath = nodePath.substring(basePath.length());