svn commit: r659081 - /jakarta/cactus/trunk/samples/servlet/pom.xml

[ptahchiev]

Author: ptahchiev
Date: Thu May 22 04:34:00 2008
New Revision: 659081

URL: http://svn.apache.org/viewvc?rev=659081&view=rev
Log:
Changed the directory of the test-classes and test-sources.

Modified:
    jakarta/cactus/trunk/samples/servlet/pom.xml

Modified: jakarta/cactus/trunk/samples/servlet/pom.xml
URL: 
http://svn.apache.org/viewvc/jakarta/cactus/trunk/samples/servlet/pom.xml?rev=659081&r1=659080&r2=659081&view=diff
==============================================================================
--- jakarta/cactus/trunk/samples/servlet/pom.xml (original)
+++ jakarta/cactus/trunk/samples/servlet/pom.xml Thu May 22 04:34:00 2008
@@ -64,27 +64,32 @@
                        <groupId>commons-codec</groupId>
                        <artifactId>commons-codec</artifactId>
                        <version>1.3</version>
+                       <scope>provided</scope>
                </dependency>
                <dependency>
                        <groupId>aspectj</groupId>
                        <artifactId>aspectjrt</artifactId>
                        <version>1.5.3</version>
+                       <scope>provided</scope>
                </dependency>
                <dependency>
                        <groupId>org.codehaus.cargo</groupId>
                        <artifactId>cargo-core-uberjar</artifactId>
                        <version>0.9</version>
+                       <scope>provided</scope>
                </dependency>
                <dependency>
                        <groupId>org.codehaus.cargo</groupId>
                        <artifactId>cargo-ant</artifactId>
                        <version>0.9</version>
+                       <scope>provided</scope>
                </dependency>
                
                <dependency>
                        <groupId>junit</groupId>
                        <artifactId>junit</artifactId>
                        <version>4.4</version>
+                       <scope>provided</scope>
                </dependency>
 
                <dependency>
@@ -127,6 +132,7 @@
       <groupId>jdom</groupId>
       <artifactId>jdom</artifactId>
       <version>1.0</version>
+                       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>jaxen</groupId>
@@ -243,6 +249,10 @@
             </goals>
             <configuration>
               <skip>false</skip>
+                                                       <!--The next line is 
because we need the tests in src/main/java to ensure
+                                                                               
        that the classes are included in the archive.-->
+                                                       
<testSourceDirectory>src/main/java</testSourceDirectory>
+                                                       
<testClassesDirectory>target/classes</testClassesDirectory>
                 <systemProperties>
                   <property>
                     <name>cactus.contextURL</name>
@@ -260,12 +270,12 @@
       <plugin>
         <artifactId>maven-war-plugin</artifactId>
         <configuration>
-          <!--useCache>false</useCache-->
+          <useCache>false</useCache>
           <webXml>src/main/webapp/WEB-INF/web.xml</webXml>
           <warSourceIncludes>
             *, test/*, WEB-INF/classes/**, WEB-INF/lib/standard*, 
WEB-INF/lib/jstl*, WEB-INF/lib/html*, WEB-INF/lib/http*
           </warSourceIncludes>
-          
<!--warSourceExcludes>WEB-INF/lib/[a-z-[s]]*.jar</warSourceExcludes-->
+          <!--warSourceExcludes>*.jar</warSourceExcludes-->
         </configuration>        
       </plugin>
                </plugins>



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]