You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by br...@apache.org on 2010/01/19 07:15:20 UTC
svn commit: r900664 [3/7] - in /archiva/branches/MRM-1025: ./ archiva-cli/
archiva-docs/ archiva-docs/src/site/ archiva-docs/src/site/apt/
archiva-docs/src/site/apt/adminguide/ archiva-docs/src/site/apt/userguide/
archiva-docs/src/site/resources/images...
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=900664&r1=900663&r2=900664&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 Tue Jan 19 06:15:09 2010
@@ -26,7 +26,6 @@
public class RepositoryTest
extends AbstractRepositoryTest
{
- @Test(dependsOnMethods = { "testWithCorrectUsernamePassword" } )
public void testAddManagedRepoValidValues()
{
goToRepositoriesPage();
@@ -37,11 +36,9 @@
assertRepositoriesPage();
}
- @Test(dependsOnMethods = { "testAddManagedRepoValidValues" } )
public void testAddManagedRepoInvalidValues()
- {
- goToRepositoriesPage();
- assertRepositoriesPage();
+ {
+ goToRepositoriesPage();
clickLinkWithLocator( "//div[@id='contentArea']/div/div/a[@href='/archiva/admin/addRepository.action']" );
addManagedRepository( "", "" , "" , "", "Maven 2.x Repository", "", "", "" );
assertTextPresent( "You must enter a repository identifier." );
Modified: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/SearchTest.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/SearchTest.java?rev=900664&r1=900663&r2=900664&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/SearchTest.java (original)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/SearchTest.java Tue Jan 19 06:15:09 2010
@@ -19,6 +19,8 @@
* under the License.
*/
+import java.io.File;
+
import org.apache.archiva.web.test.parent.AbstractSearchTest;
import org.testng.annotations.Test;
@@ -34,7 +36,6 @@
assertTextPresent( "No results found" );
}
- @Test (dependsOnMethods = { "testAddArtifactValidValues" } )
public void testSearchExistingArtifact()
{
searchForArtifact( getProperty( "ARTIFACT_ARTIFACTID" ) );
@@ -43,7 +44,6 @@
assertLinkPresent( "test" );
}
- @Test (dependsOnMethods = { "testAddArtifactValidValues" } )
public void testViewSearchedArtifact()
{
searchForArtifact( getProperty( "ARTIFACT_ARTIFACTID" ) );
@@ -66,12 +66,29 @@
assertTextPresent( "Advanced Search - At least one search criteria must be provided." );
}
- /* public void testSearchExistingArtifactUsingAdvancedSearchArtifactId()
+ public void testSearchExistingArtifactUsingAdvancedSearchArtifactId()
{
- searchForArtifactAdvancedSearch( null, getProperty( "ARTIFACT_ARTIFACTID" ), null, null, null, null );
+ searchForArtifactAdvancedSearch( null, getProperty( "ARTIFACT_ARTIFACTID" ), null, getProperty( "REPOSITORYID" ), null, null );
assertTextPresent( "Results" );
assertTextPresent( "Hits: 1 to 1 of 1" );
assertLinkPresent( "test" );
- }*/
+ }
+
+ public void testSearchExistingArtifactUsingAdvancedSearchGroupId()
+ {
+ searchForArtifactAdvancedSearch( getProperty( "GROUPID" ), null, null, getProperty( "REPOSITORYID" ), null, null );
+ assertTextPresent( "Results" );
+ assertTextPresent( "Hits: 1 to 1 of 1" );
+ assertLinkPresent( "test" );
+ }
+
+ public void testSearchExistingArtifactUsingAdvancedSearchNotInRepository()
+ {
+ searchForArtifactAdvancedSearch( null, getProperty( "ARTIFACT_ARTIFACTID" ), null, "snapshots", null, null );
+ assertTextPresent( "No results found" );
+ assertTextNotPresent( "Results" );
+ assertTextNotPresent( "Hits: 1 to 1 of 1" );
+ assertLinkNotPresent( "test" );
+ }
}
Modified: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/VirtualRepositoryTest.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/VirtualRepositoryTest.java?rev=900664&r1=900663&r2=900664&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/VirtualRepositoryTest.java (original)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/VirtualRepositoryTest.java Tue Jan 19 06:15:09 2010
@@ -21,6 +21,7 @@
import org.apache.archiva.web.test.parent.AbstractRepositoryTest;
import org.testng.annotations.Test;
+import org.testng.Assert;
@Test( groups = { "virtualrepository" }, dependsOnMethods = { "testWithCorrectUsernamePassword" } )
public class VirtualRepositoryTest
@@ -37,26 +38,25 @@
{
addRepositoryGroup( "testing" );
//assertAddedRepositoryLink( "testing" );
- assertTextPresent( "testing" );
+ Assert.assertEquals( getSelenium().getText( "//div[@id='contentArea']/div[2]/div/div[1]/p[1]" ), "testing" );
}
@Test(dependsOnMethods = { "testAddRepositoryGroupValidValue" } )
public void testAddRepositoryToRepositoryGroup()
{
addRepositoryToRepositoryGroup( "testing", "internal" );
- assertTextPresent( "internal" );
+ Assert.assertEquals( getSelenium().getText( "//div[@id='contentArea']/div[2]/div/div[3]/div[2]/p[1]" ), "internal" );
//clickLinkWithXPath( "/html/body/div[4]/div/div/div[2]/div/div/p[2]/a" );
//getSelenium().goBack();
}
@Test(dependsOnMethods = { "testAddRepositoryToRepositoryGroup" } )
public void testDeleteRepositoryOfRepositoryGroup()
- {
- goToRepositoryGroupsPage();
+ {
deleteRepositoryInRepositoryGroups();
assertTextPresent( "Repository Groups" );
assertTextNotPresent( "No Repository Groups Defined." );
- waitPage();
+ Assert.assertFalse( getSelenium().isElementPresent( "//div[@id='contentArea']/div[2]/div/div[3]/div[2]/p[1]" ) );
}
@Test(dependsOnMethods = { "testDeleteRepositoryOfRepositoryGroup" } )
Modified: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/listener/CaptureScreenShotsListener.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/listener/CaptureScreenShotsListener.java?rev=900664&r1=900663&r2=900664&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/listener/CaptureScreenShotsListener.java (original)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/listener/CaptureScreenShotsListener.java Tue Jan 19 06:15:09 2010
@@ -20,18 +20,28 @@
*/
import java.io.File;
+import java.io.IOException;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.regex.Pattern;
import org.apache.archiva.web.test.parent.AbstractSeleniumTest;
+import org.apache.commons.io.FileUtils;
import org.testng.ITestResult;
import org.testng.TestListenerAdapter;
+import com.thoughtworks.selenium.Selenium;
public class CaptureScreenShotsListener
extends TestListenerAdapter
{
@Override
+ public void onTestSkipped( ITestResult tr )
+ {
+ System.out.println( "Test " + tr.getName() + " -> Skipped" );
+ super.onTestSkipped( tr );
+ }
+
+ @Override
public void onTestFailure( ITestResult tr )
{
captureError( tr );
@@ -48,40 +58,38 @@
private void captureError( ITestResult tr )
{
- try
- {
- captureScreenshot( tr );
- }
- catch ( RuntimeException e )
- {
- System.out.println( "Error when take screenshot for test " + tr.getName() );
- e.printStackTrace();
- }
- }
-
- // captureAssertionError() creates a 'target/screenshots' directory and saves '.png' page screenshot of the
- // encountered error
- private void captureScreenshot( ITestResult tr )
- {
- File f = new File( "" );
- String filePath = f.getAbsolutePath();
- Date d = new Date();
SimpleDateFormat sdf = new SimpleDateFormat( "yyyy.MM.dd-HH_mm_ss" );
- String time = sdf.format( d );
- String fs = File.separator;
- File targetPath = new File( filePath + fs + "target" + fs + "screenshots" );
- targetPath.mkdir();
- String cName = tr.getTestClass().getName();
+ String time = sdf.format( new Date() );
+ File targetPath = new File( "target", "screenshots" );
StackTraceElement stackTrace[] = tr.getThrowable().getStackTrace();
+ String cName = tr.getTestClass().getName();
int index = getStackTraceIndexOfCallingClass( cName, stackTrace );
String methodName = stackTrace[index].getMethodName();
int lNumber = stackTrace[index].getLineNumber();
String lineNumber = Integer.toString( lNumber );
String className = cName.substring( cName.lastIndexOf( '.' ) + 1 );
- String fileName =
- targetPath.toString() + fs + methodName + "(" + className + ".java_" + lineNumber + ")-" + time + ".png";
- AbstractSeleniumTest.getSelenium().windowMaximize();
- AbstractSeleniumTest.getSelenium().captureEntirePageScreenshot( fileName, "" );
+ targetPath.mkdirs();
+ Selenium selenium = AbstractSeleniumTest.getSelenium();
+ String fileBaseName = methodName + "_" + className + ".java_" + lineNumber + "-" + time;
+ try
+ {
+ selenium.windowMaximize();
+ File fileName = new File( targetPath, fileBaseName + ".png" );
+ selenium.captureEntirePageScreenshot( fileName.getAbsolutePath(), "" );
+ }
+ catch ( RuntimeException e )
+ {
+ System.out.println( "Error when take screenshot for test " + tr.getName() + ": " + e.getMessage() );
+ try
+ {
+ File fileName = new File( targetPath, fileBaseName + ".html" );
+ FileUtils.writeStringToFile( fileName, selenium.getHtmlSource() );
+ }
+ catch ( IOException ioe )
+ {
+ System.out.println( ioe.getMessage() );
+ }
+ }
}
private int getStackTraceIndexOfCallingClass( String nameOfClass, StackTraceElement stackTrace[] )
Modified: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractArtifactManagementTest.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/AbstractArtifactManagementTest.java?rev=900664&r1=900663&r2=900664&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractArtifactManagementTest.java (original)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractArtifactManagementTest.java Tue Jan 19 06:15:09 2010
@@ -14,7 +14,7 @@
public String getArtifactId()
{
- String artifactId = getProperty( "GROUPID" ) ;
+ String artifactId = getProperty( "ARTIFACTID" ) ;
return artifactId;
}
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=900664&r1=900663&r2=900664&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 Tue Jan 19 06:15:09 2010
@@ -1,6 +1,26 @@
package org.apache.archiva.web.test.parent;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
import java.io.File;
+import org.testng.Assert;
public abstract class AbstractRepositoryTest
extends AbstractArchivaTest
@@ -80,12 +100,13 @@
public void deleteRepositoryInRepositoryGroups()
{
+ goToRepositoryGroupsPage();
getSelenium().click( "xpath=//div[@id='contentArea']/div[2]/div/div[3]/div[1]/a/img" );
+ waitPage();
}
public void deleteRepositoryGroup( String repositoryName )
{
- //goToRepositoryGroupsPage();
getSelenium().click( "xpath=//div[@id='contentArea']/div[2]/div/div[1]/div/a/img" );
waitPage();
assertDeleteRepositoryGroupPage( repositoryName );
@@ -306,23 +327,23 @@
assertTextPresent( "Repository Scanning - File Types" );
String artifactsTypes = "**/*.pom,**/*.jar,**/*.ear,**/*.war,**/*.car,**/*.sar,**/*.mar,**/*.rar,**/*.dtd,**/*.tld,**/*.tar.gz,**/*.tar.bz2,**/*.zip";
String [] arrayArtifactTypes = artifactsTypes.split( "," );
- for (String artifacttypes : arrayArtifactTypes )
- assertTextPresent( artifacttypes );
+ for (int i = 0; i < arrayArtifactTypes.length; i++)
+ Assert.assertEquals(getSelenium().getTable("//div[@id='contentArea']/div/div[1]/table."+i+".0"), arrayArtifactTypes[i]);
String autoremove = "**/*.bak,**/*~,**/*-";
String [] arrayAutoremove = autoremove.split( "," );
- for ( String arrayautoremove : arrayAutoremove )
- assertTextPresent( arrayautoremove );
+ for (int i = 0; i < arrayAutoremove.length; i++)
+ Assert.assertEquals(getSelenium().getTable("//div[@id='contentArea']/div/div[2]/table."+i+".0"), arrayAutoremove[i]);
String ignored = "**/.htaccess,**/KEYS,**/*.rb,**/*.sh,**/.svn/**,**/.DAV/**";
String [] arrayIgnored = ignored.split( "," );
- for ( String arrayignored : arrayIgnored )
- assertTextPresent( arrayignored );
+ for (int i = 0; i < arrayIgnored.length; i++)
+ Assert.assertEquals(getSelenium().getTable("//div[@id='contentArea']/div/div[3]/table."+i+".0"), arrayIgnored[i]);
String indexableContent = "**/*.txt,**/*.TXT,**/*.block,**/*.config,**/*.pom,**/*.xml,**/*.xsd,**/*.dtd,**/*.tld";
String [] arrayIndexableContent = indexableContent.split( "," );
- for ( String indexablecontent : arrayIndexableContent )
- assertTextPresent( indexablecontent );
+ for (int i = 0; i < arrayIndexableContent.length; i++)
+ Assert.assertEquals(getSelenium().getTable("//div[@id='contentArea']/div/div[4]/table."+i+".0"), arrayIndexableContent[i]);
}
/////////////////////////////////////////////
Modified: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractSearchTest.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/AbstractSearchTest.java?rev=900664&r1=900663&r2=900664&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractSearchTest.java (original)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractSearchTest.java Tue Jan 19 06:15:09 2010
@@ -25,7 +25,7 @@
//Search
public void goToSearchPage()
{
- if ( !"Apache Archiva \\ Quick Search".equals( getSelenium().getTitle() ) )
+ if ( !"Apache Archiva \\ Quick Search".equals( getTitle() ) )
{
clickLinkWithText( "Search" );
getSelenium().waitForPageToLoad( maxWaitTimeInMs );
@@ -107,6 +107,10 @@
setFieldValue( "rowCount", rowCount );
}
+ if ( repositoryId != null )
+ {
+ selectValue( "filteredSearch_repositoryId", repositoryId );
+ }
clickSubmitWithLocator( "filteredSearch_0" );
}
-}
\ No newline at end of file
+}
Modified: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractSeleniumTest.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/AbstractSeleniumTest.java?rev=900664&r1=900663&r2=900664&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractSeleniumTest.java (original)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractSeleniumTest.java Tue Jan 19 06:15:09 2010
@@ -140,14 +140,13 @@
public void assertPage( String title )
{
- // Collapse spaces
- String actualTitle = getSelenium().getTitle().replaceAll( "[ \n\r]+", " " );
- Assert.assertEquals( actualTitle, title );
+ Assert.assertEquals( getTitle(), title );
}
public String getTitle()
{
- return getSelenium().getTitle();
+ // Collapse spaces
+ return getSelenium().getTitle().replaceAll( "[ \n\r]+", " " );
}
public String getHtmlContent()
Modified: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/pom.xml
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/pom.xml?rev=900664&r1=900663&r2=900664&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/pom.xml (original)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/pom.xml Tue Jan 19 06:15:09 2010
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.archiva</groupId>
<artifactId>archiva-web</artifactId>
- <version>1.3-SNAPSHOT</version>
+ <version>1.4-SNAPSHOT</version>
</parent>
<artifactId>archiva-webapp</artifactId>
<packaging>war</packaging>
@@ -39,6 +39,10 @@
</dependency>
<dependency>
<groupId>org.apache.archiva</groupId>
+ <artifactId>audit</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.archiva</groupId>
<artifactId>archiva-scheduler-repository</artifactId>
</dependency>
<dependency>
@@ -64,7 +68,6 @@
<dependency>
<groupId>org.apache.archiva</groupId>
<artifactId>archiva-metadata-consumer</artifactId>
- <version>1.3-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
<dependency>
@@ -250,23 +253,19 @@
<dependency>
<groupId>org.apache.archiva</groupId>
<artifactId>metadata-model</artifactId>
- <version>1.3-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.archiva</groupId>
<artifactId>metadata-repository-api</artifactId>
- <version>1.3-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.archiva</groupId>
<artifactId>metadata-repository-file</artifactId>
- <version>1.3-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.archiva</groupId> <!-- FIXME: temporary coupling to plugin, should be runtime -->
<artifactId>maven2-repository</artifactId>
- <version>1.3-SNAPSHOT</version>
</dependency>
</dependencies>
<build>
@@ -307,9 +306,9 @@
<phase>compile</phase>
<configuration>
<tasks>
- <mkdir dir="${basedir}/target/archiva/WEB-INF/"/>
+ <mkdir dir="${basedir}/target/archiva/WEB-INF/" />
<copy todir="${basedir}/target/archiva/WEB-INF/">
- <fileset dir="${basedir}/target" includes="classes/" excludes="**/struts.xml"/>
+ <fileset dir="${basedir}/target" includes="classes/" excludes="**/struts.xml" />
</copy>
</tasks>
</configuration>
Modified: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/PlexusActionSupport.java
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/PlexusActionSupport.java?rev=900664&r1=900663&r2=900664&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/PlexusActionSupport.java (original)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/PlexusActionSupport.java Tue Jan 19 06:15:09 2010
@@ -89,7 +89,7 @@
protected void triggerAuditEvent( String resource, String action )
{
- AuditEvent event = new AuditEvent( getPrincipal(), resource, action );
+ AuditEvent event = new AuditEvent( null, getPrincipal(), resource, action );
event.setRemoteIP( getRemoteAddr() );
for ( AuditListener listener : auditListeners )
@@ -100,7 +100,7 @@
protected void triggerAuditEvent( String action )
{
- AuditEvent event = new AuditEvent( getPrincipal(), action );
+ AuditEvent event = new AuditEvent( null, getPrincipal(), null, action );
event.setRemoteIP( getRemoteAddr() );
for ( AuditListener listener : auditListeners )
Modified: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/UploadAction.java
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/UploadAction.java?rev=900664&r1=900663&r2=900664&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/UploadAction.java (original)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/UploadAction.java Tue Jan 19 06:15:09 2010
@@ -147,7 +147,7 @@
* @plexus.requirement role="org.apache.archiva.scheduler.ArchivaTaskScheduler" role-hint="repository"
*/
private ArchivaTaskScheduler scheduler;
-
+
private ChecksumAlgorithm[] algorithms = new ChecksumAlgorithm[]{ChecksumAlgorithm.SHA1, ChecksumAlgorithm.MD5};
public void setArtifact( File file )
@@ -415,7 +415,7 @@
String msg = "Artifact \'" + groupId + ":" + artifactId + ":" + version +
"\' was successfully deployed to repository \'" + repositoryId + "\'";
- triggerAuditEvent( repositoryId, groupId + ":" + artifactId + ":" + version, AuditEvent.UPLOAD_FILE );
+ triggerAuditEvent( repositoryId, artifactPath, AuditEvent.UPLOAD_FILE );
addActionMessage( msg );
Copied: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/reports/ViewAuditLogReportAction.java (from r899477, archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/reports/ViewAuditLogReportAction.java)
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/reports/ViewAuditLogReportAction.java?p2=archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/reports/ViewAuditLogReportAction.java&p1=archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/reports/ViewAuditLogReportAction.java&r1=899477&r2=900664&rev=900664&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/reports/ViewAuditLogReportAction.java (original)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/reports/ViewAuditLogReportAction.java Tue Jan 19 06:15:09 2010
@@ -27,16 +27,9 @@
import javax.servlet.http.HttpServletRequest;
+import org.apache.archiva.audit.AuditManager;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang.time.DateUtils;
-import org.apache.maven.archiva.database.ArchivaAuditLogsDao;
-import org.apache.maven.archiva.database.ArchivaDAO;
-import org.apache.maven.archiva.database.ArchivaDatabaseException;
-import org.apache.maven.archiva.database.ObjectNotFoundException;
-import org.apache.maven.archiva.database.SimpleConstraint;
-import org.apache.maven.archiva.database.constraints.ArchivaAuditLogsConstraint;
-import org.apache.maven.archiva.database.constraints.MostRecentArchivaAuditLogsConstraint;
-import org.apache.maven.archiva.model.ArchivaAuditLogs;
import org.apache.maven.archiva.repository.audit.AuditEvent;
import org.apache.maven.archiva.security.AccessDeniedException;
import org.apache.maven.archiva.security.ArchivaSecurityException;
@@ -65,16 +58,6 @@
*/
private UserRepositories userRepositories;
- /**
- * @plexus.requirement role-hint="jdo"
- */
- private ArchivaAuditLogsDao auditLogsDao;
-
- /**
- * @plexus.requirement role-hint="jdo"
- */
- private ArchivaDAO dao;
-
private String repository;
private List<String> repositories;
@@ -97,7 +80,7 @@
protected boolean isLastPage = true;
- private List<ArchivaAuditLogs> auditLogs;
+ private List<AuditEvent> auditLogs;
private static final String ALL_REPOSITORIES = "all";
@@ -115,6 +98,11 @@
"dd MMMMM yyyy", "dd/MM/yy", "dd/MM/yyyy", "yyyy/MM/dd", "yyyy-MM-dd", "yyyy-dd-MM", "MM-dd-yyyy",
"MM-dd-yy" };
+ /**
+ * @plexus.requirement
+ */
+ private AuditManager auditManager;
+
public SecureActionBundle getSecureActionBundle()
throws SecureActionException
{
@@ -148,27 +136,14 @@
headerName = HEADER_RESULTS;
}
- SimpleConstraint constraint = new MostRecentArchivaAuditLogsConstraint();
- auditLogs = (List<ArchivaAuditLogs>) dao.query( constraint );
+ auditLogs = auditManager.getMostRecentAuditEvents();
}
public String execute()
throws Exception
{
- auditLogs = null;
- String artifact = "";
-
- if ( groupId != null && !"".equals( groupId.trim() ) )
- {
- artifact = groupId + ( ( artifactId != null && !"".equals( artifactId.trim() ) ) ? ( "/" + artifactId + "/%" ) : "%" );
- }
- else
- {
- artifact = ( artifactId != null && !"".equals( artifactId.trim() ) ) ? ( "%" + artifactId + "%" ) : "";
- }
-
- Date startDateInDF = null;
- Date endDateInDF = null;
+ Date startDateInDF;
+ Date endDateInDF;
if ( startDate == null || "".equals( startDate ) )
{
Calendar cal = Calendar.getInstance();
@@ -201,46 +176,24 @@
range[0] = ( page - 1 ) * rowCount;
range[1] = ( page * rowCount ) + 1;
-
- ArchivaAuditLogsConstraint constraint = null;
- if ( !repository.equals( ALL_REPOSITORIES ) )
- {
- constraint =
- new ArchivaAuditLogsConstraint( range, artifact, repository, AuditEvent.UPLOAD_FILE, startDateInDF, endDateInDF );
- }
- else
- {
- constraint =
- new ArchivaAuditLogsConstraint( range, artifact, null, AuditEvent.UPLOAD_FILE, startDateInDF, endDateInDF );
- }
- try
- {
- auditLogs = auditLogsDao.queryAuditLogs( constraint );
- if( auditLogs.isEmpty() )
- {
- addActionError( "No audit logs found." );
- initial = "true";
- }
- else
- {
- initial = "false";
- }
-
- headerName = HEADER_RESULTS;
- paginate();
- }
- catch ( ObjectNotFoundException e )
+ String repo = repository.equals( ALL_REPOSITORIES ) ? null : repository;
+ // TODO: query by artifact
+ auditLogs = auditManager.getAuditEventsInRange( repo, startDateInDF, endDateInDF );
+
+ if( auditLogs.isEmpty() )
{
addActionError( "No audit logs found." );
- return ERROR;
+ initial = "true";
}
- catch ( ArchivaDatabaseException e )
+ else
{
- addActionError( "Error occurred while querying audit logs." );
- return ERROR;
+ initial = "false";
}
+ headerName = HEADER_RESULTS;
+ paginate();
+
return SUCCESS;
}
@@ -331,16 +284,11 @@
this.artifactId = artifactId;
}
- public List<ArchivaAuditLogs> getAuditLogs()
+ public List<AuditEvent> getAuditLogs()
{
return auditLogs;
}
- public void setAuditLogs( List<ArchivaAuditLogs> auditLogs )
- {
- this.auditLogs = auditLogs;
- }
-
public int getRowCount()
{
return rowCount;
Modified: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/util/ContextUtils.java
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/util/ContextUtils.java?rev=900664&r1=900663&r2=900664&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/util/ContextUtils.java (original)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/util/ContextUtils.java Tue Jan 19 06:15:09 2010
@@ -111,6 +111,12 @@
}
return name;
}
+ else
+ {
+ // respect chains of proxies, return first one (as it's the outermost visible one)
+ String[] hosts = name.split( "," );
+ name = hosts[0].trim();
+ }
return name;
}
}
Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.properties
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 19 06:15:09 2010
@@ -2,4 +2,5 @@
/archiva/branches/MRM-541/archiva-modules/archiva-web/archiva-webapp/src/main/resources/webwork.properties:686983-687034
/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/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.properties:825850-891135
+/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
Modified: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.xml
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.xml?rev=900664&r1=900663&r2=900664&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.xml (original)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.xml Tue Jan 19 06:15:09 2010
@@ -510,6 +510,16 @@
</result>
</action>
+ <!-- audit logs -->
+ <action name="queryAuditLogReport" class="viewAuditLogReport" method="input">
+ <result name="input">/WEB-INF/jsp/reports/auditLogReport.jsp</result>
+ </action>
+
+ <action name="viewAuditLogReport" class="viewAuditLogReport">
+ <result name="input">/WEB-INF/jsp/reports/auditLogReport.jsp</result>
+ <result>/WEB-INF/jsp/reports/auditLogReport.jsp</result>
+ </action>
+
</package>
</struts>
Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 19 06:15:09 2010
@@ -2,4 +2,5 @@
/archiva/branches/MRM-541/archiva-modules/archiva-web/archiva-webapp/src/main/resources/xwork.xml:686983-687034
/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/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.xml:825850-891135
+/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
Modified: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/accessToNoRepos.jsp
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/accessToNoRepos.jsp?rev=900664&r1=900663&r2=900664&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/accessToNoRepos.jsp (original)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/accessToNoRepos.jsp Tue Jan 19 06:15:09 2010
@@ -22,7 +22,7 @@
<html>
<head>
- <title>You have access to no repositories</title>
+ <title>You do not have access to any repository</title>
<s:head/>
</head>
@@ -31,8 +31,8 @@
<div id="contentArea">
<div id="results">
- You have access to no repositories.
- Ask your system administrator for access.
+ You do not have access to any repository.
+ Please contact your system administrator and request for access.
</div>
</div>
Modified: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp?rev=900664&r1=900663&r2=900664&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp (original)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp Tue Jan 19 06:15:09 2010
@@ -80,7 +80,7 @@
</li>
</ul>
- <redback:ifAnyAuthorized permissions="archiva-upload-repository,archiva-delete-artifact,archiva-manage-users,archiva-access-reports,archiva-manage-configuration">
+ <redback:ifAnyAuthorized permissions="archiva-upload-repository,archiva-delete-artifact,archiva-manage-users,archiva-access-reports,archiva-manage-configuration,archiva-view-audit-logs">
<h5>Manage</h5>
<ul>
<redback:ifAuthorized permission="archiva-access-reports">
@@ -88,6 +88,11 @@
<my:currentWWUrl action="pickReport" namespace="/report">Reports</my:currentWWUrl>
</li>
</redback:ifAuthorized>
+ <redback:ifAuthorized permission="archiva-view-audit-logs">
+ <li class="none">
+ <my:currentWWUrl action="queryAuditLogReport" namespace="/report">Audit Log Report</my:currentWWUrl>
+ </li>
+ </redback:ifAuthorized>
<redback:ifAuthorized permission="archiva-manage-users">
<li class="none">
<my:currentWWUrl action="userlist" namespace="/security">User Management</my:currentWWUrl>
@@ -112,7 +117,7 @@
<li class="none">
<my:currentWWUrl action="deleteArtifact" namespace="/">Delete Artifact</my:currentWWUrl>
</li>
- </redback:ifAuthorized>
+ </redback:ifAuthorized>
<%-- TODO: future options here.
* Repository Statistics.
* Web Services Statistics.
Copied: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/reports/auditLogReport.jsp (from r899477, archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/reports/auditLogReport.jsp)
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/reports/auditLogReport.jsp?p2=archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/reports/auditLogReport.jsp&p1=archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/reports/auditLogReport.jsp&r1=899477&r2=900664&rev=900664&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/reports/auditLogReport.jsp (original)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/reports/auditLogReport.jsp Tue Jan 19 06:15:09 2010
@@ -27,9 +27,9 @@
<title>Audit Log Report</title>
<s:head theme="ajax" />
- <link rel="stylesheet" href="<c:url value='/css/ui.datepicker.css'/>" type="text/css" media="all"/>
- <script type="text/javascript" src="<c:url value='/js/jquery/jquery-1.2.6.pack.js'/>"></script>
- <script type="text/javascript" src="<c:url value='/js/jquery/ui.datepicker.packed.js'/>"></script>
+ <link rel="stylesheet" href="<c:url value='/css/no-theme/jquery-ui-1.7.2.custom.css'/>" type="text/css" />
+ <script type="text/javascript" src="<c:url value='/js/jquery-1.3.2.min.js'/>"></script>
+ <script type="text/javascript" src="<c:url value='/js/jquery-ui-1.7.2.custom.min.js'/>"></script>
<script type="text/javascript" charset="utf-8">
$(document).ready(function()
{
@@ -119,18 +119,18 @@
<tr>
<th>Event</th>
<th>Repository</th>
- <th>Artifact</th>
+ <th>Resource</th>
<th>Event Date</th>
<th>Username</th>
</tr>
<c:forEach items="${auditLogs}" var="auditLog" varStatus="i">
<tr>
- <td>${auditLog.event}</td>
+ <td>${auditLog.action}</td>
<td>${auditLog.repositoryId}</td>
- <td>${auditLog.artifact}</td>
- <td>${auditLog.eventDate}</td>
- <td>${auditLog.username}</td>
+ <td>${auditLog.resource}</td>
+ <td>${auditLog.timestamp}</td>
+ <td>${auditLog.userId}</td>
</tr>
</c:forEach>
</table>
Modified: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/reports/statisticsReport.jsp
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/reports/statisticsReport.jsp?rev=900664&r1=900663&r2=900664&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/reports/statisticsReport.jsp (original)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/reports/statisticsReport.jsp Tue Jan 19 06:15:09 2010
@@ -154,6 +154,10 @@
<th>Archetypes</th>
<th>Jars</th>
<th>Wars</th>
+ <th>Ears</th>
+ <th>Exes</th>
+ <th>Dlls</th>
+ <th>Zips</th>
</tr>
<c:forEach var="stats" items="${repositoryStatistics}" varStatus="i">
@@ -168,6 +172,10 @@
<td align="right">${stats.totalCountForType['maven-archetype']}</td>
<td align="right">${stats.totalCountForType['jar']}</td>
<td align="right">${stats.totalCountForType['war']}</td>
+ <td align="right">${stats.totalCountForType['ear']}</td>
+ <td align="right">${stats.totalCountForType['exe']}</td>
+ <td align="right">${stats.totalCountForType['dll']}</td>
+ <td align="right">${stats.totalCountForType['zip']}</td>
</tr>
</c:forEach>
</table>
@@ -187,6 +195,10 @@
<th>Archetypes</th>
<th>Jars</th>
<th>Wars</th>
+ <th>Ears</th>
+ <th>Exes</th>
+ <th>Dlls</th>
+ <th>Zips</th>
</tr>
<c:forEach var="stats" items="${repositoryStatistics}">
@@ -201,6 +213,10 @@
<td align="right">${stats.totalCountForType['maven-archetype']}</td>
<td align="right">${stats.totalCountForType['jar']}</td>
<td align="right">${stats.totalCountForType['war']}</td>
+ <td align="right">${stats.totalCountForType['ear']}</td>
+ <td align="right">${stats.totalCountForType['exe']}</td>
+ <td align="right">${stats.totalCountForType['dll']}</td>
+ <td align="right">${stats.totalCountForType['zip']}</td>
</tr>
</c:forEach>
</table>
Modified: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/site.css
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/site.css?rev=900664&r1=900663&r2=900664&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/site.css (original)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/site.css Tue Jan 19 06:15:09 2010
@@ -350,3 +350,40 @@
list-style-image: url(../images/icon_warning_sml.gif)
}
+table.auditlogs {
+ text-align: center;
+ font-family: Verdana, Geneva, Arial, Helvetica, sans-serif ;
+ font-weight: normal;
+ font-size: 11px;
+ color: #fff;
+ width: 100%;
+ background-color: #666;
+ border: 0px;
+ border-collapse: collapse;
+ border-spacing: 0px;
+}
+
+table.auditlogs th {
+ background-color: #666;
+ color: #fff;
+ padding: 4px;
+ text-align: center;
+ border-bottom: 2px #fff solid;
+ font-size: 12px;
+ font-weight: bold;
+}
+
+table.auditlogs td {
+ background-color: #CCC;
+ color: #000;
+ padding: 4px;
+ text-align: center;
+ border: 1px #fff solid;
+}
+
+div.auditLogReportResults {
+ border: 1px dashed #DFDEDE;
+ margin-bottom: 15px;
+ margin-left: 2px;
+ padding: 5px;
+}
Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 19 06:15:09 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-891135*
+/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva:825850-882383,882384-899477*
Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/configuration/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 19 06:15:09 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-891135*
+/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/configuration:825850-882383,885006-899477*
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 Tue Jan 19 06:15:09 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-891135
+/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/configuration/TestConfiguration.java:825850-882383,885006-899477
Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/metadata/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 19 06:15:09 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-891135*
+/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/metadata:825850-882383,882384-899477*
Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/metadata/repository/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 19 06:15:09 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-891135*
+/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/metadata/repository:825850-882383,882384-899477*
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 Tue Jan 19 06:15:09 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-891135*
+/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/metadata/repository/memory:825850-882383,882384-899477*
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 Tue Jan 19 06:15:09 2010
@@ -1 +1 @@
-/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/metadata/repository/memory/TestMetadataRepository.java:888397-891135
+/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/metadata/repository/memory/TestMetadataRepository.java:888397-899477
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 Tue Jan 19 06:15:09 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-891135
+/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/metadata/repository/memory/TestMetadataResolver.java:825850-899477
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 Tue Jan 19 06:15:09 2010
@@ -1,4 +1,5 @@
/archiva/branches/MRM-541/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/rss/UserRepositoriesStub.java:686983-687034
/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/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/security/UserRepositoriesStub.java:825850-891135
+/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
Modified: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/UploadActionTest.java
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/UploadActionTest.java?rev=900664&r1=900663&r2=900664&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/UploadActionTest.java (original)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/UploadActionTest.java Tue Jan 19 06:15:09 2010
@@ -48,10 +48,6 @@
public class UploadActionTest
extends PlexusInSpringTestCase
{
- private ArchivaTaskScheduler scheduler;
-
- private MockControl schedulerControl;
-
private UploadAction uploadAction;
private ArchivaConfiguration archivaConfig;
@@ -61,25 +57,25 @@
private RepositoryContentFactory repoFactory;
private MockControl repoFactoryControl;
-
+
private static final String REPOSITORY_ID = "test-repo";
- private Configuration config;
+ private Configuration config;
public void setUp()
throws Exception
{
super.setUp();
- schedulerControl = MockControl.createControl( ArchivaTaskScheduler.class );
- scheduler = (ArchivaTaskScheduler) schedulerControl.getMock();
+ MockControl schedulerControl = MockControl.createControl( ArchivaTaskScheduler.class );
+ ArchivaTaskScheduler scheduler = (ArchivaTaskScheduler) schedulerControl.getMock();
archivaConfigControl = MockControl.createControl( ArchivaConfiguration.class );
archivaConfig = (ArchivaConfiguration) archivaConfigControl.getMock();
repoFactoryControl = MockClassControl.createControl( RepositoryContentFactory.class );
repoFactory = (RepositoryContentFactory) repoFactoryControl.getMock();
-
+
uploadAction = new UploadAction();
uploadAction.setScheduler( scheduler );
uploadAction.setConfiguration( archivaConfig );
@@ -411,7 +407,7 @@
archivaConfigControl.expectAndReturn( archivaConfig.getConfiguration(), config );
repoFactoryControl.expectAndReturn( repoFactory.getManagedRepositoryContent( REPOSITORY_ID ), content );
-
+
archivaConfigControl.replay();
repoFactoryControl.replay();
@@ -505,10 +501,10 @@
archivaConfigControl.expectAndReturn( archivaConfig.getConfiguration(), config, 2 );
repoFactoryControl.expectAndReturn( repoFactory.getManagedRepositoryContent( REPOSITORY_ID ), content, 2 );
-
+
archivaConfigControl.replay();
repoFactoryControl.replay();
-
+
String returnString = uploadAction.doUpload();
assertEquals( Action.SUCCESS, returnString );
Modified: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/DisableProxyConnectorActionTest.java
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/DisableProxyConnectorActionTest.java?rev=900664&r1=900663&r2=900664&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/DisableProxyConnectorActionTest.java (original)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/DisableProxyConnectorActionTest.java Tue Jan 19 06:15:09 2010
@@ -40,7 +40,7 @@
private MockControl archivaConfigurationControl;
private ArchivaConfiguration archivaConfiguration;
-
+
public void testConfirmDisableBadSourceOrTarget()
throws Exception
{
Modified: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/AddManagedRepositoryActionTest.java
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/AddManagedRepositoryActionTest.java?rev=900664&r1=900663&r2=900664&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/AddManagedRepositoryActionTest.java (original)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/AddManagedRepositoryActionTest.java Tue Jan 19 06:15:09 2010
@@ -51,7 +51,7 @@
private MockControl archivaConfigurationControl;
private ArchivaConfiguration archivaConfiguration;
-
+
private static final String REPO_ID = "repo-ident";
private File location;
@@ -145,8 +145,7 @@
assertFalse( location.exists() );
String status = action.commit();
assertEquals( Action.SUCCESS, status );
- assertTrue( location.exists() );
-
+ assertTrue( location.exists() );
assertEquals( Collections.singletonList( repository ), configuration.getManagedRepositories() );
roleManagerControl.verify();
Modified: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/DeleteManagedRepositoryActionTest.java
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/DeleteManagedRepositoryActionTest.java?rev=900664&r1=900663&r2=900664&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/DeleteManagedRepositoryActionTest.java (original)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/DeleteManagedRepositoryActionTest.java Tue Jan 19 06:15:09 2010
@@ -79,7 +79,7 @@
archivaConfigurationControl = MockControl.createControl( ArchivaConfiguration.class );
archivaConfiguration = (ArchivaConfiguration) archivaConfigurationControl.getMock();
action.setArchivaConfiguration( archivaConfiguration );
-
+
roleManagerControl = MockControl.createControl( RoleManager.class );
roleManager = (RoleManager) roleManagerControl.getMock();
action.setRoleManager( roleManager );
@@ -127,9 +127,10 @@
ManagedRepositoryConfiguration repository = action.getRepository();
assertNotNull( repository );
assertRepositoryEquals( repository, createRepository() );
-
+
String status = action.execute();
assertEquals( Action.SUCCESS, status );
+
repository = action.getRepository();
assertRepositoryEquals( repository, createRepository() );
assertEquals( Collections.singletonList( originalRepository ), configuration.getManagedRepositories() );
@@ -146,7 +147,7 @@
Configuration configuration = prepDeletionTest( createRepository(), 4 );
- String status = action.deleteEntry();
+ String status = action.deleteEntry();
assertEquals( Action.SUCCESS, status );
@@ -168,7 +169,7 @@
Configuration configuration = prepDeletionTest( createRepository(), 4 );
String status = action.deleteContents();
-
+
assertEquals( Action.SUCCESS, status );
assertTrue( configuration.getManagedRepositories().isEmpty() );
@@ -194,6 +195,7 @@
assertEquals( 1, configuration.getProxyConnectors().size() );
String status = action.deleteContents();
+
assertEquals( Action.SUCCESS, status );
assertTrue( configuration.getManagedRepositories().isEmpty() );
@@ -211,6 +213,7 @@
ManagedRepositoryConfiguration originalRepository = createRepository();
Configuration configuration = prepDeletionTest( originalRepository, 3 );
+
String status = action.execute();
assertEquals( Action.SUCCESS, status );
Modified: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/EditManagedRepositoryActionTest.java
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/EditManagedRepositoryActionTest.java?rev=900664&r1=900663&r2=900664&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/EditManagedRepositoryActionTest.java (original)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/EditManagedRepositoryActionTest.java Tue Jan 19 06:15:09 2010
@@ -140,10 +140,10 @@
ManagedRepositoryConfiguration repository = action.getRepository();
populateRepository( repository );
repository.setName( "new repo name" );
-
+
String status = action.commit();
assertEquals( Action.SUCCESS, status );
-
+
ManagedRepositoryConfiguration newRepository = createRepository();
newRepository.setName( "new repo name" );
assertRepositoryEquals( repository, newRepository );
Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/reports/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue Jan 19 06:15:09 2010
@@ -0,0 +1,6 @@
+/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/reports:721945-723577,882046,882457,884741,885313-885314,892686*
+/archiva/branches/MRM-541/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/reports:686983-687034
+/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
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 (added)
+++ svn:mergeinfo Tue Jan 19 06:15:09 2010
@@ -0,0 +1,6 @@
+/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/reports/GenerateReportActionTest.java:882046,882457,884741,885313-885314
+/archiva/branches/MRM-541/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/reports/GenerateReportActionTest.java:686983-687034
+/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
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 Tue Jan 19 06:15:09 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-891135*
+/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/tags:825850-885005,885006-899477*
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 Tue Jan 19 06:15:09 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-891135
+/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/tags/DependencyTreeTest.java:825850-899477
Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 19 06:15:09 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-891135*
+/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories:825850-885005,885006-899477*
Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 19 06:15:09 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-891135*
+/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test:825850-885005,885006-899477*
Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 19 06:15:09 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-891135*
+/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId:825850-885005,885006-899477*
Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/artifactId/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 19 06:15:09 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-891135*
+/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/artifactId:825850-885005,885006-899477*
Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/artifactId/version/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 19 06:15:09 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-891135*
+/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/artifactId/version:825850-885005,885006-899477*
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 Tue Jan 19 06:15:09 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-891135
+/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/artifactId/version/artifactId-version.pom:825850-899477
Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child1/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 19 06:15:09 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-891135*
+/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child1:825850-885005,885006-899477*
Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child1/1.0/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 19 06:15:09 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-891135*
+/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child1/1.0:825850-885005,885006-899477*
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 Tue Jan 19 06:15:09 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-891135
+/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child1/1.0/child1-1.0.pom:825850-899477
Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child2/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 19 06:15:09 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-891135*
+/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child2:825850-885005,885006-899477*
Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child2/1.0/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 19 06:15:09 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-891135*
+/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child2/1.0:825850-885005,885006-899477*
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 Tue Jan 19 06:15:09 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-891135
+/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child2/1.0/child2-1.0.pom:825850-899477
Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child3/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 19 06:15:09 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-891135*
+/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child3:825850-885005,885006-899477*
Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child3/1.0/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 19 06:15:09 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-891135*
+/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child3/1.0:825850-885005,885006-899477*
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 Tue Jan 19 06:15:09 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-891135
+/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child3/1.0/child3-1.0.pom:825850-899477
Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild1/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 19 06:15:09 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-891135*
+/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild1:825850-885005,885006-899477*
Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild1/2.0/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 19 06:15:09 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-891135*
+/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild1/2.0:825850-885005,885006-899477*
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 Tue Jan 19 06:15:09 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-891135
+/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild1/2.0/grandchild1-2.0.pom:825850-899477
Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild2/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 19 06:15:09 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-891135*
+/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild2:825850-885005,885006-899477*
Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild2/2.0/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 19 06:15:09 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-891135*
+/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild2/2.0:825850-885005,885006-899477*