Author: brett
Date: Sat Aug 26 04:25:57 2006
New Revision: 437144
URL: http://svn.apache.org/viewvc?rev=437144&view=rev
Log:
[MRM-145] index skins
Added:
maven/archiva/trunk/archiva-indexer/src/test/managed-repository/org/apache/maven/archiva/record/test-skin/
maven/archiva/trunk/archiva-indexer/src/test/managed-repository/org/apache/maven/archiva/record/test-skin/1.0/
maven/archiva/trunk/archiva-indexer/src/test/managed-repository/org/apache/maven/archiva/record/test-skin/1.0/test-skin-1.0.jar
(with props)
maven/archiva/trunk/archiva-indexer/src/test/managed-repository/org/apache/maven/archiva/record/test-skin/1.0/test-skin-1.0.pom
(with props)
Modified:
maven/archiva/trunk/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/record/StandardArtifactIndexRecordFactory.java
maven/archiva/trunk/archiva-indexer/src/test/java/org/apache/maven/archiva/indexer/record/MinimalArtifactIndexRecordFactoryTest.java
maven/archiva/trunk/archiva-indexer/src/test/java/org/apache/maven/archiva/indexer/record/StandardArtifactIndexRecordFactoryTest.java
Modified:
maven/archiva/trunk/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/record/StandardArtifactIndexRecordFactory.java
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/record/StandardArtifactIndexRecordFactory.java?rev=437144&r1=437143&r2=437144&view=diff
==============================================================================
---
maven/archiva/trunk/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/record/StandardArtifactIndexRecordFactory.java
(original)
+++
maven/archiva/trunk/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/record/StandardArtifactIndexRecordFactory.java
Sat Aug 26 04:25:57 2006
@@ -81,6 +81,10 @@
*/
protected Digester md5Digester;
+ private static final String SITE_TEMPLATE_NAME = "META-INF/maven/site.vm";
+
+ private static final String SITE_CSS_NAME = "css/maven-theme.css";
+
private static final String PLUGIN_METADATA_NAME =
"META-INF/maven/plugin.xml";
private static final String ARCHETYPE_METADATA_NAME =
"META-INF/maven/archetype.xml";
@@ -236,6 +240,10 @@
{
populateArchetypeEntries( record );
}
+ else if ( SITE_TEMPLATE_NAME.equals( name ) ||
SITE_CSS_NAME.equals( name ) )
+ {
+ populateSkinEntries( record );
+ }
}
}
@@ -253,6 +261,12 @@
{
// Typically discovered as a JAR
record.setType( "maven-archetype" );
+ }
+
+ private void populateSkinEntries( StandardArtifactIndexRecord record )
+ {
+ // Typically discovered as a JAR
+ record.setType( "maven-skin" );
}
private Xpp3Dom readXmlMetadataFileInJar( File file, String name )
Modified:
maven/archiva/trunk/archiva-indexer/src/test/java/org/apache/maven/archiva/indexer/record/MinimalArtifactIndexRecordFactoryTest.java
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-indexer/src/test/java/org/apache/maven/archiva/indexer/record/MinimalArtifactIndexRecordFactoryTest.java?rev=437144&r1=437143&r2=437144&view=diff
==============================================================================
---
maven/archiva/trunk/archiva-indexer/src/test/java/org/apache/maven/archiva/indexer/record/MinimalArtifactIndexRecordFactoryTest.java
(original)
+++
maven/archiva/trunk/archiva-indexer/src/test/java/org/apache/maven/archiva/indexer/record/MinimalArtifactIndexRecordFactoryTest.java
Sat Aug 26 04:25:57 2006
@@ -168,6 +168,12 @@
record = factory.createRecord( artifact );
assertNull( "Check no record", record );
+
+ artifact = createArtifact( "test-skin", "1.0", "pom" );
+
+ record = factory.createRecord( artifact );
+
+ assertNull( "Check no record", record );
}
public void testIndexedPlugin()
Modified:
maven/archiva/trunk/archiva-indexer/src/test/java/org/apache/maven/archiva/indexer/record/StandardArtifactIndexRecordFactoryTest.java
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-indexer/src/test/java/org/apache/maven/archiva/indexer/record/StandardArtifactIndexRecordFactoryTest.java?rev=437144&r1=437143&r2=437144&view=diff
==============================================================================
---
maven/archiva/trunk/archiva-indexer/src/test/java/org/apache/maven/archiva/indexer/record/StandardArtifactIndexRecordFactoryTest.java
(original)
+++
maven/archiva/trunk/archiva-indexer/src/test/java/org/apache/maven/archiva/indexer/record/StandardArtifactIndexRecordFactoryTest.java
Sat Aug 26 04:25:57 2006
@@ -254,6 +254,12 @@
record = factory.createRecord( artifact );
assertNull( "Check no record", record );
+
+ artifact = createArtifact( "test-skin", "1.0", "pom" );
+
+ record = factory.createRecord( artifact );
+
+ assertNull( "Check no record", record );
}
public void testIndexedPlugin()
@@ -312,6 +318,34 @@
"archetype-resources/src/main/java/App.java",
"archetype-resources/src/test/java/AppTest.java"} ) );
expectedRecord.setPackaging( "jar" );
expectedRecord.setProjectName( "Archetype - test-archetype" );
+
+ assertEquals( "check record", expectedRecord, record );
+ }
+
+ public void testIndexedSkin()
+ throws RepositoryIndexException, IOException, XmlPullParserException
+ {
+ Artifact artifact = createArtifact( "test-skin" );
+
+ RepositoryIndexRecord record = factory.createRecord( artifact );
+
+ StandardArtifactIndexRecord expectedRecord = new
StandardArtifactIndexRecord();
+ expectedRecord.setMd5Checksum( "ba2d8a722f763db2950ad63119585f45" );
+ expectedRecord.setFilename( repository.pathOf( artifact ) );
+ expectedRecord.setLastModified( artifact.getFile().lastModified() );
+ expectedRecord.setSize( artifact.getFile().length() );
+ expectedRecord.setArtifactId( "test-skin" );
+ expectedRecord.setGroupId( TEST_GROUP_ID );
+ expectedRecord.setBaseVersion( "1.0" );
+ expectedRecord.setVersion( "1.0" );
+ expectedRecord.setSha1Checksum(
"44855e3e56c18ce766db315a2d4c114d7a8c8ab0" );
+ expectedRecord.setType( "maven-skin" );
+ expectedRecord.setRepository( "test" );
+ expectedRecord.setFiles( Arrays.asList( new
String[]{"META-INF/MANIFEST.MF", "css/maven-theme.css",
+ "META-INF/maven/org.apache.maven.skins/test-skin/pom.xml",
+ "META-INF/maven/org.apache.maven.skins/test-skin/pom.properties"}
) );
+ expectedRecord.setPackaging( "jar" );
+ expectedRecord.setProjectName( "Skin - test-skin" );
assertEquals( "check record", expectedRecord, record );
}
Added:
maven/archiva/trunk/archiva-indexer/src/test/managed-repository/org/apache/maven/archiva/record/test-skin/1.0/test-skin-1.0.jar
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-indexer/src/test/managed-repository/org/apache/maven/archiva/record/test-skin/1.0/test-skin-1.0.jar?rev=437144&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
maven/archiva/trunk/archiva-indexer/src/test/managed-repository/org/apache/maven/archiva/record/test-skin/1.0/test-skin-1.0.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
maven/archiva/trunk/archiva-indexer/src/test/managed-repository/org/apache/maven/archiva/record/test-skin/1.0/test-skin-1.0.pom
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-indexer/src/test/managed-repository/org/apache/maven/archiva/record/test-skin/1.0/test-skin-1.0.pom?rev=437144&view=auto
==============================================================================
---
maven/archiva/trunk/archiva-indexer/src/test/managed-repository/org/apache/maven/archiva/record/test-skin/1.0/test-skin-1.0.pom
(added)
+++
maven/archiva/trunk/archiva-indexer/src/test/managed-repository/org/apache/maven/archiva/record/test-skin/1.0/test-skin-1.0.pom
Sat Aug 26 04:25:57 2006
@@ -0,0 +1,8 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.maven.archiva.record</groupId>
+ <artifactId>test-skin</artifactId>
+ <version>1.0</version>
+ <name>Skin - test-skin</name>
+</project>
Propchange:
maven/archiva/trunk/archiva-indexer/src/test/managed-repository/org/apache/maven/archiva/record/test-skin/1.0/test-skin-1.0.pom
------------------------------------------------------------------------------
svn:eol-style = native
