From commitswaltersashley@example.com Mon Jan 17 05:38:35 2011
Return-Path: <commitswaltersashley@example.com>
Delivered-To: waltersashley@example.com
Received: (qmail 63441 invoked from network); 17 Jan 2011 05:38:34 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155)
  by minotaur.apache.org with SMTP; 17 Jan 2011 05:38:34 -0000
Received: (qmail 7665 invoked by uid 500); 17 Jan 2011 05:38:34 -0000
Delivered-To: waltersashley@example.com
Received: (qmail 7607 invoked by uid 500); 17 Jan 2011 05:38:33 -0000
Mailing-List: contact waltersashley@example.com; run by ezmlm
Precedence: bulk
List-Help: <mailto:waltersashley@example.com>
List-Unsubscribe: <mailto:waltersashley@example.com>
List-Post: <mailto:waltersashley@example.com>
List-Id: <commits.archiva.apache.org>
Reply-To: waltersashley@example.com
Delivered-To: mailing list waltersashley@example.com
Received: (qmail 7600 invoked by uid 99); 17 Jan 2011 05:38:32 -0000
Received: from nike.apache.org (HELO nike.apache.org) (83.161.120.155)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 17 Jan 2011 05:38:32 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 17 Jan 2011 05:38:29 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 3712523889FD; Mon, 17 Jan 2011 05:38:01 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1059754 - in /archiva/sandbox/populate-jcr-repo/src/main:
 java/org/apache/archiva/metadata/repository/jcr/ resources/
 resources/META-INF/
Date: Mon, 17 Jan 2011 05:38:01 -0000
To: waltersashley@example.com
From: waltersashley@example.com
X-Mailer: svnmailer-1.0.8
Message-Id: <waltersashley@example.com>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: brett
Date: Mon Jan 17 05:38:00 2011
New Revision: 1059754

URL: http://svn.apache.org/viewvc?rev=1059754&view=rev
Log:
some tests with different mappings of dependencies

Added:
    archiva/sandbox/populate-jcr-repo/src/main/java/org/apache/archiva/metadata/repository/jcr/PopulateRepoAppConfig.java
    archiva/sandbox/populate-jcr-repo/src/main/resources/
    archiva/sandbox/populate-jcr-repo/src/main/resources/META-INF/
    archiva/sandbox/populate-jcr-repo/src/main/resources/META-INF/spring-context.xml
Modified:
    archiva/sandbox/populate-jcr-repo/src/main/java/org/apache/archiva/metadata/repository/jcr/PopulateRepoApp.java
    archiva/sandbox/populate-jcr-repo/src/main/java/org/apache/archiva/metadata/repository/jcr/QueryRepoApp.java

Modified: archiva/sandbox/populate-jcr-repo/src/main/java/org/apache/archiva/metadata/repository/jcr/PopulateRepoApp.java
URL: http://svn.apache.org/viewvc/archiva/sandbox/populate-jcr-repo/src/main/java/org/apache/archiva/metadata/repository/jcr/PopulateRepoApp.java?rev=1059754&r1=1059753&r2=1059754&view=diff
==============================================================================
--- archiva/sandbox/populate-jcr-repo/src/main/java/org/apache/archiva/metadata/repository/jcr/PopulateRepoApp.java (original)
+++ archiva/sandbox/populate-jcr-repo/src/main/java/org/apache/archiva/metadata/repository/jcr/PopulateRepoApp.java Mon Jan 17 05:38:00 2011
@@ -2,26 +2,29 @@ package org.apache.archiva.metadata.repo
 
 import org.apache.archiva.metadata.model.ArtifactMetadata;
 import org.apache.archiva.metadata.model.MetadataFacetFactory;
+import org.apache.archiva.metadata.model.ProjectVersionMetadata;
 import org.apache.archiva.metadata.repository.MetadataRepositoryException;
-import org.apache.archiva.metadata.repository.storage.maven2.ArtifactMappingProvider;
-import org.apache.archiva.metadata.repository.storage.maven2.DefaultArtifactMappingProvider;
+import org.apache.archiva.metadata.repository.storage.RepositoryStorageMetadataInvalidException;
+import org.apache.archiva.metadata.repository.storage.RepositoryStorageMetadataNotFoundException;
 import org.apache.archiva.metadata.repository.storage.maven2.Maven2RepositoryPathTranslator;
+import org.apache.archiva.metadata.repository.storage.maven2.Maven2RepositoryStorage;
 import org.apache.archiva.metadata.repository.storage.maven2.MavenArtifactFacet;
 import org.apache.archiva.metadata.repository.storage.maven2.MavenArtifactFacetFactory;
-import org.apache.archiva.plugins.npanday.NPandayArtifactMappingProvider;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.filefilter.IOFileFilter;
 import org.apache.commons.io.filefilter.NotFileFilter;
 import org.apache.commons.io.filefilter.WildcardFileFilter;
 import org.apache.jackrabbit.core.TransientRepository;
 import org.apache.jackrabbit.core.config.RepositoryConfig;
+import org.codehaus.plexus.spring.PlexusClassPathXmlApplicationContext;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.context.ConfigurableApplicationContext;
 
 import java.io.File;
-import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Date;
-import java.util.List;
 import java.util.Map;
 import javax.jcr.Repository;
 import javax.jcr.RepositoryException;
@@ -33,8 +36,15 @@ public class PopulateRepoApp
 {
     private static final String REPO_ID = "internal";
 
+    private static final String[] CONFIG_LOCATIONS =
+        new String[]{"classpath*:META-INF/spring-context.xml", "classpath*:META-INF/plexus/components.xml",
+            "classpath:META-INF/spring-context.xml"};
+
+    private static Logger log = LoggerFactory.getLogger( PopulateRepoApp.class );
+
     public static void main( String[] args )
-        throws RepositoryException, MetadataRepositoryException
+        throws RepositoryException, MetadataRepositoryException, RepositoryStorageMetadataNotFoundException,
+        RepositoryStorageMetadataInvalidException
     {
         RepositoryConfig config = RepositoryConfig.create( "src/main/repository.xml", "jcr" );
         Repository repository = new TransientRepository( config );
@@ -47,9 +57,8 @@ public class PopulateRepoApp
 
         JcrMetadataRepository.initialize( jcrMetadataRepository.getJcrSession() );
 
-        List<ArtifactMappingProvider> artifactMappingProviders = Arrays.asList( new DefaultArtifactMappingProvider(),
-                                                                                new NPandayArtifactMappingProvider() );
-        Maven2RepositoryPathTranslator translator = new Maven2RepositoryPathTranslator( artifactMappingProviders );
+        ConfigurableApplicationContext applicationContext = new PlexusClassPathXmlApplicationContext(
+            CONFIG_LOCATIONS );
 
         try
         {
@@ -63,14 +72,29 @@ public class PopulateRepoApp
                 basedir = new File( System.getProperty( "user.home" ),
                                     "Library/Application Support/Archiva/data/repositories/internal" );
             }
-            IOFileFilter dirFilter = new NotFileFilter( new WildcardFileFilter( ".index*" ) );
+
+            PopulateRepoAppConfig archivaConfig = (PopulateRepoAppConfig) applicationContext.getBean(
+                "archivaConfiguration" );
+            archivaConfig.addManagedRepo( REPO_ID, basedir );
+
+            Maven2RepositoryPathTranslator translator = (Maven2RepositoryPathTranslator) applicationContext.getBean(
+                "repositoryPathTranslator#maven2" );
+
+            Maven2RepositoryStorage storage = (Maven2RepositoryStorage) applicationContext.getBean(
+                "repositoryStorage#maven2" );
+
+            File dir = basedir;
+//            File dir = new File( basedir, "org/apache/archiva" );
+
+            IOFileFilter dirFilter = new NotFileFilter( new WildcardFileFilter( new String[]{".index*", ".archiva"} ) );
             IOFileFilter fileFilter = new NotFileFilter( new WildcardFileFilter(
                 new String[]{"*.asc", "*.md5", "*.sha1", "maven-metadata*.xml"} ) );
-            Collection<File> files = FileUtils.listFiles( basedir, fileFilter, dirFilter );
+            Collection<File> files = FileUtils.listFiles( dir, fileFilter, dirFilter );
 
             int index = basedir.getAbsolutePath().length() + 1;
 
             int count = 0, total = files.size();
+            System.out.println( "Processing " + total + " files" );
             for ( File f : files )
             {
                 String path = f.getAbsolutePath().substring( index );
@@ -83,6 +107,21 @@ public class PopulateRepoApp
 
                 // skipping checksums for speed
 
+                try
+                {
+                    ProjectVersionMetadata metadata;
+                    metadata = storage.readProjectVersionMetadata( REPO_ID, artifact.getNamespace(),
+                                                                   artifact.getProject(),
+                                                                   artifact.getProjectVersion() );
+
+                    jcrMetadataRepository.updateProjectVersion( REPO_ID, artifact.getNamespace(), artifact.getProject(),
+                                                                metadata );
+                }
+                catch ( Exception e )
+                {
+                    log.warn( "Unable to read POM, skipping: " + e.getMessage() );
+                }
+
                 jcrMetadataRepository.updateArtifact( REPO_ID, artifact.getNamespace(), artifact.getProject(),
                                                       artifact.getProjectVersion(), artifact );
 
@@ -97,6 +136,7 @@ public class PopulateRepoApp
         finally
         {
             jcrMetadataRepository.close();
+            applicationContext.close();
         }
     }
 }

Added: archiva/sandbox/populate-jcr-repo/src/main/java/org/apache/archiva/metadata/repository/jcr/PopulateRepoAppConfig.java
URL: http://svn.apache.org/viewvc/archiva/sandbox/populate-jcr-repo/src/main/java/org/apache/archiva/metadata/repository/jcr/PopulateRepoAppConfig.java?rev=1059754&view=auto
==============================================================================
--- archiva/sandbox/populate-jcr-repo/src/main/java/org/apache/archiva/metadata/repository/jcr/PopulateRepoAppConfig.java (added)
+++ archiva/sandbox/populate-jcr-repo/src/main/java/org/apache/archiva/metadata/repository/jcr/PopulateRepoAppConfig.java Mon Jan 17 05:38:00 2011
@@ -0,0 +1,75 @@
+package org.apache.archiva.metadata.repository.jcr;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.
+ */
+
+import org.apache.maven.archiva.configuration.ArchivaConfiguration;
+import org.apache.maven.archiva.configuration.Configuration;
+import org.apache.maven.archiva.configuration.ConfigurationListener;
+import org.apache.maven.archiva.configuration.IndeterminateConfigurationException;
+import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration;
+import org.codehaus.plexus.registry.RegistryException;
+import org.codehaus.plexus.registry.RegistryListener;
+
+import java.io.File;
+
+public class PopulateRepoAppConfig
+    implements ArchivaConfiguration
+{
+    private Configuration configuration = new Configuration();
+
+    public Configuration getConfiguration()
+    {
+        return configuration;
+    }
+
+    public void save( Configuration configuration )
+        throws RegistryException, IndeterminateConfigurationException
+    {
+        throw new UnsupportedOperationException();
+    }
+
+    public boolean isDefaulted()
+    {
+        throw new UnsupportedOperationException();
+    }
+
+    public void addListener( ConfigurationListener listener )
+    {
+        throw new UnsupportedOperationException();
+    }
+
+    public void removeListener( ConfigurationListener listener )
+    {
+        throw new UnsupportedOperationException();
+    }
+
+    public void addChangeListener( RegistryListener listener )
+    {
+        throw new UnsupportedOperationException();
+    }
+
+    public void addManagedRepo( String id, File location )
+    {
+        ManagedRepositoryConfiguration config = new ManagedRepositoryConfiguration();
+        config.setId( id );
+        config.setLocation( location.getAbsolutePath() );
+        configuration.addManagedRepository( config );
+    }
+}

Modified: archiva/sandbox/populate-jcr-repo/src/main/java/org/apache/archiva/metadata/repository/jcr/QueryRepoApp.java
URL: http://svn.apache.org/viewvc/archiva/sandbox/populate-jcr-repo/src/main/java/org/apache/archiva/metadata/repository/jcr/QueryRepoApp.java?rev=1059754&r1=1059753&r2=1059754&view=diff
==============================================================================
--- archiva/sandbox/populate-jcr-repo/src/main/java/org/apache/archiva/metadata/repository/jcr/QueryRepoApp.java (original)
+++ archiva/sandbox/populate-jcr-repo/src/main/java/org/apache/archiva/metadata/repository/jcr/QueryRepoApp.java Mon Jan 17 05:38:00 2011
@@ -25,6 +25,7 @@ import org.apache.jackrabbit.core.Transi
 import org.apache.jackrabbit.core.config.RepositoryConfig;
 
 import java.util.Collections;
+import javax.jcr.Node;
 import javax.jcr.Repository;
 import javax.jcr.RepositoryException;
 import javax.jcr.Session;
@@ -53,11 +54,17 @@ public class QueryRepoApp
 
             QueryManager queryManager = session.getWorkspace().getQueryManager();
 
-            queryAllArtifactsInRepo( queryManager );
+            queryProjectsWithDependency( queryManager, "org.springframework", "spring-web", "2.5.6" );
 
-            queryAllProjectsInRepo( queryManager );
+            queryProjectsWithDependency( queryManager, "org.springframework", "spring-web" );
 
-            queryAllGroupsInRepo( queryManager );
+            queryProjectsWithDependency( queryManager, "org.codehaus.plexus", "plexus-utils" );
+
+//            queryAllArtifactsInRepo( queryManager );
+//
+//            queryAllProjectsInRepo( queryManager );
+//
+//            queryAllGroupsInRepo( queryManager );
         }
         finally
         {
@@ -65,6 +72,12 @@ public class QueryRepoApp
         }
     }
 
+    private static void queryProjectsWithDependency( QueryManager queryManager, String namespace, String project )
+        throws RepositoryException
+    {
+        queryProjectsWithDependency( queryManager, namespace, project, null );
+    }
+
     private static void queryAllGroupsInRepo( QueryManager queryManager )
         throws RepositoryException
     {
@@ -82,6 +95,50 @@ public class QueryRepoApp
                 " ms" );
     }
 
+    private static void queryProjectsWithDependency( QueryManager queryManager, String namespace, String project,
+                                                     String version )
+        throws RepositoryException
+    {
+        System.out.println( "querying dependencies on project " + namespace + ":" + project + ":" + version );
+
+        long time = System.currentTimeMillis();
+        String q = "SELECT * FROM archiva:dependency WHERE jcr:path LIKE '%/" + namespace + "/" + project;
+        if ( version != null )
+        {
+            q += "/" + version;
+        }
+        q += "/%' ORDER BY jcr:score";
+        Query query = queryManager.createQuery( q, Query.SQL );
+
+        QueryResult execute = query.execute();
+        System.out.println( "query in " + ( System.currentTimeMillis() - time ) + " ms" );
+        time = System.currentTimeMillis();
+        for ( Row r : JcrUtils.getRows( execute ) )
+        {
+            Node n = r.getNode();
+            n = n.getParent(); // dependency version
+            String dependencyVersion = n.getName();
+
+            n = n.getParent(); // dependency project
+            n = n.getParent(); // dependency namespace
+            n = n.getParent(); // dependencies element
+            n = n.getParent(); // project version
+
+            String usedByProjectVersion = n.getName();
+
+            n = n.getParent(); // project
+            String usedByProject = n.getName();
+
+            n = n.getParent(); // namespace
+            String usedByNamespace = n.getProperty( "namespace" ).getString();
+
+//            System.out.println(
+//                usedByNamespace + ":" + usedByProject + ":" + usedByProjectVersion + " -> " + dependencyVersion );
+        }
+
+        System.out.println( "results in " + ( System.currentTimeMillis() - time ) + " ms" );
+    }
+
     private static void queryAllProjectsInRepo( QueryManager queryManager )
         throws RepositoryException
     {

Added: archiva/sandbox/populate-jcr-repo/src/main/resources/META-INF/spring-context.xml
URL: http://svn.apache.org/viewvc/archiva/sandbox/populate-jcr-repo/src/main/resources/META-INF/spring-context.xml?rev=1059754&view=auto
==============================================================================
--- archiva/sandbox/populate-jcr-repo/src/main/resources/META-INF/spring-context.xml (added)
+++ archiva/sandbox/populate-jcr-repo/src/main/resources/META-INF/spring-context.xml Mon Jan 17 05:38:00 2011
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Licensed to the Apache Software Foundation (ASF) under one
+  ~ or more contributor license agreements.  See the NOTICE file
+  ~ distributed with this work for additional information
+  ~ regarding copyright ownership.  The ASF licenses this file
+  ~ to you 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.
+  -->
+
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
+  <bean name="archivaConfiguration" class="org.apache.archiva.metadata.repository.jcr.PopulateRepoAppConfig"/>
+</beans>
\ No newline at end of file



From commitswaltersashley@example.com Thu Jan 20 04:20:48 2011
Return-Path: <commitswaltersashley@example.com>
Delivered-To: waltersashley@example.com
Received: (qmail 24054 invoked from network); 20 Jan 2011 04:20:47 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155)
  by minotaur.apache.org with SMTP; 20 Jan 2011 04:20:47 -0000
Received: (qmail 23769 invoked by uid 500); 20 Jan 2011 04:20:47 -0000
Delivered-To: waltersashley@example.com
Received: (qmail 23708 invoked by uid 500); 20 Jan 2011 04:20:45 -0000
Mailing-List: contact waltersashley@example.com; run by ezmlm
Precedence: bulk
List-Help: <mailto:waltersashley@example.com>
List-Unsubscribe: <mailto:waltersashley@example.com>
List-Post: <mailto:waltersashley@example.com>
List-Id: <commits.archiva.apache.org>
Reply-To: waltersashley@example.com
Delivered-To: mailing list waltersashley@example.com
Received: (qmail 23697 invoked by uid 99); 20 Jan 2011 04:20:44 -0000
Received: from nike.apache.org (HELO nike.apache.org) (83.161.120.155)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 20 Jan 2011 04:20:44 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 20 Jan 2011 04:20:43 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 2720123889DA; Thu, 20 Jan 2011 04:20:22 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1061114 -
 /archiva/trunk/archiva-modules/plugins/metadata-store-jcr/src/main/java/org/apache/archiva/metadata/repository/jcr/JcrMetadataRepository.java
Date: Thu, 20 Jan 2011 04:20:22 -0000
To: waltersashley@example.com
From: waltersashley@example.com
X-Mailer: svnmailer-1.0.8
Message-Id: <waltersashley@example.com>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: brett
Date: Thu Jan 20 04:20:21 2011
New Revision: 1061114

URL: http://svn.apache.org/viewvc?rev=1061114&view=rev
Log:
[MRM-1327] choose a better default for login

Modified:
    archiva/trunk/archiva-modules/plugins/metadata-store-jcr/src/main/java/org/apache/archiva/metadata/repository/jcr/JcrMetadataRepository.java

Modified: archiva/trunk/archiva-modules/plugins/metadata-store-jcr/src/main/java/org/apache/archiva/metadata/repository/jcr/JcrMetadataRepository.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/metadata-store-jcr/src/main/java/org/apache/archiva/metadata/repository/jcr/JcrMetadataRepository.java?rev=1061114&r1=1061113&r2=1061114&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/plugins/metadata-store-jcr/src/main/java/org/apache/archiva/metadata/repository/jcr/JcrMetadataRepository.java (original)
+++ archiva/trunk/archiva-modules/plugins/metadata-store-jcr/src/main/java/org/apache/archiva/metadata/repository/jcr/JcrMetadataRepository.java Thu Jan 20 04:20:21 2011
@@ -99,7 +99,7 @@ public class JcrMetadataRepository
         this.metadataFacetFactories = metadataFacetFactories;
         this.repository = repository;
 
-        session = repository.login( new SimpleCredentials( "username", "password".toCharArray() ) );
+        session = repository.login( new SimpleCredentials( "admin", "admin".toCharArray() ) );
     }
 
     static void initialize( Session session )



From commitswaltersashley@example.com Thu Jan 20 04:25:05 2011
Return-Path: <commitswaltersashley@example.com>
Delivered-To: waltersashley@example.com
Received: (qmail 33587 invoked from network); 20 Jan 2011 04:25:05 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155)
  by minotaur.apache.org with SMTP; 20 Jan 2011 04:25:05 -0000
Received: (qmail 25685 invoked by uid 500); 20 Jan 2011 04:25:05 -0000
Delivered-To: waltersashley@example.com
Received: (qmail 25628 invoked by uid 500); 20 Jan 2011 04:25:03 -0000
Mailing-List: contact waltersashley@example.com; run by ezmlm
Precedence: bulk
List-Help: <mailto:waltersashley@example.com>
List-Unsubscribe: <mailto:waltersashley@example.com>
List-Post: <mailto:waltersashley@example.com>
List-Id: <commits.archiva.apache.org>
Reply-To: waltersashley@example.com
Delivered-To: mailing list waltersashley@example.com
Received: (qmail 25621 invoked by uid 99); 20 Jan 2011 04:25:03 -0000
Received: from nike.apache.org (HELO nike.apache.org) (83.161.120.155)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 20 Jan 2011 04:25:03 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 20 Jan 2011 04:25:01 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 9DB4423889E9; Thu, 20 Jan 2011 04:24:40 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1061116 - /archiva/branches/MRM-1327-jcr-backend-default/
Date: Thu, 20 Jan 2011 04:24:40 -0000
To: waltersashley@example.com
From: waltersashley@example.com
X-Mailer: svnmailer-1.0.8
Message-Id: <waltersashley@example.com>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: brett
Date: Thu Jan 20 04:24:40 2011
New Revision: 1061116

URL: http://svn.apache.org/viewvc?rev=1061116&view=rev
Log:
recreate

Removed:
    archiva/branches/MRM-1327-jcr-backend-default/


From commitswaltersashley@example.com Thu Jan 20 04:25:44 2011
Return-Path: <commitswaltersashley@example.com>
Delivered-To: waltersashley@example.com
Received: (qmail 34322 invoked from network); 20 Jan 2011 04:25:44 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155)
  by minotaur.apache.org with SMTP; 20 Jan 2011 04:25:44 -0000
Received: (qmail 25862 invoked by uid 500); 20 Jan 2011 04:25:44 -0000
Delivered-To: waltersashley@example.com
Received: (qmail 25806 invoked by uid 500); 20 Jan 2011 04:25:42 -0000
Mailing-List: contact waltersashley@example.com; run by ezmlm
Precedence: bulk
List-Help: <mailto:waltersashley@example.com>
List-Unsubscribe: <mailto:waltersashley@example.com>
List-Post: <mailto:waltersashley@example.com>
List-Id: <commits.archiva.apache.org>
Reply-To: waltersashley@example.com
Delivered-To: mailing list waltersashley@example.com
Received: (qmail 25799 invoked by uid 99); 20 Jan 2011 04:25:42 -0000
Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 20 Jan 2011 04:25:42 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 20 Jan 2011 04:25:41 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 863EB2388A39; Thu, 20 Jan 2011 04:25:21 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1061117 - /archiva/branches/MRM-1327-jcr-backend-default/
Date: Thu, 20 Jan 2011 04:25:21 -0000
To: waltersashley@example.com
From: waltersashley@example.com
X-Mailer: svnmailer-1.0.8
Message-Id: <waltersashley@example.com>

Author: brett
Date: Thu Jan 20 04:25:21 2011
New Revision: 1061117

URL: http://svn.apache.org/viewvc?rev=1061117&view=rev
Log:
recreate branch from latest trunk

Added:
    archiva/branches/MRM-1327-jcr-backend-default/   (props changed)
      - copied from r1061116, archiva/trunk/

Propchange: archiva/branches/MRM-1327-jcr-backend-default/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Jan 20 04:25:21 2011
@@ -0,0 +1,9 @@
+target
+*.iml
+*.ipr
+*.iws
+.metadata
+.settings
+.classpath
+.project
+.pom.xml.swp

Propchange: archiva/branches/MRM-1327-jcr-backend-default/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Thu Jan 20 04:25:21 2011
@@ -0,0 +1,7 @@
+/archiva/branches/MRM-1025:721945-723577
+/archiva/branches/MRM-541:686983-687034
+/archiva/branches/archiva-1.3.x:953645
+/archiva/branches/archiva-search-improvements:723609-726925
+/archiva/branches/archiva-struts2:699795-705848
+/archiva/tags/archiva-1.3:898632
+/archiva/trunk:825850-909464,960322



From commitswaltersashley@example.com Thu Jan 20 04:38:29 2011
Return-Path: <commitswaltersashley@example.com>
Delivered-To: waltersashley@example.com
Received: (qmail 50154 invoked from network); 20 Jan 2011 04:38:29 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155)
  by minotaur.apache.org with SMTP; 20 Jan 2011 04:38:29 -0000
Received: (qmail 34047 invoked by uid 500); 20 Jan 2011 04:38:28 -0000
Delivered-To: waltersashley@example.com
Received: (qmail 33977 invoked by uid 500); 20 Jan 2011 04:38:28 -0000
Mailing-List: contact waltersashley@example.com; run by ezmlm
Precedence: bulk
List-Help: <mailto:waltersashley@example.com>
List-Unsubscribe: <mailto:waltersashley@example.com>
List-Post: <mailto:waltersashley@example.com>
List-Id: <commits.archiva.apache.org>
Reply-To: waltersashley@example.com
Delivered-To: mailing list waltersashley@example.com
Received: (qmail 33958 invoked by uid 99); 20 Jan 2011 04:38:27 -0000
Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 20 Jan 2011 04:38:27 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 20 Jan 2011 04:38:22 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 92CC423889E9; Thu, 20 Jan 2011 04:38:02 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1061121 - in /archiva/branches/MRM-1327-jcr-backend-default: ./
 archiva-cli/ archiva-docs/ archiva-jetty/ archiva-modules/
 archiva-modules/archiva-base/
 archiva-modules/archiva-base/archiva-artifact-converter/
 archiva-modules/archiva-base/...
Date: Thu, 20 Jan 2011 04:38:01 -0000
To: waltersashley@example.com
From: waltersashley@example.com
X-Mailer: svnmailer-1.0.8
Message-Id: <waltersashley@example.com>

Author: brett
Date: Thu Jan 20 04:37:59 2011
New Revision: 1061121

URL: http://svn.apache.org/viewvc?rev=1061121&view=rev
Log:
update the version so there's no conflict

Modified:
    archiva/branches/MRM-1327-jcr-backend-default/archiva-cli/pom.xml
    archiva/branches/MRM-1327-jcr-backend-default/archiva-docs/pom.xml
    archiva/branches/MRM-1327-jcr-backend-default/archiva-jetty/pom.xml
    archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-base/archiva-artifact-converter/pom.xml
    archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-base/archiva-checksum/pom.xml
    archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-base/archiva-common/pom.xml
    archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-base/archiva-configuration/pom.xml
    archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/pom.xml
    archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml
    archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-base/archiva-consumers/archiva-dependency-tree-consumer/pom.xml
    archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml
    archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-base/archiva-consumers/archiva-metadata-consumer/pom.xml
    archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-base/archiva-consumers/archiva-signature-consumers/pom.xml
    archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-base/archiva-consumers/pom.xml
    archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-base/archiva-converter/pom.xml
    archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-base/archiva-indexer/pom.xml
    archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-base/archiva-model/pom.xml
    archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-base/archiva-policies/pom.xml
    archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-base/archiva-proxy/pom.xml
    archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-base/archiva-repository-layer/pom.xml
    archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-base/archiva-repository-scanner/pom.xml
    archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-base/archiva-transaction/pom.xml
    archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-base/archiva-xml-tools/pom.xml
    archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-base/pom.xml
    archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-scheduler/archiva-scheduler-api/pom.xml
    archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/pom.xml
    archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-scheduler/archiva-scheduler-repository/pom.xml
    archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-scheduler/pom.xml
    archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-web/archiva-applet/pom.xml
    archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-web/archiva-rss/pom.xml
    archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-web/archiva-security/pom.xml
    archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-web/archiva-webapp-test/pom.xml
    archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-web/archiva-webapp/pom.xml
    archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-web/archiva-webdav/pom.xml
    archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-api/pom.xml
    archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-client/pom.xml
    archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-security/pom.xml
    archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/pom.xml
    archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-web/archiva-xmlrpc/pom.xml
    archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-web/pom.xml
    archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/metadata/metadata-model/pom.xml
    archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/metadata/metadata-repository-api/pom.xml
    archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/metadata/pom.xml
    archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/metadata/test-repository/pom.xml
    archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/plugins/audit/pom.xml
    archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/plugins/generic-metadata-support/pom.xml
    archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/plugins/maven1-repository/pom.xml
    archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/plugins/maven2-repository/pom.xml
    archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/plugins/metadata-repository-file/pom.xml
    archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/plugins/metadata-store-jcr/pom.xml
    archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/plugins/npanday-support/pom.xml
    archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/plugins/pom.xml
    archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/plugins/problem-reports/pom.xml
    archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/plugins/repository-statistics/pom.xml
    archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/plugins/stage-repository-merge/pom.xml
    archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/pom.xml
    archiva/branches/MRM-1327-jcr-backend-default/pom.xml
    archiva/branches/MRM-1327-jcr-backend-default/skin/pom.xml

Modified: archiva/branches/MRM-1327-jcr-backend-default/archiva-cli/pom.xml
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1327-jcr-backend-default/archiva-cli/pom.xml?rev=1061121&r1=1061120&r2=1061121&view=diff
==============================================================================
--- archiva/branches/MRM-1327-jcr-backend-default/archiva-cli/pom.xml (original)
+++ archiva/branches/MRM-1327-jcr-backend-default/archiva-cli/pom.xml Thu Jan 20 04:37:59 2011
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.archiva</groupId>
     <artifactId>archiva</artifactId>
-    <version>1.4-SNAPSHOT</version>
+    <version>1.4-MRM-1327-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>archiva-cli</artifactId>
@@ -35,7 +35,7 @@
     <dependency>
       <groupId>org.apache.archiva</groupId>
       <artifactId>archiva-dependency-tree-consumer</artifactId>
-      <version>1.4-SNAPSHOT</version>
+      <version>1.4-MRM-1327-SNAPSHOT</version>
       <scope>runtime</scope>
     </dependency>
     <dependency>

Modified: archiva/branches/MRM-1327-jcr-backend-default/archiva-docs/pom.xml
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1327-jcr-backend-default/archiva-docs/pom.xml?rev=1061121&r1=1061120&r2=1061121&view=diff
==============================================================================
--- archiva/branches/MRM-1327-jcr-backend-default/archiva-docs/pom.xml (original)
+++ archiva/branches/MRM-1327-jcr-backend-default/archiva-docs/pom.xml Thu Jan 20 04:37:59 2011
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.archiva</groupId>
     <artifactId>archiva</artifactId>
-    <version>1.4-SNAPSHOT</version>
+    <version>1.4-MRM-1327-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>archiva-docs</artifactId>

Modified: archiva/branches/MRM-1327-jcr-backend-default/archiva-jetty/pom.xml
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1327-jcr-backend-default/archiva-jetty/pom.xml?rev=1061121&r1=1061120&r2=1061121&view=diff
==============================================================================
--- archiva/branches/MRM-1327-jcr-backend-default/archiva-jetty/pom.xml (original)
+++ archiva/branches/MRM-1327-jcr-backend-default/archiva-jetty/pom.xml Thu Jan 20 04:37:59 2011
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.archiva</groupId>
     <artifactId>archiva</artifactId>
-    <version>1.4-SNAPSHOT</version>
+    <version>1.4-MRM-1327-SNAPSHOT</version>
   </parent>
   <artifactId>archiva-jetty</artifactId>
   <packaging>pom</packaging>

Modified: archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-base/archiva-artifact-converter/pom.xml
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-base/archiva-artifact-converter/pom.xml?rev=1061121&r1=1061120&r2=1061121&view=diff
==============================================================================
--- archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-base/archiva-artifact-converter/pom.xml (original)
+++ archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-base/archiva-artifact-converter/pom.xml Thu Jan 20 04:37:59 2011
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.archiva</groupId>
     <artifactId>archiva-base</artifactId>
-    <version>1.4-SNAPSHOT</version>
+    <version>1.4-MRM-1327-SNAPSHOT</version>
   </parent>
   <artifactId>archiva-artifact-converter</artifactId>
   <name>Archiva Artifact Converter</name>

Modified: archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-base/archiva-checksum/pom.xml
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-base/archiva-checksum/pom.xml?rev=1061121&r1=1061120&r2=1061121&view=diff
==============================================================================
--- archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-base/archiva-checksum/pom.xml (original)
+++ archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-base/archiva-checksum/pom.xml Thu Jan 20 04:37:59 2011
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.archiva</groupId>
     <artifactId>archiva-base</artifactId>
-    <version>1.4-SNAPSHOT</version>
+    <version>1.4-MRM-1327-SNAPSHOT</version>
   </parent>
   <artifactId>archiva-checksum</artifactId>
   <name>Archiva Checksum</name>

Modified: archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-base/archiva-common/pom.xml
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-base/archiva-common/pom.xml?rev=1061121&r1=1061120&r2=1061121&view=diff
==============================================================================
--- archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-base/archiva-common/pom.xml (original)
+++ archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-base/archiva-common/pom.xml Thu Jan 20 04:37:59 2011
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.archiva</groupId>
     <artifactId>archiva-base</artifactId>
-    <version>1.4-SNAPSHOT</version>
+    <version>1.4-MRM-1327-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>archiva-common</artifactId>

Modified: archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-base/archiva-configuration/pom.xml
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-base/archiva-configuration/pom.xml?rev=1061121&r1=1061120&r2=1061121&view=diff
==============================================================================
--- archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-base/archiva-configuration/pom.xml (original)
+++ archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-base/archiva-configuration/pom.xml Thu Jan 20 04:37:59 2011
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.archiva</groupId>
     <artifactId>archiva-base</artifactId>
-    <version>1.4-SNAPSHOT</version>
+    <version>1.4-MRM-1327-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>archiva-configuration</artifactId>

Modified: archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/pom.xml
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/pom.xml?rev=1061121&r1=1061120&r2=1061121&view=diff
==============================================================================
--- archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/pom.xml (original)
+++ archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/pom.xml Thu Jan 20 04:37:59 2011
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.archiva</groupId>
     <artifactId>archiva-consumers</artifactId>
-    <version>1.4-SNAPSHOT</version>
+    <version>1.4-MRM-1327-SNAPSHOT</version>
   </parent>
 
   <artifactId>archiva-consumer-api</artifactId>

Modified: archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml?rev=1061121&r1=1061120&r2=1061121&view=diff
==============================================================================
--- archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml (original)
+++ archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml Thu Jan 20 04:37:59 2011
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.archiva</groupId>
     <artifactId>archiva-consumers</artifactId>
-    <version>1.4-SNAPSHOT</version>
+    <version>1.4-MRM-1327-SNAPSHOT</version>
   </parent>
 
   <artifactId>archiva-core-consumers</artifactId>

Modified: archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-base/archiva-consumers/archiva-dependency-tree-consumer/pom.xml
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-base/archiva-consumers/archiva-dependency-tree-consumer/pom.xml?rev=1061121&r1=1061120&r2=1061121&view=diff
==============================================================================
--- archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-base/archiva-consumers/archiva-dependency-tree-consumer/pom.xml (original)
+++ archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-base/archiva-consumers/archiva-dependency-tree-consumer/pom.xml Thu Jan 20 04:37:59 2011
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.archiva</groupId>
     <artifactId>archiva-consumers</artifactId>
-    <version>1.4-SNAPSHOT</version>
+    <version>1.4-MRM-1327-SNAPSHOT</version>
   </parent>
   <artifactId>archiva-dependency-tree-consumer</artifactId>
   <name>Archiva Consumers 888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4 Dependency Tree Consumer</name>

Modified: archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml?rev=1061121&r1=1061120&r2=1061121&view=diff
==============================================================================
--- archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml (original)
+++ archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml Thu Jan 20 04:37:59 2011
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.archiva</groupId>
     <artifactId>archiva-consumers</artifactId>
-    <version>1.4-SNAPSHOT</version>
+    <version>1.4-MRM-1327-SNAPSHOT</version>
   </parent>
 
   <artifactId>archiva-lucene-consumers</artifactId>

Modified: archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-base/archiva-consumers/archiva-metadata-consumer/pom.xml
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-base/archiva-consumers/archiva-metadata-consumer/pom.xml?rev=1061121&r1=1061120&r2=1061121&view=diff
==============================================================================
--- archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-base/archiva-consumers/archiva-metadata-consumer/pom.xml (original)
+++ archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-base/archiva-consumers/archiva-metadata-consumer/pom.xml Thu Jan 20 04:37:59 2011
@@ -24,7 +24,7 @@
   <parent>
     <artifactId>archiva-consumers</artifactId>
     <groupId>org.apache.archiva</groupId>
-    <version>1.4-SNAPSHOT</version>
+    <version>1.4-MRM-1327-SNAPSHOT</version>
   </parent>
   <artifactId>archiva-metadata-consumer</artifactId>
   <name>Archiva Metadata Consumer</name>

Modified: archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-base/archiva-consumers/archiva-signature-consumers/pom.xml
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-base/archiva-consumers/archiva-signature-consumers/pom.xml?rev=1061121&r1=1061120&r2=1061121&view=diff
==============================================================================
--- archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-base/archiva-consumers/archiva-signature-consumers/pom.xml (original)
+++ archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-base/archiva-consumers/archiva-signature-consumers/pom.xml Thu Jan 20 04:37:59 2011
@@ -20,7 +20,7 @@
   <parent>
     <groupId>org.apache.archiva</groupId>
     <artifactId>archiva-consumers</artifactId>
-    <version>1.4-SNAPSHOT</version>
+    <version>1.4-MRM-1327-SNAPSHOT</version>
   </parent>
 
   <artifactId>archiva-signature-consumers</artifactId>

Modified: archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-base/archiva-consumers/pom.xml
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-base/archiva-consumers/pom.xml?rev=1061121&r1=1061120&r2=1061121&view=diff
==============================================================================
--- archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-base/archiva-consumers/pom.xml (original)
+++ archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-base/archiva-consumers/pom.xml Thu Jan 20 04:37:59 2011
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.archiva</groupId>
     <artifactId>archiva-base</artifactId>
-    <version>1.4-SNAPSHOT</version>
+    <version>1.4-MRM-1327-SNAPSHOT</version>
   </parent>
 
   <artifactId>archiva-consumers</artifactId>

Modified: archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-base/archiva-converter/pom.xml
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-base/archiva-converter/pom.xml?rev=1061121&r1=1061120&r2=1061121&view=diff
==============================================================================
--- archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-base/archiva-converter/pom.xml (original)
+++ archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-base/archiva-converter/pom.xml Thu Jan 20 04:37:59 2011
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.archiva</groupId>
     <artifactId>archiva-base</artifactId>
-    <version>1.4-SNAPSHOT</version>
+    <version>1.4-MRM-1327-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>archiva-converter</artifactId>

Modified: archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-base/archiva-indexer/pom.xml
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-base/archiva-indexer/pom.xml?rev=1061121&r1=1061120&r2=1061121&view=diff
==============================================================================
--- archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-base/archiva-indexer/pom.xml (original)
+++ archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-base/archiva-indexer/pom.xml Thu Jan 20 04:37:59 2011
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.archiva</groupId>
     <artifactId>archiva-base</artifactId>
-    <version>1.4-SNAPSHOT</version>
+    <version>1.4-MRM-1327-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>archiva-indexer</artifactId>

Modified: archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-base/archiva-model/pom.xml
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-base/archiva-model/pom.xml?rev=1061121&r1=1061120&r2=1061121&view=diff
==============================================================================
--- archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-base/archiva-model/pom.xml (original)
+++ archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-base/archiva-model/pom.xml Thu Jan 20 04:37:59 2011
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.archiva</groupId>
     <artifactId>archiva-base</artifactId>
-    <version>1.4-SNAPSHOT</version>
+    <version>1.4-MRM-1327-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>archiva-model</artifactId>

Modified: archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-base/archiva-policies/pom.xml
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-base/archiva-policies/pom.xml?rev=1061121&r1=1061120&r2=1061121&view=diff
==============================================================================
--- archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-base/archiva-policies/pom.xml (original)
+++ archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-base/archiva-policies/pom.xml Thu Jan 20 04:37:59 2011
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.archiva</groupId>
     <artifactId>archiva-base</artifactId>
-    <version>1.4-SNAPSHOT</version>
+    <version>1.4-MRM-1327-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>archiva-policies</artifactId>

Modified: archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-base/archiva-proxy/pom.xml
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-base/archiva-proxy/pom.xml?rev=1061121&r1=1061120&r2=1061121&view=diff
==============================================================================
--- archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-base/archiva-proxy/pom.xml (original)
+++ archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-base/archiva-proxy/pom.xml Thu Jan 20 04:37:59 2011
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.archiva</groupId>
     <artifactId>archiva-base</artifactId>
-    <version>1.4-SNAPSHOT</version>
+    <version>1.4-MRM-1327-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>archiva-proxy</artifactId>

Modified: archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-base/archiva-repository-layer/pom.xml
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-base/archiva-repository-layer/pom.xml?rev=1061121&r1=1061120&r2=1061121&view=diff
==============================================================================
--- archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-base/archiva-repository-layer/pom.xml (original)
+++ archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-base/archiva-repository-layer/pom.xml Thu Jan 20 04:37:59 2011
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.archiva</groupId>
     <artifactId>archiva-base</artifactId>
-    <version>1.4-SNAPSHOT</version>
+    <version>1.4-MRM-1327-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>archiva-repository-layer</artifactId>

Modified: archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-base/archiva-repository-scanner/pom.xml
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-base/archiva-repository-scanner/pom.xml?rev=1061121&r1=1061120&r2=1061121&view=diff
==============================================================================
--- archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-base/archiva-repository-scanner/pom.xml (original)
+++ archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-base/archiva-repository-scanner/pom.xml Thu Jan 20 04:37:59 2011
@@ -23,7 +23,7 @@
   <parent>
     <artifactId>archiva-base</artifactId>
     <groupId>org.apache.archiva</groupId>
-    <version>1.4-SNAPSHOT</version>
+    <version>1.4-MRM-1327-SNAPSHOT</version>
   </parent>
   <artifactId>archiva-repository-scanner</artifactId>
   <name>Archiva Repository Scanner</name>

Modified: archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-base/archiva-transaction/pom.xml
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-base/archiva-transaction/pom.xml?rev=1061121&r1=1061120&r2=1061121&view=diff
==============================================================================
--- archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-base/archiva-transaction/pom.xml (original)
+++ archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-base/archiva-transaction/pom.xml Thu Jan 20 04:37:59 2011
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.archiva</groupId>
     <artifactId>archiva-base</artifactId>
-    <version>1.4-SNAPSHOT</version>
+    <version>1.4-MRM-1327-SNAPSHOT</version>
   </parent>
   <artifactId>archiva-transaction</artifactId>
   <name>Archiva Transactions</name>

Modified: archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-base/archiva-xml-tools/pom.xml
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-base/archiva-xml-tools/pom.xml?rev=1061121&r1=1061120&r2=1061121&view=diff
==============================================================================
--- archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-base/archiva-xml-tools/pom.xml (original)
+++ archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-base/archiva-xml-tools/pom.xml Thu Jan 20 04:37:59 2011
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.archiva</groupId>
     <artifactId>archiva-base</artifactId>
-    <version>1.4-SNAPSHOT</version>
+    <version>1.4-MRM-1327-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>archiva-xml-tools</artifactId>

Modified: archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-base/pom.xml
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-base/pom.xml?rev=1061121&r1=1061120&r2=1061121&view=diff
==============================================================================
--- archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-base/pom.xml (original)
+++ archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-base/pom.xml Thu Jan 20 04:37:59 2011
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.archiva</groupId>
     <artifactId>archiva-modules</artifactId>
-    <version>1.4-SNAPSHOT</version>
+    <version>1.4-MRM-1327-SNAPSHOT</version>
   </parent>
 
   <artifactId>archiva-base</artifactId>

Modified: archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-scheduler/archiva-scheduler-api/pom.xml
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-scheduler/archiva-scheduler-api/pom.xml?rev=1061121&r1=1061120&r2=1061121&view=diff
==============================================================================
--- archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-scheduler/archiva-scheduler-api/pom.xml (original)
+++ archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-scheduler/archiva-scheduler-api/pom.xml Thu Jan 20 04:37:59 2011
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>archiva-scheduler</artifactId>
     <groupId>org.apache.archiva</groupId>
-    <version>1.4-SNAPSHOT</version>
+    <version>1.4-MRM-1327-SNAPSHOT</version>
   </parent>
   <artifactId>archiva-scheduler-api</artifactId>
   <name>Archiva Base 888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4 Scheduled Tasks 888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4 API</name>

Modified: archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/pom.xml
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/pom.xml?rev=1061121&r1=1061120&r2=1061121&view=diff
==============================================================================
--- archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/pom.xml (original)
+++ archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/pom.xml Thu Jan 20 04:37:59 2011
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>archiva-scheduler</artifactId>
     <groupId>org.apache.archiva</groupId>
-    <version>1.4-SNAPSHOT</version>
+    <version>1.4-MRM-1327-SNAPSHOT</version>
   </parent>
   <artifactId>archiva-scheduler-indexing</artifactId>
   <name>Archiva Base 888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4 Scheduled Tasks 888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4 Indexing</name>

Modified: archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-scheduler/archiva-scheduler-repository/pom.xml
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-scheduler/archiva-scheduler-repository/pom.xml?rev=1061121&r1=1061120&r2=1061121&view=diff
==============================================================================
--- archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-scheduler/archiva-scheduler-repository/pom.xml (original)
+++ archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-scheduler/archiva-scheduler-repository/pom.xml Thu Jan 20 04:37:59 2011
@@ -6,7 +6,7 @@
   <parent>
     <artifactId>archiva-scheduler</artifactId>
     <groupId>org.apache.archiva</groupId>
-    <version>1.4-SNAPSHOT</version>
+    <version>1.4-MRM-1327-SNAPSHOT</version>
   </parent>
   <artifactId>archiva-scheduler-repository</artifactId>
   <name>Archiva Base 888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4 Scheduled Tasks 888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4 Repository Scanning</name>

Modified: archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-scheduler/pom.xml
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-scheduler/pom.xml?rev=1061121&r1=1061120&r2=1061121&view=diff
==============================================================================
--- archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-scheduler/pom.xml (original)
+++ archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-scheduler/pom.xml Thu Jan 20 04:37:59 2011
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.archiva</groupId>
     <artifactId>archiva-modules</artifactId>
-    <version>1.4-SNAPSHOT</version>
+    <version>1.4-MRM-1327-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>archiva-scheduler</artifactId>

Modified: archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-web/archiva-applet/pom.xml
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-web/archiva-applet/pom.xml?rev=1061121&r1=1061120&r2=1061121&view=diff
==============================================================================
--- archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-web/archiva-applet/pom.xml (original)
+++ archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-web/archiva-applet/pom.xml Thu Jan 20 04:37:59 2011
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.archiva</groupId>
     <artifactId>archiva-web</artifactId>
-    <version>1.4-SNAPSHOT</version>
+    <version>1.4-MRM-1327-SNAPSHOT</version>
   </parent>
   <artifactId>archiva-applet</artifactId>
   <name>Archiva Web 888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4 Applet</name>

Modified: archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-web/archiva-rss/pom.xml
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-web/archiva-rss/pom.xml?rev=1061121&r1=1061120&r2=1061121&view=diff
==============================================================================
--- archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-web/archiva-rss/pom.xml (original)
+++ archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-web/archiva-rss/pom.xml Thu Jan 20 04:37:59 2011
@@ -22,7 +22,7 @@
   <parent>
     <artifactId>archiva-web</artifactId>
     <groupId>org.apache.archiva</groupId>
-    <version>1.4-SNAPSHOT</version>
+    <version>1.4-MRM-1327-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>archiva-rss</artifactId>

Modified: archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-web/archiva-security/pom.xml
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-web/archiva-security/pom.xml?rev=1061121&r1=1061120&r2=1061121&view=diff
==============================================================================
--- archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-web/archiva-security/pom.xml (original)
+++ archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-web/archiva-security/pom.xml Thu Jan 20 04:37:59 2011
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.archiva</groupId>
     <artifactId>archiva-web</artifactId>
-    <version>1.4-SNAPSHOT</version>
+    <version>1.4-MRM-1327-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>archiva-security</artifactId>

Modified: archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-web/archiva-webapp-test/pom.xml
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-web/archiva-webapp-test/pom.xml?rev=1061121&r1=1061120&r2=1061121&view=diff
==============================================================================
--- archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-web/archiva-webapp-test/pom.xml (original)
+++ archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-web/archiva-webapp-test/pom.xml Thu Jan 20 04:37:59 2011
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.archiva</groupId>
     <artifactId>archiva-web</artifactId>
-    <version>1.4-SNAPSHOT</version>
+    <version>1.4-MRM-1327-SNAPSHOT</version>
   </parent>
   <artifactId>archiva-webapp-test</artifactId>
   <packaging>pom</packaging>

Modified: archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-web/archiva-webapp/pom.xml
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-web/archiva-webapp/pom.xml?rev=1061121&r1=1061120&r2=1061121&view=diff
==============================================================================
--- archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-web/archiva-webapp/pom.xml (original)
+++ archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-web/archiva-webapp/pom.xml Thu Jan 20 04:37:59 2011
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.archiva</groupId>
     <artifactId>archiva-web</artifactId>
-    <version>1.4-SNAPSHOT</version>
+    <version>1.4-MRM-1327-SNAPSHOT</version>
   </parent>
   <artifactId>archiva-webapp</artifactId>
   <packaging>war</packaging>
@@ -86,7 +86,7 @@
     <dependency>
       <groupId>org.apache.archiva</groupId>
       <artifactId>stage-repository-merge</artifactId>
-      <version>1.4-SNAPSHOT</version>
+      <version>1.4-MRM-1327-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.archiva</groupId>

Modified: archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-web/archiva-webdav/pom.xml
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-web/archiva-webdav/pom.xml?rev=1061121&r1=1061120&r2=1061121&view=diff
==============================================================================
--- archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-web/archiva-webdav/pom.xml (original)
+++ archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-web/archiva-webdav/pom.xml Thu Jan 20 04:37:59 2011
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.archiva</groupId>
     <artifactId>archiva-web</artifactId>
-    <version>1.4-SNAPSHOT</version>
+    <version>1.4-MRM-1327-SNAPSHOT</version>
   </parent>
 
   <artifactId>archiva-webdav</artifactId>

Modified: archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-api/pom.xml
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-api/pom.xml?rev=1061121&r1=1061120&r2=1061121&view=diff
==============================================================================
--- archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-api/pom.xml (original)
+++ archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-api/pom.xml Thu Jan 20 04:37:59 2011
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.apache.archiva</groupId>
     <artifactId>archiva-xmlrpc</artifactId>
-    <version>1.4-SNAPSHOT</version>
+    <version>1.4-MRM-1327-SNAPSHOT</version>
   </parent>
   <artifactId>archiva-xmlrpc-api</artifactId>
   <name>Archiva Web 888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4 XML-RPC API</name>

Modified: archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-client/pom.xml
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-client/pom.xml?rev=1061121&r1=1061120&r2=1061121&view=diff
==============================================================================
--- archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-client/pom.xml (original)
+++ archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-client/pom.xml Thu Jan 20 04:37:59 2011
@@ -19,7 +19,7 @@
   <parent>
     <artifactId>archiva-xmlrpc</artifactId>
     <groupId>org.apache.archiva</groupId>
-    <version>1.4-SNAPSHOT</version>
+    <version>1.4-MRM-1327-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>archiva-xmlrpc-client</artifactId>

Modified: archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-security/pom.xml
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-security/pom.xml?rev=1061121&r1=1061120&r2=1061121&view=diff
==============================================================================
--- archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-security/pom.xml (original)
+++ archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-security/pom.xml Thu Jan 20 04:37:59 2011
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.archiva</groupId>
     <artifactId>archiva-xmlrpc</artifactId>
-    <version>1.4-SNAPSHOT</version>
+    <version>1.4-MRM-1327-SNAPSHOT</version>
   </parent>
   <artifactId>archiva-xmlrpc-security</artifactId>
   <name>Archiva Web 888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4 XML-RPC Security</name>

Modified: archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/pom.xml
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/pom.xml?rev=1061121&r1=1061120&r2=1061121&view=diff
==============================================================================
--- archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/pom.xml (original)
+++ archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/pom.xml Thu Jan 20 04:37:59 2011
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.archiva</groupId>
     <artifactId>archiva-xmlrpc</artifactId>
-    <version>1.4-SNAPSHOT</version>
+    <version>1.4-MRM-1327-SNAPSHOT</version>
   </parent>
   <artifactId>archiva-xmlrpc-services</artifactId>
   <name>Archiva Web 888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4 XML-RPC Services</name>

Modified: archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-web/archiva-xmlrpc/pom.xml
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-web/archiva-xmlrpc/pom.xml?rev=1061121&r1=1061120&r2=1061121&view=diff
==============================================================================
--- archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-web/archiva-xmlrpc/pom.xml (original)
+++ archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-web/archiva-xmlrpc/pom.xml Thu Jan 20 04:37:59 2011
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.archiva</groupId>
     <artifactId>archiva-web</artifactId>
-    <version>1.4-SNAPSHOT</version>
+    <version>1.4-MRM-1327-SNAPSHOT</version>
   </parent>
   <artifactId>archiva-xmlrpc</artifactId>
   <name>Archiva Web 888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4 XML-RPC</name>

Modified: archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-web/pom.xml
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-web/pom.xml?rev=1061121&r1=1061120&r2=1061121&view=diff
==============================================================================
--- archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-web/pom.xml (original)
+++ archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-web/pom.xml Thu Jan 20 04:37:59 2011
@@ -20,7 +20,7 @@
   <parent>
     <groupId>org.apache.archiva</groupId>
     <artifactId>archiva-modules</artifactId>
-    <version>1.4-SNAPSHOT</version>
+    <version>1.4-MRM-1327-SNAPSHOT</version>
   </parent>
 
   <artifactId>archiva-web</artifactId>

Modified: archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/metadata/metadata-model/pom.xml
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/metadata/metadata-model/pom.xml?rev=1061121&r1=1061120&r2=1061121&view=diff
==============================================================================
--- archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/metadata/metadata-model/pom.xml (original)
+++ archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/metadata/metadata-model/pom.xml Thu Jan 20 04:37:59 2011
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>metadata</artifactId>
     <groupId>org.apache.archiva</groupId>
-    <version>1.4-SNAPSHOT</version>
+    <version>1.4-MRM-1327-SNAPSHOT</version>
   </parent>
   <artifactId>metadata-model</artifactId>
   <name>Archiva Metadata Model</name>

Modified: archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/metadata/metadata-repository-api/pom.xml
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/metadata/metadata-repository-api/pom.xml?rev=1061121&r1=1061120&r2=1061121&view=diff
==============================================================================
--- archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/metadata/metadata-repository-api/pom.xml (original)
+++ archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/metadata/metadata-repository-api/pom.xml Thu Jan 20 04:37:59 2011
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>metadata</artifactId>
     <groupId>org.apache.archiva</groupId>
-    <version>1.4-SNAPSHOT</version>
+    <version>1.4-MRM-1327-SNAPSHOT</version>
   </parent>
   <artifactId>metadata-repository-api</artifactId>
   <name>Archiva Metadata Repository API</name>

Modified: archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/metadata/pom.xml
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/metadata/pom.xml?rev=1061121&r1=1061120&r2=1061121&view=diff
==============================================================================
--- archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/metadata/pom.xml (original)
+++ archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/metadata/pom.xml Thu Jan 20 04:37:59 2011
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>archiva-modules</artifactId>
     <groupId>org.apache.archiva</groupId>
-    <version>1.4-SNAPSHOT</version>
+    <version>1.4-MRM-1327-SNAPSHOT</version>
   </parent>
   <artifactId>metadata</artifactId>
   <name>Archiva Metadata</name>

Modified: archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/metadata/test-repository/pom.xml
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/metadata/test-repository/pom.xml?rev=1061121&r1=1061120&r2=1061121&view=diff
==============================================================================
--- archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/metadata/test-repository/pom.xml (original)
+++ archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/metadata/test-repository/pom.xml Thu Jan 20 04:37:59 2011
@@ -6,7 +6,7 @@
   <parent>
     <artifactId>metadata</artifactId>
     <groupId>org.apache.archiva</groupId>
-    <version>1.4-SNAPSHOT</version>
+    <version>1.4-MRM-1327-SNAPSHOT</version>
   </parent>
   <artifactId>test-repository</artifactId>
   <name>Archiva Repository for Testing</name>

Modified: archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/plugins/audit/pom.xml
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/plugins/audit/pom.xml?rev=1061121&r1=1061120&r2=1061121&view=diff
==============================================================================
--- archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/plugins/audit/pom.xml (original)
+++ archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/plugins/audit/pom.xml Thu Jan 20 04:37:59 2011
@@ -23,7 +23,7 @@
   <parent>
     <artifactId>plugins</artifactId>
     <groupId>org.apache.archiva</groupId>
-    <version>1.4-SNAPSHOT</version>
+    <version>1.4-MRM-1327-SNAPSHOT</version>
   </parent>
   <artifactId>audit</artifactId>
   <name>Audit Logging</name>

Modified: archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/plugins/generic-metadata-support/pom.xml
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/plugins/generic-metadata-support/pom.xml?rev=1061121&r1=1061120&r2=1061121&view=diff
==============================================================================
--- archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/plugins/generic-metadata-support/pom.xml (original)
+++ archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/plugins/generic-metadata-support/pom.xml Thu Jan 20 04:37:59 2011
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>plugins</artifactId>
     <groupId>org.apache.archiva</groupId>
-    <version>1.4-SNAPSHOT</version>
+    <version>1.4-MRM-1327-SNAPSHOT</version>
   </parent>
   <artifactId>generic-metadata-support</artifactId>
   <name>Generic Metadata Support</name>

Modified: archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/plugins/maven1-repository/pom.xml
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/plugins/maven1-repository/pom.xml?rev=1061121&r1=1061120&r2=1061121&view=diff
==============================================================================
--- archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/plugins/maven1-repository/pom.xml (original)
+++ archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/plugins/maven1-repository/pom.xml Thu Jan 20 04:37:59 2011
@@ -24,7 +24,7 @@
   <parent>
     <artifactId>plugins</artifactId>
     <groupId>org.apache.archiva</groupId>
-    <version>1.4-SNAPSHOT</version>
+    <version>1.4-MRM-1327-SNAPSHOT</version>
   </parent>
   <artifactId>maven1-repository</artifactId>
   <name>Maven 1.x Repository Support</name>

Modified: archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/plugins/maven2-repository/pom.xml
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/plugins/maven2-repository/pom.xml?rev=1061121&r1=1061120&r2=1061121&view=diff
==============================================================================
--- archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/plugins/maven2-repository/pom.xml (original)
+++ archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/plugins/maven2-repository/pom.xml Thu Jan 20 04:37:59 2011
@@ -24,7 +24,7 @@
   <parent>
     <artifactId>plugins</artifactId>
     <groupId>org.apache.archiva</groupId>
-    <version>1.4-SNAPSHOT</version>
+    <version>1.4-MRM-1327-SNAPSHOT</version>
   </parent>
   <artifactId>maven2-repository</artifactId>
   <name>Maven 2.x Repository Support</name>

Modified: archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/plugins/metadata-repository-file/pom.xml
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/plugins/metadata-repository-file/pom.xml?rev=1061121&r1=1061120&r2=1061121&view=diff
==============================================================================
--- archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/plugins/metadata-repository-file/pom.xml (original)
+++ archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/plugins/metadata-repository-file/pom.xml Thu Jan 20 04:37:59 2011
@@ -23,7 +23,7 @@
   <parent>
     <artifactId>plugins</artifactId>
     <groupId>org.apache.archiva</groupId>
-    <version>1.4-SNAPSHOT</version>
+    <version>1.4-MRM-1327-SNAPSHOT</version>
   </parent>
   <!-- FIXME: Rename to metadata-store-file -->
   <artifactId>metadata-repository-file</artifactId>

Modified: archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/plugins/metadata-store-jcr/pom.xml
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/plugins/metadata-store-jcr/pom.xml?rev=1061121&r1=1061120&r2=1061121&view=diff
==============================================================================
--- archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/plugins/metadata-store-jcr/pom.xml (original)
+++ archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/plugins/metadata-store-jcr/pom.xml Thu Jan 20 04:37:59 2011
@@ -25,7 +25,7 @@
   <parent>
     <artifactId>plugins</artifactId>
     <groupId>org.apache.archiva</groupId>
-    <version>1.4-SNAPSHOT</version>
+    <version>1.4-MRM-1327-SNAPSHOT</version>
   </parent>
   <artifactId>metadata-store-jcr</artifactId>
   <name>JCR Storage for Metadata</name>

Modified: archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/plugins/npanday-support/pom.xml
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/plugins/npanday-support/pom.xml?rev=1061121&r1=1061120&r2=1061121&view=diff
==============================================================================
--- archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/plugins/npanday-support/pom.xml (original)
+++ archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/plugins/npanday-support/pom.xml Thu Jan 20 04:37:59 2011
@@ -24,7 +24,7 @@
   <parent>
     <artifactId>plugins</artifactId>
     <groupId>org.apache.archiva</groupId>
-    <version>1.4-SNAPSHOT</version>
+    <version>1.4-MRM-1327-SNAPSHOT</version>
   </parent>
   <artifactId>npanday-support</artifactId>
   <name>NPanday Support for Archiva</name>

Modified: archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/plugins/pom.xml
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/plugins/pom.xml?rev=1061121&r1=1061120&r2=1061121&view=diff
==============================================================================
--- archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/plugins/pom.xml (original)
+++ archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/plugins/pom.xml Thu Jan 20 04:37:59 2011
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>archiva-modules</artifactId>
     <groupId>org.apache.archiva</groupId>
-    <version>1.4-SNAPSHOT</version>
+    <version>1.4-MRM-1327-SNAPSHOT</version>
   </parent>
   <artifactId>plugins</artifactId>
   <name>Archiva Core Plugins</name>

Modified: archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/plugins/problem-reports/pom.xml
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/plugins/problem-reports/pom.xml?rev=1061121&r1=1061120&r2=1061121&view=diff
==============================================================================
--- archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/plugins/problem-reports/pom.xml (original)
+++ archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/plugins/problem-reports/pom.xml Thu Jan 20 04:37:59 2011
@@ -23,7 +23,7 @@
   <parent>
     <artifactId>plugins</artifactId>
     <groupId>org.apache.archiva</groupId>
-    <version>1.4-SNAPSHOT</version>
+    <version>1.4-MRM-1327-SNAPSHOT</version>
   </parent>
   <artifactId>problem-reports</artifactId>
   <name>Archiva Problem Reporting Plugin</name>

Modified: archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/plugins/repository-statistics/pom.xml
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/plugins/repository-statistics/pom.xml?rev=1061121&r1=1061120&r2=1061121&view=diff
==============================================================================
--- archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/plugins/repository-statistics/pom.xml (original)
+++ archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/plugins/repository-statistics/pom.xml Thu Jan 20 04:37:59 2011
@@ -23,7 +23,7 @@
   <parent>
     <artifactId>plugins</artifactId>
     <groupId>org.apache.archiva</groupId>
-    <version>1.4-SNAPSHOT</version>
+    <version>1.4-MRM-1327-SNAPSHOT</version>
   </parent>
   <artifactId>repository-statistics</artifactId>
   <name>Repository Statistics</name>

Modified: archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/plugins/stage-repository-merge/pom.xml
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/plugins/stage-repository-merge/pom.xml?rev=1061121&r1=1061120&r2=1061121&view=diff
==============================================================================
--- archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/plugins/stage-repository-merge/pom.xml (original)
+++ archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/plugins/stage-repository-merge/pom.xml Thu Jan 20 04:37:59 2011
@@ -6,7 +6,7 @@
   <parent>
     <artifactId>plugins</artifactId>
     <groupId>org.apache.archiva</groupId>
-    <version>1.4-SNAPSHOT</version>
+    <version>1.4-MRM-1327-SNAPSHOT</version>
   </parent>
   <groupId>org.apache.archiva</groupId>
   <artifactId>stage-repository-merge</artifactId>

Modified: archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/pom.xml
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/pom.xml?rev=1061121&r1=1061120&r2=1061121&view=diff
==============================================================================
--- archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/pom.xml (original)
+++ archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/pom.xml Thu Jan 20 04:37:59 2011
@@ -22,7 +22,7 @@
   <parent>
     <artifactId>archiva</artifactId>
     <groupId>org.apache.archiva</groupId>
-    <version>1.4-SNAPSHOT</version>
+    <version>1.4-MRM-1327-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>archiva-modules</artifactId>

Modified: archiva/branches/MRM-1327-jcr-backend-default/pom.xml
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1327-jcr-backend-default/pom.xml?rev=1061121&r1=1061120&r2=1061121&view=diff
==============================================================================
--- archiva/branches/MRM-1327-jcr-backend-default/pom.xml (original)
+++ archiva/branches/MRM-1327-jcr-backend-default/pom.xml Thu Jan 20 04:37:59 2011
@@ -33,7 +33,7 @@
   <name>Archiva</name>
   <artifactId>archiva</artifactId>
   <packaging>pom</packaging>
-  <version>1.4-SNAPSHOT</version>
+  <version>1.4-MRM-1327-SNAPSHOT</version>
   <url>http://archiva.apache.org</url>
   <scm>
     <connection>scm:svn:http://svn.apache.org/repos/asf/archiva/trunk</connection>
@@ -305,221 +305,221 @@
       <dependency>
         <groupId>org.apache.archiva</groupId>
         <artifactId>metadata-model</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>1.4-MRM-1327-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.apache.archiva</groupId>
         <artifactId>metadata-repository-api</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>1.4-MRM-1327-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.apache.archiva</groupId>
         <artifactId>metadata-repository-api</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>1.4-MRM-1327-SNAPSHOT</version>
         <classifier>tests</classifier>
       </dependency>
       <dependency>
         <groupId>org.apache.archiva</groupId>
         <artifactId>metadata-store-jcr</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>1.4-MRM-1327-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.apache.archiva</groupId>
         <artifactId>metadata-repository-file</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>1.4-MRM-1327-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.apache.archiva</groupId>
         <artifactId>repository-statistics</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>1.4-MRM-1327-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.apache.archiva</groupId>
         <artifactId>problem-reports</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>1.4-MRM-1327-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.apache.archiva</groupId>
         <artifactId>audit</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>1.4-MRM-1327-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.apache.archiva</groupId>
         <artifactId>maven2-repository</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>1.4-MRM-1327-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.apache.archiva</groupId>
         <artifactId>generic-metadata-support</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>1.4-MRM-1327-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.apache.archiva</groupId>
         <artifactId>archiva-applet</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>1.4-MRM-1327-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.apache.archiva</groupId>
         <artifactId>archiva-artifact-converter</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>1.4-MRM-1327-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.apache.archiva</groupId>
         <artifactId>archiva-checksum</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>1.4-MRM-1327-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.apache.archiva</groupId>
         <artifactId>npanday-support</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>1.4-MRM-1327-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.apache.archiva</groupId>
         <artifactId>archiva-common</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>1.4-MRM-1327-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.apache.archiva</groupId>
         <artifactId>archiva-configuration</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>1.4-MRM-1327-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.apache.archiva</groupId>
         <artifactId>archiva-consumer-api</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>1.4-MRM-1327-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.apache.archiva</groupId>
         <artifactId>archiva-converter</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>1.4-MRM-1327-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.apache.archiva</groupId>
         <artifactId>archiva-core-consumers</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>1.4-MRM-1327-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.apache.archiva</groupId>
         <artifactId>archiva-metadata-consumer</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>1.4-MRM-1327-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.apache.archiva</groupId>
         <artifactId>test-repository</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>1.4-MRM-1327-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.apache.archiva</groupId>
         <artifactId>archiva-indexer</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>1.4-MRM-1327-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.apache.archiva</groupId>
         <artifactId>archiva-lucene-consumers</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>1.4-MRM-1327-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.apache.archiva</groupId>
         <artifactId>archiva-model</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>1.4-MRM-1327-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.apache.archiva</groupId>
         <artifactId>archiva-policies</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>1.4-MRM-1327-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.apache.archiva</groupId>
         <artifactId>archiva-proxy</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>1.4-MRM-1327-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.apache.archiva</groupId>
         <artifactId>archiva-repository-layer</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>1.4-MRM-1327-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.apache.archiva</groupId>
         <artifactId>archiva-repository-scanner</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>1.4-MRM-1327-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.apache.archiva</groupId>
         <artifactId>archiva-scheduler-api</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>1.4-MRM-1327-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.apache.archiva</groupId>
         <artifactId>archiva-scheduler-repository</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>1.4-MRM-1327-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.apache.archiva</groupId>
         <artifactId>archiva-scheduler-indexing</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>1.4-MRM-1327-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.apache.archiva</groupId>
         <artifactId>archiva-security</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>1.4-MRM-1327-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.apache.archiva</groupId>
         <artifactId>archiva-signature-consumers</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>1.4-MRM-1327-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.apache.archiva</groupId>
         <artifactId>archiva-transaction</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>1.4-MRM-1327-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.apache.archiva</groupId>
         <artifactId>archiva-docs</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>1.4-MRM-1327-SNAPSHOT</version>
         <type>zip</type>
         <classifier>docs</classifier>
       </dependency>
       <dependency>
         <groupId>org.apache.archiva</groupId>
         <artifactId>archiva-webapp</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>1.4-MRM-1327-SNAPSHOT</version>
         <type>war</type>
       </dependency>
       <dependency>
         <groupId>org.apache.archiva</groupId>
         <artifactId>archiva-xml-tools</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>1.4-MRM-1327-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.apache.archiva</groupId>
         <artifactId>archiva-webdav</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>1.4-MRM-1327-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.apache.archiva</groupId>
         <artifactId>archiva-rss</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>1.4-MRM-1327-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.apache.archiva</groupId>
         <artifactId>archiva-xmlrpc-api</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>1.4-MRM-1327-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.apache.archiva</groupId>
         <artifactId>archiva-xmlrpc-services</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>1.4-MRM-1327-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.apache.archiva</groupId>
         <artifactId>archiva-xmlrpc-security</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>1.4-MRM-1327-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.apache.archiva</groupId>
         <artifactId>stage-repository-merge</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>1.4-MRM-1327-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.codehaus.plexus</groupId>

Modified: archiva/branches/MRM-1327-jcr-backend-default/skin/pom.xml
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1327-jcr-backend-default/skin/pom.xml?rev=1061121&r1=1061120&r2=1061121&view=diff
==============================================================================
--- archiva/branches/MRM-1327-jcr-backend-default/skin/pom.xml (original)
+++ archiva/branches/MRM-1327-jcr-backend-default/skin/pom.xml Thu Jan 20 04:37:59 2011
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>archiva</artifactId>
     <groupId>org.apache.archiva</groupId>
-    <version>1.4-SNAPSHOT</version>
+    <version>1.4-MRM-1327-SNAPSHOT</version>
   </parent>
   <artifactId>skin</artifactId>
   <name>Archiva Documentation Skin</name>



From commitswaltersashley@example.com Thu Jan 20 04:48:26 2011
Return-Path: <commitswaltersashley@example.com>
Delivered-To: waltersashley@example.com
Received: (qmail 65274 invoked from network); 20 Jan 2011 04:48:25 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155)
  by minotaur.apache.org with SMTP; 20 Jan 2011 04:48:25 -0000
Received: (qmail 35914 invoked by uid 500); 20 Jan 2011 04:48:25 -0000
Delivered-To: waltersashley@example.com
Received: (qmail 35852 invoked by uid 500); 20 Jan 2011 04:48:23 -0000
Mailing-List: contact waltersashley@example.com; run by ezmlm
Precedence: bulk
List-Help: <mailto:waltersashley@example.com>
List-Unsubscribe: <mailto:waltersashley@example.com>
List-Post: <mailto:waltersashley@example.com>
List-Id: <commits.archiva.apache.org>
Reply-To: waltersashley@example.com
Delivered-To: mailing list waltersashley@example.com
Received: (qmail 35845 invoked by uid 99); 20 Jan 2011 04:48:22 -0000
Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 20 Jan 2011 04:48:22 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 20 Jan 2011 04:48:21 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id B99D523889E9; Thu, 20 Jan 2011 04:48:01 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1061123 - in
 /archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-web/archiva-webapp:
 pom.xml src/main/webapp/WEB-INF/applicationContext.xml
Date: Thu, 20 Jan 2011 04:48:01 -0000
To: waltersashley@example.com
From: waltersashley@example.com
X-Mailer: svnmailer-1.0.8
Message-Id: <waltersashley@example.com>

Author: brett
Date: Thu Jan 20 04:48:01 2011
New Revision: 1061123

URL: http://svn.apache.org/viewvc?rev=1061123&view=rev
Log:
[MRM-1327] set JCR as default repository
Merged from: r1053790, 1053808

Modified:
    archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-web/archiva-webapp/pom.xml
    archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/applicationContext.xml

Modified: archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-web/archiva-webapp/pom.xml
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-web/archiva-webapp/pom.xml?rev=1061123&r1=1061122&r2=1061123&view=diff
==============================================================================
--- archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-web/archiva-webapp/pom.xml (original)
+++ archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-web/archiva-webapp/pom.xml Thu Jan 20 04:48:01 2011
@@ -280,10 +280,17 @@
     </dependency>
     <dependency>
       <groupId>org.apache.archiva</groupId>
-      <artifactId>metadata-repository-file</artifactId>
+      <artifactId>metadata-store-jcr</artifactId>
       <scope>runtime</scope>
     </dependency>
     <dependency>
+      <groupId>org.apache.jackrabbit</groupId>
+      <artifactId>jackrabbit-core</artifactId>
+      <version>${jackrabbit.version}</version>
+      <scope>runtime</scope>
+      <!-- FIXME: exclude dependencies that aren't needed -->
+    </dependency>
+    <dependency>
       <groupId>org.apache.archiva</groupId>
       <!--  FIXME: temporary coupling to plugin, should be runtime -->
       <artifactId>maven2-repository</artifactId>

Modified: archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/applicationContext.xml
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/applicationContext.xml?rev=1061123&r1=1061122&r2=1061123&view=diff
==============================================================================
--- archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/applicationContext.xml (original)
+++ archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/applicationContext.xml Thu Jan 20 04:48:01 2011
@@ -7,7 +7,15 @@
   <bean id="loggerManager" class="org.codehaus.plexus.logging.slf4j.Slf4jLoggerManager"
         init-method="initialize"/>
 
-  <alias name="repositorySessionFactory#file" alias="repositorySessionFactory"/>
+  <alias name="repositorySessionFactory#jcr" alias="repositorySessionFactory"/>
+  <bean id="repository" class="org.apache.jackrabbit.core.RepositoryImpl" destroy-method="shutdown">
+    <constructor-arg ref="config"/>
+  </bean>
+  <bean id="config" class="org.apache.jackrabbit.core.config.RepositoryConfig" factory-method="create">
+    <!-- FIXME: better arguments needed? -->
+    <constructor-arg value="${appserver.base}/conf/repository.xml"/>
+    <constructor-arg value="${appserver.base}/data/jcr"/>
+  </bean>
 
   <bean name="wagon#http" class="org.apache.maven.wagon.providers.http.LightweightHttpWagon" scope="prototype">
     <property name="httpHeaders">



From commitswaltersashley@example.com Thu Jan 20 05:44:53 2011
Return-Path: <commitswaltersashley@example.com>
Delivered-To: waltersashley@example.com
Received: (qmail 8267 invoked from network); 20 Jan 2011 05:44:53 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155)
  by minotaur.apache.org with SMTP; 20 Jan 2011 05:44:53 -0000
Received: (qmail 76599 invoked by uid 500); 20 Jan 2011 05:44:53 -0000
Delivered-To: waltersashley@example.com
Received: (qmail 76539 invoked by uid 500); 20 Jan 2011 05:44:51 -0000
Mailing-List: contact waltersashley@example.com; run by ezmlm
Precedence: bulk
List-Help: <mailto:waltersashley@example.com>
List-Unsubscribe: <mailto:waltersashley@example.com>
List-Post: <mailto:waltersashley@example.com>
List-Id: <commits.archiva.apache.org>
Reply-To: waltersashley@example.com
Delivered-To: mailing list waltersashley@example.com
Received: (qmail 76532 invoked by uid 99); 20 Jan 2011 05:44:50 -0000
Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 20 Jan 2011 05:44:50 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 20 Jan 2011 05:44:49 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 523702388A39; Thu, 20 Jan 2011 05:44:29 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1061128 - in /archiva/branches/MRM-1327-jcr-backend-default:
 archiva-jetty/src/main/conf/
 archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/appserver-base/conf/
 archiva-modules/archiva-web/archiva-webapp/src/appserver-base...
Date: Thu, 20 Jan 2011 05:44:29 -0000
To: waltersashley@example.com
From: waltersashley@example.com
X-Mailer: svnmailer-1.0.8
Message-Id: <waltersashley@example.com>

Author: brett
Date: Thu Jan 20 05:44:28 2011
New Revision: 1061128

URL: http://svn.apache.org/viewvc?rev=1061128&view=rev
Log:
add missing files from previous commit

Added:
    archiva/branches/MRM-1327-jcr-backend-default/archiva-jetty/src/main/conf/repository.xml
      - copied unchanged from r1053790, archiva/branches/MRM-1327-jcr-backend-default/archiva-jetty/src/main/conf/repository.xml
    archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/appserver-base/conf/repository.xml
      - copied unchanged from r1053790, archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/appserver-base/conf/repository.xml
    archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-web/archiva-webapp/src/appserver-base/conf/repository.xml
      - copied unchanged from r1053790, archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-web/archiva-webapp/src/appserver-base/conf/repository.xml


From commitswaltersashley@example.com Thu Jan 20 12:28:53 2011
Return-Path: <commitswaltersashley@example.com>
Delivered-To: waltersashley@example.com
Received: (qmail 51504 invoked from network); 20 Jan 2011 12:28:53 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155)
  by minotaur.apache.org with SMTP; 20 Jan 2011 12:28:53 -0000
Received: (qmail 59895 invoked by uid 500); 20 Jan 2011 12:28:53 -0000
Delivered-To: waltersashley@example.com
Received: (qmail 59845 invoked by uid 500); 20 Jan 2011 12:28:51 -0000
Mailing-List: contact waltersashley@example.com; run by ezmlm
Precedence: bulk
List-Help: <mailto:waltersashley@example.com>
List-Unsubscribe: <mailto:waltersashley@example.com>
List-Post: <mailto:waltersashley@example.com>
List-Id: <commits.archiva.apache.org>
Reply-To: waltersashley@example.com
Delivered-To: mailing list waltersashley@example.com
Received: (qmail 59838 invoked by uid 99); 20 Jan 2011 12:28:50 -0000
Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 20 Jan 2011 12:28:50 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 20 Jan 2011 12:28:50 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 1F4E72388A4B; Thu, 20 Jan 2011 12:28:30 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1061267 - /archiva/site/pom.xml
Date: Thu, 20 Jan 2011 12:28:30 -0000
To: waltersashley@example.com
From: waltersashley@example.com
X-Mailer: svnmailer-1.0.8
Message-Id: <waltersashley@example.com>

Author: brett
Date: Thu Jan 20 12:28:29 2011
New Revision: 1061267

URL: http://svn.apache.org/viewvc?rev=1061267&view=rev
Log:
fix list of versions

Modified:
    archiva/site/pom.xml

Modified: archiva/site/pom.xml
URL: http://svn.apache.org/viewvc/archiva/site/pom.xml?rev=1061267&r1=1061266&r2=1061267&view=diff
==============================================================================
--- archiva/site/pom.xml (original)
+++ archiva/site/pom.xml Thu Jan 20 12:28:29 2011
@@ -106,7 +106,7 @@
     <archivaReleaseVersion>1.3.3</archivaReleaseVersion>
     <archivaReleaseDate>20 December 2010</archivaReleaseDate>
     <supportedVersions>1.3.2</supportedVersions>
-    <unsupportedVersions>1.3.2,1.3.1,1.3,1.2.2,1.2.1,1.2,1.1.3,1.1.2,1.1.1,1.1,1.0.2,1.0.1,1.0</unsupportedVersions>
+    <unsupportedVersions>1.3.1,1.3,1.2.2,1.2.1,1.2,1.1.3,1.1.2,1.1.1,1.1,1.0.2,1.0.1,1.0</unsupportedVersions>
   </properties>
   <profiles>
     <profile>



From commitswaltersashley@example.com Thu Jan 20 12:34:05 2011
Return-Path: <commitswaltersashley@example.com>
Delivered-To: waltersashley@example.com
Received: (qmail 59989 invoked from network); 20 Jan 2011 12:34:04 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155)
  by minotaur.apache.org with SMTP; 20 Jan 2011 12:34:04 -0000
Received: (qmail 67159 invoked by uid 500); 20 Jan 2011 12:34:04 -0000
Delivered-To: waltersashley@example.com
Received: (qmail 66918 invoked by uid 500); 20 Jan 2011 12:34:03 -0000
Mailing-List: contact waltersashley@example.com; run by ezmlm
Precedence: bulk
List-Help: <mailto:waltersashley@example.com>
List-Unsubscribe: <mailto:waltersashley@example.com>
List-Post: <mailto:waltersashley@example.com>
List-Id: <commits.archiva.apache.org>
Reply-To: waltersashley@example.com
Delivered-To: mailing list waltersashley@example.com
Received: (qmail 66911 invoked by uid 99); 20 Jan 2011 12:34:02 -0000
Received: from nike.apache.org (HELO nike.apache.org) (83.161.120.155)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 20 Jan 2011 12:34:02 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 20 Jan 2011 12:34:00 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 8EB9C2388A38; Thu, 20 Jan 2011 12:33:39 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1061268 - /archiva/sandbox/populate-jcr-repo/pom.xml
Date: Thu, 20 Jan 2011 12:33:39 -0000
To: waltersashley@example.com
From: waltersashley@example.com
X-Mailer: svnmailer-1.0.8
Message-Id: <waltersashley@example.com>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: brett
Date: Thu Jan 20 12:33:39 2011
New Revision: 1061268

URL: http://svn.apache.org/viewvc?rev=1061268&view=rev
Log:
clean POM and add some undeclared dependencies

Modified:
    archiva/sandbox/populate-jcr-repo/pom.xml

Modified: archiva/sandbox/populate-jcr-repo/pom.xml
URL: http://svn.apache.org/viewvc/archiva/sandbox/populate-jcr-repo/pom.xml?rev=1061268&r1=1061267&r2=1061268&view=diff
==============================================================================
--- archiva/sandbox/populate-jcr-repo/pom.xml (original)
+++ archiva/sandbox/populate-jcr-repo/pom.xml Thu Jan 20 12:33:39 2011
@@ -5,10 +5,8 @@
   <groupId>org.apache.archiva</groupId>
   <artifactId>populate-jcr-repo</artifactId>
   <version>1.0-SNAPSHOT</version>
-  <packaging>jar</packaging>
 
   <name>populate-jcr-repo</name>
-  <url>http://maven.apache.org</url>
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -16,12 +14,6 @@
 
   <dependencies>
     <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>3.8.1</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
       <groupId>commons-io</groupId>
       <artifactId>commons-io</artifactId>
       <version>1.4</version>
@@ -39,7 +31,12 @@
     <dependency>
       <groupId>org.apache.jackrabbit</groupId>
       <artifactId>jackrabbit-core</artifactId>
-      <version>2.2.0</version>
+      <version>2.2.1</version>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+      <version>1.5.8</version>
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
@@ -48,6 +45,11 @@
       <scope>runtime</scope>
     </dependency>
     <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-context</artifactId>
+      <version>2.5.6</version>
+    </dependency>
+    <dependency>
       <groupId>org.apache.archiva</groupId>
       <artifactId>npanday-support</artifactId>
       <version>1.4-SNAPSHOT</version>



From commitswaltersashley@example.com Tue Jan 25 06:45:56 2011
Return-Path: <commitswaltersashley@example.com>
Delivered-To: waltersashley@example.com
Received: (qmail 19605 invoked from network); 25 Jan 2011 06:45:55 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155)
  by minotaur.apache.org with SMTP; 25 Jan 2011 06:45:55 -0000
Received: (qmail 84214 invoked by uid 500); 25 Jan 2011 06:45:55 -0000
Delivered-To: waltersashley@example.com
Received: (qmail 84147 invoked by uid 500); 25 Jan 2011 06:45:54 -0000
Mailing-List: contact waltersashley@example.com; run by ezmlm
Precedence: bulk
List-Help: <mailto:waltersashley@example.com>
List-Unsubscribe: <mailto:waltersashley@example.com>
List-Post: <mailto:waltersashley@example.com>
List-Id: <commits.archiva.apache.org>
Reply-To: waltersashley@example.com
Delivered-To: mailing list waltersashley@example.com
Received: (qmail 84139 invoked by uid 99); 25 Jan 2011 06:45:53 -0000
Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 25 Jan 2011 06:45:53 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 25 Jan 2011 06:45:52 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id E1D6B2388A2C; Tue, 25 Jan 2011 06:45:31 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1063154 -
 /archiva/trunk/archiva-modules/plugins/stage-repository-merge/src/main/java/org/apache/archiva/stagerepository/merge/Maven2RepositoryMerger.java
Date: Tue, 25 Jan 2011 06:45:31 -0000
To: waltersashley@example.com
From: waltersashley@example.com
X-Mailer: svnmailer-1.0.8
Message-Id: <waltersashley@example.com>

Author: jzurbano
Date: Tue Jan 25 06:45:31 2011
New Revision: 1063154

URL: http://svn.apache.org/viewvc?rev=1063154&view=rev
Log:
fixed typo

Modified:
    archiva/trunk/archiva-modules/plugins/stage-repository-merge/src/main/java/org/apache/archiva/stagerepository/merge/Maven2RepositoryMerger.java

Modified: archiva/trunk/archiva-modules/plugins/stage-repository-merge/src/main/java/org/apache/archiva/stagerepository/merge/Maven2RepositoryMerger.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/stage-repository-merge/src/main/java/org/apache/archiva/stagerepository/merge/Maven2RepositoryMerger.java?rev=1063154&r1=1063153&r2=1063154&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/plugins/stage-repository-merge/src/main/java/org/apache/archiva/stagerepository/merge/Maven2RepositoryMerger.java (original)
+++ archiva/trunk/archiva-modules/plugins/stage-repository-merge/src/main/java/org/apache/archiva/stagerepository/merge/Maven2RepositoryMerger.java Tue Jan 25 06:45:31 2011
@@ -331,11 +331,11 @@ public class Maven2RepositoryMerger
         List<ArtifactMetadata> sourceArtifacts = metadataRepository.getArtifacts( sourceRepo );
         List<ArtifactMetadata> conflictsArtifacts = new ArrayList<ArtifactMetadata>();
 
-        for ( ArtifactMetadata targerArtifact : targetArtifacts )
+        for ( ArtifactMetadata targetArtifact : targetArtifacts )
         {
             for ( ArtifactMetadata sourceArtifact : sourceArtifacts )
             {
-                if ( isEquals( targerArtifact, sourceArtifact ) )
+                if ( isEquals( targetArtifact, sourceArtifact ) )
                 {
                     if ( !conflictsArtifacts.contains( sourceArtifact ) )
                     {



From commitswaltersashley@example.com Thu Jan 27 11:17:46 2011
Return-Path: <commitswaltersashley@example.com>
Delivered-To: waltersashley@example.com
Received: (qmail 65372 invoked from network); 27 Jan 2011 11:17:46 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155)
  by minotaur.apache.org with SMTP; 27 Jan 2011 11:17:46 -0000
Received: (qmail 59835 invoked by uid 500); 27 Jan 2011 11:17:45 -0000
Delivered-To: waltersashley@example.com
Received: (qmail 58352 invoked by uid 500); 27 Jan 2011 11:17:43 -0000
Mailing-List: contact waltersashley@example.com; run by ezmlm
Precedence: bulk
List-Help: <mailto:waltersashley@example.com>
List-Unsubscribe: <mailto:waltersashley@example.com>
List-Post: <mailto:waltersashley@example.com>
List-Id: <commits.archiva.apache.org>
Reply-To: waltersashley@example.com
Delivered-To: mailing list waltersashley@example.com
Received: (qmail 57814 invoked by uid 99); 27 Jan 2011 11:17:42 -0000
Received: from nike.apache.org (HELO nike.apache.org) (83.161.120.155)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 27 Jan 2011 11:17:42 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 27 Jan 2011 11:17:40 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 1A2C323889FD; Thu, 27 Jan 2011 11:17:19 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1064082 -
 /archiva/trunk/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/main/java/org/apache/archiva/web/xmlrpc/services/AdministrationServiceImpl.java
Date: Thu, 27 Jan 2011 11:17:19 -0000
To: waltersashley@example.com
From: waltersashley@example.com
X-Mailer: svnmailer-1.0.8
Message-Id: <waltersashley@example.com>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: jzurbano
Date: Thu Jan 27 11:17:18 2011
New Revision: 1064082

URL: http://svn.apache.org/viewvc?rev=1064082&view=rev
Log:
[MRM-1451] NPE when merging through XMLRPC
* applied patch

Patch Submitted by: Maria Catherine Tan
* passed metadataRepository instead of null during merge


Modified:
    archiva/trunk/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/main/java/org/apache/archiva/web/xmlrpc/services/AdministrationServiceImpl.java

Modified: archiva/trunk/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/main/java/org/apache/archiva/web/xmlrpc/services/AdministrationServiceImpl.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/main/java/org/apache/archiva/web/xmlrpc/services/AdministrationServiceImpl.java?rev=1064082&r1=1064081&r2=1064082&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/main/java/org/apache/archiva/web/xmlrpc/services/AdministrationServiceImpl.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/main/java/org/apache/archiva/web/xmlrpc/services/AdministrationServiceImpl.java Thu Jan 27 11:17:18 2011
@@ -529,12 +529,12 @@ public class AdministrationServiceImpl
                             sourceArtifacts.removeAll( conflicts );
 
                             log.debug( "Source artifacts size 888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4 " + sourceArtifacts.size() );
-                            mergeWithOutSnapshots( sourceArtifacts, stagingId, repoId, null );
+                            mergeWithOutSnapshots( sourceArtifacts, stagingId, repoId, metadataRepository );
                         }
                         else
                         {
                             log.debug( "Source artifacts size 888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4 " + sourceArtifacts.size() );
-                            mergeWithOutSnapshots( sourceArtifacts, stagingId, repoId, null );
+                            mergeWithOutSnapshots( sourceArtifacts, stagingId, repoId, metadataRepository );
                         }
                     }
                     else



From commitswaltersashley@example.com Fri Jan 28 03:19:34 2011
Return-Path: <commitswaltersashley@example.com>
Delivered-To: waltersashley@example.com
Received: (qmail 36067 invoked from network); 28 Jan 2011 03:19:34 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155)
  by minotaur.apache.org with SMTP; 28 Jan 2011 03:19:34 -0000
Received: (qmail 64735 invoked by uid 500); 28 Jan 2011 03:19:34 -0000
Delivered-To: waltersashley@example.com
Received: (qmail 64679 invoked by uid 500); 28 Jan 2011 03:19:32 -0000
Mailing-List: contact waltersashley@example.com; run by ezmlm
Precedence: bulk
List-Help: <mailto:waltersashley@example.com>
List-Unsubscribe: <mailto:waltersashley@example.com>
List-Post: <mailto:waltersashley@example.com>
List-Id: <commits.archiva.apache.org>
Reply-To: waltersashley@example.com
Delivered-To: mailing list waltersashley@example.com
Received: (qmail 64672 invoked by uid 99); 28 Jan 2011 03:19:31 -0000
Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 28 Jan 2011 03:19:31 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 28 Jan 2011 03:19:30 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 0C23623889CB; Fri, 28 Jan 2011 03:19:10 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1064444 - in
 /archiva/trunk/archiva-modules/archiva-web/archiva-xmlrpc:
 archiva-xmlrpc-api/src/main/java/org/apache/archiva/web/xmlrpc/api/
 archiva-xmlrpc-security/src/main/java/org/apache/archiva/web/xmlrpc/security/
 archiva-xmlrpc-servic...
Date: Fri, 28 Jan 2011 03:19:09 -0000
To: waltersashley@example.com
From: waltersashley@example.com
X-Mailer: svnmailer-1.0.8
Message-Id: <waltersashley@example.com>

Author: oching
Date: Fri Jan 28 03:19:09 2011
New Revision: 1064444

URL: http://svn.apache.org/viewvc?rev=1064444&view=rev
Log:
[MRM-1452] add ability to delete contents of a repository via xml-rpc
submitted by Marica Catherine Tan

Modified:
    archiva/trunk/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-api/src/main/java/org/apache/archiva/web/xmlrpc/api/AdministrationService.java
    archiva/trunk/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-security/src/main/java/org/apache/archiva/web/xmlrpc/security/ServiceMethodsPermissionsMapping.java
    archiva/trunk/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/main/java/org/apache/archiva/web/xmlrpc/services/AdministrationServiceImpl.java
    archiva/trunk/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/test/java/org/apache/archiva/web/xmlrpc/services/AdministrationServiceImplTest.java

Modified: archiva/trunk/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-api/src/main/java/org/apache/archiva/web/xmlrpc/api/AdministrationService.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-api/src/main/java/org/apache/archiva/web/xmlrpc/api/AdministrationService.java?rev=1064444&r1=1064443&r2=1064444&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-api/src/main/java/org/apache/archiva/web/xmlrpc/api/AdministrationService.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-api/src/main/java/org/apache/archiva/web/xmlrpc/api/AdministrationService.java Fri Jan 28 03:19:09 2011
@@ -114,6 +114,16 @@ public interface AdministrationService
         throws Exception;
 
     /**
+     * Deletes a managed repository content with the given repository id
+     * 
+     * @param repoId
+     * @return
+     * @throws Exception
+     */
+    public Boolean deleteManagedRepositoryContent( String repoId )
+        throws Exception;
+
+    /**
      * Get a managed repository with the given repository id.
      * @param repoId
      * @return

Modified: archiva/trunk/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-security/src/main/java/org/apache/archiva/web/xmlrpc/security/ServiceMethodsPermissionsMapping.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-security/src/main/java/org/apache/archiva/web/xmlrpc/security/ServiceMethodsPermissionsMapping.java?rev=1064444&r1=1064443&r2=1064444&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-security/src/main/java/org/apache/archiva/web/xmlrpc/security/ServiceMethodsPermissionsMapping.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-security/src/main/java/org/apache/archiva/web/xmlrpc/security/ServiceMethodsPermissionsMapping.java Fri Jan 28 03:19:09 2011
@@ -43,7 +43,8 @@ public class ServiceMethodsPermissionsMa
                        "AdministrationService.deleteArtifact", 
                        "AdministrationService.addManagedRepository",
                        "AdministrationService.deleteManagedRepository", "AdministrationService.getManagedRepository",
-                       "AdministrationService.merge");
+                       "AdministrationService.merge",
+                       "AdministrationService.deleteManagedRepositoryContent");
 
     public static final List<String> SERVICE_METHODS_FOR_OPERATION_RUN_INDEXER =
         Arrays.asList( "AdministrationService.executeRepositoryScanner" );

Modified: archiva/trunk/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/main/java/org/apache/archiva/web/xmlrpc/services/AdministrationServiceImpl.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/main/java/org/apache/archiva/web/xmlrpc/services/AdministrationServiceImpl.java?rev=1064444&r1=1064443&r2=1064444&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/main/java/org/apache/archiva/web/xmlrpc/services/AdministrationServiceImpl.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/main/java/org/apache/archiva/web/xmlrpc/services/AdministrationServiceImpl.java Fri Jan 28 03:19:09 2011
@@ -468,6 +468,44 @@ public class AdministrationServiceImpl
         return Boolean.TRUE;
     }
 
+    public Boolean deleteManagedRepositoryContent( String repoId )
+        throws Exception
+    {
+        Configuration config = archivaConfiguration.getConfiguration();
+
+        ManagedRepositoryConfiguration repository = config.findManagedRepositoryById( repoId );
+
+        if ( repository == null )
+        {
+            throw new Exception( "Repository Id : " + repoId + " not found." );
+        }
+
+        RepositorySession repositorySession = repositorySessionFactory.createSession();
+        try
+        {
+            MetadataRepository metadataRepository = repositorySession.getRepository();
+            metadataRepository.removeRepository( repository.getId() );
+            repositorySession.save();
+        }
+        finally
+        {
+            repositorySession.close();
+        }
+
+        File repoDir = new File( repository.getLocation() );
+        File[] children = repoDir.listFiles();
+
+        if ( children != null )
+        {
+            for ( File child : children )
+            {
+                FileUtils.deleteDirectory( child );
+            }
+        }
+
+        return Boolean.TRUE;
+    }
+
     public ManagedRepository getManagedRepository( String repoId )
         throws Exception
     {

Modified: archiva/trunk/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/test/java/org/apache/archiva/web/xmlrpc/services/AdministrationServiceImplTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/test/java/org/apache/archiva/web/xmlrpc/services/AdministrationServiceImplTest.java?rev=1064444&r1=1064443&r2=1064444&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/test/java/org/apache/archiva/web/xmlrpc/services/AdministrationServiceImplTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/test/java/org/apache/archiva/web/xmlrpc/services/AdministrationServiceImplTest.java Fri Jan 28 03:19:09 2011
@@ -665,6 +665,52 @@ public class AdministrationServiceImplTe
         assertRemoteRepo( repos.get( 1 ), remoteRepos.get( 1 ) );
     }
 
+    public void testDeleteInvalidRepositoryContent()
+    {
+        archivaConfigControl.expectAndReturn( archivaConfig.getConfiguration(), config );
+        configControl.expectAndReturn( config.findManagedRepositoryById( "invalid" ), null );
+
+        archivaConfigControl.replay();
+        configControl.replay();
+
+        try
+        {
+            service.deleteManagedRepositoryContent( "invalid" );
+        }
+        catch ( Exception e )
+        {
+            assertEquals( "Repository Id : invalid not found.", e.getMessage() );
+        }
+
+        archivaConfigControl.verify();
+        configControl.verify();
+    }
+
+    public void testDeleteRepositoryContent()
+        throws Exception
+    {
+        ManagedRepositoryConfiguration managedRepo = createManagedRepo( "default", "default-repo" );
+        assertTrue( new File( managedRepo.getLocation(), "org" ).exists() );
+
+        archivaConfigControl.expectAndReturn( archivaConfig.getConfiguration(), config );
+        configControl.expectAndReturn( config.findManagedRepositoryById( "internal" ), managedRepo );
+        metadataRepository.removeRepository( "internal" );
+        
+        archivaConfigControl.replay();
+        configControl.replay();
+        metadataRepositoryControl.replay();
+
+        boolean success = service.deleteManagedRepositoryContent( "internal" );
+        assertTrue( success );
+
+        archivaConfigControl.verify();
+        configControl.verify();
+        metadataRepositoryControl.verify();
+
+        assertFalse( new File( managedRepo.getLocation(), "org" ).exists() );
+        assertTrue( new File( managedRepo.getLocation() ).exists() );
+    }
+
     /* Merge method */
 
     public void testMergeRepositoryWithInvalidRepository()



From commitswaltersashley@example.com Fri Jan 28 15:41:31 2011
Return-Path: <commitswaltersashley@example.com>
Delivered-To: waltersashley@example.com
Received: (qmail 73313 invoked from network); 28 Jan 2011 15:41:31 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155)
  by minotaur.apache.org with SMTP; 28 Jan 2011 15:41:31 -0000
Received: (qmail 14298 invoked by uid 500); 28 Jan 2011 15:41:31 -0000
Delivered-To: waltersashley@example.com
Received: (qmail 14244 invoked by uid 500); 28 Jan 2011 15:41:29 -0000
Mailing-List: contact waltersashley@example.com; run by ezmlm
Precedence: bulk
List-Help: <mailto:waltersashley@example.com>
List-Unsubscribe: <mailto:waltersashley@example.com>
List-Post: <mailto:waltersashley@example.com>
List-Id: <commits.archiva.apache.org>
Reply-To: waltersashley@example.com
Delivered-To: mailing list waltersashley@example.com
Received: (qmail 14237 invoked by uid 99); 28 Jan 2011 15:41:29 -0000
Received: from nike.apache.org (HELO nike.apache.org) (83.161.120.155)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 28 Jan 2011 15:41:29 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 28 Jan 2011 15:41:27 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id E2FC72388A36; Fri, 28 Jan 2011 15:41:06 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1064737 -
 /archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/ShowArtifactAction.java
Date: Fri, 28 Jan 2011 15:41:06 -0000
To: waltersashley@example.com
From: waltersashley@example.com
X-Mailer: svnmailer-1.0.8
Message-Id: <waltersashley@example.com>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: oching
Date: Fri Jan 28 15:41:06 2011
New Revision: 1064737

URL: http://svn.apache.org/viewvc?rev=1064737&view=rev
Log:
[MRM-1453] fixed decimal format to US locale so test wouldn't fail on other locales
submitted by Mark Struberg

Modified:
    archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/ShowArtifactAction.java

Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/ShowArtifactAction.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/ShowArtifactAction.java?rev=1064737&r1=1064736&r2=1064737&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/ShowArtifactAction.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/ShowArtifactAction.java Fri Jan 28 15:41:06 2011
@@ -40,6 +40,7 @@ import org.apache.maven.archiva.reposito
 import org.apache.maven.artifact.versioning.DefaultArtifactVersion;
 
 import java.text.DecimalFormat;
+import java.text.DecimalFormatSymbols;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
@@ -47,6 +48,7 @@ import java.util.Comparator;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 
 /**
@@ -675,7 +677,8 @@ public class ShowArtifactAction
                 }
             }
 
-            size = new DecimalFormat( "#,###.##" ).format( s ) + " " + symbol;
+            DecimalFormat df = new DecimalFormat( "#,###.##", DecimalFormatSymbols.getInstance( Locale.US) );
+            size = df.format( s ) + " " + symbol;
             id = artifact.getId();
             version = artifact.getVersion();
         }



From commitswaltersashley@example.com Sat Jan 29 04:26:55 2011
Return-Path: <commitswaltersashley@example.com>
Delivered-To: waltersashley@example.com
Received: (qmail 42237 invoked from network); 29 Jan 2011 04:26:55 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155)
  by minotaur.apache.org with SMTP; 29 Jan 2011 04:26:55 -0000
Received: (qmail 2904 invoked by uid 500); 29 Jan 2011 04:26:55 -0000
Delivered-To: waltersashley@example.com
Received: (qmail 2832 invoked by uid 500); 29 Jan 2011 04:26:53 -0000
Mailing-List: contact waltersashley@example.com; run by ezmlm
Precedence: bulk
List-Help: <mailto:waltersashley@example.com>
List-Unsubscribe: <mailto:waltersashley@example.com>
List-Post: <mailto:waltersashley@example.com>
List-Id: <commits.archiva.apache.org>
Reply-To: waltersashley@example.com
Delivered-To: mailing list waltersashley@example.com
Received: (qmail 2815 invoked by uid 99); 29 Jan 2011 04:26:51 -0000
Received: from nike.apache.org (HELO nike.apache.org) (83.161.120.155)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 29 Jan 2011 04:26:51 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 29 Jan 2011 04:26:50 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id C253223889EA; Sat, 29 Jan 2011 04:26:28 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1064952 - /archiva/parent/pom.xml
Date: Sat, 29 Jan 2011 04:26:28 -0000
To: waltersashley@example.com
From: waltersashley@example.com
X-Mailer: svnmailer-1.0.8
Message-Id: <waltersashley@example.com>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: oching
Date: Sat Jan 29 04:26:27 2011
New Revision: 1064952

URL: http://svn.apache.org/viewvc?rev=1064952&view=rev
Log:
added Mark Struberg as contributor (MRM-1453)

Modified:
    archiva/parent/pom.xml

Modified: archiva/parent/pom.xml
URL: http://svn.apache.org/viewvc/archiva/parent/pom.xml?rev=1064952&r1=1064951&r2=1064952&view=diff
==============================================================================
--- archiva/parent/pom.xml (original)
+++ archiva/parent/pom.xml Sat Jan 29 04:26:27 2011
@@ -536,6 +536,9 @@
     <contributor>
       <name>Igor Galic</name>
     </contributor> 
+    <contributor>
+      <name>Mark Struberg</name>
+    </contributor>
   </contributors>
 
 </project>




{'source': 'Apache Software Foundation Public Mail Archives'}