You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by jo...@apache.org on 2007/10/11 20:26:01 UTC
svn commit: r583903 - in
/maven/archiva/trunk/archiva-base/archiva-configuration: ./ src/main/mdo/
src/test/java/org/apache/maven/archiva/configuration/
src/test/resources/org/apache/maven/archiva/configuration/
Author: joakime
Date: Thu Oct 11 11:26:00 2007
New Revision: 583903
URL: http://svn.apache.org/viewvc?rev=583903&view=rev
Log:
Attempting to remove <repositories> section is failing.
Saving partial unit test for brett to look at.
Modified:
maven/archiva/trunk/archiva-base/archiva-configuration/pom.xml
maven/archiva/trunk/archiva-base/archiva-configuration/src/main/mdo/configuration.mdo
maven/archiva/trunk/archiva-base/archiva-configuration/src/test/java/org/apache/maven/archiva/configuration/ArchivaConfigurationTest.java
maven/archiva/trunk/archiva-base/archiva-configuration/src/test/resources/org/apache/maven/archiva/configuration/ArchivaConfigurationTest.xml
Modified: maven/archiva/trunk/archiva-base/archiva-configuration/pom.xml
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-configuration/pom.xml?rev=583903&r1=583902&r2=583903&view=diff
==============================================================================
--- maven/archiva/trunk/archiva-base/archiva-configuration/pom.xml (original)
+++ maven/archiva/trunk/archiva-base/archiva-configuration/pom.xml Thu Oct 11 11:26:00 2007
@@ -72,6 +72,11 @@
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-container-default</artifactId>
</dependency>
+ <dependency>
+ <groupId>xmlunit</groupId>
+ <artifactId>xmlunit</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
<plugins>
Modified: maven/archiva/trunk/archiva-base/archiva-configuration/src/main/mdo/configuration.mdo
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-configuration/src/main/mdo/configuration.mdo?rev=583903&r1=583902&r2=583903&view=diff
==============================================================================
--- maven/archiva/trunk/archiva-base/archiva-configuration/src/main/mdo/configuration.mdo (original)
+++ maven/archiva/trunk/archiva-base/archiva-configuration/src/main/mdo/configuration.mdo Thu Oct 11 11:26:00 2007
@@ -1,3 +1,4 @@
+<?xml version="1.0" ?>
<!--
~ Licensed to the Apache Software Foundation (ASF) under one
~ or more contributor license agreements. See the NOTICE file
@@ -41,10 +42,16 @@
<required>true</required>
<description>This is the version of the configuration format.</description>
</field>
- <field>
+ <field java.adder="false">
+ <description>
+ @deprecated use managedRepositories or remoteRepositories instead.
+ </description>
<name>repositories</name>
<version>1.0.0</version>
- <association>
+ <association java.generate-add="false"
+ java.generate-remove="false"
+ java.generate-break="false"
+ java.generate-create="false">
<type>V1RepositoryConfiguration</type>
<multiplicity>*</multiplicity>
</association>
Modified: maven/archiva/trunk/archiva-base/archiva-configuration/src/test/java/org/apache/maven/archiva/configuration/ArchivaConfigurationTest.java
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-configuration/src/test/java/org/apache/maven/archiva/configuration/ArchivaConfigurationTest.java?rev=583903&r1=583902&r2=583903&view=diff
==============================================================================
--- maven/archiva/trunk/archiva-base/archiva-configuration/src/test/java/org/apache/maven/archiva/configuration/ArchivaConfigurationTest.java (original)
+++ maven/archiva/trunk/archiva-base/archiva-configuration/src/test/java/org/apache/maven/archiva/configuration/ArchivaConfigurationTest.java Thu Oct 11 11:26:00 2007
@@ -19,9 +19,11 @@
* under the License.
*/
+import org.apache.commons.io.IOUtils;
import org.codehaus.plexus.PlexusTestCase;
import org.codehaus.plexus.registry.Registry;
import org.codehaus.plexus.util.FileUtils;
+import org.custommonkey.xmlunit.XMLAssert;
import org.easymock.MockControl;
import java.io.File;
@@ -480,6 +482,15 @@
public void testAutoDetectV1()
throws Exception
{
+ // Setup the autodetect-v1.xml file in the target directory (so we can save/load it)
+ File userFile = getTestFile( "target/test-autodetect-v1/archiva-user.xml" );
+ userFile.delete();
+ assertFalse( userFile.exists() );
+
+ userFile.getParentFile().mkdirs();
+ FileUtils.copyFile( getTestFile( "src/test/conf/autodetect-v1.xml" ), userFile );
+
+ // Load the original (unconverted) archiva.xml
ArchivaConfiguration archivaConfiguration =
(ArchivaConfiguration) lookup( ArchivaConfiguration.class.getName(), "test-autodetect-v1" );
@@ -496,6 +507,34 @@
assertEquals( "check managed repositories", "internal", repository.getId() );
assertEquals( "check managed repositories", "default", repository.getLayout() );
assertTrue( "check managed repositories", repository.isScanned() );
+
+ // Test that only 1 set of repositories exist.
+ assertEquals( "check managed repositories size.", 2, configuration.getManagedRepositories().size() );
+ assertEquals( "check remote repositories size.", 2, configuration.getRemoteRepositories().size() );
+ assertEquals( "check v1 repositories size.", 0, configuration.getRepositories().size() );
+
+ // Save the file.
+ archivaConfiguration.save( configuration );
+
+ // Release existing
+ release( archivaConfiguration );
+
+ // Reload.
+ archivaConfiguration =
+ (ArchivaConfiguration) lookup( ArchivaConfiguration.class.getName(), "test-autodetect-v1" );
+
+ // Test that only 1 set of repositories exist.
+ assertEquals( "check managed repositories size.", 2, configuration.getManagedRepositories().size() );
+ assertEquals( "check managed repositories size.", 2, configuration.getManagedRepositoriesAsMap().size() );
+ assertEquals( "check remote repositories size.", 2, configuration.getRemoteRepositories().size() );
+ assertEquals( "check remote repositories size.", 2, configuration.getRemoteRepositoriesAsMap().size() );
+ assertEquals( "check v1 repositories size.", 0, configuration.getRepositories().size() );
+
+ /* FIXME: can't get rid of old v1 <repositories> section programatically.
+ String actualXML = FileUtils.fileRead( userFile );
+ XMLAssert.assertXpathNotExists( "//configuration/repositories/repository", actualXML );
+ XMLAssert.assertXpathNotExists( "//configuration/repositories", actualXML );
+ */
}
public void testArchivaV1()
Modified: maven/archiva/trunk/archiva-base/archiva-configuration/src/test/resources/org/apache/maven/archiva/configuration/ArchivaConfigurationTest.xml
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-configuration/src/test/resources/org/apache/maven/archiva/configuration/ArchivaConfigurationTest.xml?rev=583903&r1=583902&r2=583903&view=diff
==============================================================================
--- maven/archiva/trunk/archiva-base/archiva-configuration/src/test/resources/org/apache/maven/archiva/configuration/ArchivaConfigurationTest.xml (original)
+++ maven/archiva/trunk/archiva-base/archiva-configuration/src/test/resources/org/apache/maven/archiva/configuration/ArchivaConfigurationTest.xml Thu Oct 11 11:26:00 2007
@@ -104,8 +104,9 @@
<configuration>
<properties>
<system/>
- <xml fileName="${basedir}/src/test/conf/autodetect-v1.xml"
- config-name="org.apache.maven.archiva" config-at="org.apache.maven.archiva"/>
+ <xml fileName="${basedir}/target/test-autodetect-v1/archiva-user.xml" config-optional="true"
+ config-name="org.apache.maven.archiva.user"
+ config-at="org.apache.maven.archiva"/>
</properties>
</configuration>
</component>