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

[guillaume at wyona.com]

Author: guillaume
Date: 2009-09-29 16:53:28 +0200 (Tue, 29 Sep 2009)
New Revision: 44921

Added:
   public/yanel/trunk/src/test/pom.xml
Removed:
   public/yanel/trunk/src/build/pom-test.xml
Modified:
   public/yanel/trunk/src/test/build.xml
Log:
Ooops, I indeed broke Yanel's build system in r44911, but it was only the test subpart of it!
To fix it it was simpler to use the Yanel-independant scripts to build Yanel's test Maven artifact, so this is now also done! :)


Deleted: public/yanel/trunk/src/build/pom-test.xml
===================================================================
--- public/yanel/trunk/src/build/pom-test.xml	2009-09-29 14:23:21 UTC (rev 44920)
+++ public/yanel/trunk/src/build/pom-test.xml	2009-09-29 14:53:28 UTC (rev 44921)
@@ -1,16 +0,0 @@
-<?xml version="1.0"?>
-
-<project>
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>wyona-org-yanel</groupId>
-  <artifactId>yanel-test</artifactId>
-  <version>@VERSION@</version>
-  <dependencies>
-    <dependency>
-      <groupId>wyona-org-yanel</groupId>
-      <artifactId>yanel-impl</artifactId>
-      <version>@VERSION@</version>
-    </dependency>
-  </dependencies>
-</project>
-

Modified: public/yanel/trunk/src/test/build.xml
===================================================================
--- public/yanel/trunk/src/test/build.xml	2009-09-29 14:23:21 UTC (rev 44920)
+++ public/yanel/trunk/src/test/build.xml	2009-09-29 14:53:28 UTC (rev 44921)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project name="test" default="test"
- xmlns:yanel="http://www.wyona.org/yanel/1.0"
+ xmlns:wyona-tools="http://www.wyona.org/tools/1.0"
  xmlns:artifact="antlib:org.apache.maven.artifact.ant"
 >
   <dirname property="tests.home.dir" file="${ant.file}"/>
@@ -25,7 +25,7 @@
   <property name="webapp.lib.dir" value="${build.dir}/webapps/${servlet.context.prefix}/WEB-INF/lib"/>
 
 
-  <import file="../build/targets/build-artifacts.build.xml"/>
+  <import file="../../tools/apache-ant_extras/artifacts.build.xml"/>
   
   <target name="init" depends="dependencies">
     <!--XXX HACK: we should distinguish between the build classpath and the runtime classpath... -->
@@ -109,7 +109,10 @@
   </target>
 
   <target name="install-jar" description="Install Yanel test JAR" depends="compile-classes">
-    <yanel:install-jar id="test"
+    <wyona-tools:install-jar
+     source-home="${yanel.source.home}" version="${yanel.source.version}"
+     name="yanel-test" package-root-path="org/wyona/yanel/test"
+     id="test"
      sources-dir="${yanel.build.dir}"
      classes-dir="${yanel.build.dir}" package-dir="foo"><!--: these attributes have dummy values, we only use the elements here: -->
       <fileset dir="${junit.build.dir}" includes="org/wyona/yanel/junit/**"/>
@@ -117,7 +120,7 @@
       <!--HACK: all JARs will get everything -->
       <fileset dir="${junit.src.dir}" includes="org/wyona/yanel/junit/**"/>
       <fileset dir="${htmlunit.src.dir}" includes="org/wyona/yanel/htmlunit/**"/>
-    </yanel:install-jar>
+    </wyona-tools:install-jar>
   </target>
 
   <target name="build-resources" depends="init" description="Build tests of resources">

Copied: public/yanel/trunk/src/test/pom.xml (from rev 44916, public/yanel/trunk/src/build/pom-test.xml)
===================================================================
--- public/yanel/trunk/src/test/pom.xml	                        (rev 0)
+++ public/yanel/trunk/src/test/pom.xml	2009-09-29 14:53:28 UTC (rev 44921)
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+
+<project>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>wyona-org-yanel</groupId>
+  <artifactId>yanel-test</artifactId>
+  <version>@VERSION@</version>
+  <dependencies>
+    <dependency>
+      <groupId>wyona-org-yanel</groupId>
+      <artifactId>yanel-impl</artifactId>
+      <version>@VERSION@</version>
+    </dependency>
+  </dependencies>
+</project>
+


Property changes on: public/yanel/trunk/src/test/pom.xml
___________________________________________________________________
Name: svn:mergeinfo
   +