Re: svn commit: r518714 - in /maven/archiva/trunk: archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/database/ archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/processor/ archiva-reports-standard/src/test/ja...

Fri, 23 Mar 2007 02:26:06 -0800 

Have you decided that you want to keep these unneeded hints in then?
Just wondering as there was no response before.

Andy

On 15 Mar 2007, at 18:09, [EMAIL PROTECTED] wrote:


Author: joakime
Date: Thu Mar 15 11:09:57 2007
New Revision: 518714

URL: http://svn.apache.org/viewvc?view=rev&rev=518714
Log:
Cleaning up 'default' role-hint usage in reports module.

Modified:
maven/archiva/trunk/archiva-reports-standard/src/main/java/org/ apache/maven/archiva/reporting/database/ArtifactResultsDatabase.java maven/archiva/trunk/archiva-reports-standard/src/main/java/org/ apache/maven/archiva/reporting/database/MetadataResultsDatabase.java maven/archiva/trunk/archiva-reports-standard/src/main/java/org/ apache/maven/archiva/reporting/database/ReportingDatabase.java maven/archiva/trunk/archiva-reports-standard/src/main/java/org/ apache/maven/archiva/reporting/processor/ BadMetadataReportProcessor.java maven/archiva/trunk/archiva-reports-standard/src/main/java/org/ apache/maven/archiva/reporting/processor/ ChecksumMetadataReportProcessor.java maven/archiva/trunk/archiva-reports-standard/src/test/java/org/ apache/maven/archiva/reporting/database/ MetadataResultsDatabaseTest.java maven/archiva/trunk/archiva-reports-standard/src/test/java/org/ apache/maven/archiva/reporting/database/ReportingDatabaseTest.java maven/archiva/trunk/archiva-reports-standard/src/test/java/org/ apache/maven/archiva/reporting/processor/ BadMetadataReportProcessorTest.java maven/archiva/trunk/archiva-reports-standard/src/test/java/org/ apache/maven/archiva/reporting/reporter/ ChecksumMetadataReporterTest.java maven/archiva/trunk/archiva-reports-standard/src/test/java/org/ apache/maven/archiva/reporting/reporter/ DefaultArtifactReporterTest.java maven/archiva/trunk/archiva-reports-standard/src/test/resources/ org/apache/maven/archiva/reporting/processor/ DuplicateArtifactFileReportProcessorTest.xml maven/archiva/trunk/archiva-reports-standard/src/test/resources/ org/apache/maven/archiva/reporting/processor/ OldArtifactReportProcessorTest.xml maven/archiva/trunk/archiva-reports-standard/src/test/resources/ org/apache/maven/archiva/reporting/processor/ OldSnapshotArtifactReportProcessorTest.xml maven/archiva/trunk/archiva-webapp/src/main/java/org/apache/ maven/archiva/web/action/ReportsAction.java
Modified: maven/archiva/trunk/archiva-reports-standard/src/main/ java/org/apache/maven/archiva/reporting/database/ ArtifactResultsDatabase.java URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva- reports-standard/src/main/java/org/apache/maven/archiva/reporting/ database/ArtifactResultsDatabase.java? view=diff&rev=518714&r1=518713&r2=518714 ====================================================================== ======== --- maven/archiva/trunk/archiva-reports-standard/src/main/java/org/ apache/maven/archiva/reporting/database/ ArtifactResultsDatabase.java (original) +++ maven/archiva/trunk/archiva-reports-standard/src/main/java/org/ apache/maven/archiva/reporting/database/ ArtifactResultsDatabase.java Thu Mar 15 11:09:57 2007 
@@ -41,6 +41,7 @@
  * @version $Id$
  *
* @plexus.component role="org.apache.maven.archiva.reporting.database.ArtifactResultsDatab ase" 
+ *                   role-hint="default"
  */
 public class ArtifactResultsDatabase
     extends AbstractResultsDatabase
Modified: maven/archiva/trunk/archiva-reports-standard/src/main/ java/org/apache/maven/archiva/reporting/database/ MetadataResultsDatabase.java URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva- reports-standard/src/main/java/org/apache/maven/archiva/reporting/ database/MetadataResultsDatabase.java? view=diff&rev=518714&r1=518713&r2=518714 ====================================================================== ======== --- maven/archiva/trunk/archiva-reports-standard/src/main/java/org/ apache/maven/archiva/reporting/database/ MetadataResultsDatabase.java (original) +++ maven/archiva/trunk/archiva-reports-standard/src/main/java/org/ apache/maven/archiva/reporting/database/ MetadataResultsDatabase.java Thu Mar 15 11:09:57 2007 
@@ -38,6 +38,7 @@
  * @version $Id$
  *
* @plexus.component role="org.apache.maven.archiva.reporting.database.MetadataResultsDatab ase" 
+ *                   role-hint="default"
  */
 public class MetadataResultsDatabase
     extends AbstractResultsDatabase
Modified: maven/archiva/trunk/archiva-reports-standard/src/main/ java/org/apache/maven/archiva/reporting/database/ ReportingDatabase.java URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva- reports-standard/src/main/java/org/apache/maven/archiva/reporting/ database/ReportingDatabase.java? view=diff&rev=518714&r1=518713&r2=518714 ====================================================================== ======== --- maven/archiva/trunk/archiva-reports-standard/src/main/java/org/ apache/maven/archiva/reporting/database/ReportingDatabase.java (original) +++ maven/archiva/trunk/archiva-reports-standard/src/main/java/org/ apache/maven/archiva/reporting/database/ReportingDatabase.java Thu Mar 15 11:09:57 2007 
@@ -26,18 +26,19 @@
  *
  * @todo i18n, including message formatting and parameterisation
* @plexus.component role="org.apache.maven.archiva.reporting.database.ReportingDatabase" 
+ *                   role-hint="default"
  */
 public class ReportingDatabase
 {
public static final String ROLE = ReportingDatabase.class.getName(); 

     /**
-     * @plexus.requirement
+     * @plexus.requirement role-hint="default"
      */
     private ArtifactResultsDatabase artifactDatabase;

     /**
-     * @plexus.requirement
+     * @plexus.requirement role-hint="default"
      */
     private MetadataResultsDatabase metadataDatabase;
Modified: maven/archiva/trunk/archiva-reports-standard/src/main/ java/org/apache/maven/archiva/reporting/processor/ BadMetadataReportProcessor.java URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva- reports-standard/src/main/java/org/apache/maven/archiva/reporting/ processor/BadMetadataReportProcessor.java? view=diff&rev=518714&r1=518713&r2=518714 ====================================================================== ======== --- maven/archiva/trunk/archiva-reports-standard/src/main/java/org/ apache/maven/archiva/reporting/processor/ BadMetadataReportProcessor.java (original) +++ maven/archiva/trunk/archiva-reports-standard/src/main/java/org/ apache/maven/archiva/reporting/processor/ BadMetadataReportProcessor.java Thu Mar 15 11:09:57 2007 
@@ -62,7 +62,7 @@
     private RepositoryQueryLayerFactory repositoryQueryLayerFactory;

     /**
-     * @plexus.requirement
+     * @plexus.requirement role-hint="default"
      */
     private MetadataResultsDatabase database;
Modified: maven/archiva/trunk/archiva-reports-standard/src/main/ java/org/apache/maven/archiva/reporting/processor/ ChecksumMetadataReportProcessor.java URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva- reports-standard/src/main/java/org/apache/maven/archiva/reporting/ processor/ChecksumMetadataReportProcessor.java? view=diff&rev=518714&r1=518713&r2=518714 ====================================================================== ======== --- maven/archiva/trunk/archiva-reports-standard/src/main/java/org/ apache/maven/archiva/reporting/processor/ ChecksumMetadataReportProcessor.java (original) +++ maven/archiva/trunk/archiva-reports-standard/src/main/java/org/ apache/maven/archiva/reporting/processor/ ChecksumMetadataReportProcessor.java Thu Mar 15 11:09:57 2007 
@@ -49,7 +49,7 @@
     private Digester md5Digester;

     /**
-     * @plexus.requirement
+     * @plexus.requirement role-hint="default"
      */
     private MetadataResultsDatabase database;
Modified: maven/archiva/trunk/archiva-reports-standard/src/test/ java/org/apache/maven/archiva/reporting/database/ MetadataResultsDatabaseTest.java URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva- reports-standard/src/test/java/org/apache/maven/archiva/reporting/ database/MetadataResultsDatabaseTest.java? view=diff&rev=518714&r1=518713&r2=518714 ====================================================================== ======== --- maven/archiva/trunk/archiva-reports-standard/src/test/java/org/ apache/maven/archiva/reporting/database/ MetadataResultsDatabaseTest.java (original) +++ maven/archiva/trunk/archiva-reports-standard/src/test/java/org/ apache/maven/archiva/reporting/database/ MetadataResultsDatabaseTest.java Thu Mar 15 11:09:57 2007 
@@ -47,7 +47,7 @@
     {
         super.setUp();
- database = (MetadataResultsDatabase) lookup ( MetadataResultsDatabase.ROLE ); + database = (MetadataResultsDatabase) lookup ( MetadataResultsDatabase.ROLE, "default" );
Artifact artifact = new DefaultArtifact( "group", "artifact", VersionRange.createFromVersion( "1.0" ), "scope", "type", "classifier", null );
Modified: maven/archiva/trunk/archiva-reports-standard/src/test/ java/org/apache/maven/archiva/reporting/database/ ReportingDatabaseTest.java URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva- reports-standard/src/test/java/org/apache/maven/archiva/reporting/ database/ReportingDatabaseTest.java? view=diff&rev=518714&r1=518713&r2=518714 ====================================================================== ======== --- maven/archiva/trunk/archiva-reports-standard/src/test/java/org/ apache/maven/archiva/reporting/database/ReportingDatabaseTest.java (original) +++ maven/archiva/trunk/archiva-reports-standard/src/test/java/org/ apache/maven/archiva/reporting/database/ReportingDatabaseTest.java Thu Mar 15 11:09:57 2007 
@@ -36,7 +36,7 @@
         throws Exception
     {
         super.setUp();
- database = (ReportingDatabase) lookup ( ReportingDatabase.ROLE ); + database = (ReportingDatabase) lookup ( ReportingDatabase.ROLE, "default" ); 
     }

     protected void tearDown()
Modified: maven/archiva/trunk/archiva-reports-standard/src/test/ java/org/apache/maven/archiva/reporting/processor/ BadMetadataReportProcessorTest.java URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva- reports-standard/src/test/java/org/apache/maven/archiva/reporting/ processor/BadMetadataReportProcessorTest.java? view=diff&rev=518714&r1=518713&r2=518714 ====================================================================== ======== --- maven/archiva/trunk/archiva-reports-standard/src/test/java/org/ apache/maven/archiva/reporting/processor/ BadMetadataReportProcessorTest.java (original) +++ maven/archiva/trunk/archiva-reports-standard/src/test/java/org/ apache/maven/archiva/reporting/processor/ BadMetadataReportProcessorTest.java Thu Mar 15 11:09:57 2007 
@@ -57,7 +57,7 @@
artifactFactory = (ArtifactFactory) lookup ( ArtifactFactory.ROLE );
- database = (MetadataResultsDatabase) lookup ( MetadataResultsDatabase.ROLE ); + database = (MetadataResultsDatabase) lookup ( MetadataResultsDatabase.ROLE, "default" );
badMetadataReportProcessor = (MetadataReportProcessor) lookup( MetadataReportProcessor.ROLE, "bad-metadata" ); 
     }
Modified: maven/archiva/trunk/archiva-reports-standard/src/test/ java/org/apache/maven/archiva/reporting/reporter/ ChecksumMetadataReporterTest.java URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva- reports-standard/src/test/java/org/apache/maven/archiva/reporting/ reporter/ChecksumMetadataReporterTest.java? view=diff&rev=518714&r1=518713&r2=518714 ====================================================================== ======== --- maven/archiva/trunk/archiva-reports-standard/src/test/java/org/ apache/maven/archiva/reporting/reporter/ ChecksumMetadataReporterTest.java (original) +++ maven/archiva/trunk/archiva-reports-standard/src/test/java/org/ apache/maven/archiva/reporting/reporter/ ChecksumMetadataReporterTest.java Thu Mar 15 11:09:57 2007 
@@ -58,8 +58,8 @@
         super.setUp();
metadataReportProcessor = (MetadataReportProcessor) lookup ( MetadataReportProcessor.ROLE, "checksum-metadata" ); artifactReportProcessor = (ArtifactReportProcessor) lookup ( ArtifactReportProcessor.ROLE, "checksum" ); - database = (MetadataResultsDatabase) lookup ( MetadataResultsDatabase.ROLE ); - artifactsDatabase = (ArtifactResultsDatabase) lookup ( ArtifactResultsDatabase.ROLE ); + database = (MetadataResultsDatabase) lookup ( MetadataResultsDatabase.ROLE, "default" ); + artifactsDatabase = (ArtifactResultsDatabase) lookup ( ArtifactResultsDatabase.ROLE, "default" ); 
     }

     /**
Modified: maven/archiva/trunk/archiva-reports-standard/src/test/ java/org/apache/maven/archiva/reporting/reporter/ DefaultArtifactReporterTest.java URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva- reports-standard/src/test/java/org/apache/maven/archiva/reporting/ reporter/DefaultArtifactReporterTest.java? view=diff&rev=518714&r1=518713&r2=518714 ====================================================================== ======== --- maven/archiva/trunk/archiva-reports-standard/src/test/java/org/ apache/maven/archiva/reporting/reporter/ DefaultArtifactReporterTest.java (original) +++ maven/archiva/trunk/archiva-reports-standard/src/test/java/org/ apache/maven/archiva/reporting/reporter/ DefaultArtifactReporterTest.java Thu Mar 15 11:09:57 2007 
@@ -56,7 +56,7 @@
     {
         super.setUp();
- database = (ReportingDatabase) lookup ( ReportingDatabase.ROLE ); + database = (ReportingDatabase) lookup ( ReportingDatabase.ROLE, "default" );
ArtifactFactory artifactFactory = (ArtifactFactory) lookup ( ArtifactFactory.ROLE );
Modified: maven/archiva/trunk/archiva-reports-standard/src/test/ resources/org/apache/maven/archiva/reporting/processor/ DuplicateArtifactFileReportProcessorTest.xml URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva- reports-standard/src/test/resources/org/apache/maven/archiva/ reporting/processor/DuplicateArtifactFileReportProcessorTest.xml? view=diff&rev=518714&r1=518713&r2=518714 ====================================================================== ======== --- maven/archiva/trunk/archiva-reports-standard/src/test/resources/ org/apache/maven/archiva/reporting/processor/ DuplicateArtifactFileReportProcessorTest.xml (original) +++ maven/archiva/trunk/archiva-reports-standard/src/test/resources/ org/apache/maven/archiva/reporting/processor/ DuplicateArtifactFileReportProcessorTest.xml Thu Mar 15 11:09:57 2007 
@@ -37,6 +37,7 @@
         </requirement>
         <requirement>
<role>org.apache.maven.archiva.reporting.database.ArtifactResultsDatab ase</role> 
+          <role-hint>default</role-hint>
           <field-name>database</field-name>
         </requirement>
       </requirements>
Modified: maven/archiva/trunk/archiva-reports-standard/src/test/ resources/org/apache/maven/archiva/reporting/processor/ OldArtifactReportProcessorTest.xml URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva- reports-standard/src/test/resources/org/apache/maven/archiva/ reporting/processor/OldArtifactReportProcessorTest.xml? view=diff&rev=518714&r1=518713&r2=518714 ====================================================================== ======== --- maven/archiva/trunk/archiva-reports-standard/src/test/resources/ org/apache/maven/archiva/reporting/processor/ OldArtifactReportProcessorTest.xml (original) +++ maven/archiva/trunk/archiva-reports-standard/src/test/resources/ org/apache/maven/archiva/reporting/processor/ OldArtifactReportProcessorTest.xml Thu Mar 15 11:09:57 2007 
@@ -27,6 +27,7 @@
       <requirements>
         <requirement>
<role>org.apache.maven.archiva.reporting.database.ArtifactResultsDatab ase</role> 
+          <role-hint>default</role-hint>
           <field-name>database</field-name>
         </requirement>
       </requirements>
Modified: maven/archiva/trunk/archiva-reports-standard/src/test/ resources/org/apache/maven/archiva/reporting/processor/ OldSnapshotArtifactReportProcessorTest.xml URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva- reports-standard/src/test/resources/org/apache/maven/archiva/ reporting/processor/OldSnapshotArtifactReportProcessorTest.xml? view=diff&rev=518714&r1=518713&r2=518714 ====================================================================== ======== --- maven/archiva/trunk/archiva-reports-standard/src/test/resources/ org/apache/maven/archiva/reporting/processor/ OldSnapshotArtifactReportProcessorTest.xml (original) +++ maven/archiva/trunk/archiva-reports-standard/src/test/resources/ org/apache/maven/archiva/reporting/processor/ OldSnapshotArtifactReportProcessorTest.xml Thu Mar 15 11:09:57 2007 
@@ -27,6 +27,7 @@
       <requirements>
         <requirement>
<role>org.apache.maven.archiva.reporting.database.ArtifactResultsDatab ase</role> 
+          <role-hint>default</role-hint>
           <field-name>database</field-name>
         </requirement>
       </requirements>
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=518714&r1=518713&r2=518714 ====================================================================== ======== --- 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 Thu Mar 15 11:09:57 2007 
@@ -40,7 +40,7 @@
     implements SecureAction
 {
     /**
-     * @plexus.requirement
+     * @plexus.requirement role-hint="default"
      */
     private ReportingDatabase database;

Reply via email to