Apache
/
archiva
mirror of https://github.com/apache/archiva.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[MRM-1472] some cleanup based on Olivier's comments on the dev list to clarify how to get the tomcat plugin running 

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1100227 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Brett Porter 2011-05-06 14:22:41 +00:00
parent 3f96b9c2b6
commit adcdfcf3bf
3 changed files with 4 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
archiva-modules/archiva-web/archiva-applet/pom.xml
View File

@ -86,26 +86,4 @@
</plugin>
</plugins>
</build>
<profiles>
<profile>
<id>dev</id>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<executions>
<execution>
<id>jar-generate-for-dev</id>
<phase>compile</phase>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
</profiles>
</project>

40
archiva-modules/archiva-web/archiva-webapp/pom.xml
View File

@ -614,9 +614,6 @@
</goals>
<configuration>
<tasks>
<copy overwrite="true" file="${basedir}/src/test/resources/log4j.xml" todir="${basedir}/src/main/webapp/WEB-INF/classes" />
<copy overwrite="true" file="${basedir}/src/test/resources/log4j.xml" todir="${project.build.directory}/classes" />
</tasks>
</configuration>
@ -628,6 +625,7 @@
<artifactId>maven-dependency-plugin</artifactId>
<version>2.2</version>
<executions>
<!-- redefine to skip its execution in Tomcat -->
<execution>
<id>copy</id>
<phase>process-resources</phase>
@ -647,6 +645,7 @@
</artifactItems>
</configuration>
</execution>
<!-- redefine to override exclude configuration (and add back struts-security.xml -->
<execution>
<id>unpack-redback-war</id>
<goals>
@ -669,45 +668,14 @@
</execution>
</executions>
</plugin>
<!--plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<version>2.5</version>
<executions>
<execution>
<id>copy-redback-resources</id>
<phase>compile</phase>
<goals>
<goal>copy-resources</goal>
</goals>
<configuration>
<outputDirectory>${project.build.outputDirectory}</outputDirectory>
<resources>
<resource>
<directory>${basedir}/src/main/webapp/WEB-INF/classes</directory>
<filtering>false</filtering>
<includes>
<include>struts-security.xml</include>
</includes>
</resource>
</resources>
</configuration>
</execution>
</executions>
</plugin-->
</plugins>
</build>
<dependencies>
<!-- TODO: Bug in the Tomcat plugin - it doesn't seem to respect runtime dependencies, so we redeclare it as compile -->
<dependency>
<groupId>org.apache.archiva</groupId>
<artifactId>metadata-store-file</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.codehaus.redback</groupId>
<artifactId>redback-struts2-integration</artifactId>
<version>${redback.version}</version>
<scope>compile</scope>
</dependency>
</dependencies>
</profile>

6
archiva-modules/archiva-web/archiva-webapp/src/test/tomcat/tomcat-context-archiva.xml
View File

@ -24,12 +24,6 @@
driverClassName="org.apache.derby.jdbc.EmbeddedDriver"
url="jdbc:derby:${catalina.base}/target/database/users;create=true"
/>
<Resource name="jdbc/continuum" auth="Container" type="javax.sql.DataSource"
username="sa"
password=""
driverClassName="org.apache.derby.jdbc.EmbeddedDriver"
url="jdbc:derby:${catalina.base}/target/database/continuum;create=true"
/>
<Resource name="mail/Session" auth="Container"
type="javax.mail.Session"
mail.smtp.host="localhost"/>