X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=runtime%2Forg.argeo.slc.repo%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fslc%2Frepo%2FArtifactIndexer.java;h=462739c7d3736274083ba11960cb8ed242003fd3;hb=7d6251e4260ed330236ae86b732307439affcf76;hp=4b767796151d044a02e0b91c2771777f0aedf6d1;hpb=912cf5554a61dc35fb61183da39673656b668467;p=gpl%2Fargeo-slc.git

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 4b7677961..462739c7d 100644
--- 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,3 +1,18 @@
+/*
+ * 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.
+ * You may obtain a copy of the License at
+ *
+ *         http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.argeo.slc.repo;
 
 import javax.jcr.Node;
@@ -5,6 +20,7 @@ import javax.jcr.nodetype.NodeType;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.argeo.jcr.JcrUtils;
 import org.argeo.slc.SlcException;
 import org.argeo.slc.aether.AetherUtils;
 import org.argeo.slc.jcr.SlcNames;
@@ -36,6 +52,9 @@ public class ArtifactIndexer implements NodeIndexer {
 	public void index(Node fileNode) {
 		Artifact artifact = null;
 		try {
+			if(!support(fileNode.getPath()))
+				return;
+			
 			if (!fileNode.isNodeType(NodeType.NT_FILE))
 				return;
 
@@ -55,6 +74,21 @@ public class ArtifactIndexer implements NodeIndexer {
 			// can be null but ok for JCR API
 			fileNode.setProperty(SlcNames.SLC_ARTIFACT_CLASSIFIER,
 					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();
@@ -69,6 +103,13 @@ public class ArtifactIndexer implements NodeIndexer {
 				artifactVersionBase.setProperty(SlcNames.SLC_GROUP_ID,
 						artifact.getGroupId());
 			}
+			JcrUtils.updateLastModified(artifactVersionBase);
+
+			// pom
+			if (artifact.getExtension().equals("pom")) {
+				// TODO read to make it a distribution
+			}
+
 			Node artifactBase = artifactVersionBase.getParent();
 			if (!artifactBase.isNodeType(SlcTypes.SLC_ARTIFACT_BASE)) {
 				artifactBase.addMixin(SlcTypes.SLC_ARTIFACT_BASE);
@@ -77,12 +118,20 @@ public class ArtifactIndexer implements NodeIndexer {
 				artifactBase.setProperty(SlcNames.SLC_GROUP_ID,
 						artifact.getGroupId());
 			}
+			JcrUtils.updateLastModified(artifactBase);
+
 			Node groupBase = artifactBase.getParent();
 			if (!groupBase.isNodeType(SlcTypes.SLC_GROUP_BASE)) {
+				// if (groupBase.isNodeType(SlcTypes.SLC_ARTIFACT_BASE)) {
+				// log.warn("Group base " + groupBase.getPath()
+				// + " is also artifact base");
+				// }
 				groupBase.addMixin(SlcTypes.SLC_GROUP_BASE);
-				groupBase.setProperty(SlcNames.SLC_GROUP_ID,
+				groupBase.setProperty(SlcNames.SLC_GROUP_BASE_ID,
 						artifact.getGroupId());
 			}
+			JcrUtils.updateLastModifiedAndParents(groupBase,
+					RepoConstants.DEFAULT_ARTIFACTS_BASE_PATH);
 
 			if (log.isTraceEnabled())
 				log.trace("Indexed artifact " + artifact + " on " + fileNode);
@@ -93,7 +142,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());