Improve Repo

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

diff --git a/demo/log4j.properties b/demo/log4j.properties
index b7d8fe6530eb5093d71e22ec30c519aa9932777d..26304cc11f3e114f02495041aed86cbf724f884f 100644 (file)
--- a/demo/log4j.properties
+++ b/demo/log4j.properties
@@ -4,10 +4,13 @@ log4j.rootLogger=WARN, development
 ## Levels
 log4j.logger.org.argeo=DEBUG
 log4j.logger.org.argeo.jackrabbit.remote.ExtendedDispatcherServlet=ERROR
+#log4j.logger.org.argeo.jcr.mvc.ResourceProxyServlet=TRACE
 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.argeo.jcr.proxy=TRACE
+
 #log4j.logger.org.apache.jackrabbit.webdav=DEBUG
 #log4j.logger.org.apache.jackrabbit.jcr2spi=DEBUG
 

diff --git a/modules/server/org.argeo.slc.server.repo/META-INF/MANIFEST.MF b/modules/server/org.argeo.slc.server.repo/META-INF/MANIFEST.MF
index e64aeef453c5cb70aa1e2f572ed6f3d302fdf172..e20ff6597ad9ab6d06009876dbd1a6db3826a88e 100644 (file)
--- a/modules/server/org.argeo.slc.server.repo/META-INF/MANIFEST.MF
+++ b/modules/server/org.argeo.slc.server.repo/META-INF/MANIFEST.MF
@@ -13,5 +13,6 @@ Import-Package: javax.jcr;version="2.0.0",
  org.argeo.slc.repo,
  org.argeo.slc.repo.maven,
  org.argeo.slc.repo.maven.proxy,
+ org.h2;resolution:=optional,
  org.sonatype.aether;version="1.9.0",
  org.springframework.security;version="2.0.6.RELEASE"

diff --git a/modules/server/org.argeo.slc.server.repo/META-INF/spring/maven.xml b/modules/server/org.argeo.slc.server.repo/META-INF/spring/maven.xml
index a3708ba39ddda97d138e200599234f2ae12bb6c0..4b01d6194e090ae588afe29a986a00746cd0e996 100644 (file)
--- a/modules/server/org.argeo.slc.server.repo/META-INF/spring/maven.xml
+++ b/modules/server/org.argeo.slc.server.repo/META-INF/spring/maven.xml
@@ -7,38 +7,30 @@
        http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-2.5.xsd
        ">
 
-<!-- 
-       <bean class="org.argeo.slc.repo.maven.ImportMavenDependencies" init-method="run">
-               <property name="rootCoordinates"
-                       value="org.argeo.dep:versions-all:pom:1.1.3-SNAPSHOT" />
-               <property name="distributionName" value="tp" />
-               <property name="aetherTemplate" ref="mavenAetherTemplate" />
-               <property name="jcrSession" ref="jcrSession" />
-               <property name="excludedArtifacts">
-                       <set>
-                               <value>org.apache.commons:com.springsource.org.apache.commons.logging
-                               </value>
-                               <value>org.osgi:org.osgi.core</value>
-                               <value>org.easymock:easymock</value>
-                               <value>com.springsource.org.apache.xmlcommons</value>
-                       </set>
-               </property>
-       </bean>
- -->
- 
-<!--   <bean id="mavenAetherTemplate" class="org.argeo.slc.aether.AetherTemplate"> -->
-<!--           <property name="repositorySystem" ref="mavenRepositorySystem" /> -->
-<!--           <property name="repositorySystemSession" ref="mavenRepositorySystemSession" /> -->
-<!--           <property name="remoteRepositories" ref="defaultMavenRepositories" /> -->
-<!--   </bean> -->
+       <!-- <bean class="org.argeo.slc.repo.maven.ImportMavenDependencies" init-method="run"> 
+               <property name="rootCoordinates" value="org.argeo.dep:versions-all:pom:1.1.3-SNAPSHOT" 
+               /> <property name="distributionName" value="tp" /> <property name="aetherTemplate" 
+               ref="mavenAetherTemplate" /> <property name="jcrSession" ref="jcrSession" 
+               /> <property name="excludedArtifacts"> <set> <value>org.apache.commons:com.springsource.org.apache.commons.logging 
+               </value> <value>org.osgi:org.osgi.core</value> <value>org.easymock:easymock</value> 
+               <value>com.springsource.org.apache.xmlcommons</value> </set> </property> 
+               </bean> -->
+
+       <!-- <bean id="mavenAetherTemplate" class="org.argeo.slc.aether.AetherTemplate"> -->
+       <!-- <property name="repositorySystem" ref="mavenRepositorySystem" /> -->
+       <!-- <property name="repositorySystemSession" ref="mavenRepositorySystemSession" 
+               /> -->
+       <!-- <property name="remoteRepositories" ref="defaultMavenRepositories" 
+               /> -->
+       <!-- </bean> -->
 
        <!-- Remote repositories -->
        <util:list id="defaultMavenRepositories">
+               <ref local="argeo-snapshots" />
+               <ref local="argeo" />
                <ref local="central" />
                <ref local="com.springsource.repository.bundles.external" />
                <ref local="com.springsource.repository.bundles.release" />
-               <ref local="argeo" />
-               <ref local="argeo-snapshots" />
        </util:list>
 
        <bean id="central" class="org.argeo.slc.aether.spring.RemoteRepositoryFactory">
@@ -53,10 +45,10 @@
                        value="http://repository.springsource.com/maven/bundles/external" />
        </bean>
        <bean id="argeo" class="org.argeo.slc.aether.spring.RemoteRepositoryFactory">
-               <property name="url" value="http://maven.argeo.org/argeo/" />
+               <property name="url" value="http://maven.argeo.org/argeo" />
        </bean>
        <bean id="argeo-snapshots" class="org.argeo.slc.aether.spring.RemoteRepositoryFactory">
-               <property name="url" value="http://dev.argeo.org/maven/argeo-snapshots/" />
+               <property name="url" value="http://dev.argeo.org/maven/argeo-snapshots" />
        </bean>
 
 </beans>
\ No newline at end of file

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 841f22d38b8e9713340494cc989bd1c25c791fb8..c2e20c3abc479a1c13908c52006237b913e62594 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
@@ -70,8 +70,14 @@ public class ArtifactIndexer implements NodeIndexer {
                                                artifact.getArtifactId());
                                artifactVersionBase.setProperty(SlcNames.SLC_GROUP_ID,
                                                artifact.getGroupId());
-                               JcrUtils.updateLastModified(artifactVersionBase);
                        }
+                       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);
@@ -79,10 +85,9 @@ 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?
+                       JcrUtils.updateLastModified(artifactBase);
+
                        Node groupBase = artifactBase.getParent();
                        if (!groupBase.isNodeType(SlcTypes.SLC_GROUP_BASE)) {
                                // if (groupBase.isNodeType(SlcTypes.SLC_ARTIFACT_BASE)) {
@@ -92,8 +97,9 @@ public class ArtifactIndexer implements NodeIndexer {
                                groupBase.addMixin(SlcTypes.SLC_GROUP_BASE);
                                groupBase.setProperty(SlcNames.SLC_GROUP_BASE_ID,
                                                artifact.getGroupId());
-                               JcrUtils.updateLastModified(groupBase);
                        }
+                       JcrUtils.updateLastModifiedAndParents(groupBase,
+                                       RepoConstants.ARTIFACTS_BASE_PATH);
 
                        if (log.isTraceEnabled())
                                log.trace("Indexed artifact " + artifact + " on " + fileNode);

diff --git a/runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/RepoConstants.java b/runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/RepoConstants.java
index 0cbfcf47538d038b82018b79a276c56b127bfb34..6a02828285b9092555f08aedbad2b4348e6a4867 100644 (file)
--- a/runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/RepoConstants.java
+++ b/runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/RepoConstants.java
@@ -2,6 +2,6 @@ package org.argeo.slc.repo;
 
 /** SLC repository constants */
 public interface RepoConstants {
-       public final static String ARTIFACTS_BASE_PATH = "/slc/repo/artifacts";
-       public final static String PROXIED_REPOSITORIES = "/slc/repo/proxiedRepositories";
+       public final static String ARTIFACTS_BASE_PATH = "/repo";
+       public final static String PROXIED_REPOSITORIES = "/slc/repo/sources";
 }

diff --git a/runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/maven/proxy/MavenProxyServiceImpl.java b/runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/maven/proxy/MavenProxyServiceImpl.java
index 19df339a27b44b96c74c65853fcfb31be45e1e34..c2b4e53d1f31f581d5b278fa713ce047fb6a7351 100644 (file)
--- a/runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/maven/proxy/MavenProxyServiceImpl.java
+++ b/runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/maven/proxy/MavenProxyServiceImpl.java
@@ -6,6 +6,8 @@ import java.util.List;
 import javax.jcr.Node;
 import javax.jcr.NodeIterator;
 import javax.jcr.RepositoryException;
+import javax.jcr.Session;
+import javax.jcr.nodetype.NodeType;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -14,6 +16,7 @@ import org.argeo.jcr.JcrUtils;
 import org.argeo.jcr.proxy.AbstractUrlProxy;
 import org.argeo.slc.SlcException;
 import org.argeo.slc.jcr.SlcNames;
+import org.argeo.slc.jcr.SlcTypes;
 import org.argeo.slc.repo.RepoConstants;
 import org.sonatype.aether.repository.RemoteRepository;
 
@@ -25,16 +28,21 @@ public class MavenProxyServiceImpl extends AbstractUrlProxy implements
 
        private List<RemoteRepository> defaultRepositories = new ArrayList<RemoteRepository>();
 
+       /** Inititalizes the artifacts area. */
        @Override
-       protected void beforeInitSessionSave() throws RepositoryException {
-               JcrUtils.mkdirs(getJcrAdminSession(), RepoConstants.ARTIFACTS_BASE_PATH);
-               Node proxiedRepositories = JcrUtils.mkdirs(getJcrAdminSession(),
+       protected void beforeInitSessionSave(Session session)
+                       throws RepositoryException {
+               JcrUtils.mkdirsSafe(session, RepoConstants.ARTIFACTS_BASE_PATH);
+               Node proxiedRepositories = JcrUtils.mkdirsSafe(session,
                                RepoConstants.PROXIED_REPOSITORIES);
                for (RemoteRepository repository : defaultRepositories) {
                        if (!proxiedRepositories.hasNode(repository.getId())) {
                                Node proxiedRepository = proxiedRepositories.addNode(repository
                                                .getId());
-                               proxiedRepository.setProperty(SLC_URL, repository.getUrl());
+                               proxiedRepository.addMixin(NodeType.MIX_REFERENCEABLE);
+                               JcrUtils.urlToAddressProperties(proxiedRepository,
+                                               repository.getUrl());
+                               // proxiedRepository.setProperty(SLC_URL, repository.getUrl());
                                proxiedRepository.setProperty(SLC_TYPE,
                                                repository.getContentType());
                        }
@@ -44,34 +52,42 @@ public class MavenProxyServiceImpl extends AbstractUrlProxy implements
        /**
         * Retrieve and add this file to the repository
         */
-       protected String retrieve(String path) {
+       @Override
+       protected Node retrieve(Session session, String path) {
                try {
+                       if (session.hasPendingChanges())
+                               throw new SlcException("Session has pending changed");
                        Node node = null;
-                       baseUrls: for (String baseUrl : getBaseUrls()) {
-                               node = proxyUrl(baseUrl, path);
-                               if (node != null)
-                                       break baseUrls;
-                       }
-
-                       if (node != null)
-                               return node.getIdentifier();
-                       else {
-                               log.warn("Could not proxy " + path);
-                               return null;
+                       for (Node proxiedRepository : getBaseUrls(session)) {
+                               String baseUrl = JcrUtils
+                                               .urlFromAddressProperties(proxiedRepository);
+                               node = proxyUrl(session, baseUrl, path);
+                               if (node != null) {
+                                       node.addMixin(SlcTypes.SLC_KNOWN_ORIGIN);
+                                       Node origin = node
+                                                       .addNode(SLC_ORIGIN, SlcTypes.SLC_PROXIED);
+                                       origin.setProperty(SLC_PROXY, proxiedRepository);
+                                       JcrUtils.urlToAddressProperties(origin, baseUrl + path);
+                                       if (log.isDebugEnabled())
+                                               log.debug("Imported " + baseUrl + path + " to " + node);
+                                       return node;
+                               }
                        }
-               } catch (RepositoryException e) {
+                       if (log.isDebugEnabled())
+                               log.warn("No proxy found for " + path);
+                       return null;
+               } catch (Exception e) {
                        throw new SlcException("Cannot proxy " + path, e);
                }
        }
 
-       protected synchronized List<String> getBaseUrls()
+       protected synchronized List<Node> getBaseUrls(Session session)
                        throws RepositoryException {
-               List<String> baseUrls = new ArrayList<String>();
-               for (NodeIterator nit = getJcrAdminSession().getNode(
+               List<Node> baseUrls = new ArrayList<Node>();
+               for (NodeIterator nit = session.getNode(
                                RepoConstants.PROXIED_REPOSITORIES).getNodes(); nit.hasNext();) {
                        Node proxiedRepository = nit.nextNode();
-                       String repoUrl = proxiedRepository.getProperty(SLC_URL).getString();
-                       baseUrls.add(repoUrl);
+                       baseUrls.add(proxiedRepository);
                }
                return baseUrls;
        }

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 1ab84569d67e8d6a0f860b97dab72f0e8eccff8e..578beb570ba7f377bfcccda85ef0a651cca47f88 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
@@ -1,7 +1,7 @@
 <slc = 'http://www.argeo.org/ns/slc'>
 
 // AETHER
-[slc:artifact] > nt:base, mix:shareable
+[slc:artifact] > mix:referenceable, mix:created, mix:lastModified
 mixin
 - slc:artifactId (STRING) m
 - slc:groupId (STRING) m
@@ -9,24 +9,37 @@ mixin
 - slc:artifactExtension (STRING) m
 - slc:artifactClassifier (STRING) ='' m a
 
-[slc:artifactVersionBase] > nt:base
+[slc:artifactVersion] > mix:referenceable, mix:created, mix:lastModified, mix:title
 mixin
 - slc:artifactId (STRING) m
 - slc:groupId (STRING) m
 - slc:artifactVersion (STRING) m
 
-[slc:artifactBase] > nt:base
+[slc:artifactBase] > mix:referenceable, mix:created, mix:lastModified
 mixin
 - slc:artifactId (STRING) m
 - slc:groupId (STRING) m
 
-[slc:groupBase] > nt:base
+[slc:groupBase] > mix:referenceable, mix:created, mix:lastModified
 mixin
 // 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
+[slc:distribution] > slc:artifactVersion
+mixin
++ slc:artifactVersions (argeo:references) m
+
+// ORIGINS
+[slc:knownOrigin] > nt:base
+mixin
++ slc:origin (nt:address)
+
+[slc:proxied] > nt:address
+- slc:proxy (REFERENCE)
+
+// JAVA
+[slc:jarFile] > mix:referenceable
 mixin
 - 'slc:manifest' (BINARY) m
 - 'slc:Manifest-Version' (STRING)
@@ -46,10 +59,10 @@ mixin
 // OSGi
 // see http://www.osgi.org/Specifications/Reference
 
-[slc:javaPackage] > nt:base
+[slc:javaPackage] > mix:referenceable
 - slc:name (STRING) primary m
 
-[slc:osgiBaseVersion] > nt:base
+[slc:osgiBaseVersion] > mix:referenceable
 - slc:asString (STRING) primary m
 - slc:major (LONG) m
 - slc:minor (LONG) m
@@ -70,22 +83,22 @@ mixin
 - slc:version (STRING) ='0.0.0' m a
 - slc:optional (BOOLEAN) ='false' m a
 
-[slc:requiredBundle] > nt:base
+[slc:requiredBundle] > mix:referenceable
 - 'slc:symbolic-name' (STRING) primary m
 - 'slc:bundle-version' (STRING) ='0.0.0' m a
 - slc:optional (BOOLEAN) ='false' m a
 
-[slc:fragmentHost] > nt:base
+[slc:fragmentHost] > mix:referenceable
 - 'slc:symbolic-name' (STRING) m
 - 'slc:bundle-version' (STRING) ='0.0.0' m a
 
-[slc:bundleNativeCode] > nt:base
+[slc:bundleNativeCode] > mix:referenceable
 - slc:path (STRING) primary m
 - slc:osname (STRING)
 - slc:processor (STRING)
 
 // see http://www.osgi.org/Specifications/ReferenceHeaders
-[slc:bundle] > nt:base
+[slc:bundle] > mix:referenceable
 mixin
 - 'slc:symbolic-name' (STRING) primary m
 - 'slc:bundle-version' (STRING) m
@@ -116,4 +129,3 @@ mixin
 
 [slc:bundleArtifact] > slc:artifact,slc:jarFile,slc:bundle
 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 3d39cbb7de8760cccea42566112f685caf7d98b4..51a62b4b7e5539ad9121bfef07d7cfcdbaacb6e1 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
@@ -56,6 +56,10 @@ public interface SlcNames {
        public final static String SLC_OPTIONAL = "slc:optional";
        public final static String SLC_AS_STRING = "slc:asString";
 
+       // origin
+       public final static String SLC_ORIGIN = "slc:origin";
+       public final static String SLC_PROXY = "slc:proxy";
+
        // slc:artifact
        public final static String SLC_ARTIFACT_ID = "slc:artifactId";
        public final static String SLC_GROUP_ID = "slc:groupId";

diff --git a/runtime/org.argeo.slc.support.jcr/src/main/java/org/argeo/slc/jcr/SlcTypes.java b/runtime/org.argeo.slc.support.jcr/src/main/java/org/argeo/slc/jcr/SlcTypes.java
index e0e2d1e25f4b6c524bb039d15d2247b69da380cc..fde1b0dd29679e5498bf260c004d47deead15063 100644 (file)
--- a/runtime/org.argeo.slc.support.jcr/src/main/java/org/argeo/slc/jcr/SlcTypes.java
+++ b/runtime/org.argeo.slc.support.jcr/src/main/java/org/argeo/slc/jcr/SlcTypes.java
@@ -33,7 +33,7 @@ public interface SlcTypes {
         * REPO
         */
        public final static String SLC_ARTIFACT = "slc:artifact";
-       public final static String SLC_ARTIFACT_VERSION_BASE = "slc:artifactVersionBase";
+       public final static String SLC_ARTIFACT_VERSION_BASE = "slc:artifactVersion";
        public final static String SLC_ARTIFACT_BASE = "slc:artifactBase";
        public final static String SLC_GROUP_BASE = "slc:groupBase";
        public final static String SLC_JAR_FILE = "slc:jarFile";
@@ -45,5 +45,9 @@ public interface SlcTypes {
        public final static String SLC_DYNAMIC_IMPORTED_PACKAGE = "slc:dynamicImportedPackage";
        public final static String SLC_REQUIRED_BUNDLE = "slc:requiredBundle";
        public final static String SLC_FRAGMENT_HOST = "slc:fragmentHost";
+       
+       // origin
+       public final static String SLC_KNOWN_ORIGIN = "slc:knownOrigin";
+       public final static String SLC_PROXIED = "slc:proxied";
 
 }

diff --git a/runtime/org.argeo.slc.support.jcr/src/main/java/org/argeo/slc/jcr/execution/JcrAgent.java b/runtime/org.argeo.slc.support.jcr/src/main/java/org/argeo/slc/jcr/execution/JcrAgent.java
index 89b618d1bff74b535c6cf4f3fc02ec9a3b4c6366..a096e5d5eebd6aa84b93a8ff94a5c1b926846f10 100644 (file)
--- a/runtime/org.argeo.slc.support.jcr/src/main/java/org/argeo/slc/jcr/execution/JcrAgent.java
+++ b/runtime/org.argeo.slc.support.jcr/src/main/java/org/argeo/slc/jcr/execution/JcrAgent.java
@@ -31,7 +31,7 @@ public class JcrAgent extends DefaultAgent implements SlcAgentFactory, SlcNames
         */
        protected String initAgentUuid() {
                try {
-                       Node vmAgentFactoryNode = JcrUtils.mkdirs(session,
+                       Node vmAgentFactoryNode = JcrUtils.mkdirsSafe(session,
                                        SlcJcrConstants.VM_AGENT_FACTORY_PATH,
                                        SlcTypes.SLC_AGENT_FACTORY);
                        if (!vmAgentFactoryNode.hasNode(agentNodeName)) {