svn commit: rev 21425 - excalibur/trunk/datasource

[le...@apache.org]

Author: leif
Date: Fri Jun 18 08:24:13 2004
New Revision: 21425

Modified:
   excalibur/trunk/datasource/maven.xml
   excalibur/trunk/datasource/project.xml
Log:
The Fortress META data was not being generated correctly.

Modified: excalibur/trunk/datasource/maven.xml
==============================================================================
--- excalibur/trunk/datasource/maven.xml	(original)
+++ excalibur/trunk/datasource/maven.xml	Fri Jun 18 08:24:13 2004
@@ -1,5 +1,30 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <project default="jar:install"  xmlns:maven="jelly:maven" xmlns:j="jelly:core" xmlns:util="jelly:util" xmlns:ant="jelly:ant">
+
+    <!-- ===================================================================== -->
+    <!-- Generate fortress meta descriptors                                    -->
+    <!-- ===================================================================== -->
+
+    <postGoal name="java:compile">
+        <attainGoal name="provide-fortress-meta"/>
+    </postGoal>
+
+    <goal
+        name="provide-fortress-meta"
+        description="Add fortress meta descriptors to the compiled classes">
+
+        <taskdef name="fortress-collect-meta"
+            classname="org.apache.avalon.fortress.tools.ComponentMetaInfoCollector">
+            <classpath>
+                <path refid="maven.dependency.classpath"/>
+                <pathelement path="${java.build.dir}"/>
+            </classpath>
+        </taskdef>
+
+        <fortress-collect-meta destdir="${maven.build.dir}/classes">
+            <fileset dir="${maven.src.dir}/java"/>
+        </fortress-collect-meta>
+    </goal>
     
     <postGoal name="jar:jar">
         <checksum file="${maven.build.dir}/${maven.final.name}.jar" fileext=".md5" />

Modified: excalibur/trunk/datasource/project.xml
==============================================================================
--- excalibur/trunk/datasource/project.xml	(original)
+++ excalibur/trunk/datasource/project.xml	Fri Jun 18 08:24:13 2004
@@ -20,7 +20,7 @@
 
     <name>Excalibur Datasource</name>
     <id>excalibur-datasource</id>
-    <currentVersion>1.2.0</currentVersion>
+    <currentVersion>1.2.1</currentVersion>
     <inceptionYear>2003</inceptionYear>
     <shortDescription>Excalibur's Datasourc component</shortDescription>
     <description>
@@ -106,6 +106,24 @@
         <dependency>
             <id>excalibur-logger</id>
             <version>1.2</version>
+        </dependency>
+        
+        <dependency>
+            <!-- for metadata generation only -->
+            <groupId>excalibur-fortress</groupId>
+            <artifactId>excalibur-fortress-container-api</artifactId>
+            <version>1.2</version>
+        </dependency>
+        <dependency>
+            <!-- for metadata generation only -->
+            <groupId>excalibur-fortress</groupId>
+            <artifactId>excalibur-fortress-meta</artifactId>
+            <version>1.2</version>
+        </dependency>
+        <dependency>
+            <!-- for metadata generation only -->
+            <id>qdox</id>
+            <version>1.1</version>
         </dependency>
     </dependencies>
 </project>

---------------------------------------------------------------------
To unsubscribe, e-mail: scm-unsubscribe@excalibur.apache.org
For additional commands, e-mail: scm-help@excalibur.apache.org