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

Merged /archiva/trunk:r899478-909070 

git-svn-id: https://svn.apache.org/repos/asf/archiva/branches/MRM-1025@909202 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Brett Porter 2010-02-12 01:43:19 +00:00
parent 333764a1da bfe9d3b48d
commit 96fb5280ef
11 changed files with 91 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
archiva-docs/src/site/apt/adminguide/upgrade.apt
View File

@ -19,8 +19,8 @@ Upgrading Archiva
Because of the changes in the search implementation starting in 1.2, a few additional steps need to be performed when upgrading Archiva from 1.1.x to Because of the changes in the search implementation starting in 1.2, a few additional steps need to be performed when upgrading Archiva from 1.1.x to
1.2.x. Since the format of the index has changed in 1.2.x, the old index directory (which is located at <<</path/to/repo/.index>>> by default) needs to 1.2.x. Since the format of the index has changed in 1.2.x, the old index directory (which is located at <<</path/to/repo/.index>>> by default) needs to
be removed. And in order for the artifacts in the repository to be indexed again, the last modified date of the artifacts need to be updated. be removed. And in order for the artifacts in the repository to be indexed again, the last modified date of the artifacts need to be updated.
To do this, you can force Archiva to scan all the artifacts by ticking the 'Process All Artifacts' checkbox then clicking the 'Scan Repository Now' To do this, you can force Archiva to scan all the artifacts by ticking the <<<Process All Artifacts>>> checkbox then clicking the <<<Scan Repository Now>>>
button in the Repositories page. Take note though that this feature is only available starting with version 1.2.3. Otherwise, you must execute button in the Repositories page. Take note though that this feature is only available starting with version 1.3. Otherwise, you must execute
<<find [REPOSITORY_DIRECTORY_NAME] | xargs touch>> at the base directory where the repository resides and then force execute the repository scanning so <<find [REPOSITORY_DIRECTORY_NAME] | xargs touch>> at the base directory where the repository resides and then force execute the repository scanning so
that the new index will be generated. that the new index will be generated.

BIN
archiva-docs/src/site/resources/images/tour/audit-log.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 55 KiB

26
archiva-docs/src/site/xdoc/tour/audit-log.xml Normal file
View File

@ -0,0 +1,26 @@
<?xml version="1.0"?>
<document>
<properties>
<title>Audit Log Report</title>
<author email="oching@apache.org">Maria Odea Ching</author>
</properties>
<head>
</head>
<body>
<section name="Audit Log Report">
<div style="text-align: center">
<img src="../images/tour/audit-log.png" width="640" height="401" alt="" />
<p>
Archiva provides a user interface for querying audit logs. The current
implementation only covers upload/deploy actions but will include other
actions such as artifact delete, repository configuration and more in the future.
</p>
<p>
<a href="reports.html">Previous: Integrity Reports</a> |
<strong>Audit Log Report</strong> |
<a href="maintenance.html">Next: Maintenance</a>
</p>
</div>
</section>
</body>
</document>

8
archiva-docs/src/site/xdoc/tour/index.xml
View File

@ -91,10 +91,16 @@ table.bodyTable tr.b {
9. Integrity Reports 9. Integrity Reports
</a> </a>
</td> </td>
<td>
<a href="audit-log.html">
<img src="../images/tour/audit-log.png" width="150" height="93" style="border: 1px solid silver; margin-left: 0.25em; margin-bottom: 0.25em" alt="" /><br/>
10. Audit Log Report
</a>
</td>
<td> <td>
<a href="maintenance.html"> <a href="maintenance.html">
<img src="../images/tour/maintenance.png" width="150" height="93" style="border: 1px solid silver; margin-left: 0.25em; margin-bottom: 0.25em" alt="" /><br/> <img src="../images/tour/maintenance.png" width="150" height="93" style="border: 1px solid silver; margin-left: 0.25em; margin-bottom: 0.25em" alt="" /><br/>
10. Maintenance 11. Maintenance
</a> </a>
</td> </td>
</tr> </tr>

2
archiva-docs/src/site/xdoc/tour/maintenance.xml
View File

@ -18,7 +18,7 @@
enable or disable these consumers. enable or disable these consumers.
</p> </p>
<p> <p>
<a href="reports.html">Previous: Integrity Reports</a> | <a href="audit-log.html">Previous: Audit Log Report</a> |
<strong>Maintenance</strong> | <strong>Maintenance</strong> |
<a href="index.html">Next: Feature Tour</a> <a href="index.html">Next: Feature Tour</a>
</p> </p>

2
archiva-docs/src/site/xdoc/tour/reports.xml
View File

@ -18,7 +18,7 @@
<p> <p>
<a href="security.html">Previous: Role-based Security</a> | <a href="security.html">Previous: Role-based Security</a> |
<strong>Integrity Reports</strong> | <strong>Integrity Reports</strong> |
<a href="maintenance.html">Next: Maintenance</a> <a href="audit-log.html">Next: Audit Log Report</a>
</p> </p>
</div> </div>
</section> </section>

7
archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/testng.properties
View File

@ -77,6 +77,13 @@ PACKAGING1=jar
ARTIFACTFILEPATH1=test ARTIFACTFILEPATH1=test
REPOSITORYID1=internal REPOSITORYID1=internal
SNAPSHOT_GROUPID=org.apache.archiva
SNAPSHOT_ARTIFACTID=archiva-test
SNAPSHOT_VERSION=1.0-SNAPSHOT
SNAPSHOT_PACKAGING=jar
SNAPSHOT_ARTIFACTFILEPATH=test
SNAPSHOT_REPOSITORYID=snapshots
# REPOSITORIES # REPOSITORIES
# Manage Repositories # Manage Repositories
MANAGED_IDENTIFIER=testing1 MANAGED_IDENTIFIER=testing1

36
archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/AuditLogsReportTest.java
View File

@ -128,4 +128,40 @@ public class AuditLogsReportTest
assertTextPresent( "internal" ); assertTextPresent( "internal" );
assertTextPresent( "admin" ); assertTextPresent( "admin" );
} }
@Test (dependsOnMethods = { "testAddArtifactValidValues", "testUserWithRepoManagerInternalRole" }, enabled = false )
public void testViewAuditLogsViewAuditEventsForManageableRepositoriesOnly()
{
String groupId = getProperty( "SNAPSHOT_GROUPID" );
String artifactId = getProperty( "SNAPSHOT_ARTIFACTID" );
String version = getProperty( "SNAPSHOT_VERSION" );
String repo = getProperty( "SNAPSHOT_REPOSITORYID" );
String packaging = getProperty( "SNAPSHOT_PACKAGING" );
addArtifact( groupId, artifactId, version, packaging, getProperty( "SNAPSHOT_ARTIFACTFILEPATH" ), repo );
assertTextPresent( "Artifact '" + groupId + ":" + artifactId + ":" + version +
"' was successfully deployed to repository '" + repo + "'" );
clickLinkWithText( "Logout" );
login( getProperty( "REPOMANAGER_INTERNAL_USERNAME" ), getUserRolePassword() );
goToAuditLogReports();
assertAuditLogsReportPage();
selectValue( "repository", "all" );
submit();
assertAuditLogsReportPage();
assertTextPresent( "Results" );
assertTextNotPresent( "No audit logs found." );
assertTextPresent( "test-1.0.jar" );
assertTextPresent( "Uploaded File" );
assertTextPresent( "internal" );
assertTextPresent( "admin" );
assertTextNotPresent( artifactId + "-" + version + "." + packaging );
clickLinkWithText( "Logout" );
login( getProperty( "ADMIN_USERNAME" ), getProperty( "ADMIN_PASSWORD" ) );
}
} }

1
archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/RepositoryTest.java
View File

@ -36,6 +36,7 @@ public class RepositoryTest
assertRepositoriesPage(); assertRepositoriesPage();
} }
@Test(dependsOnMethods = { "testAddManagedRepoValidValues" } )
public void testAddManagedRepoInvalidValues() public void testAddManagedRepoInvalidValues()
{ {
goToRepositoriesPage(); goToRepositoriesPage();

5
archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractArchivaTest.java
View File

@ -503,7 +503,10 @@ public abstract class AbstractArchivaTest
public void goToRepositoriesPage() public void goToRepositoriesPage()
{ {
clickLinkWithText( "Repositories" ); if( !getTitle().equals( "Apache Archiva \\ Administration - Repositories" ) )
{
clickLinkWithText( "Repositories" );
}
assertRepositoriesPage(); assertRepositoriesPage();
} }

9
archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractRepositoryTest.java
View File

@ -28,7 +28,10 @@ public abstract class AbstractRepositoryTest
// Repository Groups // Repository Groups
public void goToRepositoryGroupsPage() public void goToRepositoryGroupsPage()
{ {
clickLinkWithText( "Repository Groups" ); if( !getTitle().equals( "Apache Archiva \\ Administration - Repository Groups" ) )
{
clickLinkWithText( "Repository Groups" );
}
assertRepositoryGroupsPage(); assertRepositoryGroupsPage();
} }
@ -288,8 +291,8 @@ public abstract class AbstractRepositoryTest
} }
public void editManagedRepository( String fieldName, String value ) public void editManagedRepository( String fieldName, String value )
{ {
//goToRepositoriesPage(); goToRepositoriesPage();
clickLinkWithXPath( "//div[@id='contentArea']/div/div[5]/div[1]/a[1]/img" ); clickLinkWithXPath( "//div[@id='contentArea']/div/div[5]/div[1]/a[1]/img" );
assertPage( "Apache Archiva \\ Admin: Edit Managed Repository" ); assertPage( "Apache Archiva \\ Admin: Edit Managed Repository" );
setFieldValue(fieldName, value); setFieldValue(fieldName, value);