Modified: maven/archiva/trunk/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/DependencyArtifactReportProcessorTest.java URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/DependencyArtifactReportProcessorTest.java?view=diff&rev=442028&r1=442027&r2=442028 ============================================================================== --- maven/archiva/trunk/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/DependencyArtifactReportProcessorTest.java (original) +++ maven/archiva/trunk/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/DependencyArtifactReportProcessorTest.java Sun Sep 10 16:21:19 2006 @@ -37,7 +37,7 @@ private static final String VALID_VERSION = "1.0-alpha-1"; - private ReportingDatabase reporter; + private ReportingDatabase reportingDatabase; private Model model; @@ -51,19 +51,21 @@ throws Exception { super.setUp(); - reporter = new ReportingDatabase(); model = new Model(); processor = (ArtifactReportProcessor) lookup( ArtifactReportProcessor.ROLE, "dependency" ); artifactFactory = (ArtifactFactory) lookup( ArtifactFactory.ROLE ); + + ReportGroup reportGroup = (ReportGroup) lookup( ReportGroup.ROLE, "health" ); + reportingDatabase = new ReportingDatabase( reportGroup ); } public void testArtifactFoundButNoDirectDependencies() { Artifact artifact = createValidArtifact(); - processor.processArtifact( artifact, model, reporter ); - assertEquals( 0, reporter.getNumFailures() ); - assertEquals( 0, reporter.getNumWarnings() ); + processor.processArtifact( artifact, model, reportingDatabase ); + assertEquals( 0, reportingDatabase.getNumFailures() ); + assertEquals( 0, reportingDatabase.getNumWarnings() ); } private Artifact createValidArtifact() @@ -78,10 +80,10 @@ { Artifact artifact = artifactFactory.createProjectArtifact( INVALID, INVALID, INVALID ); artifact.setRepository( repository ); - processor.processArtifact( artifact, model, reporter ); - assertEquals( 1, reporter.getNumFailures() ); - assertEquals( 0, reporter.getNumWarnings() ); - Iterator failures = reporter.getArtifactIterator(); + processor.processArtifact( artifact, model, reportingDatabase ); + assertEquals( 1, reportingDatabase.getNumFailures() ); + assertEquals( 0, reportingDatabase.getNumWarnings() ); + Iterator failures = reportingDatabase.getArtifactIterator(); ArtifactResults results = (ArtifactResults) failures.next(); assertFalse( failures.hasNext() ); failures = results.getFailures().iterator(); @@ -96,9 +98,9 @@ Dependency dependency = createValidDependency(); model.addDependency( dependency ); - processor.processArtifact( artifact, model, reporter ); - assertEquals( 0, reporter.getNumFailures() ); - assertEquals( 0, reporter.getNumWarnings() ); + processor.processArtifact( artifact, model, reportingDatabase ); + assertEquals( 0, reportingDatabase.getNumFailures() ); + assertEquals( 0, reportingDatabase.getNumWarnings() ); } private Dependency createValidDependency() @@ -113,9 +115,9 @@ Dependency dependency = createValidDependency(); model.addDependency( dependency ); - processor.processArtifact( artifact, model, reporter ); - assertEquals( 0, reporter.getNumFailures() ); - assertEquals( 0, reporter.getNumWarnings() ); + processor.processArtifact( artifact, model, reportingDatabase ); + assertEquals( 0, reportingDatabase.getNumFailures() ); + assertEquals( 0, reportingDatabase.getNumWarnings() ); } public void testValidArtifactWithValidMultipleDependencies() @@ -128,9 +130,9 @@ model.addDependency( dependency ); Artifact artifact = createValidArtifact(); - processor.processArtifact( artifact, model, reporter ); - assertEquals( 0, reporter.getNumFailures() ); - assertEquals( 0, reporter.getNumWarnings() ); + processor.processArtifact( artifact, model, reportingDatabase ); + assertEquals( 0, reportingDatabase.getNumFailures() ); + assertEquals( 0, reportingDatabase.getNumWarnings() ); } public void testValidArtifactWithAnInvalidDependency() @@ -143,11 +145,11 @@ model.addDependency( createDependency( INVALID, INVALID, INVALID ) ); Artifact artifact = createValidArtifact(); - processor.processArtifact( artifact, model, reporter ); - assertEquals( 1, reporter.getNumFailures() ); - assertEquals( 0, reporter.getNumWarnings() ); + processor.processArtifact( artifact, model, reportingDatabase ); + assertEquals( 1, reportingDatabase.getNumFailures() ); + assertEquals( 0, reportingDatabase.getNumWarnings() ); - Iterator failures = reporter.getArtifactIterator(); + Iterator failures = reportingDatabase.getArtifactIterator(); ArtifactResults results = (ArtifactResults) failures.next(); assertFalse( failures.hasNext() ); failures = results.getFailures().iterator(); @@ -163,11 +165,11 @@ Dependency dependency = createDependency( INVALID, VALID_ARTIFACT_ID, VALID_VERSION ); model.addDependency( dependency ); - processor.processArtifact( artifact, model, reporter ); - assertEquals( 1, reporter.getNumFailures() ); - assertEquals( 0, reporter.getNumWarnings() ); + processor.processArtifact( artifact, model, reportingDatabase ); + assertEquals( 1, reportingDatabase.getNumFailures() ); + assertEquals( 0, reportingDatabase.getNumWarnings() ); - Iterator failures = reporter.getArtifactIterator(); + Iterator failures = reportingDatabase.getArtifactIterator(); ArtifactResults results = (ArtifactResults) failures.next(); assertFalse( failures.hasNext() ); failures = results.getFailures().iterator(); @@ -191,11 +193,11 @@ Dependency dependency = createDependency( VALID_GROUP_ID, INVALID, VALID_VERSION ); model.addDependency( dependency ); - processor.processArtifact( artifact, model, reporter ); - assertEquals( 1, reporter.getNumFailures() ); - assertEquals( 0, reporter.getNumWarnings() ); + processor.processArtifact( artifact, model, reportingDatabase ); + assertEquals( 1, reportingDatabase.getNumFailures() ); + assertEquals( 0, reportingDatabase.getNumWarnings() ); - Iterator failures = reporter.getArtifactIterator(); + Iterator failures = reportingDatabase.getArtifactIterator(); ArtifactResults results = (ArtifactResults) failures.next(); assertFalse( failures.hasNext() ); failures = results.getFailures().iterator(); @@ -210,11 +212,11 @@ Dependency dependency = createDependency( VALID_GROUP_ID, VALID_ARTIFACT_ID, INVALID ); model.addDependency( dependency ); - processor.processArtifact( artifact, model, reporter ); - assertEquals( 1, reporter.getNumFailures() ); - assertEquals( 0, reporter.getNumWarnings() ); + processor.processArtifact( artifact, model, reportingDatabase ); + assertEquals( 1, reportingDatabase.getNumFailures() ); + assertEquals( 0, reportingDatabase.getNumWarnings() ); - Iterator failures = reporter.getArtifactIterator(); + Iterator failures = reportingDatabase.getArtifactIterator(); ArtifactResults results = (ArtifactResults) failures.next(); assertFalse( failures.hasNext() ); failures = results.getFailures().iterator(); @@ -229,11 +231,11 @@ Dependency dependency = createDependency( VALID_GROUP_ID, VALID_ARTIFACT_ID, "[" ); model.addDependency( dependency ); - processor.processArtifact( artifact, model, reporter ); - assertEquals( 1, reporter.getNumFailures() ); - assertEquals( 0, reporter.getNumWarnings() ); + processor.processArtifact( artifact, model, reportingDatabase ); + assertEquals( 1, reportingDatabase.getNumFailures() ); + assertEquals( 0, reportingDatabase.getNumWarnings() ); - Iterator failures = reporter.getArtifactIterator(); + Iterator failures = reportingDatabase.getArtifactIterator(); ArtifactResults results = (ArtifactResults) failures.next(); assertFalse( failures.hasNext() ); failures = results.getFailures().iterator(); @@ -248,9 +250,9 @@ Dependency dependency = createDependency( VALID_GROUP_ID, VALID_ARTIFACT_ID, "[1.0,)" ); model.addDependency( dependency ); - processor.processArtifact( artifact, model, reporter ); - assertEquals( 0, reporter.getNumFailures() ); - assertEquals( 0, reporter.getNumWarnings() ); + processor.processArtifact( artifact, model, reportingDatabase ); + assertEquals( 0, reportingDatabase.getNumFailures() ); + assertEquals( 0, reportingDatabase.getNumWarnings() ); } public void testValidArtifactWithMissingDependencyVersion() @@ -260,11 +262,11 @@ Dependency dependency = createDependency( VALID_GROUP_ID, VALID_ARTIFACT_ID, null ); model.addDependency( dependency ); - processor.processArtifact( artifact, model, reporter ); - assertEquals( 1, reporter.getNumFailures() ); - assertEquals( 0, reporter.getNumWarnings() ); + processor.processArtifact( artifact, model, reportingDatabase ); + assertEquals( 1, reportingDatabase.getNumFailures() ); + assertEquals( 0, reportingDatabase.getNumWarnings() ); - Iterator failures = reporter.getArtifactIterator(); + Iterator failures = reportingDatabase.getArtifactIterator(); ArtifactResults results = (ArtifactResults) failures.next(); assertFalse( failures.hasNext() ); failures = results.getFailures().iterator();
Modified: maven/archiva/trunk/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/DuplicateArtifactFileReportProcessorTest.java URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/DuplicateArtifactFileReportProcessorTest.java?view=diff&rev=442028&r1=442027&r2=442028 ============================================================================== --- maven/archiva/trunk/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/DuplicateArtifactFileReportProcessorTest.java (original) +++ maven/archiva/trunk/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/DuplicateArtifactFileReportProcessorTest.java Sun Sep 10 16:21:19 2006 @@ -43,7 +43,7 @@ File indexDirectory; - private ReportingDatabase reportDatabase = new ReportingDatabase(); + private ReportingDatabase reportDatabase; protected void setUp() throws Exception @@ -68,6 +68,9 @@ index.indexRecords( Collections.singletonList( recordFactory.createRecord( artifact ) ) ); processor = (ArtifactReportProcessor) lookup( ArtifactReportProcessor.ROLE, "duplicate" ); + + ReportGroup reportGroup = (ReportGroup) lookup( ReportGroup.ROLE, "health" ); + reportDatabase = new ReportingDatabase( reportGroup ); } public void testNullArtifactFile() Modified: maven/archiva/trunk/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/InvalidPomArtifactReportProcessorTest.java URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/InvalidPomArtifactReportProcessorTest.java?view=diff&rev=442028&r1=442027&r2=442028 ============================================================================== --- maven/archiva/trunk/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/InvalidPomArtifactReportProcessorTest.java (original) +++ maven/archiva/trunk/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/InvalidPomArtifactReportProcessorTest.java Sun Sep 10 16:21:19 2006 @@ -26,13 +26,16 @@ { private ArtifactReportProcessor artifactReportProcessor; - private ReportingDatabase reporter = new ReportingDatabase(); + private ReportingDatabase reportDatabase; public void setUp() throws Exception { super.setUp(); artifactReportProcessor = (ArtifactReportProcessor) lookup( ArtifactReportProcessor.ROLE, "invalid-pom" ); + + ReportGroup reportGroup = (ReportGroup) lookup( ReportGroup.ROLE, "health" ); + reportDatabase = new ReportingDatabase( reportGroup ); } /** @@ -42,8 +45,8 @@ { Artifact artifact = createArtifact( "org.apache.maven", "artifactId", "1.0-alpha-3", "pom" ); - artifactReportProcessor.processArtifact( artifact, null, reporter ); - assertEquals( 1, reporter.getNumFailures() ); + artifactReportProcessor.processArtifact( artifact, null, reportDatabase ); + assertEquals( 1, reportDatabase.getNumFailures() ); } @@ -54,9 +57,9 @@ { Artifact artifact = createArtifact( "groupId", "artifactId", "1.0-alpha-2", "pom" ); - artifactReportProcessor.processArtifact( artifact, null, reporter ); - assertEquals( 0, reporter.getNumFailures() ); - assertEquals( 0, reporter.getNumWarnings() ); + artifactReportProcessor.processArtifact( artifact, null, reportDatabase ); + assertEquals( 0, reportDatabase.getNumFailures() ); + assertEquals( 0, reportDatabase.getNumWarnings() ); } @@ -67,8 +70,8 @@ { Artifact artifact = createArtifact( "groupId", "artifactId", "1.0-alpha-1", "jar" ); - artifactReportProcessor.processArtifact( artifact, null, reporter ); - assertEquals( 0, reporter.getNumFailures() ); - assertEquals( 0, reporter.getNumWarnings() ); + artifactReportProcessor.processArtifact( artifact, null, reportDatabase ); + assertEquals( 0, reportDatabase.getNumFailures() ); + assertEquals( 0, reportDatabase.getNumWarnings() ); } } Modified: maven/archiva/trunk/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/LocationArtifactReportProcessorTest.java URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/LocationArtifactReportProcessorTest.java?view=diff&rev=442028&r1=442027&r2=442028 ============================================================================== --- maven/archiva/trunk/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/LocationArtifactReportProcessorTest.java (original) +++ maven/archiva/trunk/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/LocationArtifactReportProcessorTest.java Sun Sep 10 16:21:19 2006 @@ -34,16 +34,16 @@ { private ArtifactReportProcessor artifactReportProcessor; - private ReportingDatabase reporter = new ReportingDatabase(); - - private MavenXpp3Reader pomReader; + private ReportingDatabase reportDatabase; public void setUp() throws Exception { super.setUp(); artifactReportProcessor = (ArtifactReportProcessor) lookup( ArtifactReportProcessor.ROLE, "artifact-location" ); - pomReader = new MavenXpp3Reader(); + + ReportGroup reportGroup = (ReportGroup) lookup( ReportGroup.ROLE, "health" ); + reportDatabase = new ReportingDatabase( reportGroup ); } /** @@ -55,9 +55,9 @@ { Artifact artifact = createArtifact( "org.apache.maven", "maven-model", "2.0" ); - artifactReportProcessor.processArtifact( artifact, null, reporter ); - assertEquals( 0, reporter.getNumFailures() ); - assertEquals( 0, reporter.getNumWarnings() ); + artifactReportProcessor.processArtifact( artifact, null, reportDatabase ); + assertEquals( 0, reportDatabase.getNumFailures() ); + assertEquals( 0, reportDatabase.getNumWarnings() ); } /** @@ -71,9 +71,9 @@ Artifact pomArtifact = createArtifact( "groupId", "artifactId", "1.0-alpha-1", "pom" ); Model model = readPom( repository.pathOf( pomArtifact ) ); - artifactReportProcessor.processArtifact( artifact, model, reporter ); - assertEquals( 0, reporter.getNumFailures() ); - assertEquals( 0, reporter.getNumWarnings() ); + artifactReportProcessor.processArtifact( artifact, model, reportDatabase ); + assertEquals( 0, reportDatabase.getNumFailures() ); + assertEquals( 0, reportDatabase.getNumWarnings() ); } /** @@ -86,9 +86,9 @@ Artifact pomArtifact = createArtifact( "groupId", "artifactId", "1.0-alpha-1", "pom" ); Model model = readPom( repository.pathOf( pomArtifact ) ); - artifactReportProcessor.processArtifact( pomArtifact, model, reporter ); - assertEquals( 0, reporter.getNumFailures() ); - assertEquals( 0, reporter.getNumWarnings() ); + artifactReportProcessor.processArtifact( pomArtifact, model, reportDatabase ); + assertEquals( 0, reportDatabase.getNumFailures() ); + assertEquals( 0, reportDatabase.getNumWarnings() ); } /** @@ -102,9 +102,9 @@ Artifact pomArtifact = createArtifact( "groupId", "artifactId", "1.0-alpha-1", "pom" ); Model model = readPom( repository.pathOf( pomArtifact ) ); - artifactReportProcessor.processArtifact( artifact, model, reporter ); - assertEquals( 0, reporter.getNumFailures() ); - assertEquals( 0, reporter.getNumWarnings() ); + artifactReportProcessor.processArtifact( artifact, model, reportDatabase ); + assertEquals( 0, reportDatabase.getNumFailures() ); + assertEquals( 0, reportDatabase.getNumWarnings() ); } /** @@ -119,9 +119,9 @@ Artifact pomArtifact = createArtifact( "groupId", "artifactId", "1.0-alpha-1", "pom" ); Model model = readPom( repository.pathOf( pomArtifact ) ); - artifactReportProcessor.processArtifact( artifact, model, reporter ); - assertEquals( 0, reporter.getNumFailures() ); - assertEquals( 0, reporter.getNumWarnings() ); + artifactReportProcessor.processArtifact( artifact, model, reportDatabase ); + assertEquals( 0, reportDatabase.getNumFailures() ); + assertEquals( 0, reportDatabase.getNumWarnings() ); } /** @@ -136,9 +136,9 @@ Artifact pomArtifact = createArtifact( "groupId", "artifactId", "1.0-alpha-1", "pom" ); Model model = readPom( repository.pathOf( pomArtifact ) ); - artifactReportProcessor.processArtifact( artifact, model, reporter ); - assertEquals( 0, reporter.getNumFailures() ); - assertEquals( 0, reporter.getNumWarnings() ); + artifactReportProcessor.processArtifact( artifact, model, reportDatabase ); + assertEquals( 0, reportDatabase.getNumFailures() ); + assertEquals( 0, reportDatabase.getNumWarnings() ); } /** @@ -154,7 +154,7 @@ try { Model model = readPom( repository.pathOf( pomArtifact ) ); - artifactReportProcessor.processArtifact( artifact, model, reporter ); + artifactReportProcessor.processArtifact( artifact, model, reportDatabase ); fail( "Should not have passed the artifact" ); } catch ( IllegalStateException e ) @@ -174,15 +174,15 @@ Artifact pomArtifact = createArtifact( "org.apache.maven", "maven-archiver", "2.0", "pom" ); Model model = readPom( repository.pathOf( pomArtifact ) ); - artifactReportProcessor.processArtifact( artifact, model, reporter ); - assertEquals( 1, reporter.getNumFailures() ); + artifactReportProcessor.processArtifact( artifact, model, reportDatabase ); + assertEquals( 1, reportDatabase.getNumFailures() ); } private Model readPom( String path ) throws IOException, XmlPullParserException { Reader reader = new FileReader( new File( repository.getBasedir(), path ) ); - Model model = pomReader.read( reader ); + Model model = new MavenXpp3Reader().read( reader ); // hokey inheritence to avoid some errors right now if ( model.getGroupId() == null ) { @@ -204,8 +204,8 @@ { Artifact artifact = createArtifact( "org.apache.maven", "maven-monitor", "2.1" ); - artifactReportProcessor.processArtifact( artifact, null, reporter ); - assertEquals( 1, reporter.getNumFailures() ); + artifactReportProcessor.processArtifact( artifact, null, reportDatabase ); + assertEquals( 1, reportDatabase.getNumFailures() ); } /** @@ -217,8 +217,8 @@ { Artifact artifact = createArtifact( "org.apache.maven", "maven-project", "2.1" ); - artifactReportProcessor.processArtifact( artifact, null, reporter ); - assertEquals( 1, reporter.getNumFailures() ); + artifactReportProcessor.processArtifact( artifact, null, reportDatabase ); + assertEquals( 1, reportDatabase.getNumFailures() ); } } Modified: maven/archiva/trunk/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/ReportsAction.java URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/ReportsAction.java?view=diff&rev=442028&r1=442027&r2=442028 ============================================================================== --- maven/archiva/trunk/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/ReportsAction.java (original) +++ maven/archiva/trunk/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/ReportsAction.java Sun Sep 10 16:21:19 2006 @@ -25,6 +25,7 @@ import org.apache.maven.archiva.discoverer.filter.AcceptAllArtifactFilter; import org.apache.maven.archiva.discoverer.filter.SnapshotArtifactFilter; import org.apache.maven.archiva.reporting.ReportExecutor; +import org.apache.maven.archiva.reporting.ReportGroup; import org.apache.maven.archiva.reporting.ReportingDatabase; import org.apache.maven.archiva.reporting.ReportingStore; import org.apache.maven.archiva.reporting.ReportingStoreException; @@ -34,6 +35,7 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; +import java.util.Map; /** * Repository reporting. @@ -70,15 +72,26 @@ private Configuration configuration; + /** + * @plexus.requirement role="org.apache.maven.archiva.reporting.ReportGroup" + */ + private Map reports; + + private String reportGroup = DEFAULT_REPORT_GROUP; + + private static final String DEFAULT_REPORT_GROUP = "health"; + public String execute() throws Exception { + ReportGroup reportGroup = (ReportGroup) reports.get( this.reportGroup ); + databases = new ArrayList(); if ( repositoryId != null && !repositoryId.equals( "-" ) ) { RepositoryConfiguration repositoryConfiguration = configuration.getRepositoryById( repositoryId ); - getReport( repositoryConfiguration ); + getReport( repositoryConfiguration, reportGroup ); } else { @@ -86,18 +99,18 @@ { RepositoryConfiguration repositoryConfiguration = (RepositoryConfiguration) i.next(); - getReport( repositoryConfiguration ); + getReport( repositoryConfiguration, reportGroup ); } } return SUCCESS; } - private void getReport( RepositoryConfiguration repositoryConfiguration ) + private void getReport( RepositoryConfiguration repositoryConfiguration, ReportGroup reportGroup ) throws ReportingStoreException { ArtifactRepository repository = factory.createRepository( repositoryConfiguration ); - ReportingDatabase database = reportingStore.getReportsFromStore( repository ); + ReportingDatabase database = reportingStore.getReportsFromStore( repository, reportGroup ); databases.add( database ); } @@ -105,12 +118,12 @@ public String runReport() throws Exception { - // TODO: this should be one that runs in the background - see the showcase + ReportGroup reportGroup = (ReportGroup) reports.get( this.reportGroup ); RepositoryConfiguration repositoryConfiguration = configuration.getRepositoryById( repositoryId ); ArtifactRepository repository = factory.createRepository( repositoryConfiguration ); - ReportingDatabase database = executor.getReportDatabase( repository ); + ReportingDatabase database = executor.getReportDatabase( repository, reportGroup ); if ( database.isInProgress() ) { return SUCCESS; @@ -140,7 +153,7 @@ try { - executor.runReports( repository, blacklistedPatterns, filter ); + executor.runReports( reportGroup, repository, blacklistedPatterns, filter ); } finally { @@ -150,6 +163,16 @@ return SUCCESS; } + public void setReportGroup( String reportGroup ) + { + this.reportGroup = reportGroup; + } + + public String getReportGroup() + { + return reportGroup; + } + public String getRepositoryId() { return repositoryId; @@ -174,5 +197,10 @@ public Configuration getConfiguration() { return configuration; + } + + public Map getReports() + { + return reports; } } Modified: maven/archiva/trunk/archiva-webapp/src/main/webapp/WEB-INF/jsp/reports/reports.jsp URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-webapp/src/main/webapp/WEB-INF/jsp/reports/reports.jsp?view=diff&rev=442028&r1=442027&r2=442028 ============================================================================== --- maven/archiva/trunk/archiva-webapp/src/main/webapp/WEB-INF/jsp/reports/reports.jsp (original) +++ maven/archiva/trunk/archiva-webapp/src/main/webapp/WEB-INF/jsp/reports/reports.jsp Sun Sep 10 16:21:19 2006 @@ -21,8 +21,9 @@ <html> <head> - <%-- TODO! change the name --%> - <title>Report: Repository Health</title> + <ww:set name="reports" value="reports"/> + <ww:set name="reportGroup" value="reportGroup"/> + <title>Report: ${reports[reportGroup].name}</title> <ww:head/> </head> @@ -32,8 +33,9 @@ <div id="contentArea"> -<%-- TODO!: select report, filter --%> +<%-- TODO!: select filter --%> <ww:form action="reports" namespace="/admin"> + <ww:select list="reports" label="Report" name="reportGroup"/> <ww:select list="configuration.repositories" listKey="id" listValue="name" label="Repository" headerKey="-" headerValue="(All repositories)" name="repositoryId"/> <ww:submit value="Get Report"/>
