You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@avalon.apache.org by ni...@apache.org on 2004/10/12 12:28:32 UTC

svn commit: rev 54664 - in avalon/trunk/runtime: . meta/plugin meta/plugin/etc meta/plugin/etc/main meta/plugin/src/main

Author: niclas
Date: Tue Oct 12 03:28:30 2004
New Revision: 54664

Added:
   avalon/trunk/runtime/meta/plugin/build.xml   (contents, props changed)
   avalon/trunk/runtime/meta/plugin/etc/
   avalon/trunk/runtime/meta/plugin/etc/main/
   avalon/trunk/runtime/meta/plugin/etc/main/plugin.properties   (contents, props changed)
   avalon/trunk/runtime/meta/plugin/etc/main/project.xml   (contents, props changed)
   avalon/trunk/runtime/meta/plugin/src/main/
   avalon/trunk/runtime/meta/plugin/src/main/plugin.jelly
Modified:
   avalon/trunk/runtime/index.xml
Log:
Added the Meta plugin back for use with Maven.

Modified: avalon/trunk/runtime/index.xml
==============================================================================
--- avalon/trunk/runtime/index.xml	(original)
+++ avalon/trunk/runtime/index.xml	Tue Oct 12 03:28:30 2004
@@ -855,4 +855,16 @@
     </dependencies>
   </project>
 
+  <project basedir="meta/plugin">
+    <info>
+      <group>avalon/meta</group>
+      <name>avalon-meta-plugin</name>
+      <version>1.5.0</version>
+      <status>SNAPSHOT</status>
+    </info>
+    <dependencies>
+      <include key="avalon-meta-tools"/>
+    </dependencies>
+  </project>
+  
 </index>

Added: avalon/trunk/runtime/meta/plugin/build.xml
==============================================================================
--- (empty file)
+++ avalon/trunk/runtime/meta/plugin/build.xml	Tue Oct 12 03:28:30 2004
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<project name="avalon-meta-plugin" default="install" basedir="." 
+    xmlns:x="antlib:org.apache.avalon.tools">
+
+  <x:home/>
+  <import file="${magic.templates}/standard.xml"/>
+
+</project>

Added: avalon/trunk/runtime/meta/plugin/etc/main/plugin.properties
==============================================================================
--- (empty file)
+++ avalon/trunk/runtime/meta/plugin/etc/main/plugin.properties	Tue Oct 12 03:28:30 2004
@@ -0,0 +1,32 @@
+# ------------------------------------------------------------------
+# P L U G I N  P R O P E R T I E S
+# -------------------------------------------------------------------
+# Avalon plugin.
+# -------------------------------------------------------------------
+
+#
+# Policy controlling the regeneration of meta descriptors independently
+# of the descriptor data.  This value defaults to false.  
+#
+avalon.meta.force=false
+
+#
+# Output format specification.  Valid values include 'xml' or 'serial'.
+# The xml value instructs the meta generator to create meta descriptions
+# in an XML format whereas the 'serial' value generates a serialized 
+# description of the descriptor.  Serial format is more efficient.  The 
+# default XML format is more portable.
+#
+avalon.meta.format=xml
+
+#
+# When generating type descriptors, Merlin recognizes both <classname>.xinfo
+# and <classname>.xtype. The .xtype postfix is used in situations where 
+# developers want to generate both Merlin and Phoenix descriptors. The 
+# value default to xinfo.
+#
+avalon.meta.type.postfix=xinfo
+
+
+
+

Added: avalon/trunk/runtime/meta/plugin/etc/main/project.xml
==============================================================================
--- (empty file)
+++ avalon/trunk/runtime/meta/plugin/etc/main/project.xml	Tue Oct 12 03:28:30 2004
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<project>
+
+  <groupId>avalon/meta</groupId>
+  <id>avalon-meta-plugin</id>
+  <currentVersion>1.5</currentVersion>
+
+  <name>Avalon Meta Model Plugin</name>
+  <description>Avalon Plugin for Maven</description>
+  <shortDescription>Avalon Plugin for Maven</shortDescription>
+  <package>org.apache.avalon</package>
+
+  <dependencies>
+
+    <dependency>
+      <groupId>avalon-framework</groupId>
+      <artifactId>avalon-framework-api</artifactId>
+      <version>4.2.0</version>
+    </dependency>
+    <dependency>
+      <groupId>avalon-framework</groupId>
+      <artifactId>avalon-framework-impl</artifactId>
+      <version>4.2.0</version>
+    </dependency>
+
+    <dependency>
+      <groupId>avalon/meta</groupId>
+      <artifactId>avalon-meta-api</artifactId>
+      <version>SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>avalon/meta</groupId>
+      <artifactId>avalon-meta-spi</artifactId>
+      <version>1.4.0</version>
+    </dependency>
+    <dependency>
+      <groupId>avalon/meta</groupId>
+      <artifactId>avalon-meta-impl</artifactId>
+      <version>SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>avalon/meta</groupId>
+      <artifactId>avalon-meta-tools</artifactId>
+      <version>SNAPSHOT</version>
+    </dependency>
+
+    <dependency>
+      <groupId>avalon/util</groupId>
+      <artifactId>avalon-util-i18n</artifactId>
+      <version>1.0.0</version>
+    </dependency>
+
+    <dependency>
+      <groupId>avalon/util</groupId>
+      <artifactId>avalon-util-configuration</artifactId>
+      <version>1.0.0</version>
+    </dependency>
+
+    <dependency>
+      <groupId>ant</groupId>
+      <artifactId>ant</artifactId>
+      <version>1.6.2</version>
+    </dependency>
+
+    <dependency>
+      <groupId>qdox</groupId>
+      <artifactId>qdox</artifactId>
+      <version>1.4</version>
+    </dependency>
+
+  </dependencies>
+  
+</project>

Added: avalon/trunk/runtime/meta/plugin/src/main/plugin.jelly
==============================================================================
--- (empty file)
+++ avalon/trunk/runtime/meta/plugin/src/main/plugin.jelly	Tue Oct 12 03:28:30 2004
@@ -0,0 +1,76 @@
+<?xml version="1.0"?>
+
+<project xmlns:j="jelly:core"
+  xmlns:define="jelly:define"
+  xmlns:util="jelly:util"
+  xmlns:maven="jelly:maven"
+  xmlns:ant="jelly:ant"
+  xmlns:avalon="avalon">
+
+  <define:taglib uri="avalon"/>
+
+  <ant:taskdef name="avalon" classname="org.apache.avalon.meta.info.ant.MetaTask">
+    <classpath>
+      <pathelement path="${plugin.getDependencyPath('qdox:qdox')}"/>
+      <pathelement path="${plugin.getDependencyPath('avalon-framework:avalon-framework-api')}"/>
+      <pathelement path="${plugin.getDependencyPath('avalon-framework:avalon-framework-impl')}"/>
+      <pathelement path="${plugin.getDependencyPath('avalon-meta:avalon-meta-tools')}"/>
+      <pathelement path="${plugin.getDependencyPath('avalon-meta:avalon-meta-api')}"/>
+      <pathelement path="${plugin.getDependencyPath('avalon-meta:avalon-meta-spi')}"/>
+      <pathelement path="${plugin.getDependencyPath('avalon-meta:avalon-meta-impl')}"/>
+    </classpath>
+  </ant:taskdef>
+
+  <goal name="avalon:meta" 
+    description="Generate meta info descriptors based on meta tags declared in Java source files for inclusion in a jar file.">
+
+    <j:choose>
+      <j:when test="${sourcesPresent == 'true'}">
+
+        <ant:available property="javaSourcesPresent"
+           file="${maven.src.dir}/java"/>
+
+        <ant:available property="mainSourcesPresent"
+           file="${maven.src.dir}/main"/>
+
+        <ant:available property="testSourcesPresent"
+           file="${maven.src.dir}/test"/>
+
+        <ant:mkdir dir="${maven.build.dest}"/>
+        <ant:avalon destDir="${maven.build.dest}" 
+          format="${avalon.meta.format}" 
+          force="${avalon.meta.force}"
+          postfix="${avalon.meta.type.postfix}">
+
+          <j:if test="${javaSourcesPresent == 'true'}">
+            <ant:fileset dir="${maven.src.dir}/java">
+              <include name="**/*.java"/>
+            </ant:fileset>
+          </j:if>
+          <j:if test="${mainSourcesPresent == 'true'}">
+            <ant:fileset dir="${maven.src.dir}/main">
+              <include name="**/*.java"/>
+            </ant:fileset>
+          </j:if>
+
+        </ant:avalon>
+
+        <j:if test="${testSourcesPresent == 'true'}">
+          <ant:mkdir dir="${maven.build.dir}/test-classes"/>
+          <ant:avalon destDir="${maven.build.dir}/test-classes" 
+              format="${avalon.meta.format}" 
+              force="${avalon.meta.force}"
+              postfix="${avalon.meta.type.postfix}">
+            <ant:fileset dir="${maven.src.dir}/test">
+              <include name="**/*.java"/>
+            </ant:fileset>
+          </ant:avalon>
+        </j:if>
+      </j:when>
+      <j:otherwise>
+        <ant:echo>No Avalon Meta java source files to compile.</ant:echo>
+      </j:otherwise>      
+    </j:choose>
+  </goal>
+
+</project>

---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org


RE: svn commit: rev 54664 - in avalon/trunk/runtime: . meta/plugin meta/plugin/etc meta/plugin/etc/main meta/plugin/src/main

Posted by Stephen McConnell <mc...@dpml.net>.
Just a quick note - the project.xml that is bundled with the build is
hard coded with version refs.  What is really needed here is a plugin in
magic which will auto-generate the maven project.xml for a maven plugin.
We have the technology - just a matter of incentive.

Steve.


> -----Original Message-----
> From: niclas@apache.org [mailto:niclas@apache.org]
> Sent: 12 October 2004 12:29
> To: cvs@avalon.apache.org
> Subject: svn commit: rev 54664 - in avalon/trunk/runtime: .
meta/plugin
> meta/plugin/etc meta/plugin/etc/main meta/plugin/src/main
> 
> Author: niclas
> Date: Tue Oct 12 03:28:30 2004
> New Revision: 54664
> 
> Added:
>    avalon/trunk/runtime/meta/plugin/build.xml   (contents, props
changed)
>    avalon/trunk/runtime/meta/plugin/etc/
>    avalon/trunk/runtime/meta/plugin/etc/main/
>    avalon/trunk/runtime/meta/plugin/etc/main/plugin.properties
> (contents, props changed)
>    avalon/trunk/runtime/meta/plugin/etc/main/project.xml   (contents,
> props changed)
>    avalon/trunk/runtime/meta/plugin/src/main/
>    avalon/trunk/runtime/meta/plugin/src/main/plugin.jelly
> Modified:
>    avalon/trunk/runtime/index.xml
> Log:
> Added the Meta plugin back for use with Maven.
> 
> Modified: avalon/trunk/runtime/index.xml
>
========================================================================
==
> ====
> --- avalon/trunk/runtime/index.xml	(original)
> +++ avalon/trunk/runtime/index.xml	Tue Oct 12 03:28:30 2004
> @@ -855,4 +855,16 @@
>      </dependencies>
>    </project>
> 
> +  <project basedir="meta/plugin">
> +    <info>
> +      <group>avalon/meta</group>
> +      <name>avalon-meta-plugin</name>
> +      <version>1.5.0</version>
> +      <status>SNAPSHOT</status>
> +    </info>
> +    <dependencies>
> +      <include key="avalon-meta-tools"/>
> +    </dependencies>
> +  </project>
> +
>  </index>
> 
> Added: avalon/trunk/runtime/meta/plugin/build.xml
>
========================================================================
==
> ====
> --- (empty file)
> +++ avalon/trunk/runtime/meta/plugin/build.xml	Tue Oct 12
03:28:30 2004
> @@ -0,0 +1,9 @@
> +<?xml version="1.0" encoding="UTF-8" ?>
> +
> +<project name="avalon-meta-plugin" default="install" basedir="."
> +    xmlns:x="antlib:org.apache.avalon.tools">
> +
> +  <x:home/>
> +  <import file="${magic.templates}/standard.xml"/>
> +
> +</project>
> 
> Added: avalon/trunk/runtime/meta/plugin/etc/main/plugin.properties
>
========================================================================
==
> ====
> --- (empty file)
> +++ avalon/trunk/runtime/meta/plugin/etc/main/plugin.properties
Tue Oct
> 12 03:28:30 2004
> @@ -0,0 +1,32 @@
> +# ------------------------------------------------------------------
> +# P L U G I N  P R O P E R T I E S
> +# -------------------------------------------------------------------
> +# Avalon plugin.
> +# -------------------------------------------------------------------
> +
> +#
> +# Policy controlling the regeneration of meta descriptors
independently
> +# of the descriptor data.  This value defaults to false.
> +#
> +avalon.meta.force=false
> +
> +#
> +# Output format specification.  Valid values include 'xml' or
'serial'.
> +# The xml value instructs the meta generator to create meta
descriptions
> +# in an XML format whereas the 'serial' value generates a serialized
> +# description of the descriptor.  Serial format is more efficient.
The
> +# default XML format is more portable.
> +#
> +avalon.meta.format=xml
> +
> +#
> +# When generating type descriptors, Merlin recognizes both
> <classname>.xinfo
> +# and <classname>.xtype. The .xtype postfix is used in situations
where
> +# developers want to generate both Merlin and Phoenix descriptors.
The
> +# value default to xinfo.
> +#
> +avalon.meta.type.postfix=xinfo
> +
> +
> +
> +
> 
> Added: avalon/trunk/runtime/meta/plugin/etc/main/project.xml
>
========================================================================
==
> ====
> --- (empty file)
> +++ avalon/trunk/runtime/meta/plugin/etc/main/project.xml	Tue Oct
12
> 03:28:30 2004
> @@ -0,0 +1,74 @@
> +<?xml version="1.0" encoding="ISO-8859-1"?>
> +
> +<project>
> +
> +  <groupId>avalon/meta</groupId>
> +  <id>avalon-meta-plugin</id>
> +  <currentVersion>1.5</currentVersion>
> +
> +  <name>Avalon Meta Model Plugin</name>
> +  <description>Avalon Plugin for Maven</description>
> +  <shortDescription>Avalon Plugin for Maven</shortDescription>
> +  <package>org.apache.avalon</package>
> +
> +  <dependencies>
> +
> +    <dependency>
> +      <groupId>avalon-framework</groupId>
> +      <artifactId>avalon-framework-api</artifactId>
> +      <version>4.2.0</version>
> +    </dependency>
> +    <dependency>
> +      <groupId>avalon-framework</groupId>
> +      <artifactId>avalon-framework-impl</artifactId>
> +      <version>4.2.0</version>
> +    </dependency>
> +
> +    <dependency>
> +      <groupId>avalon/meta</groupId>
> +      <artifactId>avalon-meta-api</artifactId>
> +      <version>SNAPSHOT</version>
> +    </dependency>
> +    <dependency>
> +      <groupId>avalon/meta</groupId>
> +      <artifactId>avalon-meta-spi</artifactId>
> +      <version>1.4.0</version>
> +    </dependency>
> +    <dependency>
> +      <groupId>avalon/meta</groupId>
> +      <artifactId>avalon-meta-impl</artifactId>
> +      <version>SNAPSHOT</version>
> +    </dependency>
> +    <dependency>
> +      <groupId>avalon/meta</groupId>
> +      <artifactId>avalon-meta-tools</artifactId>
> +      <version>SNAPSHOT</version>
> +    </dependency>
> +
> +    <dependency>
> +      <groupId>avalon/util</groupId>
> +      <artifactId>avalon-util-i18n</artifactId>
> +      <version>1.0.0</version>
> +    </dependency>
> +
> +    <dependency>
> +      <groupId>avalon/util</groupId>
> +      <artifactId>avalon-util-configuration</artifactId>
> +      <version>1.0.0</version>
> +    </dependency>
> +
> +    <dependency>
> +      <groupId>ant</groupId>
> +      <artifactId>ant</artifactId>
> +      <version>1.6.2</version>
> +    </dependency>
> +
> +    <dependency>
> +      <groupId>qdox</groupId>
> +      <artifactId>qdox</artifactId>
> +      <version>1.4</version>
> +    </dependency>
> +
> +  </dependencies>
> +
> +</project>
> 
> Added: avalon/trunk/runtime/meta/plugin/src/main/plugin.jelly
>
========================================================================
==
> ====
> --- (empty file)
> +++ avalon/trunk/runtime/meta/plugin/src/main/plugin.jelly	Tue Oct
12
> 03:28:30 2004
> @@ -0,0 +1,76 @@
> +<?xml version="1.0"?>
> +
> +<project xmlns:j="jelly:core"
> +  xmlns:define="jelly:define"
> +  xmlns:util="jelly:util"
> +  xmlns:maven="jelly:maven"
> +  xmlns:ant="jelly:ant"
> +  xmlns:avalon="avalon">
> +
> +  <define:taglib uri="avalon"/>
> +
> +  <ant:taskdef name="avalon"
> classname="org.apache.avalon.meta.info.ant.MetaTask">
> +    <classpath>
> +      <pathelement path="${plugin.getDependencyPath('qdox:qdox')}"/>
> +      <pathelement path="${plugin.getDependencyPath('avalon-
> framework:avalon-framework-api')}"/>
> +      <pathelement path="${plugin.getDependencyPath('avalon-
> framework:avalon-framework-impl')}"/>
> +      <pathelement
path="${plugin.getDependencyPath('avalon-meta:avalon-
> meta-tools')}"/>
> +      <pathelement
path="${plugin.getDependencyPath('avalon-meta:avalon-
> meta-api')}"/>
> +      <pathelement
path="${plugin.getDependencyPath('avalon-meta:avalon-
> meta-spi')}"/>
> +      <pathelement
path="${plugin.getDependencyPath('avalon-meta:avalon-
> meta-impl')}"/>
> +    </classpath>
> +  </ant:taskdef>
> +
> +  <goal name="avalon:meta"
> +    description="Generate meta info descriptors based on meta tags
> declared in Java source files for inclusion in a jar file.">
> +
> +    <j:choose>
> +      <j:when test="${sourcesPresent == 'true'}">
> +
> +        <ant:available property="javaSourcesPresent"
> +           file="${maven.src.dir}/java"/>
> +
> +        <ant:available property="mainSourcesPresent"
> +           file="${maven.src.dir}/main"/>
> +
> +        <ant:available property="testSourcesPresent"
> +           file="${maven.src.dir}/test"/>
> +
> +        <ant:mkdir dir="${maven.build.dest}"/>
> +        <ant:avalon destDir="${maven.build.dest}"
> +          format="${avalon.meta.format}"
> +          force="${avalon.meta.force}"
> +          postfix="${avalon.meta.type.postfix}">
> +
> +          <j:if test="${javaSourcesPresent == 'true'}">
> +            <ant:fileset dir="${maven.src.dir}/java">
> +              <include name="**/*.java"/>
> +            </ant:fileset>
> +          </j:if>
> +          <j:if test="${mainSourcesPresent == 'true'}">
> +            <ant:fileset dir="${maven.src.dir}/main">
> +              <include name="**/*.java"/>
> +            </ant:fileset>
> +          </j:if>
> +
> +        </ant:avalon>
> +
> +        <j:if test="${testSourcesPresent == 'true'}">
> +          <ant:mkdir dir="${maven.build.dir}/test-classes"/>
> +          <ant:avalon destDir="${maven.build.dir}/test-classes"
> +              format="${avalon.meta.format}"
> +              force="${avalon.meta.force}"
> +              postfix="${avalon.meta.type.postfix}">
> +            <ant:fileset dir="${maven.src.dir}/test">
> +              <include name="**/*.java"/>
> +            </ant:fileset>
> +          </ant:avalon>
> +        </j:if>
> +      </j:when>
> +      <j:otherwise>
> +        <ant:echo>No Avalon Meta java source files to
compile.</ant:echo>
> +      </j:otherwise>
> +    </j:choose>
> +  </goal>
> +
> +</project>
> 
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
> For additional commands, e-mail: cvs-help@avalon.apache.org


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@avalon.apache.org
For additional commands, e-mail: dev-help@avalon.apache.org