Author: brett
Date: Thu Nov 19 06:20:43 2009
New Revision: 882055
URL: http://svn.apache.org/viewvc?rev=882055&view=rev
Log:
Merged /archiva/trunk:r825850-882054
Removed:
archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp-test/junit-pom.xml
Modified:
archiva/branches/MRM-1025/ (props changed)
archiva/branches/MRM-1025/archiva-docs/src/site/site.xml
archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/Consumer.java
(props changed)
archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/main/java/org/apache/archiva/consumers/lucene/NexusIndexerConsumer.java
archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/test/java/org/apache/archiva/consumers/lucene/NexusIndexerConsumerTest.java
archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-layer/pom.xml
archiva/branches/MRM-1025/archiva-modules/archiva-scheduled/src/test/java/org/apache/maven/archiva/scheduled/executors/ArchivaIndexingTaskExecutorTest.java
archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp-test/
(props changed)
archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp-test/ReadMe.txt
archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp-test/pom.xml
archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/ArchivaAdminTest.java
archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/SearchTest.java
archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractSearchTest.java
archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractSeleniumTest.java
archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp-test/src/test/tomcat5x/conf/Catalina/localhost/archiva.xml
archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/pom.xml
archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.properties
(props changed)
archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.xml
(props changed)
archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/security/UserRepositoriesStub.java
(props changed)
Propchange: archiva/branches/MRM-1025/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Nov 19 06:20:43 2009
@@ -2,3 +2,4 @@
/archiva/branches/MRM-541:686983-687034
/archiva/branches/archiva-search-improvements:723609-726925
/archiva/branches/archiva-struts2:699795-705848
+/archiva/trunk:825850-882054
Modified: archiva/branches/MRM-1025/archiva-docs/src/site/site.xml
URL:
http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-docs/src/site/site.xml?rev=882055&r1=882054&r2=882055&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-docs/src/site/site.xml (original)
+++ archiva/branches/MRM-1025/archiva-docs/src/site/site.xml Thu Nov 19
06:20:43 2009
@@ -67,7 +67,7 @@
<item name="Consumers" href="/adminguide/consumers.html"
/>
</item>
<item name="Configuration Files"
href="/adminguide/configuration-files.html" />
- <item name="Log Files" href="/adminguide/logging.html" >
+ <item name="Log Files" href="/adminguide/logging.html"
collapse="true">
<item name="Archiva Logs"
href="/adminguide/archiva-logs.html" />
<item name="Audit Logs"
href="/adminguide/audit-logs.html" />
<item name="Security Logs"
href="/adminguide/security-logs.html" />
Propchange:
archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/Consumer.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Nov 19 06:20:43 2009
@@ -2,3 +2,4 @@
/archiva/branches/MRM-541/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/BaseConsumer.java:686983-687034
/archiva/branches/archiva-search-improvements/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/Consumer.java:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/BaseConsumer.java:699795-705848
+/archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/Consumer.java:825850-882054
Modified:
archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/main/java/org/apache/archiva/consumers/lucene/NexusIndexerConsumer.java
URL:
http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/main/java/org/apache/archiva/consumers/lucene/NexusIndexerConsumer.java?rev=882055&r1=882054&r2=882055&view=diff
==============================================================================
---
archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/main/java/org/apache/archiva/consumers/lucene/NexusIndexerConsumer.java
(original)
+++
archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/main/java/org/apache/archiva/consumers/lucene/NexusIndexerConsumer.java
Thu Nov 19 06:20:43 2009
@@ -173,6 +173,8 @@
includes.clear();
includes.addAll( filetypes.getFileTypePatterns(
FileTypes.INDEXABLE_CONTENT ) );
+
+ includes.addAll( filetypes.getFileTypePatterns( FileTypes.ARTIFACTS )
);
}
public void initialize()
Modified:
archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/test/java/org/apache/archiva/consumers/lucene/NexusIndexerConsumerTest.java
URL:
http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/test/java/org/apache/archiva/consumers/lucene/NexusIndexerConsumerTest.java?rev=882055&r1=882054&r2=882055&view=diff
==============================================================================
---
archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/test/java/org/apache/archiva/consumers/lucene/NexusIndexerConsumerTest.java
(original)
+++
archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/test/java/org/apache/archiva/consumers/lucene/NexusIndexerConsumerTest.java
Thu Nov 19 06:20:43 2009
@@ -24,6 +24,7 @@
import java.util.Calendar;
import java.util.Date;
import java.util.HashSet;
+import java.util.List;
import java.util.Set;
import org.apache.commons.io.FileUtils;
@@ -36,6 +37,7 @@
import org.apache.maven.archiva.scheduled.tasks.ArtifactIndexingTask;
import org.apache.maven.archiva.scheduled.tasks.DatabaseTask;
import org.apache.maven.archiva.scheduled.tasks.RepositoryTask;
+import org.codehaus.plexus.personality.plexus.lifecycle.phase.Initializable;
import org.codehaus.plexus.spring.PlexusInSpringTestCase;
import org.codehaus.plexus.taskqueue.TaskQueueException;
import org.codehaus.plexus.taskqueue.execution.TaskExecutionException;
@@ -125,6 +127,9 @@
FileTypes filetypes = (FileTypes) lookup( FileTypes.class );
nexusIndexerConsumer = new NexusIndexerConsumer( scheduler,
configuration, filetypes );
+
+ // initialize to set the file types to be processed
+ ( (Initializable) nexusIndexerConsumer ).initialize();
repositoryConfig = new ManagedRepositoryConfiguration();
repositoryConfig.setId( "test-repo" );
@@ -218,6 +223,19 @@
assertTrue( scheduler.indexed.contains( artifactFile ) );
}
+
+ // MRM-1275 - Include other file types for the index consumer instead of
just the indexable-content
+ public void testIncludedFileTypes()
+ throws Exception
+ {
+ List<String> includes = nexusIndexerConsumer.getIncludes();
+ assertTrue( ".pom artifacts should be processed.", includes.contains(
"**/*.pom" ) );
+ assertTrue( ".xml artifacts should be processed.", includes.contains(
"**/*.xml" ) );
+ assertTrue( ".txt artifacts should be processed.", includes.contains(
"**/*.txt" ) );
+ assertTrue( ".jar artifacts should be processed.", includes.contains(
"**/*.jar" ) );
+ assertTrue( ".war artifacts should be processed.", includes.contains(
"**/*.war" ) );
+ assertTrue( ".zip artifacts should be processed.", includes.contains(
"**/*.zip" ) );
+ }
@Override
protected String getPlexusConfigLocation()
Modified:
archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-layer/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-layer/pom.xml?rev=882055&r1=882054&r2=882055&view=diff
==============================================================================
---
archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-layer/pom.xml
(original)
+++
archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-layer/pom.xml
Thu Nov 19 06:20:43 2009
@@ -30,10 +30,6 @@
<dependencies>
<dependency>
<groupId>org.apache.archiva</groupId>
- <artifactId>archiva-xml-tools</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.archiva</groupId>
<artifactId>archiva-model</artifactId>
</dependency>
<dependency>
Modified:
archiva/branches/MRM-1025/archiva-modules/archiva-scheduled/src/test/java/org/apache/maven/archiva/scheduled/executors/ArchivaIndexingTaskExecutorTest.java
URL:
http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-scheduled/src/test/java/org/apache/maven/archiva/scheduled/executors/ArchivaIndexingTaskExecutorTest.java?rev=882055&r1=882054&r2=882055&view=diff
==============================================================================
---
archiva/branches/MRM-1025/archiva-modules/archiva-scheduled/src/test/java/org/apache/maven/archiva/scheduled/executors/ArchivaIndexingTaskExecutorTest.java
(original)
+++
archiva/branches/MRM-1025/archiva-modules/archiva-scheduled/src/test/java/org/apache/maven/archiva/scheduled/executors/ArchivaIndexingTaskExecutorTest.java
Thu Nov 19 06:20:43 2009
@@ -101,7 +101,8 @@
protected void tearDown()
throws Exception
{
- context.close( false );
+ context.close( true );
+ indexer.removeIndexingContext( context, true );
// delete created index in the repository
File indexDir = new File( repositoryConfig.getLocation(), ".indexer" );
@@ -151,6 +152,8 @@
assertEquals( "org.apache.archiva", artifactInfo.groupId );
assertEquals( "archiva-index-methods-jar-test",
artifactInfo.artifactId );
assertEquals( "test-repo", artifactInfo.repository );
+
+ context.close( true );
}
public void testUpdateArtifactInIndex()
@@ -173,6 +176,8 @@
IndexSearcher searcher = new IndexSearcher(
repositoryConfig.getLocation() + "/.indexer" );
TopDocs topDocs = searcher.search( q, null, 10 );
+ searcher.close();
+
assertTrue( new File( repositoryConfig.getLocation(), ".indexer"
).exists() );
assertFalse( new File( repositoryConfig.getLocation(), ".index"
).exists() );
@@ -206,6 +211,8 @@
// should return 1 hit
assertEquals( 1, topDocs.totalHits );
+ searcher.close();
+
context = TaskCreator.createContext( repositoryConfig );
// remove added artifact from index
@@ -230,6 +237,8 @@
// artifact should have been removed from the index!
assertEquals( 0, topDocs.totalHits );
+ context.close( true );
+ searcher.close();
// TODO: test it was removed from the packaged index also
}
@@ -278,6 +287,8 @@
assertEquals( "org.apache.archiva", artifactInfo.groupId );
assertEquals( "archiva-index-methods-jar-test",
artifactInfo.artifactId );
assertEquals( "test-repo", artifactInfo.repository );
+
+ context.close( true );
}
private void unzipIndex( String indexDir, String destDir )
Propchange:
archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp-test/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Nov 19 06:20:43 2009
@@ -1,10 +1,9 @@
target
-*.log
+derby.log
*.iml
*.ipr
*.iws
.settings
-bin
.classpath
.project
-database
+cargo-installs
Modified:
archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp-test/ReadMe.txt
URL:
http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp-test/ReadMe.txt?rev=882055&r1=882054&r2=882055&view=diff
==============================================================================
---
archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp-test/ReadMe.txt
(original)
+++
archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp-test/ReadMe.txt
Thu Nov 19 06:20:43 2009
@@ -9,7 +9,11 @@
- modify src/test/resources/testng.properties as needed
- mvn clean install -Dcontainer-existing
+The Cargo installations are stored outside of target to avoid multiple
downloads.
+To remove the Cargo installations and re-download them next run, use:
+ - mvn -Pclean-cargo clean
+
For the default values in the scripts, to pass all the tests, you need to add
an artifact in internal repository.
Run Selenium tests in src/test/it with Maven and JUnit
- - mvn clean install -f junit-pom.xml
\ No newline at end of file
+ - mvn clean install -f junit-pom.xml
Modified:
archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp-test/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp-test/pom.xml?rev=882055&r1=882054&r2=882055&view=diff
==============================================================================
---
archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp-test/pom.xml
(original)
+++
archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp-test/pom.xml
Thu Nov 19 06:20:43 2009
@@ -29,14 +29,6 @@
<packaging>pom</packaging>
<name>Archiva Web :: Application Tests</name>
- <repositories>
- <repository>
- <id>openqa-snapshots</id>
- <url>http://nexus.openqa.org/content/repositories/snapshots</url>
- <releases><enabled>false</enabled></releases>
- </repository>
- </repositories>
-
<dependencies>
<dependency>
<groupId>org.testng</groupId>
@@ -76,9 +68,9 @@
<artifactId>plexus-slf4j-logging</artifactId>
</dependency>
<dependency>
- <groupId>org.openqa.selenium.client-drivers</groupId>
+ <groupId>org.seleniumhq.selenium.client-drivers</groupId>
<artifactId>selenium-java-client-driver</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0.1</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -273,7 +265,7 @@
<fileset dir="src/test/${container.name}" />
</copy>
<copy
-
todir="${project.build.directory}/installs/${container.name}/apache-tomcat-5.5.27/apache-tomcat-5.5.27/common/lib">
+
todir="${cargo.install.dir}/${container.name}/apache-tomcat-${tomcat5x.version}/apache-tomcat-${tomcat5x.version}/common/lib">
<fileset
dir="${project.build.directory}/providedDependencies">
<include name="**/*.jar" />
</fileset>
@@ -320,12 +312,12 @@
</execution>
</executions>
<configuration>
- <wait>false</wait>
+ <wait>${cargo.wait}</wait>
<container>
<containerId>${container.name}</containerId>
<zipUrlInstaller>
<url>${container.url}</url>
-
<installDir>${project.build.directory}/installs/${container.name}</installDir>
+
<installDir>${project.basedir}/${cargo.install.dir}/${container.name}</installDir>
</zipUrlInstaller>
<log>${project.build.directory}/logs/${container.name}.log</log>
<output>${project.build.directory}/logs/${container.name}.out</output>
@@ -400,7 +392,7 @@
</activation>
<properties>
<container.name>tomcat5x</container.name>
-
<container.url>http://archive.apache.org/dist/tomcat/tomcat-5/v5.5.27/bin/apache-tomcat-5.5.27.zip</container.url>
+
<container.url>http://archive.apache.org/dist/tomcat/tomcat-5/v${tomcat5x.version}/bin/apache-tomcat-${tomcat5x.version}.zip</container.url>
</properties>
</profile>
<profile>
@@ -451,6 +443,24 @@
</properties>
</profile>
<profile>
+ <id>clean-cargo</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-clean-plugin</artifactId>
+ <configuration>
+ <filesets>
+ <fileset>
+ <directory>${cargo.install.dir}</directory>
+ </fileset>
+ </filesets>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
<id>headless</id>
<build>
<plugins>
@@ -471,4 +481,9 @@
</build>
</profile>
</profiles>
+ <properties>
+ <tomcat5x.version>5.5.27</tomcat5x.version>
+ <cargo.wait>false</cargo.wait>
+ <cargo.install.dir>cargo-installs</cargo.install.dir>
+ </properties>
</project>
Modified:
archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/ArchivaAdminTest.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/ArchivaAdminTest.java?rev=882055&r1=882054&r2=882055&view=diff
==============================================================================
---
archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/ArchivaAdminTest.java
(original)
+++
archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/ArchivaAdminTest.java
Thu Nov 19 06:20:43 2009
@@ -55,7 +55,7 @@
super.open( baseUrl, browser, seleniumHost, seleniumPort );
getSelenium().open( baseUrl );
String title = getSelenium().getTitle();
- if ( title.equals( "Apache Archiva \\ Create Admin User" ) )
+ if ( title.endsWith( "Create Admin User" ) )
{
assertCreateAdmin();
String fullname = getProperty( "ADMIN_FULLNAME" );
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=882055&r1=882054&r2=882055&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
Thu Nov 19 06:20:43 2009
@@ -54,6 +54,24 @@
assertPage( "Apache Archiva \\ Browse Repository" );
}
-
+ public void testSearchNonExistingArtifactInAdvancedSearch()
+ {
+ searchForArtifactAdvancedSearch( null, getProperty(
"SEARCH_BAD_ARTIFACT"), null, null, null, null );
+ assertTextPresent( "No results found" );
+ }
+ public void testSearchNoSearchCriteriaSpecifiedInAdvancedSearch()
+ {
+ searchForArtifactAdvancedSearch( null, null, null, null, null, null );
+ assertTextPresent( "Advanced Search - At least one search criteria
must be provided." );
+ }
+
+ /* public void testSearchExistingArtifactUsingAdvancedSearchArtifactId()
+ {
+ searchForArtifactAdvancedSearch( null, getProperty(
"ARTIFACT_ARTIFACTID" ), null, null, null, null );
+ assertTextPresent( "Results" );
+ assertTextPresent( "Hits: 1 to 1 of 1" );
+ assertLinkPresent( "test" );
+ }*/
}
+
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=882055&r1=882054&r2=882055&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
Thu Nov 19 06:20:43 2009
@@ -25,8 +25,13 @@
//Search
public void goToSearchPage()
{
- clickLinkWithText( "Search" );
- assertSearchPage();
+ if ( !"Apache Archiva \\ Quick Search".equals(
getSelenium().getTitle() ) )
+ {
+ clickLinkWithText( "Search" );
+ getSelenium().waitForPageToLoad( maxWaitTimeInMs );
+
+ assertPage( "Apache Archiva \\ Quick Search" );
+ }
}
public void assertSearchPage()
@@ -42,16 +47,66 @@
public void searchForArtifact( String artifactId )
{
- if ( !"Apache Archiva \\ Quick Search".equals(
getSelenium().getTitle() ) )
- {
- clickLinkWithText( "Search" );
-
- getSelenium().waitForPageToLoad( maxWaitTimeInMs );
-
- assertPage( "Apache Archiva \\ Quick Search" );
- }
+ goToSearchPage();
getSelenium().type( "dom=document.forms[1].elements[0]", artifactId );
clickButtonWithValue( "Search" );
}
+
+ public void searchForArtifactAdvancedSearch( String groupId, String
artifactId, String version, String repositoryId,
+ String className, String
rowCount )
+ {
+ goToSearchPage();
+
+ clickLinkWithXPath( "//d...@id='contentArea']/div[1]/a[1]/strong",
false );
+ assertElementPresent( "filteredSearch_searchField" );
+ assertElementPresent( "filteredSearch_repositoryId" );
+
+ if ( groupId != null )
+ {
+ selectValue( "filteredSearch_searchField", "Group ID" );
+ clickLinkWithLocator( "//a...@id='filteredSearch_']/img", false );
+
+ assertElementPresent( "groupId" );
+ setFieldValue( "groupId", groupId );
+ }
+
+ if ( artifactId != null )
+ {
+ selectValue( "filteredSearch_searchField", "Artifact ID" );
+ clickLinkWithLocator( "//a...@id='filteredSearch_']/img", false );
+
+ assertElementPresent( "artifactId" );
+ setFieldValue( "artifactId", artifactId );
+ }
+
+ if ( version != null )
+ {
+ selectValue( "filteredSearch_searchField", "Version" );
+ clickLinkWithLocator( "//a...@id='filteredSearch_']/img", false );
+
+ assertElementPresent( "version" );
+ setFieldValue( "version", version );
+ }
+
+ if ( className != null )
+ {
+ selectValue( "filteredSearch_searchField", "Class/Package Name" );
+ clickLinkWithLocator( "//a...@id='filteredSearch_']/img", false );
+
+ assertElementPresent( "className" );
+ setFieldValue( "className", className );
+ }
+
+ if ( rowCount != null )
+ {
+ selectValue( "filteredSearch_searchField", "Row Count" );
+ clickLinkWithLocator( "//a...@id='filteredSearch_']/img", false );
+
+ assertElementPresent( "rowCount" );
+ setFieldValue( "rowCount", rowCount );
+ }
+
+ 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=882055&r1=882054&r2=882055&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
Thu Nov 19 06:20:43 2009
@@ -60,8 +60,6 @@
//baseUrl = getProperty( "BASE_URL" );
maxWaitTimeInMs = getProperty( "MAX_WAIT_TIME_IN_MS" );
-
-
}
/**
@@ -76,6 +74,7 @@
{
DefaultSelenium s = new DefaultSelenium( seleniumHost,
seleniumPort, browser, baseUrl );
s.start();
+ s.setTimeout( maxWaitTimeInMs );
selenium.set( s );
}
}
@@ -139,10 +138,12 @@
Assert.assertEquals( fieldValue,
getSelenium().getValue( fieldName ) );
}
- public void assertPage( String title )
- {
- Assert.assertEquals( getSelenium().getTitle(), title );
- }
+ public void assertPage( String title )
+ {
+ // Collapse spaces
+ String actualTitle = getSelenium().getTitle().replaceAll( "[ \n\r]+",
" " );
+ Assert.assertEquals( actualTitle, title );
+ }
public String getTitle()
{
Modified:
archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp-test/src/test/tomcat5x/conf/Catalina/localhost/archiva.xml
URL:
http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp-test/src/test/tomcat5x/conf/Catalina/localhost/archiva.xml?rev=882055&r1=882054&r2=882055&view=diff
==============================================================================
---
archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp-test/src/test/tomcat5x/conf/Catalina/localhost/archiva.xml
(original)
+++
archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp-test/src/test/tomcat5x/conf/Catalina/localhost/archiva.xml
Thu Nov 19 06:20:43 2009
@@ -32,5 +32,5 @@
username="sa"
password=""
driverClassName="org.apache.derby.jdbc.EmbeddedDriver"
- url="jdbc:derby:database/archiva;create=true" />
+ url="jdbc:derby:target/database/archiva;create=true" />
</Context>
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=882055&r1=882054&r2=882055&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
Thu Nov 19 06:20:43 2009
@@ -282,23 +282,6 @@
</configuration>
</plugin>
-->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-clean-plugin</artifactId>
- <version>2.1.1</version>
- <!-- This configuration is added to cleanup from war:inplace -->
- <configuration>
- <filesets>
- <fileset>
- <directory>${basedir}</directory>
- <includes>
- <!-- TODO: META-INF shouldn't be required, seems to be an
issue with the current war plugin -->
- <include>appserver-base</include>
- </includes>
- </fileset>
- </filesets>
- </configuration>
- </plugin>
<!-- hack for jetty:run, archiva web config files are checked in
/WEB-INF/ dir -->
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
Propchange:
archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.properties
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Nov 19 06:20:43 2009
@@ -2,3 +2,4 @@
/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-705848
+/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.properties:825850-882054
Propchange:
archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Nov 19 06:20:43 2009
@@ -2,3 +2,4 @@
/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-705848
+/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.xml:825850-882054
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 Thu Nov 19 06:20:43 2009
@@ -1,3 +1,4 @@
/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-882054
