[MRM-1164] Add it.properties to externalize info needed for tests. Adjust directory...

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

diff --git a/archiva-modules/archiva-web/archiva-webapp-test/pom.xml b/archiva-modules/archiva-web/archiva-webapp-test/pom.xml
index 12658038067abbe6497de647f8e4bfe5ed1926d8..1b507b051b1462783944825d2c7970d3e2f63554 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp-test/pom.xml
+++ b/archiva-modules/archiva-web/archiva-webapp-test/pom.xml
@@ -87,6 +87,16 @@
   <build>
     <testSourceDirectory>src/test/it</testSourceDirectory>
     <plugins>
+      <plugin>
+        <artifactId>maven-resources-plugin</artifactId>
+        <executions>
+          <execution>
+            <goals>
+              <goal>testResources</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>dependency-maven-plugin</artifactId>
@@ -136,22 +146,22 @@
             <configuration>
               <tasks>
                 <copy todir="${project.build.directory}/appserver-base">
-                  <fileset dir="src/test/resources/appserver-base" />
+                  <fileset dir="src/test/it-resources/appserver-base" />
                 </copy>
                 <copy todir="${project.build.directory}/repository">
-                  <fileset dir="src/test/resources/repository" />
+                  <fileset dir="src/test/it-resources/repository" />
                 </copy>
                 <copy todir="${project.build.directory}/index">
-                  <fileset dir="src/test/resources/index" />
+                  <fileset dir="src/test/it-resources/index" />
                 </copy>
                 <copy todir="${project.build.directory}/snapshots">
-                  <fileset dir="src/test/resources/snapshots" />
+                  <fileset dir="src/test/it-resources/snapshots" />
                 </copy>
                 <copy todir="${project.build.directory}/projects">
-                  <fileset dir="src/test/resources/projects" />
+                  <fileset dir="src/test/it-resources/projects" />
                 </copy>
                 <copy todir="${project.build.directory}/local-repo">
-                  <fileset dir="src/test/resources/local-repo" />
+                  <fileset dir="src/test/it-resources/local-repo" />
                 </copy>
               </tasks>
             </configuration>

diff --git a/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/it.properties b/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/it.properties
new file mode 100644 (file)
index 0000000..a421830
--- /dev/null
+++ b/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/it.properties
@@ -0,0 +1,13 @@
+#properties for integration tests
+
+BASE_URL=http://localhost:9696/archiva
+MAX_WAIT_TIME_IN_MS=60000
+
+ADMIN_USERNAME=admin
+ADMIN_FULLNAME=Administrator
+ADMIN_EMAIL=admin@localhost
+ADMIN_PASSWORD=admin123
+
+SELENIUM_HOST=localhost
+SELENIUM_PORT=4444
+SELENIUM_BROWSER=*firefox