werken 2002/07/05 21:49:10
Modified: . build-bootstrap.xml maven.xml
src/java/org/apache/maven/app PluginManager.java
src/plugins/clover plugin.jelly
src/plugins/jdepend plugin.jelly
src/plugins/test plugin.jelly
Added: src/plugins/clean plugin.jelly
src/plugins/java plugin.jelly plugin.properties
Removed: src/plugins/core plugin.jelly plugin.properties
Log:
No more 'core' plugin. Now called 'java', since that's what it does.
Modified PluginManager to know this, and still load 'java' plugin
first. That's annoying.
'clean' plugin. weird display in --goals output, though. stephane?
Updated bootstrap and maven.xml to refer to better-named goals.
Revision Changes Path
1.116 +2 -2 jakarta-turbine-maven/build-bootstrap.xml
Index: build-bootstrap.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/build-bootstrap.xml,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -r1.115 -r1.116
--- build-bootstrap.xml 6 Jul 2002 02:02:36 -0000 1.115
+++ build-bootstrap.xml 6 Jul 2002 04:49:10 -0000 1.116
@@ -139,8 +139,8 @@
</condition>
<exec executable="${maven.home}/bin/${maven.script}"
failonerror="true">
- <arg line="core:clean"/>
- <arg line="core:jar"/>
+ <arg line="clean"/>
+ <arg line="java:jar"/>
</exec>
</target>
1.8 +5 -5 jakarta-turbine-maven/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/maven.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- maven.xml 6 Jul 2002 02:02:36 -0000 1.7
+++ maven.xml 6 Jul 2002 04:49:10 -0000 1.8
@@ -1,15 +1,15 @@
-<project default="core:jar">
+<project default="java:jar">
<!--
- <preGoal name="core:compile">
+ <preGoal name="java:compile">
<echo>
- This is a callback before core:compile
+ This is a callback before java:compile
</echo>
</preGoal>
- <postGoal name="core:compile">
+ <postGoal name="java:compile">
<echo>
- This is a callback after core:compile
+ This is a callback after java:compile
</echo>
</postGoal>
-->
1.5 +2 -2
jakarta-turbine-maven/src/java/org/apache/maven/app/PluginManager.java
Index: PluginManager.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/app/PluginManager.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- PluginManager.java 6 Jul 2002 03:59:42 -0000 1.4
+++ PluginManager.java 6 Jul 2002 04:49:10 -0000 1.5
@@ -127,7 +127,7 @@
{
setPluginsDir( new File( getMavenHome(), "plugins" ) );
- loadPlugin("core");
+ loadPlugin("java");
File pluginsDir = getPluginsDir();
@@ -137,7 +137,7 @@
{
if (pluginDirs[i].isDirectory()
&&
- ! pluginDirs[i].getName().equals("core"))
+ ! pluginDirs[i].getName().equals("java"))
{
loadPlugin(pluginDirs[i].getName());
}
1.1 jakarta-turbine-maven/src/plugins/clean/plugin.jelly
Index: plugin.jelly
===================================================================
<?xml version="1.0"?>
<project>
<goal name="clean:clean"
description="Remove all project artifacts">
<delete dir="${maven.build.dir}"/>
<delete dir="${maven.test.reportsDirectory}"/>
</goal>
<goal name="clean" prereqs="clean:clean"/>
</project>
1.4 +2 -2 jakarta-turbine-maven/src/plugins/clover/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/plugins/clover/plugin.jelly,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- plugin.jelly 6 Jul 2002 04:21:13 -0000 1.3
+++ plugin.jelly 6 Jul 2002 04:49:10 -0000 1.4
@@ -19,8 +19,8 @@
<mkdir dir="${maven.build.clover.classes}"/>
<mkdir dir="${maven.clover.database.dir}"/>
- <attainGoal name="core:compile"/>
- <attainGoal name="core:compile-test"/>
+ <attainGoal name="java:compile"/>
+ <attainGoal name="java:compile-test"/>
</goal>
1.1 jakarta-turbine-maven/src/plugins/java/plugin.jelly
Index: plugin.jelly
===================================================================
<?xml version="1.0"?>
<project xmlns:j="jelly:core">
<path id="maven.compile.src.set">
<pathelement location="${pom.build.SourceDirectory}"/>
</path>
<j:choose>
<j:when test="${!pom.build.resources.includes.isEmpty()}">
<property name="maven.has.jar.resource.patterns" value="true"/>
</j:when>
<j:when test="${!pom.build.resources.excludes.isEmpty()}">
<property name="maven.has.jar.resource.patterns" value="true"/>
</j:when>
<j:otherwise>
<property name="maven.has.jar.resource.patterns" value="false"/>
</j:otherwise>
</j:choose>
<patternset id="maven.jar.resources.set">
<j:forEach var="res" items="${pom.build.resources.includes}">
<include name="${res}"/>
</j:forEach>
<j:forEach var="res" items="${pom.build.resources.excludes}">
<exclude name="${res}"/>
</j:forEach>
</patternset>
<path id="maven.dependency.classpath">
<j:forEach var="dep" items="${pom.dependencies}">
<pathelement location="${maven.repo.local}/${dep.jar}"/>
</j:forEach>
</path>
<!-- Setup maven's internal classpath -->
<path id="maven-classpath">
<fileset dir="${maven.home}/lib"/>
</path>
<!-- The start of setting up some flags for the build:
. sourceDirectory present
. testSourceDirectory present
-->
<available
property="sourcesPresent"
file="${pom.build.sourceDirectory}"
/>
<available
property="unitTestSourcesPresent"
file="${pom.build.unitTestSourceDirectory}"
/>
<!-- ================================================================== -->
<!-- prepare-filesystem -->
<!-- ================================================================== -->
<goal name="java:prepare-filesystem">
<mkdir dir="${maven.build.dest}"/>
</goal>
<!-- ================================================================== -->
<!-- compile -->
<!-- ================================================================== -->
<goal name="java:compile"
prereqs="java:prepare-filesystem">
<property name="cp" refid="maven.dependency.classpath"/>
<javac
destdir="${maven.build.dest}"
excludes="**/package.html"
debug="${maven.compile.debug}"
deprecation="${maven.compile.deprecation}"
optimize="${maven.compile.optimize}">
<src>
<path refid="maven.compile.src.set"/>
</src>
<classpath>
<path refid="maven.dependency.classpath"/>
<pathelement path="${maven.build.dest}"/>
</classpath>
</javac>
</goal>
<!-- ================================================================== -->
<!-- jar resources -->
<!-- ================================================================== -->
<goal name="java:jar-resources">
<j:if test="${maven.has.jar.resource.patterns}">
<!-- Copy any resources that must be present in the deployed
JAR file.
-->
<copy todir="${maven.build.dest}">
<fileset dir="${maven.jarResources.basedir}">
<patternset refid="maven.jar.resources.set"/>
</fileset>
</copy>
</j:if>
</goal>
<!-- ================================================================== -->
<!-- jar -->
<!-- ================================================================== -->
<goal name="java:jar"
description="Create the deliverable jar file."
prereqs="test:test,java:jar-resources">
<jar
jarfile="${maven.build.dir}/${maven.final.name}.jar"
basedir="${maven.build.dest}"
excludes="${maven.jar.excludes}">
<metainf dir="${basedir}">
<include name="LICENSE.txt"/>
</metainf>
<manifest>
<attribute name="Built-By" value="${user.name}"/>
<attribute name="Created-By" value="Apache Jakarta Maven"/>
<section name="${maven.package}">
<attribute name="Specification-Title" value="${maven.id}"/>
<attribute name="Specification-Version" value="${maven.currentVersion}"/>
<attribute name="Specification-Vendor" value="${maven.organization}"/>
<attribute name="Implementation-Title" value="${maven.package}"/>
<attribute name="Implementation-Version" value="${maven.currentVersion}"/>
<attribute name="Implementation-Vendor" value="${maven.organization}"/>
</section>
</manifest>
</jar>
</goal>
<!-- ================================================================== -->
<!-- SITE GENERATION -->
<!-- ================================================================== -->
<goal
name="site:generate">
<attainGoal name="jdepend:generate-report"/>
<attainGoal name="checkstyle:generate-report"/>
<attainGoal name="changelog:generate"/>
<attainGoal name="activity:generate"/>
<attainGoal name="javadoc:generate"/>
<attainGoal name="jxr:generate"/>
<attainGoal name="junit-report:generate"/>
<attainGoal name="tasklist:generate"/>
<attainGoal name="xdoc:generate-from-pom"/>
<attainGoal name="xdoc:transform"/>
</goal>
</project>
1.1 jakarta-turbine-maven/src/plugins/java/plugin.properties
Index: plugin.properties
===================================================================
# -------------------------------------------------------------------
# D E F A U L T M A V E N P R O P E R T I E S
# -------------------------------------------------------------------
# These are the properties that we believe are immutable so we
# keep them apart from the project specific properties.
# -------------------------------------------------------------------
maven.src.dir = ${basedir}/src
maven.conf.dir = ${basedir}/conf
maven.build.dir = ${basedir}/target
maven.build.src = ${maven.build.dir}/src
maven.build.dest = ${maven.build.dir}/classes
maven.compile.aspects = false
maven.compile.debug = on
maven.compile.optimize = off
maven.compile.deprecation = off
maven.jar.aspectjrt = ${ant.home}/lib/aspectjrt.jar
maven.jar.aspectjtools = ${ant.home}/lib/aspectjtools.jar
maven.jar.excludes = **/package.html
maven.docs.src = ${basedir}/xdocs
maven.docs.dest = ${maven.build.dir}/docs
maven.docs.outputencoding = ISO-8859-1
maven.gen.docs = ${maven.build.dir}/generated-xdocs
maven.repo.remote = http://jakarta.apache.org/turbine/jars/
maven.repo.local = ${lib.repo}
maven.jarResources.basedir=${basedir}
#
# properties for unit testing
#
maven.junit.fork = no
maven.junit.dir = ${basedir}
maven.junit.usefile = true
maven.test.dest = ${maven.build.dir}/test-classes
maven.test.reportsDirectory = ${maven.build.dir}/test-reports
#
# These names will actually be based on the versioning document
# that morgan checked into jakarta-site2 the other day.
#
#maven.final.name = ${maven.id}-${maven.currentVersion}
maven.final.name = ${pom.id}-${pom.currentVersion}
maven.final.dir = ${basedir}/${maven.final.name}
# -------------------------------------------------------------------
# M A V E N U P D A T E S I T E A N D S E L F U P D A T I N G
# -------------------------------------------------------------------
# This needs to be changed before prime time.
maven.updateSite = http://www.apache.org/~jvanzyl/maven/update
# -------------------------------------------------------------------
# M A V E N D I S T R I B U T I O N S
# -------------------------------------------------------------------
maven.distBuildDirectory = ${basedir}/target
maven.distBuildIndicator = DIST_BUILD_DIRECTORY
maven.distDirectory = ${basedir}/dist
# -------------------------------------------------------------------
# E N V I R O N M E N T D E P E N D E N T T O O L S
# -------------------------------------------------------------------
maven.scp.executable = scp
maven.ssh.executable = ssh
# -------------------------------------------------------------------
# Mark the defaults as loaded - PLEASE DON'T OVERRIDE
# -------------------------------------------------------------------
maven.defaults.loaded = true
1.6 +1 -1 jakarta-turbine-maven/src/plugins/jdepend/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/plugins/jdepend/plugin.jelly,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- plugin.jelly 6 Jul 2002 04:21:13 -0000 1.5
+++ plugin.jelly 6 Jul 2002 04:49:10 -0000 1.6
@@ -14,7 +14,7 @@
<goal
name="jdepend:generate-report"
- prereqs="core:compile">
+ prereqs="java:compile">
<j:if test="${sourcesPresent == 'true'}">
1.6 +1 -1 jakarta-turbine-maven/src/plugins/test/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/plugins/test/plugin.jelly,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- plugin.jelly 6 Jul 2002 02:02:36 -0000 1.5
+++ plugin.jelly 6 Jul 2002 04:49:10 -0000 1.6
@@ -9,7 +9,7 @@
</goal>
<goal name="test:compile"
- prereqs="core:compile,core:jar-resources,test:prepare-filesystem">
+ prereqs="java:compile,java:jar-resources,test:prepare-filesystem">
<javac
destdir="${maven.test.dest}"
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
