Return-Path: Delivered-To: apmail-archiva-commits-archive@www.apache.org Received: (qmail 41491 invoked from network); 12 Feb 2010 01:43:51 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 12 Feb 2010 01:43:51 -0000 Received: (qmail 43066 invoked by uid 500); 12 Feb 2010 01:43:50 -0000 Delivered-To: apmail-archiva-commits-archive@archiva.apache.org Received: (qmail 43035 invoked by uid 500); 12 Feb 2010 01:43:50 -0000 Mailing-List: contact commits-help@archiva.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@archiva.apache.org Delivered-To: mailing list commits@archiva.apache.org Received: (qmail 43026 invoked by uid 99); 12 Feb 2010 01:43:50 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 12 Feb 2010 01:43:50 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 12 Feb 2010 01:43:47 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id BCEC223889F1; Fri, 12 Feb 2010 01:43:27 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r909202 [2/4] - in /archiva/branches/MRM-1025: ./ archiva-docs/src/site/apt/adminguide/ archiva-docs/src/site/resources/images/tour/ archiva-docs/src/site/xdoc/tour/ archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/ma... Date: Fri, 12 Feb 2010 01:43:25 -0000 To: commits@archiva.apache.org From: brett@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100212014327.BCEC223889F1@eris.apache.org> Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/archiva-test.xml ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Feb 12 01:43:19 2010 @@ -2,4 +2,4 @@ /archiva/branches/MRM-541/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/archiva-test.xml:686983-687034 /archiva/branches/archiva-search-improvements/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/archiva-test.xml:723609-726925 /archiva/branches/archiva-struts2/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/archiva-test.xml:699795-705848 -/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/archiva-test.xml:825850-899477 +/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/archiva-test.xml:825850-909070 Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/org/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Feb 12 01:43:19 2010 @@ -2,4 +2,4 @@ /archiva/branches/MRM-541/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/org:686983-687034 /archiva/branches/archiva-search-improvements/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/org:723609-726925 /archiva/branches/archiva-struts2/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/org:699795-705848 -/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/org:825850-882054,882055-899477* +/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/org:825850-882054,882055-909070* Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/org/apache/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Feb 12 01:43:19 2010 @@ -2,4 +2,4 @@ /archiva/branches/MRM-541/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/org/apache:686983-687034 /archiva/branches/archiva-search-improvements/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/org/apache:723609-726925 /archiva/branches/archiva-struts2/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/org/apache:699795-705848 -/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/org/apache:825850-882054,882055-899477* +/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/org/apache:825850-882054,882055-909070* Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/org/apache/archiva/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Feb 12 01:43:19 2010 @@ -2,4 +2,4 @@ /archiva/branches/MRM-541/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/org/apache/archiva:686983-687034 /archiva/branches/archiva-search-improvements/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/org/apache/archiva:723609-726925 /archiva/branches/archiva-struts2/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/org/apache/archiva:699795-705848 -/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/org/apache/archiva:825850-882054,882055-899477* +/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/org/apache/archiva:825850-882054,882055-909070* Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/org/apache/archiva/scheduler/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Feb 12 01:43:19 2010 @@ -2,4 +2,4 @@ /archiva/branches/MRM-541/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/org/apache/archiva/scheduler:686983-687034 /archiva/branches/archiva-search-improvements/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/org/apache/archiva/scheduler:723609-726925 /archiva/branches/archiva-struts2/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/org/apache/archiva/scheduler:699795-705848 -/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/org/apache/archiva/scheduler:825850-882054,882055-899477* +/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/org/apache/archiva/scheduler:825850-882054,882055-909070* Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/org/apache/archiva/scheduler/repository/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Feb 12 01:43:19 2010 @@ -2,4 +2,4 @@ /archiva/branches/MRM-541/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/org/apache/archiva/scheduler/repository:686983-687034 /archiva/branches/archiva-search-improvements/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/org/apache/archiva/scheduler/repository:723609-726925 /archiva/branches/archiva-struts2/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/org/apache/archiva/scheduler/repository:699795-705848 -/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/org/apache/archiva/scheduler/repository:825850-882054,882055-899477* +/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/org/apache/archiva/scheduler/repository:825850-882054,882055-909070* Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutorTest.xml ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Feb 12 01:43:19 2010 @@ -2,4 +2,4 @@ /archiva/branches/MRM-541/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutorTest.xml:686983-687034 /archiva/branches/archiva-search-improvements/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutorTest.xml:723609-726925 /archiva/branches/archiva-struts2/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutorTest.xml:699795-705848 -/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutorTest.xml:825850-899477 +/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutorTest.xml:825850-909070 Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/test-repo/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Feb 12 01:43:19 2010 @@ -2,4 +2,4 @@ /archiva/branches/MRM-541/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/test-repo:686983-687034 /archiva/branches/archiva-search-improvements/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/test-repo:723609-726925 /archiva/branches/archiva-struts2/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/test-repo:699795-705848 -/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/test-repo:825850-899477 +/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/test-repo:825850-909070 Modified: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/testng.properties URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/testng.properties?rev=909202&r1=909201&r2=909202&view=diff ============================================================================== --- archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/testng.properties (original) +++ archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/testng.properties Fri Feb 12 01:43:19 2010 @@ -77,6 +77,13 @@ ARTIFACTFILEPATH1=test 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 # Manage Repositories MANAGED_IDENTIFIER=testing1 Modified: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/AuditLogsReportTest.java URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/AuditLogsReportTest.java?rev=909202&r1=909201&r2=909202&view=diff ============================================================================== --- archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/AuditLogsReportTest.java (original) +++ archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/AuditLogsReportTest.java Fri Feb 12 01:43:19 2010 @@ -128,4 +128,40 @@ assertTextPresent( "internal" ); 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" ) ); + } } Modified: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/RepositoryTest.java URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/RepositoryTest.java?rev=909202&r1=909201&r2=909202&view=diff ============================================================================== --- archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/RepositoryTest.java (original) +++ archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/RepositoryTest.java Fri Feb 12 01:43:19 2010 @@ -36,6 +36,7 @@ assertRepositoriesPage(); } + @Test(dependsOnMethods = { "testAddManagedRepoValidValues" } ) public void testAddManagedRepoInvalidValues() { goToRepositoriesPage(); Modified: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractArchivaTest.java URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractArchivaTest.java?rev=909202&r1=909201&r2=909202&view=diff ============================================================================== --- archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractArchivaTest.java (original) +++ archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractArchivaTest.java Fri Feb 12 01:43:19 2010 @@ -503,7 +503,10 @@ public void goToRepositoriesPage() { - clickLinkWithText( "Repositories" ); + if( !getTitle().equals( "Apache Archiva \\ Administration - Repositories" ) ) + { + clickLinkWithText( "Repositories" ); + } assertRepositoriesPage(); } Modified: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractRepositoryTest.java URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractRepositoryTest.java?rev=909202&r1=909201&r2=909202&view=diff ============================================================================== --- archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractRepositoryTest.java (original) +++ archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractRepositoryTest.java Fri Feb 12 01:43:19 2010 @@ -28,7 +28,10 @@ // Repository Groups public void goToRepositoryGroupsPage() { - clickLinkWithText( "Repository Groups" ); + if( !getTitle().equals( "Apache Archiva \\ Administration - Repository Groups" ) ) + { + clickLinkWithText( "Repository Groups" ); + } assertRepositoryGroupsPage(); } @@ -288,8 +291,8 @@ } public void editManagedRepository( String fieldName, String value ) - { - //goToRepositoriesPage(); + { + goToRepositoriesPage(); clickLinkWithXPath( "//div[@id='contentArea']/div/div[5]/div[1]/a[1]/img" ); assertPage( "Apache Archiva \\ Admin: Edit Managed Repository" ); setFieldValue(fieldName, value); Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.properties ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Feb 12 01:43:19 2010 @@ -3,4 +3,4 @@ /archiva/branches/archiva-search-improvements/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.properties:723609-726925 /archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.properties:699795-700720 /archiva/tags/archiva-1.3/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.properties:898632 -/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.properties:825850-899477 +/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.properties:825850-909070 Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.xml ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Feb 12 01:43:19 2010 @@ -3,4 +3,4 @@ /archiva/branches/archiva-search-improvements/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.xml:723609-726925 /archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.xml:699795-700720 /archiva/tags/archiva-1.3/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.xml:898632 -/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.xml:825850-899477 +/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.xml:825850-909070 Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Feb 12 01:43:19 2010 @@ -2,4 +2,4 @@ /archiva/branches/MRM-541/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva:686983-687034 /archiva/branches/archiva-search-improvements/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva:723609-726925 /archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva:699795-705848 -/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva:825850-882383,882384-899477* +/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva:825850-882383,882384-909070* Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/configuration/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Feb 12 01:43:19 2010 @@ -2,4 +2,4 @@ /archiva/branches/MRM-541/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/configuration:686983-687034 /archiva/branches/archiva-search-improvements/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/configuration:723609-726925 /archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/configuration:699795-705848 -/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/configuration:825850-882383,885006-899477* +/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/configuration:825850-882383,885006-909070* Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/configuration/TestConfiguration.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Feb 12 01:43:19 2010 @@ -2,4 +2,4 @@ /archiva/branches/MRM-541/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/configuration/TestConfiguration.java:686983-687034 /archiva/branches/archiva-search-improvements/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/configuration/TestConfiguration.java:723609-726925 /archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/configuration/TestConfiguration.java:699795-705848 -/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/configuration/TestConfiguration.java:825850-882383,885006-899477 +/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/configuration/TestConfiguration.java:825850-882383,885006-909070 Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/metadata/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Feb 12 01:43:19 2010 @@ -2,4 +2,4 @@ /archiva/branches/MRM-541/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/metadata:686983-687034 /archiva/branches/archiva-search-improvements/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/metadata:723609-726925 /archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/metadata:699795-705848 -/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/metadata:825850-882383,882384-899477* +/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/metadata:825850-882383,882384-909070* Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/metadata/repository/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Feb 12 01:43:19 2010 @@ -2,4 +2,4 @@ /archiva/branches/MRM-541/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/metadata/repository:686983-687034 /archiva/branches/archiva-search-improvements/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/metadata/repository:723609-726925 /archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/metadata/repository:699795-705848 -/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/metadata/repository:825850-882383,882384-899477* +/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/metadata/repository:825850-882383,882384-909070* Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/metadata/repository/memory/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Feb 12 01:43:19 2010 @@ -2,4 +2,4 @@ /archiva/branches/MRM-541/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/metadata/repository/memory:686983-687034 /archiva/branches/archiva-search-improvements/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/metadata/repository/memory:723609-726925 /archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/metadata/repository/memory:699795-705848 -/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/metadata/repository/memory:825850-882383,882384-899477* +/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/metadata/repository/memory:825850-882383,882384-909070* Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/metadata/repository/memory/TestMetadataRepository.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Feb 12 01:43:19 2010 @@ -1 +1 @@ -/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/metadata/repository/memory/TestMetadataRepository.java:888397-899477 +/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/metadata/repository/memory/TestMetadataRepository.java:888397-909070 Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/metadata/repository/memory/TestMetadataResolver.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Feb 12 01:43:19 2010 @@ -2,4 +2,4 @@ /archiva/branches/MRM-541/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/metadata/repository/memory/TestMetadataResolver.java:686983-687034 /archiva/branches/archiva-search-improvements/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/metadata/repository/memory/TestMetadataResolver.java:723609-726925 /archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/metadata/repository/memory/TestMetadataResolver.java:699795-705848 -/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/metadata/repository/memory/TestMetadataResolver.java:825850-899477 +/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/metadata/repository/memory/TestMetadataResolver.java:825850-909070 Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/security/UserRepositoriesStub.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Feb 12 01:43:19 2010 @@ -2,4 +2,4 @@ /archiva/branches/archiva-search-improvements/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/rss/UserRepositoriesStub.java:723609-726925 /archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/rss/UserRepositoriesStub.java:699795-705848 /archiva/tags/archiva-1.3/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/security/UserRepositoriesStub.java:898632 -/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/security/UserRepositoriesStub.java:825850-899477 +/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/security/UserRepositoriesStub.java:825850-909070 Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/reports/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Feb 12 01:43:19 2010 @@ -3,4 +3,4 @@ /archiva/branches/archiva-search-improvements/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/reports:723609-726925 /archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/reports:699795-705848 /archiva/tags/archiva-1.3/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/reports:898632 -/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/reports:825850-899477 +/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/reports:825850-909070 Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/reports/GenerateReportActionTest.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Feb 12 01:43:19 2010 @@ -3,4 +3,4 @@ /archiva/branches/archiva-search-improvements/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/reports/GenerateReportActionTest.java:723609-726925 /archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/reports/GenerateReportActionTest.java:699795-705848 /archiva/tags/archiva-1.3/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/reports/GenerateReportActionTest.java:898632 -/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/reports/GenerateReportActionTest.java:891136-899477 +/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/reports/GenerateReportActionTest.java:891136-909070 Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/tags/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Feb 12 01:43:19 2010 @@ -2,4 +2,4 @@ /archiva/branches/MRM-541/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/tags:686983-687034 /archiva/branches/archiva-search-improvements/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/tags:723609-726925 /archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/tags:699795-705848 -/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/tags:825850-885005,885006-899477* +/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/tags:825850-885005,885006-909070* Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/tags/DependencyTreeTest.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Feb 12 01:43:19 2010 @@ -2,4 +2,4 @@ /archiva/branches/MRM-541/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/tags/DependencyTreeTest.java:686983-687034 /archiva/branches/archiva-search-improvements/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/tags/DependencyTreeTest.java:723609-726925 /archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/tags/DependencyTreeTest.java:699795-705848 -/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/tags/DependencyTreeTest.java:825850-899477 +/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/tags/DependencyTreeTest.java:825850-909070 Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Feb 12 01:43:19 2010 @@ -2,4 +2,4 @@ /archiva/branches/MRM-541/archiva-modules/archiva-web/archiva-webapp/src/test/repositories:686983-687034 /archiva/branches/archiva-search-improvements/archiva-modules/archiva-web/archiva-webapp/src/test/repositories:723609-726925 /archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/test/repositories:699795-705848 -/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories:825850-885005,885006-899477* +/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories:825850-885005,885006-909070* Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Feb 12 01:43:19 2010 @@ -2,4 +2,4 @@ /archiva/branches/MRM-541/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test:686983-687034 /archiva/branches/archiva-search-improvements/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test:723609-726925 /archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test:699795-705848 -/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test:825850-885005,885006-899477* +/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test:825850-885005,885006-909070* Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Feb 12 01:43:19 2010 @@ -2,4 +2,4 @@ /archiva/branches/MRM-541/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId:686983-687034 /archiva/branches/archiva-search-improvements/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId:723609-726925 /archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId:699795-705848 -/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId:825850-885005,885006-899477* +/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId:825850-885005,885006-909070* Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/artifactId/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Feb 12 01:43:19 2010 @@ -2,4 +2,4 @@ /archiva/branches/MRM-541/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/artifactId:686983-687034 /archiva/branches/archiva-search-improvements/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/artifactId:723609-726925 /archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/artifactId:699795-705848 -/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/artifactId:825850-885005,885006-899477* +/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/artifactId:825850-885005,885006-909070* Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/artifactId/version/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Feb 12 01:43:19 2010 @@ -2,4 +2,4 @@ /archiva/branches/MRM-541/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/artifactId/version:686983-687034 /archiva/branches/archiva-search-improvements/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/artifactId/version:723609-726925 /archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/artifactId/version:699795-705848 -/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/artifactId/version:825850-885005,885006-899477* +/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/artifactId/version:825850-885005,885006-909070* Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/artifactId/version/artifactId-version.pom ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Feb 12 01:43:19 2010 @@ -2,4 +2,4 @@ /archiva/branches/MRM-541/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/artifactId/version/artifactId-version.pom:686983-687034 /archiva/branches/archiva-search-improvements/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/artifactId/version/artifactId-version.pom:723609-726925 /archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/artifactId/version/artifactId-version.pom:699795-705848 -/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/artifactId/version/artifactId-version.pom:825850-899477 +/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/artifactId/version/artifactId-version.pom:825850-909070 Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child1/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Feb 12 01:43:19 2010 @@ -2,4 +2,4 @@ /archiva/branches/MRM-541/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child1:686983-687034 /archiva/branches/archiva-search-improvements/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child1:723609-726925 /archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child1:699795-705848 -/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child1:825850-885005,885006-899477* +/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child1:825850-885005,885006-909070* Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child1/1.0/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Feb 12 01:43:19 2010 @@ -2,4 +2,4 @@ /archiva/branches/MRM-541/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child1/1.0:686983-687034 /archiva/branches/archiva-search-improvements/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child1/1.0:723609-726925 /archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child1/1.0:699795-705848 -/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child1/1.0:825850-885005,885006-899477* +/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child1/1.0:825850-885005,885006-909070* Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child1/1.0/child1-1.0.pom ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Feb 12 01:43:19 2010 @@ -2,4 +2,4 @@ /archiva/branches/MRM-541/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child1/1.0/child1-1.0.pom:686983-687034 /archiva/branches/archiva-search-improvements/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child1/1.0/child1-1.0.pom:723609-726925 /archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child1/1.0/child1-1.0.pom:699795-705848 -/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child1/1.0/child1-1.0.pom:825850-899477 +/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child1/1.0/child1-1.0.pom:825850-909070 Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child2/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Feb 12 01:43:19 2010 @@ -2,4 +2,4 @@ /archiva/branches/MRM-541/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child2:686983-687034 /archiva/branches/archiva-search-improvements/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child2:723609-726925 /archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child2:699795-705848 -/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child2:825850-885005,885006-899477* +/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child2:825850-885005,885006-909070* Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child2/1.0/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Feb 12 01:43:19 2010 @@ -2,4 +2,4 @@ /archiva/branches/MRM-541/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child2/1.0:686983-687034 /archiva/branches/archiva-search-improvements/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child2/1.0:723609-726925 /archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child2/1.0:699795-705848 -/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child2/1.0:825850-885005,885006-899477* +/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child2/1.0:825850-885005,885006-909070* Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child2/1.0/child2-1.0.pom ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Feb 12 01:43:19 2010 @@ -2,4 +2,4 @@ /archiva/branches/MRM-541/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child2/1.0/child2-1.0.pom:686983-687034 /archiva/branches/archiva-search-improvements/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child2/1.0/child2-1.0.pom:723609-726925 /archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child2/1.0/child2-1.0.pom:699795-705848 -/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child2/1.0/child2-1.0.pom:825850-899477 +/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child2/1.0/child2-1.0.pom:825850-909070 Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child3/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Feb 12 01:43:19 2010 @@ -2,4 +2,4 @@ /archiva/branches/MRM-541/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child3:686983-687034 /archiva/branches/archiva-search-improvements/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child3:723609-726925 /archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child3:699795-705848 -/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child3:825850-885005,885006-899477* +/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child3:825850-885005,885006-909070* Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child3/1.0/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Feb 12 01:43:19 2010 @@ -2,4 +2,4 @@ /archiva/branches/MRM-541/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child3/1.0:686983-687034 /archiva/branches/archiva-search-improvements/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child3/1.0:723609-726925 /archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child3/1.0:699795-705848 -/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child3/1.0:825850-885005,885006-899477* +/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child3/1.0:825850-885005,885006-909070* Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child3/1.0/child3-1.0.pom ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Feb 12 01:43:19 2010 @@ -2,4 +2,4 @@ /archiva/branches/MRM-541/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child3/1.0/child3-1.0.pom:686983-687034 /archiva/branches/archiva-search-improvements/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child3/1.0/child3-1.0.pom:723609-726925 /archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child3/1.0/child3-1.0.pom:699795-705848 -/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child3/1.0/child3-1.0.pom:825850-899477 +/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child3/1.0/child3-1.0.pom:825850-909070 Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild1/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Feb 12 01:43:19 2010 @@ -2,4 +2,4 @@ /archiva/branches/MRM-541/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild1:686983-687034 /archiva/branches/archiva-search-improvements/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild1:723609-726925 /archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild1:699795-705848 -/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild1:825850-885005,885006-899477* +/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild1:825850-885005,885006-909070* Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild1/2.0/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Feb 12 01:43:19 2010 @@ -2,4 +2,4 @@ /archiva/branches/MRM-541/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild1/2.0:686983-687034 /archiva/branches/archiva-search-improvements/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild1/2.0:723609-726925 /archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild1/2.0:699795-705848 -/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild1/2.0:825850-885005,885006-899477* +/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild1/2.0:825850-885005,885006-909070* Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild1/2.0/grandchild1-2.0.pom ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Feb 12 01:43:19 2010 @@ -2,4 +2,4 @@ /archiva/branches/MRM-541/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild1/2.0/grandchild1-2.0.pom:686983-687034 /archiva/branches/archiva-search-improvements/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild1/2.0/grandchild1-2.0.pom:723609-726925 /archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild1/2.0/grandchild1-2.0.pom:699795-705848 -/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild1/2.0/grandchild1-2.0.pom:825850-899477 +/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild1/2.0/grandchild1-2.0.pom:825850-909070 Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild2/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Feb 12 01:43:19 2010 @@ -2,4 +2,4 @@ /archiva/branches/MRM-541/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild2:686983-687034 /archiva/branches/archiva-search-improvements/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild2:723609-726925 /archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild2:699795-705848 -/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild2:825850-885005,885006-899477* +/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild2:825850-885005,885006-909070* Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild2/2.0/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Feb 12 01:43:19 2010 @@ -2,4 +2,4 @@ /archiva/branches/MRM-541/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild2/2.0:686983-687034 /archiva/branches/archiva-search-improvements/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild2/2.0:723609-726925 /archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild2/2.0:699795-705848 -/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild2/2.0:825850-885005,885006-899477* +/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild2/2.0:825850-885005,885006-909070* Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild2/2.0/grandchild2-2.0.pom ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Feb 12 01:43:19 2010 @@ -2,4 +2,4 @@ /archiva/branches/MRM-541/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild2/2.0/grandchild2-2.0.pom:686983-687034 /archiva/branches/archiva-search-improvements/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild2/2.0/grandchild2-2.0.pom:723609-726925 /archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild2/2.0/grandchild2-2.0.pom:699795-705848 -/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild2/2.0/grandchild2-2.0.pom:825850-899477 +/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild2/2.0/grandchild2-2.0.pom:825850-909070 Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild3/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Feb 12 01:43:19 2010 @@ -2,4 +2,4 @@ /archiva/branches/MRM-541/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild3:686983-687034 /archiva/branches/archiva-search-improvements/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild3:723609-726925 /archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild3:699795-705848 -/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild3:825850-885005,885006-899477* +/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild3:825850-885005,885006-909070* Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild3/2.0/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Feb 12 01:43:19 2010 @@ -2,4 +2,4 @@ /archiva/branches/MRM-541/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild3/2.0:686983-687034 /archiva/branches/archiva-search-improvements/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild3/2.0:723609-726925 /archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild3/2.0:699795-705848 -/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild3/2.0:825850-885005,885006-899477* +/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild3/2.0:825850-885005,885006-909070* Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild3/2.0/grandchild3-2.0.pom ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Feb 12 01:43:19 2010 @@ -2,4 +2,4 @@ /archiva/branches/MRM-541/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild3/2.0/grandchild3-2.0.pom:686983-687034 /archiva/branches/archiva-search-improvements/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild3/2.0/grandchild3-2.0.pom:723609-726925 /archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild3/2.0/grandchild3-2.0.pom:699795-705848 -/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild3/2.0/grandchild3-2.0.pom:825850-899477 +/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild3/2.0/grandchild3-2.0.pom:825850-909070 Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/great-grandchild/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Feb 12 01:43:19 2010 @@ -2,4 +2,4 @@ /archiva/branches/MRM-541/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/great-grandchild:686983-687034 /archiva/branches/archiva-search-improvements/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/great-grandchild:723609-726925 /archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/great-grandchild:699795-705848 -/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/great-grandchild:825850-885005,885006-899477* +/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/great-grandchild:825850-885005,885006-909070* Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/great-grandchild/3.0/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Feb 12 01:43:19 2010 @@ -2,4 +2,4 @@ /archiva/branches/MRM-541/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/great-grandchild/3.0:686983-687034 /archiva/branches/archiva-search-improvements/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/great-grandchild/3.0:723609-726925 /archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/great-grandchild/3.0:699795-705848 -/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/great-grandchild/3.0:825850-885005,885006-899477* +/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/great-grandchild/3.0:825850-885005,885006-909070* Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/great-grandchild/3.0/great-grandchild-3.0.pom ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Feb 12 01:43:19 2010 @@ -2,4 +2,4 @@ /archiva/branches/MRM-541/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/great-grandchild/3.0/great-grandchild-3.0.pom:686983-687034 /archiva/branches/archiva-search-improvements/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/great-grandchild/3.0/great-grandchild-3.0.pom:723609-726925 /archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/great-grandchild/3.0/great-grandchild-3.0.pom:699795-705848 -/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/great-grandchild/3.0/great-grandchild-3.0.pom:825850-899477 +/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/great-grandchild/3.0/great-grandchild-3.0.pom:825850-909070 Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/action/reports/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Feb 12 01:43:19 2010 @@ -3,4 +3,4 @@ /archiva/branches/archiva-search-improvements/archiva-modules/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/action/reports:723609-726925 /archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/action/reports:699795-705848 /archiva/tags/archiva-1.3/archiva-modules/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/action/reports:898632 -/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/action/reports:825850-899477 +/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/action/reports:825850-909070 Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/tags/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Feb 12 01:43:19 2010 @@ -2,4 +2,4 @@ /archiva/branches/MRM-541/archiva-modules/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/tags:686983-687034 /archiva/branches/archiva-search-improvements/archiva-modules/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/tags:723609-726925 /archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/tags:699795-705848 -/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/tags:825850-885005,885006-899477* +/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/tags:825850-885005,885006-909070* Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/tags/DependencyTreeTest.xml ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Feb 12 01:43:19 2010 @@ -2,4 +2,4 @@ /archiva/branches/MRM-541/archiva-modules/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/tags/DependencyTreeTest.xml:686983-687034 /archiva/branches/archiva-search-improvements/archiva-modules/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/tags/DependencyTreeTest.xml:723609-726925 /archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/tags/DependencyTreeTest.xml:699795-705848 -/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/tags/DependencyTreeTest.xml:825850-899477 +/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/tags/DependencyTreeTest.xml:825850-909070 Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Feb 12 01:43:19 2010 @@ -2,4 +2,4 @@ /archiva/branches/MRM-541/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva:686983-687034 /archiva/branches/archiva-search-improvements/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva:723609-726925 /archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva:699795-705848 -/archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva:825850-887039,887040-899477* +/archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva:825850-887039,887040-909070* Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/metadata/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Feb 12 01:43:19 2010 @@ -2,4 +2,4 @@ /archiva/branches/MRM-541/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/metadata:686983-687034 /archiva/branches/archiva-search-improvements/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/metadata:723609-726925 /archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/metadata:699795-705848 -/archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/metadata:825850-887039,887040-899477* +/archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/metadata:825850-887039,887040-909070* Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/metadata/repository/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Feb 12 01:43:19 2010 @@ -2,4 +2,4 @@ /archiva/branches/MRM-541/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/metadata/repository:686983-687034 /archiva/branches/archiva-search-improvements/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/metadata/repository:723609-726925 /archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/metadata/repository:699795-705848 -/archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/metadata/repository:825850-887039,887040-899477* +/archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/metadata/repository:825850-887039,887040-909070* Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/metadata/repository/TestMetadataRepository.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Feb 12 01:43:19 2010 @@ -2,4 +2,4 @@ /archiva/branches/MRM-541/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/metadata/repository/TestMetadataRepository.java:686983-687034 /archiva/branches/archiva-search-improvements/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/metadata/repository/TestMetadataRepository.java:723609-726925 /archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/metadata/repository/TestMetadataRepository.java:699795-705848 -/archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/metadata/repository/TestMetadataRepository.java:825850-899477 +/archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/metadata/repository/TestMetadataRepository.java:825850-909070 Propchange: archiva/branches/MRM-1025/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/filter/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Feb 12 01:43:19 2010 @@ -2,4 +2,4 @@ /archiva/branches/MRM-541/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/filter:686983-687034 /archiva/branches/archiva-search-improvements/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/filter:723609-726925 /archiva/branches/archiva-struts2/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/filter:699795-705848 -/archiva/trunk/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/filter:825850-885005,885006-899477* +/archiva/trunk/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/filter:825850-885005,885006-909070* Propchange: archiva/branches/MRM-1025/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/filter/AllFilter.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Feb 12 01:43:19 2010 @@ -2,4 +2,4 @@ /archiva/branches/MRM-541/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/filter/AllFilter.java:686983-687034 /archiva/branches/archiva-search-improvements/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/filter/AllFilter.java:723609-726925 /archiva/branches/archiva-struts2/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/filter/AllFilter.java:699795-705848 -/archiva/trunk/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/filter/AllFilter.java:825850-899477 +/archiva/trunk/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/filter/AllFilter.java:825850-909070 Propchange: archiva/branches/MRM-1025/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/filter/ExcludesFilter.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Feb 12 01:43:19 2010 @@ -2,4 +2,4 @@ /archiva/branches/MRM-541/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/filter/ExcludesFilter.java:686983-687034 /archiva/branches/archiva-search-improvements/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/filter/ExcludesFilter.java:723609-726925 /archiva/branches/archiva-struts2/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/filter/ExcludesFilter.java:699795-705848 -/archiva/trunk/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/filter/ExcludesFilter.java:825850-899477 +/archiva/trunk/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/filter/ExcludesFilter.java:825850-909070 Propchange: archiva/branches/MRM-1025/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/filter/Filter.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Feb 12 01:43:19 2010 @@ -2,4 +2,4 @@ /archiva/branches/MRM-541/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/filter/Filter.java:686983-687034 /archiva/branches/archiva-search-improvements/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/filter/Filter.java:723609-726925 /archiva/branches/archiva-struts2/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/filter/Filter.java:699795-705848 -/archiva/trunk/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/filter/Filter.java:825850-899477 +/archiva/trunk/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/filter/Filter.java:825850-909070 Propchange: archiva/branches/MRM-1025/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/storage/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Feb 12 01:43:19 2010 @@ -2,4 +2,4 @@ /archiva/branches/MRM-541/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/storage:686983-687034 /archiva/branches/archiva-search-improvements/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/storage:723609-726925 /archiva/branches/archiva-struts2/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/storage:699795-705848 -/archiva/trunk/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/storage:825850-882383,882384-899477* +/archiva/trunk/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/storage:825850-882383,882384-909070* Propchange: archiva/branches/MRM-1025/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/storage/RepositoryPathTranslator.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Feb 12 01:43:19 2010 @@ -2,4 +2,4 @@ /archiva/branches/MRM-541/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/storage/RepositoryPathTranslator.java:686983-687034 /archiva/branches/archiva-search-improvements/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/storage/RepositoryPathTranslator.java:723609-726925 /archiva/branches/archiva-struts2/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/storage/RepositoryPathTranslator.java:699795-705848 -/archiva/trunk/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/storage/RepositoryPathTranslator.java:825850-899477 +/archiva/trunk/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/storage/RepositoryPathTranslator.java:825850-909070 Propchange: archiva/branches/MRM-1025/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/storage/StorageMetadataResolver.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Feb 12 01:43:19 2010 @@ -2,4 +2,4 @@ /archiva/branches/MRM-541/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/storage/StorageMetadataResolver.java:686983-687034 /archiva/branches/archiva-search-improvements/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/storage/StorageMetadataResolver.java:723609-726925 /archiva/branches/archiva-struts2/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/storage/StorageMetadataResolver.java:699795-705848 -/archiva/trunk/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/storage/StorageMetadataResolver.java:825850-882383,885006-899477 +/archiva/trunk/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/storage/StorageMetadataResolver.java:825850-882383,885006-909070 Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/ ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Fri Feb 12 01:43:19 2010 @@ -0,0 +1,6 @@ +/archiva/branches/MRM-1025/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit:721945-723577 +/archiva/branches/MRM-541/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit:686983-687034 +/archiva/branches/archiva-search-improvements/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit:723609-726925 +/archiva/branches/archiva-struts2/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit:699795-705848 +/archiva/tags/archiva-1.3/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit:898632 +/archiva/trunk/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit:825850-899477,899478-909070* Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/AuditEventFactory.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Feb 12 01:43:19 2010 @@ -1,5 +1,6 @@ -/archiva/branches/MRM-1025/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/RepositoryStatisticsFactory.java:721945-723577 -/archiva/branches/MRM-541/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/RepositoryStatisticsFactory.java:686983-687034 -/archiva/branches/archiva-search-improvements/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/RepositoryStatisticsFactory.java:723609-726925 -/archiva/branches/archiva-struts2/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/RepositoryStatisticsFactory.java:699795-705848 -/archiva/trunk/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/RepositoryStatisticsFactory.java:825850-899477 +/archiva/branches/MRM-1025/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/AuditEventFactory.java:721945-723577 +/archiva/branches/MRM-541/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/AuditEventFactory.java:686983-687034 +/archiva/branches/archiva-search-improvements/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/AuditEventFactory.java:723609-726925 +/archiva/branches/archiva-struts2/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/AuditEventFactory.java:699795-705848 +/archiva/tags/archiva-1.3/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/AuditEventFactory.java:898632 +/archiva/trunk/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/AuditEventFactory.java:825850-909070 Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/AuditManager.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Feb 12 01:43:19 2010 @@ -1,5 +1,6 @@ -/archiva/branches/MRM-1025/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/RepositoryStatisticsManager.java:721945-723577 -/archiva/branches/MRM-541/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/RepositoryStatisticsManager.java:686983-687034 -/archiva/branches/archiva-search-improvements/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/RepositoryStatisticsManager.java:723609-726925 -/archiva/branches/archiva-struts2/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/RepositoryStatisticsManager.java:699795-705848 -/archiva/trunk/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/RepositoryStatisticsManager.java:825850-899477 +/archiva/branches/MRM-1025/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/AuditManager.java:721945-723577 +/archiva/branches/MRM-541/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/AuditManager.java:686983-687034 +/archiva/branches/archiva-search-improvements/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/AuditManager.java:723609-726925 +/archiva/branches/archiva-struts2/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/AuditManager.java:699795-705848 +/archiva/tags/archiva-1.3/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/AuditManager.java:898632 +/archiva/trunk/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/AuditManager.java:825850-909070 Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/DefaultAuditManager.java ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Fri Feb 12 01:43:19 2010 @@ -0,0 +1,6 @@ +/archiva/branches/MRM-1025/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/DefaultAuditManager.java:721945-723577 +/archiva/branches/MRM-541/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/DefaultAuditManager.java:686983-687034 +/archiva/branches/archiva-search-improvements/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/DefaultAuditManager.java:723609-726925 +/archiva/branches/archiva-struts2/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/DefaultAuditManager.java:699795-705848 +/archiva/tags/archiva-1.3/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/DefaultAuditManager.java:898632 +/archiva/trunk/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/DefaultAuditManager.java:825850-909070 Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/MetadataAuditListener.java ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Fri Feb 12 01:43:19 2010 @@ -0,0 +1,6 @@ +/archiva/branches/MRM-1025/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/MetadataAuditListener.java:721945-723577 +/archiva/branches/MRM-541/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/MetadataAuditListener.java:686983-687034 +/archiva/branches/archiva-search-improvements/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/MetadataAuditListener.java:723609-726925 +/archiva/branches/archiva-struts2/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/MetadataAuditListener.java:699795-705848 +/archiva/tags/archiva-1.3/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/MetadataAuditListener.java:898632 +/archiva/trunk/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/MetadataAuditListener.java:825850-909070 Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/audit/src/test/java/org/apache/archiva/audit/ ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Fri Feb 12 01:43:19 2010 @@ -0,0 +1,6 @@ +/archiva/branches/MRM-1025/archiva-modules/plugins/audit/src/test/java/org/apache/archiva/audit:721945-723577 +/archiva/branches/MRM-541/archiva-modules/plugins/audit/src/test/java/org/apache/archiva/audit:686983-687034 +/archiva/branches/archiva-search-improvements/archiva-modules/plugins/audit/src/test/java/org/apache/archiva/audit:723609-726925 +/archiva/branches/archiva-struts2/archiva-modules/plugins/audit/src/test/java/org/apache/archiva/audit:699795-705848 +/archiva/tags/archiva-1.3/archiva-modules/plugins/audit/src/test/java/org/apache/archiva/audit:898632 +/archiva/trunk/archiva-modules/plugins/audit/src/test/java/org/apache/archiva/audit:825850-899477,899478-909070* Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/audit/src/test/java/org/apache/archiva/audit/AuditManagerTest.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Feb 12 01:43:19 2010 @@ -1,5 +1,6 @@ -/archiva/branches/MRM-1025/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata/repository/stats/RepositoryStatisticsManagerTest.java:721945-723577 -/archiva/branches/MRM-541/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata/repository/stats/RepositoryStatisticsManagerTest.java:686983-687034 -/archiva/branches/archiva-search-improvements/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata/repository/stats/RepositoryStatisticsManagerTest.java:723609-726925 -/archiva/branches/archiva-struts2/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata/repository/stats/RepositoryStatisticsManagerTest.java:699795-705848 -/archiva/trunk/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata/repository/stats/RepositoryStatisticsManagerTest.java:825850-899477 +/archiva/branches/MRM-1025/archiva-modules/plugins/audit/src/test/java/org/apache/archiva/audit/AuditManagerTest.java:721945-723577 +/archiva/branches/MRM-541/archiva-modules/plugins/audit/src/test/java/org/apache/archiva/audit/AuditManagerTest.java:686983-687034 +/archiva/branches/archiva-search-improvements/archiva-modules/plugins/audit/src/test/java/org/apache/archiva/audit/AuditManagerTest.java:723609-726925 +/archiva/branches/archiva-struts2/archiva-modules/plugins/audit/src/test/java/org/apache/archiva/audit/AuditManagerTest.java:699795-705848 +/archiva/tags/archiva-1.3/archiva-modules/plugins/audit/src/test/java/org/apache/archiva/audit/AuditManagerTest.java:898632 +/archiva/trunk/archiva-modules/plugins/audit/src/test/java/org/apache/archiva/audit/AuditManagerTest.java:825850-909070 Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Feb 12 01:43:19 2010 @@ -2,4 +2,4 @@ /archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata:686983-687034 /archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata:723609-726925 /archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata:699795-705848 -/archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata:825850-882383,882384-899477* +/archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata:825850-882383,882384-909070* Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Feb 12 01:43:19 2010 @@ -2,4 +2,4 @@ /archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository:686983-687034 /archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository:723609-726925 /archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository:699795-705848 -/archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository:825850-882383,882384-899477* +/archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository:825850-882383,882384-909070* Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Feb 12 01:43:19 2010 @@ -2,4 +2,4 @@ /archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage:686983-687034 /archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage:723609-726925 /archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage:699795-705848 -/archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage:825850-882383,882384-899477* +/archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage:825850-882383,882384-909070* Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Feb 12 01:43:19 2010 @@ -2,4 +2,4 @@ /archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2:686983-687034 /archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2:723609-726925 /archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2:699795-705848 -/archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2:825850-882383,882384-899477* +/archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2:825850-882383,882384-909070* Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/DummyLifecycleBindingsInjector.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Feb 12 01:43:19 2010 @@ -2,4 +2,4 @@ /archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/DummyLifecycleBindingsInjector.java:686983-687034 /archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/DummyLifecycleBindingsInjector.java:723609-726925 /archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/DummyLifecycleBindingsInjector.java:699795-705848 -/archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/DummyLifecycleBindingsInjector.java:825850-899477 +/archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/DummyLifecycleBindingsInjector.java:825850-909070