[Yanel-commits] rev 30005 - in public/yanel/trunk/src: build test

[michi at wyona.com]

Author: michi
Date: 2007-12-19 14:40:42 +0100 (Wed, 19 Dec 2007)
New Revision: 30005

Modified:
   public/yanel/trunk/src/build/build.xml
   public/yanel/trunk/src/build/dependencies.xml
   public/yanel/trunk/src/test/build.xml
Log:
use servlet api lib only to compile but not within webapp

Modified: public/yanel/trunk/src/build/build.xml
===================================================================
--- public/yanel/trunk/src/build/build.xml	2007-12-19 13:25:24 UTC (rev 30004)
+++ public/yanel/trunk/src/build/build.xml	2007-12-19 13:40:42 UTC (rev 30005)
@@ -273,10 +273,12 @@
       </fileset>
       -->
       <pathelement path="${maven2.cp}"/>
+      <pathelement path="${maven2.compile.cp}"/>
     </path>
 
     <path id="classpath.cmdl">
       <pathelement path="${maven2.cp}"/>
+      <pathelement path="${maven2.compile.cp}"/>
     </path>
   </target>
 

Modified: public/yanel/trunk/src/build/dependencies.xml
===================================================================
--- public/yanel/trunk/src/build/dependencies.xml	2007-12-19 13:25:24 UTC (rev 30004)
+++ public/yanel/trunk/src/build/dependencies.xml	2007-12-19 13:40:42 UTC (rev 30005)
@@ -21,9 +21,14 @@
     -->
     <artifact:remoteRepository id="wyona.remote.repository" url="${maven.url}"/>
 
+    <!-- dependencies which are only needed at compile time, but won't be copied to WEB-INF/lib -->
+    <artifact:dependencies pathId="maven2.compile.classpath" filesetId="maven2.compile.fileset">
+      <remoteRepository refid="wyona.remote.repository"/>
+      <dependency groupId="javax.servlet" artifactId="servlet-api" version="2.3" scope="provided"/>
+    </artifact:dependencies>
+    
     <artifact:dependencies pathId="maven2.classpath" filesetId="maven2.fileset">
       <remoteRepository refid="wyona.remote.repository"/>
-      <dependency groupId="javax.servlet" artifactId="servlet-api" version="2.3" scope="provided"/>
       <dependency groupId="log4j" artifactId="log4j"
                   version="1.2.8"/>
       <!-- TODO: Add checksum file to server -->
@@ -85,6 +90,7 @@
     </artifact:dependencies>
 
     <property name="maven2.cp" refid="maven2.classpath"/>
+    <property name="maven2.compile.cp" refid="maven2.compile.classpath"/>
     <!--<echo>Maven2 classpath: ${maven2.cp}</echo>-->
 
   </target>

Modified: public/yanel/trunk/src/test/build.xml
===================================================================
--- public/yanel/trunk/src/test/build.xml	2007-12-19 13:25:24 UTC (rev 30004)
+++ public/yanel/trunk/src/test/build.xml	2007-12-19 13:40:42 UTC (rev 30005)
@@ -53,6 +53,7 @@
       <dependency groupId="jaxen" artifactId="jaxen" version="1.1-beta-10"/>
       <dependency groupId="rhino" artifactId="rhino" version="1.6R2"/>
       <dependency groupId="nekohtml" artifactId="nekohtml" version="0.9.5"/>
+      <dependency groupId="javax.servlet" artifactId="servlet-api" version="2.3" scope="provided"/>
     </artifact:dependencies>
 
     <property name="maven2.cp" refid="maven2.classpath"/>