archiva-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Brett Porter <br...@apache.org>
Subject Re: svn commit: r583412 [1/8] - in /maven/archiva/trunk: archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/ archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/functors/ archiva-base...
Date Fri, 19 Oct 2007 01:36:20 GMT

On 19/10/2007, at 11:10 AM, Joakim Erdfelt wrote:

>
> I can't duplicate this.
> I suspect that this was corrected with the swingover to  
> RepositoryContent code too.
> Can you get me a complete stack trace?

I'll take a look.

>
>>
>>>>>
>>>>>  <configuration>
>>>>>    <version>1</version>
>>>>> -  <repositories>
>>>>> -    <repository>
>>>>> +  <managedRepositories>
>>>>> +    <managedRepository>
>>>>>        <id>internal</id>
>>>>>        <name>Archiva Managed Internal Repository</name>
>>>>> -      <url>file://${appserver.base}/repositories/internal</url>
>>>>> +      <location>${appserver.base}/repositories/internal</ 
>>>>> location>
>>>>
>>>> These changes are incorrect, if it is version '1', it is the old  
>>>> format, you can't update the content (I'm surprised it works).
>>>
>>> As far as I know, version 1 equals <managedRepositories> +  
>>> <remoteRepositories> etc...
>>> This was required to allow the unit tests to operate.
>>> Versions before 1 are in the realm of Archiva 0.9
>>> And I don't see support for a version 2 in the code.
>>
>> No, this isn't correct:
>>
>> version null is 0.9.
>> version 1 was what you introduced, ie <repositories>
>> version 2 is what I changed it to <managedRepositories> +  
>> <remoteRepositories>
>>
>> There is no explicit handling of the version - the existence of  
>> <repositories> triggers the handling in the current case. Now that  
>> version is consistently set it should be easier to keep track of.
>>
>> So, this change is likely to be problematic. We're going to need  
>> to roll back these changes and investigate why the tests actually  
>> broke.
>>
>> I will do this.
>
> This is likely related to MRM-546 (Duplicate repositories show up  
> while editing).

Yes, which I wasn't working on because I wasn't confident the code  
did what it used to based on the above. I'll fix it as part of that.

>
>>
>>>
>>>>
>>>>
>>>> On 10/10/2007, at 11:47 AM, joakime@apache.org wrote:
>>>>> -        assertFalse( el.getValue().equals( "20070315032817" ) );
>>>>> +        // FIXME: assertFalse( el.getValue().equals 
>>>>> ( "20070315032817" ) );
>>>>
>>>> what happened here? (2 more instances in the file)
>>>
>>> That was a holdover on MRM-535, it was known to be bad.
>>> I should have labelled that as // FIXME [MRM-535] instead.
>>
>> but MRM-535 is fixed, why are they still commented out?
>
> Not commented out in my code.
> At least, I'm not seeing what you are seeing.
> What File / line number are you referring to?

archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/ 
org/apache/maven/archiva/consumers/core/repository/ 
CleanupReleasedSnapshotsRepositoryPurgeTest.java:91:        // FIXME  
[MRM-535]: XMLAssert.assertXpathEvaluatesTo( "20070315032817", "// 
metadata/versioning/lastUpdated", metadataXml );
archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/ 
org/apache/maven/archiva/consumers/core/repository/ 
CleanupReleasedSnapshotsRepositoryPurgeTest.java:134:        // FIXME  
[MRM-535]: XMLAssert.assertXpathEvaluatesTo( "20070427033345", "// 
metadata/versioning/lastUpdated", metadataXml );
archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/ 
org/apache/maven/archiva/consumers/core/repository/ 
RepositoryPurgeConsumerTest.java:226:        // FIXME [MRM-535]:  
XMLAssert.assertXpathEvaluatesTo( "20070315032817", "//metadata/ 
versioning/lastUpdated", metadataXml );


>
>>
>>>
>>>>
>>>> On 10/10/2007, at 11:47 AM, joakime@apache.org wrote:
>>>>> +    /* FIXME
>>>>>      public void  
>>>>> testLegacyRequestPluginConvertedToDefaultPathInManagedRepo()
>>>>>          throws Exception
>>>>>      {
>>>>> @@ -400,7 +401,7 @@
>>>>>          setupTestableManagedRepository( path );
>>>>>
>>>>>          File expectedFile = new File( managedDefaultDir, path );
>>>>> -        ArtifactReference artifact = createArtifactReference 
>>>>> ( "legacy", legacyPath );
>>>>> +        ArtifactReference artifact =  
>>>>> managedDefaultRepository.toArtifactReference( path );
>>>>>
>>>>>          expectedFile.delete();
>>>>>          assertFalse( expectedFile.exists() );
>>>>> @@ -415,6 +416,7 @@
>>>>>          assertFileEquals( expectedFile, downloadedFile,  
>>>>> proxiedFile );
>>>>>          assertNoTempFiles( expectedFile );
>>>>>      }
>>>>> +    */
>>>>
>>>> what happened here? (2 instances)
>>>
>>> This whole test case was invalidated with the RepositoryContent  
>>> changes and has been removed.
>>
>> But I still see it in source control, commented out?
>
> Again, I'm not seeing this anymore.
> What File / Line number are you referring to?

archiva-base/archiva-proxy/src/test/java/org/apache/maven/archiva/ 
proxy/ManagedDefaultTransferTest.java:392:    /* FIXME
archiva-base/archiva-proxy/src/test/java/org/apache/maven/archiva/ 
proxy/ManagedLegacyTransferTest.java:129:    /* FIXME

- Brett

--
Brett Porter - brett@apache.org
Blog: http://www.devzuz.org/blogs/bporter/

Mime
View raw message