Author: oching
Date: Tue Apr 17 02:52:25 2007
New Revision: 529546
URL: http://svn.apache.org/viewvc?view=rev&rev=529546
Log:
MRM-310 Applied patch submitted by Napoleon Esmundo Ramirez
Modified:
maven/archiva/trunk/archiva-webapp-test/pom.xml
maven/archiva/trunk/archiva-webapp-test/src/test/tomcat5x/conf/Catalina/localhost/archiva.xml
Modified: maven/archiva/trunk/archiva-webapp-test/pom.xml
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-webapp-test/pom.xml?view=diff&rev=529546&r1=529545&r2=529546
==============================================================================
--- maven/archiva/trunk/archiva-webapp-test/pom.xml (original)
+++ maven/archiva/trunk/archiva-webapp-test/pom.xml Tue Apr 17 02:52:25 2007
@@ -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>
Modified:
maven/archiva/trunk/archiva-webapp-test/src/test/tomcat5x/conf/Catalina/localhost/archiva.xml
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-webapp-test/src/test/tomcat5x/conf/Catalina/localhost/archiva.xml?view=diff&rev=529546&r1=529545&r2=529546
==============================================================================
---
maven/archiva/trunk/archiva-webapp-test/src/test/tomcat5x/conf/Catalina/localhost/archiva.xml
(original)
+++
maven/archiva/trunk/archiva-webapp-test/src/test/tomcat5x/conf/Catalina/localhost/archiva.xml
Tue Apr 17 02:52:25 2007
@@ -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>
