Apache
/
archiva
mirror of https://github.com/apache/archiva.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[MRM-1283] handle missing Maven facet 

git-svn-id: https://svn.apache.org/repos/asf/archiva/branches/MRM-1025@884147 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Brett Porter 2009-11-25 15:33:40 +00:00
parent f863666a3d
commit 9c2b960aea
2 changed files with 43 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/ShowArtifactAction.java
View File

@ -150,6 +150,8 @@ public class ShowArtifactAction
// TODO: eventually, move to just use the metadata directly, with minimal JSP changes, mostly for Maven specifics
model = new ArchivaProjectModel();
MavenProjectFacet projectFacet = (MavenProjectFacet) versionMetadata.getFacet( MavenProjectFacet.FACET_ID );
if ( projectFacet != null )
{
model.setGroupId( projectFacet.getGroupId() );
model.setArtifactId( projectFacet.getArtifactId() );
model.setPackaging( projectFacet.getPackaging() );
@ -161,6 +163,7 @@ public class ShowArtifactAction
parent.setVersion( projectFacet.getParent().getVersion() );
model.setParentProject( parent );
}
}
model.setVersion( versionMetadata.getId() );
model.setDescription( versionMetadata.getDescription() );

31
archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/ShowArtifactActionTest.java
View File

@ -308,6 +308,37 @@ public class ShowArtifactActionTest
assertTrue( action.getSnapshotVersions().isEmpty() );
}
public void testGetArtifactNoMavenFacet()
{
ProjectVersionMetadata versionMetadata = new ProjectVersionMetadata();
versionMetadata.setId( TEST_VERSION );
versionMetadata.setUrl( TEST_URL );
versionMetadata.setName( TEST_NAME );
versionMetadata.setDescription( TEST_DESCRIPTION );
metadataResolver.setProjectVersion( TEST_REPO, TEST_GROUP_ID, TEST_ARTIFACT_ID, versionMetadata );
setActionParameters();
String result = action.artifact();
assertActionSuccess( action, result );
assertActionParameters( action );
ArchivaProjectModel model = action.getModel();
assertEquals( TEST_VERSION, model.getVersion() );
assertEquals( TEST_URL, model.getUrl() );
assertEquals( TEST_NAME, model.getName() );
assertEquals( TEST_DESCRIPTION, model.getDescription() );
assertEquals( TEST_REPO, action.getRepositoryId() );
assertNull( action.getDependees() );
assertNull( action.getDependencies() );
assertNull( action.getMailingLists() );
assertTrue( action.getSnapshotVersions().isEmpty() );
}
private void assertNoOutputFields()
{
assertNull( action.getModel() );