[MRM-1472] some cleanup based on Olivier's comments on the dev list to clarify how...

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

diff --git a/archiva-modules/archiva-web/archiva-applet/pom.xml b/archiva-modules/archiva-web/archiva-applet/pom.xml
index efcc4cfdd77ce070582fb9b4147fea4541a8347b..5a317b861c4c5c3dc19eae88c630fa09264072a3 100644 (file)
--- a/archiva-modules/archiva-web/archiva-applet/pom.xml
+++ b/archiva-modules/archiva-web/archiva-applet/pom.xml
@@ -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>

diff --git a/archiva-modules/archiva-web/archiva-webapp/pom.xml b/archiva-modules/archiva-web/archiva-webapp/pom.xml
index c6f4981228eab7414538b1e9ae87cbf0b5fdb45b..a47f889c0ec560186c0ec99e8aedf0adfc21d3cc 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp/pom.xml
+++ b/archiva-modules/archiva-web/archiva-webapp/pom.xml
@@ -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>

diff --git a/archiva-modules/archiva-web/archiva-webapp/src/test/tomcat/tomcat-context-archiva.xml b/archiva-modules/archiva-web/archiva-webapp/src/test/tomcat/tomcat-context-archiva.xml
index b5275faa01d6d9987c6fbd659e519b50fdf7f834..44c1f59ffcf4f2aef1782ebdfdbcec9707ba067f 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp/src/test/tomcat/tomcat-context-archiva.xml
+++ b/archiva-modules/archiva-web/archiva-webapp/src/test/tomcat/tomcat-context-archiva.xml
@@ -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"/>