MRM-310 Applied patch submitted by Napoleon Esmundo Ramirez

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

diff --git a/archiva-webapp-test/pom.xml b/archiva-webapp-test/pom.xml
index 264f6eff3f8f5b6387ae03b0fc34f956857f8769..2f7e4a567559073fe99c235d8e2a5881e6937c4b 100644 (file)
--- a/archiva-webapp-test/pom.xml
+++ b/archiva-webapp-test/pom.xml
@@ -42,6 +42,23 @@
       <version>1.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
+    
+    <!-- Dependencies below are provided by the appserver -->
+    <dependency>
+      <groupId>org.apache.derby</groupId>
+      <artifactId>derby</artifactId>
+      <version>10.1.3.1</version>
+    </dependency>
+    <dependency>
+      <groupId>javax.mail</groupId>
+      <artifactId>mail</artifactId>
+      <version>1.4</version>
+    </dependency>
+    <dependency>
+      <groupId>javax.activation</groupId>
+      <artifactId>activation</artifactId>
+      <version>1.1</version>
+    </dependency>
   </dependencies>
 
   <build>
@@ -69,6 +86,19 @@
               <outputDirectory>${project.build.directory}/${container.name}conf/webapps/archiva</outputDirectory>
             </configuration>
           </execution>
+          <execution>
+            <id>prepare-provided-dependencies</id>
+            <phase>generate-resources</phase>
+            <goals>
+              <goal>copy-dependencies</goal>
+            </goals>
+            <configuration>
+              <overWriteReleases>false</overWriteReleases>
+              <overWriteSnapshots>true</overWriteSnapshots>
+              <excludeTransitive>false</excludeTransitive>
+              <outputDirectory>${project.build.directory}/providedDependencies</outputDirectory>
+            </configuration>
+          </execution>
         </executions>
       </plugin>
       <plugin>
@@ -84,7 +114,7 @@
                 </copy>
                 <copy
                     todir="${project.build.directory}/installs/${container.name}/apache-tomcat-5.5.20/apache-tomcat-5.5.20/common/lib">
-                  <fileset dir="${project.build.directory}/${container.name}conf/webapps/archiva/WEB-INF/lib">
+                  <fileset dir="${project.build.directory}/providedDependencies">
                     <include name="**/derby-*.jar"/>
                   </fileset>
                 </copy>

diff --git a/archiva-webapp-test/src/test/tomcat5x/conf/Catalina/localhost/archiva.xml b/archiva-webapp-test/src/test/tomcat5x/conf/Catalina/localhost/archiva.xml
index af06920564cb7a556b6bc9258cd7b6db72e5403c..180dbb74292d7621edf07f3e9718abbbd7a8a912 100644 (file)
--- a/archiva-webapp-test/src/test/tomcat5x/conf/Catalina/localhost/archiva.xml
+++ b/archiva-webapp-test/src/test/tomcat5x/conf/Catalina/localhost/archiva.xml
@@ -27,4 +27,10 @@
             driverClassName="org.apache.derby.jdbc.EmbeddedDriver"
             url="jdbc:derby:target/database/users;create=true"
       />
+  
+  <Resource name="jdbc/archiva" auth="Container" type="javax.sql.DataSource"
+            username="sa"
+            password=""
+            driverClassName="org.apache.derby.jdbc.EmbeddedDriver"
+            url="jdbc:derby:database/archiva;create=true" />
 </Context>