remove non used classes

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1355246 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/archiva-modules/archiva-web/archiva-webapp-test-js/pom.xml b/archiva-modules/archiva-web/archiva-webapp-test-js/pom.xml
index cc81ea119c10fa39b47a548febbf62b15930d4ba..3ed15c80a8ce108d808bd3737df68a12502df484 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp-test-js/pom.xml
+++ b/archiva-modules/archiva-web/archiva-webapp-test-js/pom.xml
@@ -99,6 +99,23 @@
       <groupId>commons-lang</groupId>
       <artifactId>commons-lang</artifactId>
     </dependency>
+
+    <dependency>
+      <groupId>org.easytesting</groupId>
+      <artifactId>fest-assert</artifactId>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>jcl-over-slf4j</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-log4j12</artifactId>
+    </dependency>
+
   </dependencies>
 
   <build>
@@ -199,6 +216,7 @@
             <configuration>
               <systemPropertyVariables>
                 <browser>${selenium.browser}</browser>
+                <selenium.browser>${selenium.browser}</selenium.browser>
                 <baseUrl>${baseUrl}</baseUrl>
                 <maxWaitTimeInMs>${maxWaitTimeInMs}</maxWaitTimeInMs>
                 <seleniumHost>${seleniumHost}</seleniumHost>

diff --git a/archiva-modules/archiva-web/archiva-webapp-test-js/src/test/java/org/apache/archiva/web/test/parent/AbstractArtifactManagementTest.java b/archiva-modules/archiva-web/archiva-webapp-test-js/src/test/java/org/apache/archiva/web/test/parent/AbstractArtifactManagementTest.java
deleted file mode 100644 (file)
index 5869a06..0000000
--- a/archiva-modules/archiva-web/archiva-webapp-test-js/src/test/java/org/apache/archiva/web/test/parent/AbstractArtifactManagementTest.java
+++ /dev/null
@@ -1,82 +0,0 @@
-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.
- */
-
-public abstract class AbstractArtifactManagementTest
-    extends AbstractArchivaTest
-{
-
-    public String getGroupId()
-    {
-        String groupId = getProperty( "GROUPID" );
-        return groupId;
-    }
-
-    public String getArtifactId()
-    {
-        String artifactId = getProperty( "ARTIFACTID" );
-        return artifactId;
-    }
-
-    public String getVersion()
-    {
-        String version = getProperty( "VERSION" );
-        return version;
-    }
-
-    public String getPackaging()
-    {
-        String packaging = getProperty( "PACKAGING" );
-        return packaging;
-    }
-
-    public String getArtifactFilePath()
-    {
-        return "src/test/resources/snapshots/org/apache/maven/archiva/web/test/foo-bar/1.0-SNAPSHOT/foo-bar-1.0-SNAPSHOT.jar";
-    }
-
-    public String getRepositoryId()
-    {
-        String repositoryId = getProperty( "REPOSITORYID" );
-        return repositoryId;
-    }
-
-    public void goToDeleteArtifactPage()
-    {
-        login( getProperty( "ADMIN_USERNAME" ), getProperty( "ADMIN_PASSWORD" ) );
-        getSelenium().open( "/archiva/deleteArtifact.action" );
-        assertDeleteArtifactPage();
-    }
-
-    public void deleteArtifact( String groupId, String artifactId, String version, String repositoryId )
-    {
-        deleteArtifact( groupId, artifactId, version, repositoryId, false );
-    }
-
-    public void deleteArtifact( String groupId, String artifactId, String version, String repositoryId, boolean wait )
-    {
-        goToDeleteArtifactPage();
-        setFieldValue( "groupId", groupId );
-        setFieldValue( "artifactId", artifactId );
-        setFieldValue( "version", version );
-        selectValue( "repositoryId", repositoryId );
-        clickButtonWithValue( "Submit", wait );
-    }
-}

diff --git a/archiva-modules/archiva-web/archiva-webapp-test-js/src/test/java/org/apache/archiva/web/test/parent/AbstractArtifactReportsTest.java b/archiva-modules/archiva-web/archiva-webapp-test-js/src/test/java/org/apache/archiva/web/test/parent/AbstractArtifactReportsTest.java
deleted file mode 100644 (file)
index e026f78..0000000
--- a/archiva-modules/archiva-web/archiva-webapp-test-js/src/test/java/org/apache/archiva/web/test/parent/AbstractArtifactReportsTest.java
+++ /dev/null
@@ -1,80 +0,0 @@
-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.
- */
-
-public abstract class AbstractArtifactReportsTest
-    extends AbstractArchivaTest
-{
-
-    // Reports
-    public void goToReportsPage()
-    {
-        getSelenium().open( "/archiva/report/pickReport.action" );
-        assertReportsPage();
-    }
-
-    public void assertReportsPage()
-    {
-        assertPage( "Apache Archiva \\ Reports" );
-        assertTextPresent( "Reports" );
-        assertTextPresent( "Repository Statistics" );
-        assertTextPresent( "Repositories To Be Compared" );
-        assertElementPresent( "availableRepositories" );
-        assertButtonWithValuePresent( "v" );
-        assertButtonWithValuePresent( "^" );
-        assertButtonWithValuePresent( "<-" );
-        assertButtonWithValuePresent( "->" );
-        assertButtonWithValuePresent( "<<--" );
-        assertButtonWithValuePresent( "-->>" );
-        assertButtonWithValuePresent( "<*>" );
-        assertElementPresent( "selectedRepositories" );
-        assertButtonWithValuePresent( "v" );
-        assertButtonWithValuePresent( "^" );
-        assertTextPresent( "Row Count" );
-        assertElementPresent( "rowCount" );
-        assertTextPresent( "Start Date" );
-        assertElementPresent( "startDate" );
-        assertTextPresent( "End Date" );
-        assertElementPresent( "endDate" );
-        assertButtonWithValuePresent( "View Statistics" );
-        assertTextPresent( "Repository Health" );
-        assertTextPresent( "Row Count" );
-        assertElementPresent( "rowCount" );
-        assertTextPresent( "Group ID" );
-        assertElementPresent( "groupId" );
-        assertTextPresent( "Repository ID" );
-        assertElementPresent( "repositoryId" );
-        assertButtonWithValuePresent( "Show Report" );
-    }
-
-    public void compareRepositories( String labelSelected, String startDate, String endDate )
-    {
-        goToReportsPage();
-        getSelenium().removeSelection( "generateStatisticsReport_availableRepositories", labelSelected );
-        clickButtonWithValue( "->", false );
-        getSelenium().type( "startDate", startDate );
-        // clickLinkWithLocator( "1" , false );
-        // getSelenium().click( "endDate" );
-        getSelenium().type( "endDate", endDate );
-        // clickLinkWithLocator( "30" , false );
-        clickButtonWithValue( "View Statistics" );
-    }
-
-}

diff --git a/archiva-modules/archiva-web/archiva-webapp-test-js/src/test/java/org/apache/archiva/web/test/parent/AbstractBrowseTest.java b/archiva-modules/archiva-web/archiva-webapp-test-js/src/test/java/org/apache/archiva/web/test/parent/AbstractBrowseTest.java
deleted file mode 100644 (file)
index 2b4fc11..0000000
--- a/archiva-modules/archiva-web/archiva-webapp-test-js/src/test/java/org/apache/archiva/web/test/parent/AbstractBrowseTest.java
+++ /dev/null
@@ -1,40 +0,0 @@
-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.
- */
-
-public abstract class AbstractBrowseTest
-    extends AbstractArchivaTest
-{
-
-    // Browse
-    public void goToBrowsePage()
-    {
-        getSelenium().open( "/archiva/browse" );
-        assertBrowsePage();
-    }
-
-    public void assertBrowsePage()
-    {
-        assertPage( "Apache Archiva \\ Browse Repository" );
-        assertTextPresent( "Browse Repository" );
-        assertTextPresent( "Groups" );
-    }
-
-}

diff --git a/archiva-modules/archiva-web/archiva-webapp-test-js/src/test/java/org/apache/archiva/web/test/parent/AbstractMergingRepositoriesTest.java b/archiva-modules/archiva-web/archiva-webapp-test-js/src/test/java/org/apache/archiva/web/test/parent/AbstractMergingRepositoriesTest.java
deleted file mode 100644 (file)
index c134a06..0000000
--- a/archiva-modules/archiva-web/archiva-webapp-test-js/src/test/java/org/apache/archiva/web/test/parent/AbstractMergingRepositoriesTest.java
+++ /dev/null
@@ -1,74 +0,0 @@
-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;
-
-public abstract class AbstractMergingRepositoriesTest
-    extends AbstractArchivaTest
-{
-
-    public void goToAuditLogReports()
-    {
-        getSelenium().open( "/archiva/report/queryAuditLogReport.action" );
-    }
-
-    public String getRepositoryDir()
-    {
-        File f = new File( "" );
-        String artifactFilePath = f.getAbsolutePath();
-        return artifactFilePath + "/target/";
-    }
-
-    public void editManagedRepository()
-    {
-        goToRepositoriesPage();
-        clickLinkWithXPath( "//div[@id='contentArea']/div/div[5]/div[1]/a[1]/img" );
-        assertPage( "Apache Archiva \\ Admin: Edit Managed Repository" );
-        checkField( "repository.blockRedeployments" );
-        clickButtonWithValue( "Update Repository" );
-    }
-
-    public String getGroupId()
-    {
-        return getProperty( "VALIDARTIFACT_GROUPID" );
-    }
-
-    public String getArtifactId()
-    {
-        return getProperty( "VALIDARTIFACT_ARTIFACTID" );
-    }
-
-    public String getVersion()
-    {
-        return getProperty( "VERSION" );
-    }
-
-    public String getPackaging()
-    {
-        return getProperty( "PACKAGING" );
-    }
-
-    public String getValidArtifactFilePath()
-    {
-        return "src/test/resources/snapshots/org/apache/maven/archiva/web/test/foo-bar/1.0-SNAPSHOT/foo-bar-1.0-SNAPSHOT.jar";
-    }
-
-}

diff --git a/archiva-modules/archiva-web/archiva-webapp-test-js/src/test/java/org/apache/archiva/web/test/parent/AbstractRepositoryTest.java b/archiva-modules/archiva-web/archiva-webapp-test-js/src/test/java/org/apache/archiva/web/test/parent/AbstractRepositoryTest.java
deleted file mode 100644 (file)
index a90e6ac..0000000
--- a/archiva-modules/archiva-web/archiva-webapp-test-js/src/test/java/org/apache/archiva/web/test/parent/AbstractRepositoryTest.java
+++ /dev/null
@@ -1,374 +0,0 @@
-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 org.junit.Assert;
-
-import java.io.File;
-
-public abstract class AbstractRepositoryTest
-    extends AbstractArchivaTest
-{
-    // Repository Groups
-    public void goToRepositoryGroupsPage()
-    {
-        if ( !getTitle().equals( "Apache Archiva \\ Administration - Repository Groups" ) )
-        {
-            getSelenium().open( "/archiva/admin/repositoryGroups.action" );
-        }
-        assertRepositoryGroupsPage();
-    }
-
-    public void assertRepositoryGroupsPage()
-    {
-        assertPage( "Apache Archiva \\ Administration - Repository Groups" );
-        assertTextPresent( "Administration - Repository Groups" );
-        assertTextPresent( "Identifier*:" );
-        assertElementPresent( "repositoryGroup.id" );
-        assertButtonWithValuePresent( "Add Group" );
-        assertTextPresent( "Repository Groups" );
-    }
-
-    public void assertAddedRepositoryLink( String repositoryGroupName )
-    {
-        assertPage( "Apache Archiva \\ Administration - Repository Groups" );
-        String repositoryGroupUrlValue = "repository/" + repositoryGroupName + "/";
-        String baseUrlValue = "archiva";
-        String repositoryGroupLink = baseUrl.replaceFirst( baseUrlValue, repositoryGroupUrlValue );
-        assertTextPresent( repositoryGroupLink );
-    }
-
-    public void assertAddedRepositoryToRepositoryGroups( String repositoryName )
-    {
-        assertPage( "Apache Archiva \\ Administration - Repository Groups" );
-        assertTextPresent( repositoryName );
-        assertTextPresent( "Archiva Managed Internal Repository" );
-        assertAddedRepositoryLink( repositoryName );
-    }
-
-    public void assertDeleteRepositoryGroupPage( String repositoryName )
-    {
-        assertPage( "Apache Archiva \\ Admin: Delete Repository Group" );
-        assertTextPresent( "WARNING: This operation can not be undone." );
-        assertTextPresent( "Are you sure you want to delete the following repository group?" );
-        assertTextPresent( "ID:" );
-        assertTextPresent( repositoryName );
-        assertButtonWithValuePresent( "Confirm" );
-        assertButtonWithValuePresent( "Cancel" );
-    }
-
-    public void addRepositoryGroup( String repoGroupName, boolean wait )
-    {
-        goToRepositoryGroupsPage();
-        setFieldValue( "repositoryGroup.id", repoGroupName );
-        clickButtonWithValue( "Add Group", wait );
-    }
-
-    public void addRepositoryToRepositoryGroup( String repositoryGroupName, String repositoryName )
-    {
-        goToRepositoryGroupsPage();
-        String s = getSelenium().getBodyText();
-        if ( s.contains( "No Repository Groups Defined." ) )
-        {
-            setFieldValue( "repositoryGroup.id", repositoryGroupName );
-            clickButtonWithValue( "Add Group" );
-            // assertAddedRepositoryLink( repositoryGroupName );
-
-            selectValue( "addRepositoryToGroup_repoId", repositoryName );
-            clickButtonWithValue( "Add Repository" );
-            assertAddedRepositoryToRepositoryGroups( repositoryName );
-        }
-        else
-        {
-            // assertAddedRepositoryLink( repositoryGroupName );
-            selectValue( "addRepositoryToGroup_repoId", repositoryName );
-            clickButtonWithValue( "Add Repository" );
-        }
-    }
-
-    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 )
-    {
-        getSelenium().click( "xpath=//div[@id='contentArea']/div[2]/div/div[1]/div/a/img" );
-        waitPage();
-        assertDeleteRepositoryGroupPage( repositoryName );
-        clickButtonWithValue( "Confirm" );
-    }
-
-    // /////////////////////////////
-    // proxy connectors
-    // /////////////////////////////
-    public void goToProxyConnectorsPage()
-    {
-        clickLinkWithText( "Proxy Connectors" );
-        assertProxyConnectorsPage();
-    }
-
-    public void assertProxyConnectorsPage()
-    {
-        assertPage( "Apache Archiva \\ Administration - Proxy Connectors" );
-        assertTextPresent( "Administration - Proxy Connectors" );
-        assertTextPresent( "Repository Proxy Connectors" );
-        assertTextPresent( "internal" );
-        assertTextPresent( "Archiva Managed Internal Repository" );
-        assertTextPresent( "Proxy Connector" );
-        assertTextPresent( "Central Repository" );
-    }
-
-    public void assertAddProxyConnectorPage()
-    {
-        assertPage( "Apache Archiva \\ Admin: Add Proxy Connector" );
-        assertTextPresent( "Admin: Add Proxy Connector" );
-        String proxy =
-            "Network Proxy*:,Managed Repository*:,Remote Repository*:,Policies:,Return error when:,On remote error:,Releases:,Snapshots:,Checksum:,Cache failures:,Properties:,No properties have been set.,Black List:,No black list patterns have been set.,White List:,No white list patterns have been set.";
-        String[] arrayProxy = proxy.split( "," );
-        for ( String arrayproxy : arrayProxy )
-        {
-            assertTextPresent( arrayproxy );
-        }
-        /*
-         * String proxyElements =
-         * "addProxyConnector_connector_proxyId,addProxyConnector_connector_sourceRepoId,addProxyConnector_connector_targetRepoId,policy_propagate-errors-on-update,policy_propagate-errors,policy_releases,policy_snapshots,policy_checksum,policy_cache-failures,propertiesEntry,propertiesValue,blackListEntry,whiteListEntry"
-         * ; String[] arrayProxyElements = proxyElements.split( "," ); for ( String arrayproxyelements :
-         * arrayProxyElements ) assertTextPresent( arrayproxyelements );
-         */
-        assertButtonWithValuePresent( "Add Property" );
-        assertButtonWithValuePresent( "Add Pattern" );
-        assertButtonWithValuePresent( "Add Proxy Connector" );
-    }
-
-    // this only fills in the values of required fields in adding Proxy Connectors
-    public void addProxyConnector( String networkProxy, String managedRepo, String remoteRepo )
-    {
-        goToProxyConnectorsPage();
-        clickLinkWithText( "Add" );
-        assertAddProxyConnectorPage();
-        selectValue( "connector.proxyId", networkProxy );
-        selectValue( "connector.sourceRepoId", managedRepo );
-        selectValue( "connector.targetRepoId", remoteRepo );
-        clickButtonWithValue( "Add Proxy Connector" );
-    }
-
-    public void deleteProxyConnector()
-    {
-        goToProxyConnectorsPage();
-        clickLinkWithXPath( "//div[@id='contentArea']/div[2]/div[1]/div[2]/div[1]/a[3]/img" );
-        assertPage( "Apache Archiva \\ Admin: Delete Proxy Connectors" );
-        clickButtonWithValue( "Delete" );
-        assertPage( "Apache Archiva \\ Administration - Proxy Connectors" );
-    }
-
-    // /////////////////////////////
-    // network proxies
-    // /////////////////////////////
-
-    public void editNetworkProxies( String fieldName, String value )
-    {
-        // goToNetworkProxiesPage();
-        clickLinkWithText( "Edit Network Proxy" );
-        setFieldValue( fieldName, value );
-        clickButtonWithValue( "Save Network Proxy" );
-    }
-
-    public void deleteNetworkProxy()
-    {
-        // goToNetworkProxiesPage();
-        clickLinkWithText( "Delete Network Proxy" );
-        assertPage( "Apache Archiva \\ Admin: Delete Network Proxy" );
-        assertTextPresent( "WARNING: This operation can not be undone." );
-        clickButtonWithValue( "Delete" );
-    }
-
-    // remote repositories
-    public void assertAddRemoteRepository()
-    {
-        assertPage( "Apache Archiva \\ Admin: Add Remote Repository" );
-        String remote = "Identifier*:,Name*:,URL*:,Username:,Password:,Timeout in seconds:,Type:";
-        String[] arrayRemote = remote.split( "," );
-        for ( String arrayremote : arrayRemote )
-        {
-            assertTextPresent( arrayremote );
-        }
-        String remoteElements =
-            "addRemoteRepository_repository_id,addRemoteRepository_repository_name,addRemoteRepository_repository_url,addRemoteRepository_repository_userName,addRemoteRepository_repository_password,addRemoteRepository_repository_timeout,addRemoteRepository_repository_layout";
-        String[] arrayRemoteElements = remoteElements.split( "," );
-        for ( String arrayremotelement : arrayRemoteElements )
-        {
-            assertElementPresent( arrayremotelement );
-        }
-    }
-
-    public void assertDeleteRemoteRepositoryPage()
-    {
-        assertPage( "Apache Archiva \\ Admin: Delete Remote Repository" );
-        assertTextPresent( "Admin: Delete Remote Repository" );
-        assertTextPresent( "WARNING: This operation can not be undone." );
-        assertTextPresent( "Are you sure you want to delete the following remote repository?" );
-        assertButtonWithValuePresent( "Confirm" );
-        assertButtonWithValuePresent( "Cancel" );
-    }
-
-    public void addRemoteRepository( String identifier, String name, String url, String username, String password,
-                                     String timeout, String type, boolean wait )
-    {
-        assertAddRemoteRepository();
-        setFieldValue( "addRemoteRepository_repository_id", identifier );
-        setFieldValue( "addRemoteRepository_repository_name", name );
-        setFieldValue( "addRemoteRepository_repository_url", url );
-        setFieldValue( "addRemoteRepository_repository_userName", username );
-        setFieldValue( "addRemoteRepository_repository_password", password );
-        setFieldValue( "addRemoteRepository_repository_timeout", timeout );
-        selectValue( "addRemoteRepository_repository_layout", type );
-        clickButtonWithValue( "Add Repository", wait );
-    }
-
-    public void deleteRemoteRepository()
-    {
-        goToRepositoriesPage();
-        clickLinkWithXPath( "//div[@id='contentArea']/div/div[8]/div[1]/a[2]" );
-        assertDeleteRemoteRepositoryPage();
-        clickButtonWithValue( "Confirm" );
-    }
-
-    public void editRemoteRepository( String fieldName, String value )
-    {
-        goToRepositoriesPage();
-        clickLinkWithXPath( "//div[@id='contentArea']/div/div[8]/div[1]/a[1]" );
-        setFieldValue( fieldName, value );
-        clickButtonWithValue( "Update Repository" );
-    }
-
-    public void editManagedRepository( String fieldName, String value )
-    {
-        goToRepositoriesPage();
-        clickLinkWithXPath( "//div[@id='contentArea']/div/div[5]/div[1]/a[1]/img" );
-        assertPage( "Apache Archiva \\ Admin: Edit Managed Repository" );
-        setFieldValue( fieldName, value );
-        // TODO
-        clickButtonWithValue( "Update Repository" );
-    }
-
-    public void editManagedRepository( String name, String directory, String indexDirectory, String type, String cron,
-                                       String daysOlder, String retentionCount )
-    {
-        goToRepositoriesPage();
-        clickLinkWithXPath( "//div[@id='contentArea']/div/div[5]/div[1]/a[1]/img" );
-        assertPage( "Apache Archiva \\ Admin: Edit Managed Repository" );
-        setFieldValue( "repository.name", name );
-        setFieldValue( "repository.location", directory );
-        setFieldValue( "repository.indexDirectory", indexDirectory );
-        selectValue( "repository.layout", type );
-        setFieldValue( "repository.cronExpression", cron );
-        setFieldValue( "repository.daysOlder", daysOlder );
-        setFieldValue( "repository.retentionCount", retentionCount );
-        clickButtonWithValue( "Update Repository" );
-    }
-
-    public void deleteManagedRepository()
-    {
-        clickLinkWithXPath( "//div[@id='contentArea']/div/div[5]/div[1]/a[2]" );
-        assertPage( "Apache Archiva \\ Admin: Delete Managed Repository" );
-        clickButtonWithValue( "Delete Configuration Only" );
-    }
-
-    public String getRepositoryDir()
-    {
-        File f = new File( "" );
-        String artifactFilePath = f.getAbsolutePath();
-        return artifactFilePath + "/target/";
-    }
-
-    // ///////////////////////////////////////////
-    // Repository Scanning
-    // ///////////////////////////////////////////
-    public void goToRepositoryScanningPage()
-    {
-        getSelenium().open( "/archiva/admin/repositoryScanning.action" );
-        assertRepositoryScanningPage();
-    }
-
-    public void assertRepositoryScanningPage()
-    {
-        assertPage( "Apache Archiva \\ Administration - Repository Scanning" );
-        assertTextPresent( "Administration - Repository Scanning" );
-        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 ( 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 ( 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 ( 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 ( int i = 0; i < arrayIndexableContent.length; i++ )
-        {
-            Assert.assertEquals( getSelenium().getTable( "//div[@id='contentArea']/div/div[4]/table." + i + ".0" ),
-                                 arrayIndexableContent[i] );
-        }
-    }
-
-    // ///////////////////////////////////////////
-    // Database
-    // ///////////////////////////////////////////
-    public void goToDatabasePage()
-    {
-        clickLinkWithText( "Database" );
-        assertDatabasePage();
-    }
-
-    public void assertDatabasePage()
-    {
-        assertPage( "Apache Archiva \\ Administration - Database" );
-        assertTextPresent( "Administration - Database" );
-        assertTextPresent( "Database - Unprocessed Artifacts Scanning" );
-        assertTextPresent( "Cron:" );
-        assertElementPresent( "database_cron" );
-        assertButtonWithValuePresent( "Update Cron" );
-        assertButtonWithValuePresent( "Update Database Now" );
-        assertTextPresent( "Database - Unprocessed Artifacts Scanning" );
-        assertTextPresent( "Database - Artifact Cleanup Scanning" );
-    }
-}

diff --git a/archiva-modules/archiva-web/archiva-webapp-test-js/src/test/java/org/apache/archiva/web/test/parent/AbstractSearchTest.java b/archiva-modules/archiva-web/archiva-webapp-test-js/src/test/java/org/apache/archiva/web/test/parent/AbstractSearchTest.java
deleted file mode 100644 (file)
index 33b12be..0000000
--- a/archiva-modules/archiva-web/archiva-webapp-test-js/src/test/java/org/apache/archiva/web/test/parent/AbstractSearchTest.java
+++ /dev/null
@@ -1,117 +0,0 @@
-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.
- */
-
-public abstract class AbstractSearchTest
-    extends AbstractArchivaTest
-{
-    // Search
-    public void goToSearchPage()
-    {
-        goToHomePage();
-        if (!isElementPresent( "quickSearchBox" ) )
-        {
-            getSelenium().open( "/index.action");
-            //getSelenium().waitForPageToLoad( maxWaitTimeInMs );
-            waitPage();
-            assertElementPresent( "quickSearchSubmit" );
-        }
-    }
-
-    public void assertSearchPage()
-    {
-        assertPage( "Apache Archiva \\ Quick Search" );
-        assertTextPresent( "Search for" );
-        assertElementPresent( "quickSearchSubmit" );
-        assertButtonWithValuePresent( "Search" );
-        // assertLinkPresent( "Advanced Search" );
-        assertTextPresent( "Enter your search terms. A variety of data will be searched for your keywords." );
-        // assertButtonWithDivIdPresent( "searchHint" );
-    }
-
-    public void searchForArtifact( String artifactId )
-    {
-        goToSearchPage();
-
-        setFieldValue( "quickSearchValue", artifactId );
-        clickButtonWithLocator( "quickSearchSubmit" );
-    }
-
-    public void searchForArtifactAdvancedSearch( String groupId, String artifactId, String version, String repositoryId,
-                                                 String className, String rowCount )
-    {
-        goToSearchPage();
-
-        clickLinkWithXPath( "//div[@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 );
-        }
-
-        if ( repositoryId != null )
-        {
-            selectValue( "filteredSearch_repositoryId", repositoryId );
-        }
-        clickSubmitWithLocator( "filteredSearch_0" );
-    }
-}
\ No newline at end of file

diff --git a/archiva-modules/archiva-web/archiva-webapp-test-js/src/test/resources/log4j.xml b/archiva-modules/archiva-web/archiva-webapp-test-js/src/test/resources/log4j.xml
new file mode 100644 (file)
index 0000000..4957e2d
--- /dev/null
+++ b/archiva-modules/archiva-web/archiva-webapp-test-js/src/test/resources/log4j.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+  ~ 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.
+  -->
+
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
+
+  <appender name="console" class="org.apache.log4j.ConsoleAppender">
+    <layout class="org.apache.log4j.PatternLayout">
+      <param name="ConversionPattern" value="%d [%t] %-5p %c %x - %m%n"/>
+    </layout>
+  </appender>
+
+
+  <logger name="org.springframework">
+    <level value="ERROR"/>
+  </logger>
+
+  <root>
+    <priority value ="info" />
+    <appender-ref ref="console" />
+  </root>
+
+</log4j:configuration>