dion 2003/08/07 09:53:24
Modified: src/conf Tag: MAVEN_RC1_STABLE defaults.properties
driver.jelly
Log:
Update from back ported fixes
Revision Changes Path
No revision
No revision
1.2.2.1 +0 -3 maven/src/conf/defaults.properties
Index: defaults.properties
===================================================================
RCS file: /home/cvs/maven/src/conf/defaults.properties,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- defaults.properties 11 Jul 2003 07:21:27 -0000 1.2
+++ defaults.properties 7 Aug 2003 16:53:24 -0000 1.2.2.1
@@ -14,9 +14,6 @@
maven.compile.optimize = off
maven.compile.deprecation = off
-# dIon - WTF is this doing here?
-maven.jar.excludes = **/package.html
-
# -------------------------------------------------------------------
# M A V E N L O C A L R E P O
# -------------------------------------------------------------------
1.18.2.1 +1 -115 maven/src/conf/driver.jelly
Index: driver.jelly
===================================================================
RCS file: /home/cvs/maven/src/conf/driver.jelly,v
retrieving revision 1.18
retrieving revision 1.18.2.1
diff -u -r1.18 -r1.18.2.1
--- driver.jelly 22 Jul 2003 01:08:48 -0000 1.18
+++ driver.jelly 7 Aug 2003 16:53:24 -0000 1.18.2.1
@@ -1,124 +1,11 @@
<?xml version="1.0"?>
<project
+ xmlns:j="jelly:core"
xmlns:ant="jelly:ant"
xmlns:define="jelly:define"
- xmlns:j="jelly:core"
- xmlns:m="maven"
- xmlns:resources="resources"
xmlns:util="jelly:util">
- <!-- ================================================================== -->
- <!-- M A V E N T A G L I B R A R Y -->
- <!-- ================================================================== -->
- <!-- A collection of dynamic tag libraries that make writing -->
- <!-- plugins convenient. -->
- <!-- ================================================================== -->
-
- <define:taglib uri="maven">
-
- <!-- ================================================================== -->
- <!-- U S E R N A M E C H E C K -->
- <!-- ================================================================== -->
- <!-- For several goals we need to make sure that Maven can grab -->
- <!-- hold of a valid username. For deployment goals in particular -->
- <!-- where Maven needs to upload an artifact to a server. -->
- <!-- ================================================================== -->
-
- <define:tag name="user-check">
- <j:set var="tmp" value="${user}"/>
- <j:if test="${tmp.equals('USERNAME_NOT_SET')}">
- <fail message="">
-+------------------------------------------------------------------
-| ERROR!
-|
-| You must specify a maven username in order to deploy the site!
-| You can either set this property in your ~/build.properties
-| or specify one on the command line:
-|
-| maven -Dmaven.username=${user.name} [goal]
-+------------------------------------------------------------------
- </fail>
- </j:if>
- </define:tag>
-
- <!--
- | Check a provided parameter has a value, and if not dump a message out
- | and optionally fail while doing it.
- |
- | @param value the param value to check
- | @param message the message to display, if not specified, the body of
- | the tag is used
- | @param fail whether to fail or not if the param has no value (true/false)
- |
- -->
- <define:tag name="param-check">
- <j:if test="${empty(value)}">
- <j:if test="${empty(message)}">
- <j:set var="message" trim="yes"><define:invokeBody/></j:set>
- </j:if>
- <j:if test="${fail}">
- <ant:fail>${message}</ant:fail>
- </j:if>
- <j:if test="${!fail}">
- <ant:echo>${message}</ant:echo>
- </j:if>
- </j:if>
- </define:tag>
- </define:taglib>
-
- <define:taglib uri="resources">
- <!--
- | Copy all the file matched by each provided Resource to
- | the provided destination directory.
- |
- | @param resources A collection of pom Resource objects
- | @param todir Target directory
- | @param targetPath
- |
- -->
-
- <define:tag name="copy">
- <j:forEach var="resource" items="${resources}">
- <j:set var="resourceDirectoryPresent" value="false"/>
-
- <util:available file="${resource.directory}">
- <j:set var="resourceDirectoryPresent" value="true"/>
- </util:available>
-
- <j:if test="${resourceDirectoryPresent == 'true'}">
- <j:choose>
- <j:when test="${resource.targetPath ==''}">
- <j:set var="targetDirectory" value="${todir}"/>
- </j:when>
- <j:otherwise>
- <j:set var="targetDirectory"
value="${todir}/${resource.targetPath}"/>
- </j:otherwise>
- </j:choose>
- <copy todir="${targetDirectory}" filtering="${resource.filtering}"
- overwrite="${resource.filtering}">
- <fileset dir="${resource.directory}">
- <j:if test="${resources.includes.isEmpty()}">
- <include name="**/**"/>
- </j:if>
- <j:forEach var="include" items="${resource.includes}">
- <include name="${include}"/>
- </j:forEach>
- <j:forEach var="exclude" items="${resource.excludes}">
- <exclude name="${exclude}"/>
- </j:forEach>
- </fileset>
- </copy>
- </j:if>
- </j:forEach>
- </define:tag>
- </define:taglib>
-
- <!-- Allow a hook for processing around the build start. -->
-
- <goal name="build:start">
- </goal>
-
<!-- ================================================================== -->
<!-- D R I V E R I N I T I A L I Z A T I O N -->
<!-- ================================================================== -->
@@ -164,6 +51,5 @@
<goal name="build:end">
</goal>
-
</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
