You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by oc...@apache.org on 2009/04/01 13:00:41 UTC
svn commit: r760853 - in
/archiva/branches/archiva-1.1.x/archiva-modules/archiva-base:
archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/metadata/
archiva-xml-tools/src/test/examples/
archiva-xml-tools/src/test/java/org/apache/...
Author: oching
Date: Wed Apr 1 11:00:37 2009
New Revision: 760853
URL: http://svn.apache.org/viewvc?rev=760853&view=rev
Log:
[MRM-1152]
o merge -r756559 from trunk (fix for MRM-1136)
Added:
archiva/branches/archiva-1.1.x/archiva-modules/archiva-base/archiva-xml-tools/src/test/examples/maven-metadata-codehaus-snapshots.xml
- copied unchanged from r756559, archiva/trunk/archiva-modules/archiva-base/archiva-xml-tools/src/test/examples/maven-metadata-codehaus-snapshots.xml
Modified:
archiva/branches/archiva-1.1.x/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/metadata/RepositoryMetadataReader.java
archiva/branches/archiva-1.1.x/archiva-modules/archiva-base/archiva-xml-tools/src/test/java/org/apache/maven/archiva/xml/XMLReaderTest.java
Modified: archiva/branches/archiva-1.1.x/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/metadata/RepositoryMetadataReader.java
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-1.1.x/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/metadata/RepositoryMetadataReader.java?rev=760853&r1=760852&r2=760853&view=diff
==============================================================================
--- archiva/branches/archiva-1.1.x/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/metadata/RepositoryMetadataReader.java (original)
+++ archiva/branches/archiva-1.1.x/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/metadata/RepositoryMetadataReader.java Wed Apr 1 11:00:37 2009
@@ -51,7 +51,9 @@
try
{
XMLReader xml = new XMLReader( "metadata", metadataFile );
-
+ // invoke this to remove namespaces, see MRM-1136
+ xml.removeNamespaces();
+
ArchivaRepositoryMetadata metadata = new ArchivaRepositoryMetadata();
metadata.setGroupId( xml.getElementText( "//metadata/groupId" ) );
Modified: archiva/branches/archiva-1.1.x/archiva-modules/archiva-base/archiva-xml-tools/src/test/java/org/apache/maven/archiva/xml/XMLReaderTest.java
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-1.1.x/archiva-modules/archiva-base/archiva-xml-tools/src/test/java/org/apache/maven/archiva/xml/XMLReaderTest.java?rev=760853&r1=760852&r2=760853&view=diff
==============================================================================
--- archiva/branches/archiva-1.1.x/archiva-modules/archiva-base/archiva-xml-tools/src/test/java/org/apache/maven/archiva/xml/XMLReaderTest.java (original)
+++ archiva/branches/archiva-1.1.x/archiva-modules/archiva-base/archiva-xml-tools/src/test/java/org/apache/maven/archiva/xml/XMLReaderTest.java Wed Apr 1 11:00:37 2009
@@ -92,5 +92,18 @@
List names = reader.getElementList( "//basic/names/name" );
assertElementTexts( names, new String[] { TRYGVIS, INFINITE_ARCHIVA } );
}
+
+ // MRM-1136 or MRM-1152
+ public void testProxiedMetadataRead()
+ throws XMLException
+ {
+ File xmlFile = getExampleXml( "maven-metadata-codehaus-snapshots.xml" );
+ XMLReader reader = new XMLReader( "metadata", xmlFile );
+ reader.removeNamespaces();
+
+ Element groupId = reader.getElement( "//metadata/groupId" );
+ assertNotNull( groupId );
+ assertEquals( "org.codehaus.mojo", groupId.getTextTrim() );
+ }
}