Return-Path: 
 <archiva-commits-return-2112-apmail-maven-archiva-commits-archive=maven.apache.org@maven.apache.org>
Delivered-To: apmail-maven-archiva-commits-archive@locus.apache.org
Received: (qmail 85545 invoked from network); 18 Apr 2008 04:39:37 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 18 Apr 2008 04:39:37 -0000
Received: (qmail 70256 invoked by uid 500); 18 Apr 2008 04:39:38 -0000
Delivered-To: apmail-maven-archiva-commits-archive@maven.apache.org
Received: (qmail 70199 invoked by uid 500); 18 Apr 2008 04:39:38 -0000
Mailing-List: contact archiva-commits-help@maven.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:archiva-commits-help@maven.apache.org>
List-Unsubscribe: <mailto:archiva-commits-unsubscribe@maven.apache.org>
List-Post: <mailto:archiva-commits@maven.apache.org>
List-Id: <archiva-commits.maven.apache.org>
Reply-To: archiva-dev@maven.apache.org
Delivered-To: mailing list archiva-commits@maven.apache.org
Received: (qmail 70187 invoked by uid 99); 18 Apr 2008 04:39:38 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 17 Apr 2008 21:39:38 -0700
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 18 Apr 2008 04:39:03 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 29EDD1A9832; Thu, 17 Apr 2008 21:39:16 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r649364 - in
 /archiva/trunk/archiva-modules/archiva-base/archiva-configuration: ./
 src/main/java/org/apache/maven/archiva/configuration/ src/main/mdo/
 src/test/conf/ src/test/java/org/apache/maven/archiva/configuration/
Date: Fri, 18 Apr 2008 04:39:12 -0000
To: archiva-commits@maven.apache.org
From: oching@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20080418043916.29EDD1A9832@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: oching
Date: Thu Apr 17 21:38:48 2008
New Revision: 649364

URL: http://svn.apache.org/viewvc?rev=649364&view=rev
Log:
[MRM-694]
changes by Nap Ramirez, Maria Catherine Tan, Henry Isidro, Brett Porter and myself

-add repositoryGroups in configuration 
-updated ArchivaConfiguration and added test for this change

Modified:
    archiva/trunk/archiva-modules/archiva-base/archiva-configuration/pom.xml
    archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/DefaultArchivaConfiguration.java
    archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/main/mdo/configuration.mdo
    archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/test/conf/conf-single-list-elements.xml
    archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/test/java/org/apache/maven/archiva/configuration/ArchivaConfigurationTest.java

Modified: archiva/trunk/archiva-modules/archiva-base/archiva-configuration/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-configuration/pom.xml?rev=649364&r1=649363&r2=649364&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-configuration/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-configuration/pom.xml Thu Apr 17 21:38:48 2008
@@ -87,7 +87,7 @@
           </execution>
         </executions>
         <configuration>
-          <version>1.1.0</version>
+          <version>1.2.0</version>
           <model>src/main/mdo/configuration.mdo</model>
         </configuration>
       </plugin>

Modified: archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/DefaultArchivaConfiguration.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/DefaultArchivaConfiguration.java?rev=649364&r1=649363&r2=649364&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/DefaultArchivaConfiguration.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/DefaultArchivaConfiguration.java Thu Apr 17 21:38:48 2008
@@ -416,7 +416,7 @@
                 if ( key.startsWith( "repositories" ) || key.startsWith( "proxyConnectors" )
                     || key.startsWith( "networkProxies" ) || key.startsWith( "repositoryScanning" )
                     || key.startsWith( "databaseScanning" ) || key.startsWith( "remoteRepositories" )
-                    || key.startsWith( "managedRepositories" ) )
+                    || key.startsWith( "managedRepositories" ) || key.startsWith( "repositoryGroups" ) )
                 {
                     foundList = true;
                 }
@@ -454,6 +454,10 @@
         if ( configuration.getLegacyArtifactPaths().isEmpty() )
         {
             section.removeSubset( "legacyArtifactPaths" );
+        }
+        if ( configuration.getRepositoryGroups().isEmpty() )        	
+        {
+            section.removeSubset( "repositoryGroups" );
         }
         if ( configuration.getRepositoryScanning() != null )
         {

Modified: archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/main/mdo/configuration.mdo
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/main/mdo/configuration.mdo?rev=649364&r1=649363&r2=649364&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/main/mdo/configuration.mdo (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/main/mdo/configuration.mdo Thu Apr 17 21:38:48 2008
@@ -57,6 +57,15 @@
           </association>
         </field>
         <field>
+          <name>repositoryGroups</name>
+          <version>1.2.0+</version>
+          <association>
+            <type>RepositoryGroupConfiguration</type>
+            <multiplicity>*</multiplicity>
+          </association>
+          <description>The list of repository groups.</description>
+        </field>
+        <field>
           <name>managedRepositories</name>
           <version>1.0.0+</version>
           <association>
@@ -510,6 +519,28 @@
        ]]></code>
         </codeSegment>
       </codeSegments>
+    </class>
+    <class>
+      <name>RepositoryGroupConfiguration</name>
+      <version>1.2.0+</version>
+      <fields>
+        <field>
+          <name>id</name>
+          <version>1.2.0+</version>
+          <type>String</type>
+          <required>true</required>
+          <description>The id of the repository group.</description>
+        </field>
+        <field>
+          <name>repositories</name>
+          <version>1.2.0+</version>
+          <association>
+            <type>String</type>
+            <multiplicity>*</multiplicity>
+          </association>
+          <description>The list of repository ids under the group.</description>          
+        </field>
+      </fields>
     </class>
 
     <!--

Modified: archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/test/conf/conf-single-list-elements.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/test/conf/conf-single-list-elements.xml?rev=649364&r1=649363&r2=649364&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/test/conf/conf-single-list-elements.xml (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/test/conf/conf-single-list-elements.xml Thu Apr 17 21:38:48 2008
@@ -20,6 +20,14 @@
 
 <configuration>
   <version>2</version>
+  <repositoryGroups>
+    <repositoryGroup>
+      <id>default</id>
+      <repositories>
+        <repository>snapshots</repository>
+      </repositories>
+    </repositoryGroup>
+  </repositoryGroups>
   <managedRepositories>
     <managedRepository>
       <id>snapshots</id>

Modified: archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/test/java/org/apache/maven/archiva/configuration/ArchivaConfigurationTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/test/java/org/apache/maven/archiva/configuration/ArchivaConfigurationTest.java?rev=649364&r1=649363&r2=649364&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/test/java/org/apache/maven/archiva/configuration/ArchivaConfigurationTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/test/java/org/apache/maven/archiva/configuration/ArchivaConfigurationTest.java Thu Apr 17 21:38:48 2008
@@ -686,7 +686,12 @@
             (ArchivaConfiguration) lookup( ArchivaConfiguration.class.getName(), "test-remove-central" );
 
         Configuration configuration = archivaConfiguration.getConfiguration();
-
+       
+        RepositoryGroupConfiguration repositoryGroup = ( RepositoryGroupConfiguration ) configuration.getRepositoryGroups().get( 0 );
+        assertNotNull( repositoryGroup );
+        configuration.removeRepositoryGroup( repositoryGroup );
+        assertTrue( configuration.getRepositoryGroups().isEmpty() );
+        
         RemoteRepositoryConfiguration repository = configuration.getRemoteRepositoriesAsMap().get( "central" );
         assertNotNull( repository );
         configuration.removeRemoteRepository( repository );
@@ -740,6 +745,7 @@
             (ArchivaConfiguration) lookup( ArchivaConfiguration.class.getName(), "test-read-saved" );
         configuration = archivaConfiguration.getConfiguration();
         assertNull( configuration.getRemoteRepositoriesAsMap().get( "central" ) );
+        assertTrue( configuration.getRepositoryGroups().isEmpty() );
         assertNull( configuration.getManagedRepositoriesAsMap().get( "snapshots" ) );
         assertTrue( configuration.getProxyConnectors().isEmpty() );
         assertNull( configuration.getNetworkProxiesAsMap().get( "proxy" ) );