Author: brett
Date: Tue Aug 21 01:16:36 2007
New Revision: 568011
URL: http://svn.apache.org/viewvc?rev=568011&view=rev
Log:
[MRM-449, 450] improvements to the group search reporting
Submitted by: Teodoro Cue Jr.
Modified:
maven/archiva/trunk/archiva-database/src/main/java/org/apache/maven/archiva/database/constraints/RepositoryProblemByGroupIdConstraint.java
maven/archiva/trunk/archiva-database/src/main/java/org/apache/maven/archiva/database/constraints/RepositoryProblemConstraint.java
maven/archiva/trunk/archiva-database/src/test/java/org/apache/maven/archiva/database/constraints/RepositoryProblemByGroupIdConstraintTest.java
maven/archiva/trunk/archiva-database/src/test/java/org/apache/maven/archiva/database/constraints/RepositoryProblemConstraintTest.java
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/reports/GenerateReportAction.java
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/reports/ShowReportsAction.java
Modified:
maven/archiva/trunk/archiva-database/src/main/java/org/apache/maven/archiva/database/constraints/RepositoryProblemByGroupIdConstraint.java
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-database/src/main/java/org/apache/maven/archiva/database/constraints/RepositoryProblemByGroupIdConstraint.java?rev=568011&r1=568010&r2=568011&view=diff
==============================================================================
---
maven/archiva/trunk/archiva-database/src/main/java/org/apache/maven/archiva/database/constraints/RepositoryProblemByGroupIdConstraint.java
(original)
+++
maven/archiva/trunk/archiva-database/src/main/java/org/apache/maven/archiva/database/constraints/RepositoryProblemByGroupIdConstraint.java
Tue Aug 21 01:16:36 2007
@@ -32,9 +32,9 @@
private void createWhereClause( String desiredGroupId )
{
- whereClause = "groupId == desiredGroupId";
+ whereClause = "groupId.like(desiredGroupId)";
declParams = new String[]{"String desiredGroupId"};
- params = new Object[]{desiredGroupId};
+ params = new Object[]{desiredGroupId + "%"};
}
public RepositoryProblemByGroupIdConstraint( String desiredGroupId )
Modified:
maven/archiva/trunk/archiva-database/src/main/java/org/apache/maven/archiva/database/constraints/RepositoryProblemConstraint.java
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-database/src/main/java/org/apache/maven/archiva/database/constraints/RepositoryProblemConstraint.java?rev=568011&r1=568010&r2=568011&view=diff
==============================================================================
---
maven/archiva/trunk/archiva-database/src/main/java/org/apache/maven/archiva/database/constraints/RepositoryProblemConstraint.java
(original)
+++
maven/archiva/trunk/archiva-database/src/main/java/org/apache/maven/archiva/database/constraints/RepositoryProblemConstraint.java
Tue Aug 21 01:16:36 2007
@@ -32,9 +32,9 @@
private void createWhereClause( String desiredGroupId, String
desiredRepositoryId )
{
- whereClause = "groupId == desiredGroupId && repositoryId ==
desiredRepositoryId";
+ whereClause = "groupId.like(desiredGroupId) && repositoryId ==
desiredRepositoryId";
declParams = new String[]{"String desiredGroupId", "String
desiredRepositoryId"};
- params = new Object[]{desiredGroupId, desiredRepositoryId};
+ params = new Object[]{desiredGroupId + "%", desiredRepositoryId};
}
public RepositoryProblemConstraint( String desiredGroupId, String
desiredRepositoryId )
Modified:
maven/archiva/trunk/archiva-database/src/test/java/org/apache/maven/archiva/database/constraints/RepositoryProblemByGroupIdConstraintTest.java
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-database/src/test/java/org/apache/maven/archiva/database/constraints/RepositoryProblemByGroupIdConstraintTest.java?rev=568011&r1=568010&r2=568011&view=diff
==============================================================================
---
maven/archiva/trunk/archiva-database/src/test/java/org/apache/maven/archiva/database/constraints/RepositoryProblemByGroupIdConstraintTest.java
(original)
+++
maven/archiva/trunk/archiva-database/src/test/java/org/apache/maven/archiva/database/constraints/RepositoryProblemByGroupIdConstraintTest.java
Tue Aug 21 01:16:36 2007
@@ -39,6 +39,8 @@
private static final String GROUP_ID_3 = "org.apache.maven.archiva.test.3";
+ private static final String GROUP_ID_PARTIAL = "org.apache.maven.archiva";
+
private RepositoryProblemDAO repoProblemDao;
protected void setUp()
@@ -81,6 +83,7 @@
assertConstraint( 1, new RepositoryProblemByGroupIdConstraint(
GROUP_ID_1 ) );
assertConstraint( 2, new RepositoryProblemByGroupIdConstraint(
GROUP_ID_2 ) );
assertConstraint( 3, new RepositoryProblemByGroupIdConstraint(
GROUP_ID_3 ) );
+ assertConstraint( 6, new RepositoryProblemByGroupIdConstraint(
GROUP_ID_PARTIAL ) );
}
private void assertConstraint( int expectedHits, Constraint constraint )
Modified:
maven/archiva/trunk/archiva-database/src/test/java/org/apache/maven/archiva/database/constraints/RepositoryProblemConstraintTest.java
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-database/src/test/java/org/apache/maven/archiva/database/constraints/RepositoryProblemConstraintTest.java?rev=568011&r1=568010&r2=568011&view=diff
==============================================================================
---
maven/archiva/trunk/archiva-database/src/test/java/org/apache/maven/archiva/database/constraints/RepositoryProblemConstraintTest.java
(original)
+++
maven/archiva/trunk/archiva-database/src/test/java/org/apache/maven/archiva/database/constraints/RepositoryProblemConstraintTest.java
Tue Aug 21 01:16:36 2007
@@ -41,6 +41,8 @@
private static final String GROUP_ID_4 = "org.apache.maven.archiva.test.4";
+ private static final String GROUP_ID_PARTIAL = "org.apache.maven.archiva";
+
private static final String REPO_ID_1 = "test-repo-1";
private static final String REPO_ID_2 = "test-repo-2";
@@ -92,6 +94,7 @@
assertConstraint( 2, new RepositoryProblemConstraint( GROUP_ID_2,
REPO_ID_1 ) );
assertConstraint( 3, new RepositoryProblemConstraint( GROUP_ID_3,
REPO_ID_1 ) );
assertConstraint( 0, new RepositoryProblemConstraint( GROUP_ID_4,
REPO_ID_1 ) );
+ assertConstraint( 6, new RepositoryProblemConstraint(
GROUP_ID_PARTIAL, REPO_ID_1 ) );
}
public void testRepoIdConstraint()
@@ -110,6 +113,10 @@
assertConstraint( 2, new RepositoryProblemConstraint( GROUP_ID_1,
REPO_ID_2 ) );
assertConstraint( 3, new RepositoryProblemConstraint( GROUP_ID_1,
REPO_ID_3 ) );
assertConstraint( 0, new RepositoryProblemConstraint( GROUP_ID_1,
REPO_ID_4 ) );
+ assertConstraint( 1, new RepositoryProblemConstraint(
GROUP_ID_PARTIAL, REPO_ID_1 ) );
+ assertConstraint( 2, new RepositoryProblemConstraint(
GROUP_ID_PARTIAL, REPO_ID_2 ) );
+ assertConstraint( 3, new RepositoryProblemConstraint(
GROUP_ID_PARTIAL, REPO_ID_3 ) );
+ assertConstraint( 0, new RepositoryProblemConstraint(
GROUP_ID_PARTIAL, REPO_ID_4 ) );
}
private void assertConstraint( int expectedHits, Constraint constraint )
Modified:
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/reports/GenerateReportAction.java
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/reports/GenerateReportAction.java?rev=568011&r1=568010&r2=568011&view=diff
==============================================================================
---
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/reports/GenerateReportAction.java
(original)
+++
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/reports/GenerateReportAction.java
Tue Aug 21 01:16:36 2007
@@ -154,7 +154,7 @@
if ( groupId != null && ( !groupId.equals( "" ) ) )
{
- if ( repositoryId != null && ( !repositoryId.equals( "" ) ) )
+ if ( repositoryId != null && ( !repositoryId.equals( "" ) &&
!repositoryId.equals( ShowReportsAction.ALL_REPOSITORIES ) ) )
{
constraint = new RepositoryProblemConstraint( range, groupId,
repositoryId );
}
@@ -163,7 +163,7 @@
constraint = new RepositoryProblemByGroupIdConstraint( range,
groupId );
}
}
- else if ( repositoryId != null && ( !repositoryId.equals( "" ) ) )
+ else if ( repositoryId != null && ( !repositoryId.equals( "" ) &&
!repositoryId.equals( ShowReportsAction.ALL_REPOSITORIES ) ) )
{
constraint = new RepositoryProblemByRepositoryIdConstraint( range,
repositoryId );
}
Modified:
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/reports/ShowReportsAction.java
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/reports/ShowReportsAction.java?rev=568011&r1=568010&r2=568011&view=diff
==============================================================================
---
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/reports/ShowReportsAction.java
(original)
+++
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/reports/ShowReportsAction.java
Tue Aug 21 01:16:36 2007
@@ -42,10 +42,12 @@
private Collection repositoryIds = new ArrayList();
+ public static final String ALL_REPOSITORIES = "All Repositories";
+
public String execute()
throws Exception
{
- repositoryIds.add( "" );
+ repositoryIds.add( ALL_REPOSITORIES );
repositoryIds.addAll(
dao.query( new UniqueFieldConstraint(
RepositoryProblem.class.getName(), "repositoryId" ) ) );
