Improve Maven support in repo

git-svn-id: https://svn.argeo.org/slc/trunk@4836 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc

diff --git a/demo/log4j.properties b/demo/log4j.properties
index 7b62f3a481c4ed74ff75da152dc69d6337db1189..b7d8fe6530eb5093d71e22ec30c519aa9932777d 100644 (file)
--- a/demo/log4j.properties
+++ b/demo/log4j.properties
@@ -3,12 +3,13 @@ log4j.rootLogger=WARN, development
 
 ## Levels
 log4j.logger.org.argeo=DEBUG
-log4j.logger.org.argeo.jackrabbit.remote.ExtendedDispatcherServlet=WARN
+log4j.logger.org.argeo.jackrabbit.remote.ExtendedDispatcherServlet=ERROR
+log4j.logger.org.springframework.web.servlet.PageNotFound=ERROR
 log4j.logger.org.argeo.server.webextender.TomcatDeployer=WARN
 log4j.logger.org.argeo.slc.client.ui.dist=TRACE
 
-log4j.logger.org.apache.jackrabbit.webdav=DEBUG
-log4j.logger.org.apache.jackrabbit.jcr2spi=DEBUG
+#log4j.logger.org.apache.jackrabbit.webdav=DEBUG
+#log4j.logger.org.apache.jackrabbit.jcr2spi=DEBUG
 
 log4j.logger.org.apache.catalina=INFO
 log4j.logger.org.apache.coyote=INFO

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 4b767796151d044a02e0b91c2771777f0aedf6d1..841f22d38b8e9713340494cc989bd1c25c791fb8 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
@@ -5,6 +5,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;
@@ -55,6 +56,7 @@ public class ArtifactIndexer implements NodeIndexer {
                        // can be null but ok for JCR API
                        fileNode.setProperty(SlcNames.SLC_ARTIFACT_CLASSIFIER,
                                        artifact.getClassifier());
+                       JcrUtils.updateLastModified(fileNode);
 
                        // set higher levels
                        Node artifactVersionBase = fileNode.getParent();
@@ -68,6 +70,7 @@ public class ArtifactIndexer implements NodeIndexer {
                                                artifact.getArtifactId());
                                artifactVersionBase.setProperty(SlcNames.SLC_GROUP_ID,
                                                artifact.getGroupId());
+                               JcrUtils.updateLastModified(artifactVersionBase);
                        }
                        Node artifactBase = artifactVersionBase.getParent();
                        if (!artifactBase.isNodeType(SlcTypes.SLC_ARTIFACT_BASE)) {
@@ -76,12 +79,20 @@ public class ArtifactIndexer implements NodeIndexer {
                                                artifact.getArtifactId());
                                artifactBase.setProperty(SlcNames.SLC_GROUP_ID,
                                                artifact.getGroupId());
+                               JcrUtils.updateLastModified(artifactBase);
                        }
+                       
+                       // TODO do we really need group base?
                        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.updateLastModified(groupBase);
                        }
 
                        if (log.isTraceEnabled())

diff --git a/runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/JarFileIndexer.java b/runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/JarFileIndexer.java
index 92460b02138e5d46c52d92e12d715eefc2fcebad..9e4af70651d68033faf2fba925082c5b4f724171 100644 (file)
--- a/runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/JarFileIndexer.java
+++ b/runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/JarFileIndexer.java
@@ -59,8 +59,8 @@ public class JarFileIndexer implements NodeIndexer {
 
                        jarIn = new JarInputStream(fileBinary.getStream());
                        Manifest manifest = jarIn.getManifest();
-                       if(manifest==null){
-                               log.error(fileNode+" has no MANIFEST");
+                       if (manifest == null) {
+                               log.error(fileNode + " has no MANIFEST");
                                return;
                        }
                        bo = new ByteArrayOutputStream();
@@ -93,9 +93,11 @@ public class JarFileIndexer implements NodeIndexer {
                        // OSGi
                        if (attrs.containsKey(new Name(Constants.BUNDLE_SYMBOLICNAME))) {
                                addOsgiMetadata(fileNode, attrs);
+                               JcrUtils.updateLastModified(fileNode);
                                if (log.isTraceEnabled())
                                        log.trace("Indexed OSGi bundle " + fileNode);
                        } else {
+                               JcrUtils.updateLastModified(fileNode);
                                if (log.isTraceEnabled())
                                        log.trace("Indexed JAR file " + fileNode);
                        }

diff --git a/runtime/org.argeo.slc.repo/src/main/resources/org/argeo/slc/repo/repo.cnd b/runtime/org.argeo.slc.repo/src/main/resources/org/argeo/slc/repo/repo.cnd
index bc6c116abee757a4e75714f1c0277a231dd11a83..1ab84569d67e8d6a0f860b97dab72f0e8eccff8e 100644 (file)
--- a/runtime/org.argeo.slc.repo/src/main/resources/org/argeo/slc/repo/repo.cnd
+++ b/runtime/org.argeo.slc.repo/src/main/resources/org/argeo/slc/repo/repo.cnd
@@ -3,7 +3,7 @@
 // AETHER
 [slc:artifact] > nt:base, mix:shareable
 mixin
-- slc:artifactId (STRING) primary m
+- slc:artifactId (STRING) m
 - slc:groupId (STRING) m
 - slc:artifactVersion (STRING) m
 - slc:artifactExtension (STRING) m
@@ -11,18 +11,20 @@ mixin
 
 [slc:artifactVersionBase] > nt:base
 mixin
-- slc:artifactId (STRING) primary m
+- slc:artifactId (STRING) m
 - slc:groupId (STRING) m
 - slc:artifactVersion (STRING) m
 
 [slc:artifactBase] > nt:base
 mixin
-- slc:artifactId (STRING) primary m
+- slc:artifactId (STRING) m
 - slc:groupId (STRING) m
 
 [slc:groupBase] > nt:base
 mixin
-- slc:groupId (STRING) primary m
+// it is possible to have groupBase being artifact base (e.g. org.argeo.commons.basic)
+// so using groupId would conflict 
+- slc:groupBaseId (STRING) m
 
 [slc:jarFile] > nt:base
 mixin

diff --git a/runtime/org.argeo.slc.support.jcr/src/main/java/org/argeo/slc/jcr/SlcNames.java b/runtime/org.argeo.slc.support.jcr/src/main/java/org/argeo/slc/jcr/SlcNames.java
index daf1ede4e957a7607d5ea7052d59ed9e7f90485f..3d39cbb7de8760cccea42566112f685caf7d98b4 100644 (file)
--- a/runtime/org.argeo.slc.support.jcr/src/main/java/org/argeo/slc/jcr/SlcNames.java
+++ b/runtime/org.argeo.slc.support.jcr/src/main/java/org/argeo/slc/jcr/SlcNames.java
@@ -59,6 +59,7 @@ public interface SlcNames {
        // slc:artifact
        public final static String SLC_ARTIFACT_ID = "slc:artifactId";
        public final static String SLC_GROUP_ID = "slc:groupId";
+       public final static String SLC_GROUP_BASE_ID = "slc:groupBaseId";
        public final static String SLC_ARTIFACT_VERSION = "slc:artifactVersion";
        public final static String SLC_ARTIFACT_EXTENSION = "slc:artifactExtension";
        public final static String SLC_ARTIFACT_CLASSIFIER = "slc:artifactClassifier";