niclas 2004/04/27 08:20:06
Modified: activation/impl Tag: BETTER_MAVENIZATION maven.xml
project.properties
composition/impl Tag: BETTER_MAVENIZATION maven.xml
project.properties
maven-plugins/artifact Tag: BETTER_MAVENIZATION maven.xml
project.properties project.xml
maven-plugins/meta Tag: BETTER_MAVENIZATION maven.xml
plugin.jelly project.properties project.xml
merlin/site/xdocs/starting/tutorial Tag: BETTER_MAVENIZATION
creation.xml
Log:
Kind-of builds all the way now...
Revision Changes Path
No revision
No revision
1.7.2.3 +0 -4 avalon/activation/impl/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/avalon/activation/impl/maven.xml,v
retrieving revision 1.7.2.2
retrieving revision 1.7.2.3
diff -u -r1.7.2.2 -r1.7.2.3
--- maven.xml 27 Apr 2004 08:35:26 -0000 1.7.2.2
+++ maven.xml 27 Apr 2004 15:20:06 -0000 1.7.2.3
@@ -24,8 +24,4 @@
<ant:filter token="REPOSITORY_MAIN"
value="&avalon-repository-artifact;"/>
- <preGoal name="java:compile">
- <attainGoal name="avalon:meta"/>
- </preGoal>
-
</project>
1.4.2.1 +1 -0 avalon/activation/impl/project.properties
Index: project.properties
===================================================================
RCS file: /home/cvs/avalon/activation/impl/project.properties,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -r1.4 -r1.4.2.1
--- project.properties 19 Apr 2004 06:15:42 -0000 1.4
+++ project.properties 27 Apr 2004 15:20:06 -0000 1.4.2.1
@@ -13,3 +13,4 @@
project.name = avalon-activation-impl
avalon.buildsystem = ${basedir}/../../buildsystem
+avalon.meta.enabled = true
\ No newline at end of file
No revision
No revision
1.8.2.5 +0 -4 avalon/composition/impl/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/avalon/composition/impl/maven.xml,v
retrieving revision 1.8.2.4
retrieving revision 1.8.2.5
diff -u -r1.8.2.4 -r1.8.2.5
--- maven.xml 27 Apr 2004 09:34:32 -0000 1.8.2.4
+++ maven.xml 27 Apr 2004 15:20:06 -0000 1.8.2.5
@@ -24,10 +24,6 @@
<ant:filter token="REPOSITORY_MAIN"
value="&avalon-repository-artifact;"/>
- <preGoal name="java:compile">
- <attainGoal name="avalon:meta"/>
- </preGoal>
-
<postGoal name="test:compile">
<mkdir dir="${basedir}/target/test/repository/test/jars"/>
1.4.2.2 +1 -0 avalon/composition/impl/project.properties
Index: project.properties
===================================================================
RCS file: /home/cvs/avalon/composition/impl/project.properties,v
retrieving revision 1.4.2.1
retrieving revision 1.4.2.2
diff -u -r1.4.2.1 -r1.4.2.2
--- project.properties 24 Apr 2004 09:39:35 -0000 1.4.2.1
+++ project.properties 27 Apr 2004 15:20:06 -0000 1.4.2.2
@@ -9,3 +9,4 @@
project.name = avalon-composition-impl
avalon.buildsystem = ${basedir}/../../buildsystem
+avalon.meta.enabled = true
\ No newline at end of file
No revision
No revision
1.1.2.2 +1 -9 avalon/maven-plugins/artifact/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/avalon/maven-plugins/artifact/maven.xml,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- maven.xml 24 Apr 2004 09:39:36 -0000 1.1.2.1
+++ maven.xml 27 Apr 2004 15:20:06 -0000 1.1.2.2
@@ -1,14 +1,6 @@
<project default="plugin:install" xmlns:ant="jelly:ant">
- <postGoal name="plugin:install" >
- <attainGoal name="plugin:deploy" />
- </postGoal>
-
<preGoal name="jar:jar">
- <attainGoal name="avalon:generate"/>
- </preGoal>
-
- <goal name="avalon:generate">
<echo message="starting"/>
<mkdir dir="${maven.build.dir}/classes"/>
<ant:xslt in="${basedir}/project.xml"
out="${maven.build.dir}/classes/project.xml"
@@ -18,6 +10,6 @@
<outputproperty name="indent" value="yes"/>
</ant:xslt>
<echo message="done"/>
- </goal>
+ </preGoal>
</project>
1.1.2.2 +0 -1 avalon/maven-plugins/artifact/project.properties
Index: project.properties
===================================================================
RCS file: /home/cvs/avalon/maven-plugins/artifact/project.properties,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- project.properties 24 Apr 2004 09:39:36 -0000 1.1.2.1
+++ project.properties 27 Apr 2004 15:20:06 -0000 1.1.2.2
@@ -3,5 +3,4 @@
avalon.buildsystem = ${basedir}/../../buildsystem
-maven.artifact.type=plugin
maven.multiproject.type=plugin
1.1.2.2 +1 -0 avalon/maven-plugins/artifact/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/maven-plugins/artifact/project.xml,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- project.xml 27 Apr 2004 07:54:58 -0000 1.1.2.1
+++ project.xml 27 Apr 2004 15:20:06 -0000 1.1.2.2
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
<!DOCTYPE project [
<!ENTITY % index SYSTEM "file:index.ent"> %index;
]>
No revision
No revision
1.1.2.2 +1 -9 avalon/maven-plugins/meta/Attic/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/avalon/maven-plugins/meta/Attic/maven.xml,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- maven.xml 27 Apr 2004 09:34:32 -0000 1.1.2.1
+++ maven.xml 27 Apr 2004 15:20:06 -0000 1.1.2.2
@@ -1,14 +1,6 @@
<project default="plugin:install" xmlns:ant="jelly:ant">
-
- <postGoal name="plugin:install" >
- <attainGoal name="plugin:deploy" />
- </postGoal>
<preGoal name="jar:jar">
- <attainGoal name="avalon:generate"/>
- </preGoal>
-
- <goal name="avalon:generate">
<echo message="starting"/>
<mkdir dir="${maven.build.dir}/classes"/>
<ant:xslt in="${basedir}/project.xml"
out="${maven.build.dir}/classes/project.xml"
@@ -18,7 +10,7 @@
<outputproperty name="indent" value="yes"/>
</ant:xslt>
<echo message="done"/>
- </goal>
+ </preGoal>
</project>
1.1.2.2 +66 -48 avalon/maven-plugins/meta/Attic/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/avalon/maven-plugins/meta/Attic/plugin.jelly,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- plugin.jelly 27 Apr 2004 09:34:32 -0000 1.1.2.1
+++ plugin.jelly 27 Apr 2004 15:20:06 -0000 1.1.2.2
@@ -5,11 +5,11 @@
xmlns:util="jelly:util"
xmlns:maven="jelly:maven"
xmlns:ant="jelly:ant"
- xmlns:avalon="avalon-meta">
+ xmlns:meta="avalon-meta">
<define:taglib uri="avalon-meta"/>
- <ant:taskdef name="avalon-meta"
classname="org.apache.avalon.meta.info.ant.MetaTask">
+ <ant:taskdef name="meta-generate"
classname="org.apache.avalon.meta.info.ant.MetaTask">
<classpath>
<pathelement path="${plugin.getDependencyPath('qdox:qdox')}"/>
<pathelement
path="${plugin.getDependencyPath('avalon-framework:avalon-framework-api')}"/>
@@ -21,56 +21,74 @@
</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-meta destDir="${maven.build.dest}"
+ <goal name="meta:meta"
+ >
+<echo>
+Please removed the <![CDATA[
+<attainGoal name="avalon:meta" />
+]]>
+from the maven.xml, and instead add a
+
+ avalon.meta.enabled = true
+
+in the project.properties file.
+</echo>
+<fail message="avalon:meta has been dropped, and no longer used." />
+ </goal>
+
+ <postGoal name="java:compile" >
+<echo>Entering the Meta Generation for Java Sources</echo>
+ <ant:available property="javaSourcesPresent"
+ file="${maven.src.dir}/java"/>
+
+ <ant:available property="mainSourcesPresent"
+ file="${maven.src.dir}/main"/>
+
+ <j:set var="needsMetaGen" value="${avalon.meta.enabled}" />
+
+ <j:if test="${needsMetaGen }" >
+ <j:if test="${ (javaSourcesPresent || mainSourcesPresent )}">
+ <ant:mkdir dir="${maven.build.dest}"/>
+ <ant:meta-generate 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-meta>
-
- <j:if test="${testSourcesPresent == 'true'}">
- <ant:mkdir dir="${maven.build.dir}/test-classes"/>
- <ant:avalon-meta 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-meta>
+ <j:if test="${javaSourcesPresent == 'true'}">
+ <ant:fileset dir="${maven.src.dir}/java">
+ <include name="**/*.java"/>
+ </ant:fileset>
</j:if>
- </j:when>
- <j:otherwise>
- <ant:echo>No Avalon Meta java source files to compile.</ant:echo>
- </j:otherwise>
- </j:choose>
- </goal>
+ <j:if test="${mainSourcesPresent == 'true'}">
+ <ant:fileset dir="${maven.src.dir}/main">
+ <include name="**/*.java"/>
+ </ant:fileset>
+ </j:if>
+ </ant:meta-generate>
+ </j:if>
+ </j:if>
+ </postGoal>
+
+ <postGoal name="test:compile" >
+<echo>Entering the Meta Generation for Test Sources</echo>
+ <ant:mkdir dir="${maven.build.dest}"/>
+ <ant:available property="testSourcesPresent"
+ file="${maven.src.dir}/test"/>
+ <j:set var="needsMetaGen" value="${avalon.meta.enabled}" />
+
+ <j:if test="${needsMetaGen }" >
+ <j:if test="${needsMetaGen}">
+ <ant:mkdir dir="${maven.build.dir}/test-classes"/>
+ <ant:meta-generate 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:meta-generate>
+ </j:if>
+ </j:if>
+ </postGoal>
</project>
1.1.2.2 +0 -1 avalon/maven-plugins/meta/Attic/project.properties
Index: project.properties
===================================================================
RCS file: /home/cvs/avalon/maven-plugins/meta/Attic/project.properties,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- project.properties 27 Apr 2004 09:34:32 -0000 1.1.2.1
+++ project.properties 27 Apr 2004 15:20:06 -0000 1.1.2.2
@@ -3,5 +3,4 @@
avalon.buildsystem = ${basedir}/../../buildsystem
-maven.artifact.type=plugin
maven.multiproject.type=plugin
1.1.2.2 +0 -12 avalon/maven-plugins/meta/Attic/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/maven-plugins/meta/Attic/project.xml,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- project.xml 27 Apr 2004 09:34:32 -0000 1.1.2.1
+++ project.xml 27 Apr 2004 15:20:06 -0000 1.1.2.2
@@ -112,19 +112,9 @@
<id>xdoclet+jmx-module</id>
<version>1.2b2</version>
</dependency>
-
</dependencies>
<build>
- <sourceDirectory>${basedir}/src/java</sourceDirectory>
- <unitTestSourceDirectory>${basedir}/src/test</unitTestSourceDirectory>
-
- <unitTest>
- <includes>
- <include>**/*Test.java</include>
- </includes>
- </unitTest>
-
<resources>
<resource>
<directory>${basedir}/src/plugin-resources</directory>
@@ -139,7 +129,5 @@
</includes>
</resource>
</resources>
-
</build>
-
</project>
No revision
No revision
1.4.2.1 +4 -6 avalon/merlin/site/xdocs/starting/tutorial/creation.xml
Index: creation.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/site/xdocs/starting/tutorial/creation.xml,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -r1.4 -r1.4.2.1
--- creation.xml 19 Apr 2004 10:43:14 -0000 1.4
+++ creation.xml 27 Apr 2004 15:20:06 -0000 1.4.2.1
@@ -132,16 +132,14 @@
<p>
In order for Merlin to recognize this class as a component, we
need to
generate a <classname>.xinfo file. This can be done
- automatically by including a pre-goal as shown below into the
- maven.xml file.
+ automatically by enabling the Meta Plug-in, by entering in
+ project.properties;
</p>
<source><![CDATA[
-<preGoal name="java:compile">
- <attainGoal name="avalon:meta"/>
-</preGoal>
+avalon.meta.enabled=true
]]></source>
<p>
- The avalon:meta plugin looks for @avalon tags in the
+ The avalon-meta plugin looks for @avalon tags in the
source code, to generate the correct Type Descriptor. In the above
example it will find the @avalon.component tag in the class level
javadocs and generate component the descriptors for us (see
below).
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
