jvanzyl 2002/09/29 18:56:10
Modified: . maven.xml
src/bin driver.jelly
src/java/org/apache/maven/app App.java JellyUtils.java
PluginManager.java ProjectVerifier.java
RepoConfigException.java UnknownGoalException.java
src/plugins-build/java plugin.jelly
xdocs/reference user-guide.xml
Log:
Revision Changes Path
1.49 +28 -0 jakarta-turbine-maven/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/maven.xml,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- maven.xml 27 Sep 2002 05:07:52 -0000 1.48
+++ maven.xml 30 Sep 2002 01:56:09 -0000 1.49
@@ -337,5 +337,33 @@
</j:forEach>
</j:if>
</postGoal>
+
+ <!-- ================================================================== -->
+ <!-- M A V E N D I S T R I B U T I O N T E S T A I D S -->
+ <!-- ================================================================== -->
+
+ <postGoal name="java:jar-resources">
+ <j:if test="${maven.test.distribution}">
+ <copy
+ file="src/test/log4j.properties"
+ todir="${maven.build.dest}"
+ overwrite="true"
+ />
+ </j:if>
+ </postGoal>
+ <!-- Use build:start hook to nuke the debug log files -->
+
+ <!--
+ <postGoal name="build:start">
+ <j:if test="${maven.test.distribution}">
+ <delete>
+ <fileset dir="${basedir}">
+ <include name="log*"/>
+ </fileset>
+ </delete>
+ </j:if>
+ </postGoal>
+ -->
+
</project>
1.26 +0 -2 jakarta-turbine-maven/src/bin/driver.jelly
Index: driver.jelly
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/bin/driver.jelly,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- driver.jelly 30 Sep 2002 01:19:47 -0000 1.25
+++ driver.jelly 30 Sep 2002 01:56:10 -0000 1.26
@@ -51,8 +51,6 @@
<goal name="build:start"/>
- <attainGoal name="build:start"/>
-
<!-- ================================================================== -->
<!-- D R I V E R I N I T I A L I Z A T I O N -->
<!-- ================================================================== -->
1.21 +11 -1 jakarta-turbine-maven/src/java/org/apache/maven/app/App.java
Index: App.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/app/App.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- App.java 19 Sep 2002 10:33:04 -0000 1.20
+++ App.java 30 Sep 2002 01:56:10 -0000 1.21
@@ -76,6 +76,10 @@
import org.apache.commons.cli.ParseException;
import org.apache.commons.jelly.JellyException;
import org.apache.commons.jelly.XMLOutput;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
import org.apache.maven.project.Project;
import com.werken.werkz.Goal;
@@ -83,11 +87,15 @@
import com.werken.werkz.UnattainableGoalException;
/**
- * @author Jason van Zyl
+ * @author <a href="mailto:[EMAIL PROTECTED]";>Jason van Zyl</a>
* @author dIon Gillard
+ * @version $Id$
*/
public class App
{
+ /** Log. */
+ private static final Log log = LogFactory.getLog(App.class);
+
/** Default console width - for formatting output - 78 */
private static final int CONSOLE_WIDTH = 80;
/** return code for ok processing */
@@ -153,6 +161,8 @@
public void initializeCore(String[] args)
throws ParseException, IOException, MalformedURLException, Exception
{
+ log.debug("Initializing core.");
+
commandLine = CLIManager.parse(args);
if (getCli().hasOption("f"))
1.5 +1 -0
jakarta-turbine-maven/src/java/org/apache/maven/app/JellyUtils.java
Index: JellyUtils.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/app/JellyUtils.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- JellyUtils.java 22 Aug 2002 19:40:43 -0000 1.4
+++ JellyUtils.java 30 Sep 2002 01:56:10 -0000 1.5
@@ -70,6 +70,7 @@
* commons-jelly</a>
*
* @author <a href="mailto:[EMAIL PROTECTED]";>bob mcwhirter</a>
+ * @version $Id$
*/
public class JellyUtils
{
1.31 +2 -1
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.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- PluginManager.java 23 Aug 2002 03:17:20 -0000 1.30
+++ PluginManager.java 30 Sep 2002 01:56:10 -0000 1.31
@@ -99,6 +99,7 @@
* </p>
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Jason van Zyl</a>
+ * @version $Id$
*/
public class PluginManager
{
@@ -283,7 +284,7 @@
// If there is no plugin.properties then this method will simply return
loadPluginProperties(name);
- log.debug("plugin: " + name + " -> " + getPluginDir(name));
+ log.debug("\n\nLOADING PLUGIN: " + name + " -> " + getPluginDir(name));
Forehead.getInstance().getClassLoader("root.maven").addURL(getPluginDir(name).toURL());
Project pluginProject = MavenUtils.getProject(new
File(getPluginDir(name),"project.xml"));
1.5 +2 -1
jakarta-turbine-maven/src/java/org/apache/maven/app/ProjectVerifier.java
Index: ProjectVerifier.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/app/ProjectVerifier.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ProjectVerifier.java 22 Aug 2002 19:40:43 -0000 1.4
+++ ProjectVerifier.java 30 Sep 2002 01:56:10 -0000 1.5
@@ -378,6 +378,7 @@
if (remoteRepoEnabled != null && !remoteRepoEnabled.booleanValue())
{
+ log.debug("The use of the remote repository is disabled. Not verifying
dependencies.");
return;
}
1.5 +2 -1
jakarta-turbine-maven/src/java/org/apache/maven/app/RepoConfigException.java
Index: RepoConfigException.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/app/RepoConfigException.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- RepoConfigException.java 22 Aug 2002 19:40:43 -0000 1.4
+++ RepoConfigException.java 30 Sep 2002 01:56:10 -0000 1.5
@@ -60,7 +60,8 @@
/** Specialized repository configuration exception.
*
- * @author <a href="mailto:[EMAIL PROTECTED]";>bob mcwhirter</a>
+ * @author <a href="mailto:[EMAIL PROTECTED]";>bob mcwhirter</a>
+ * @version $Id$
*/
public class RepoConfigException extends MavenException
{
1.3 +2 -1
jakarta-turbine-maven/src/java/org/apache/maven/app/UnknownGoalException.java
Index: UnknownGoalException.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/app/UnknownGoalException.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- UnknownGoalException.java 24 Jun 2002 18:33:19 -0000 1.2
+++ UnknownGoalException.java 30 Sep 2002 01:56:10 -0000 1.3
@@ -58,7 +58,8 @@
/** Indicates an attempt to access an unknown werkz goal.
*
- * @author <a href="mailto:[EMAIL PROTECTED]";>bob mcwhirter</a>
+ * @author <a href="mailto:[EMAIL PROTECTED]";>bob mcwhirter</a>
+ * @version $Id$
*/
public class UnknownGoalException extends Exception
{
1.20 +2 -0 jakarta-turbine-maven/src/plugins-build/java/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/plugins-build/java/plugin.jelly,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- plugin.jelly 24 Sep 2002 14:52:07 -0000 1.19
+++ plugin.jelly 30 Sep 2002 01:56:10 -0000 1.20
@@ -114,6 +114,8 @@
<!-- Copy any resources that must be present in the deployed
JAR file.
-->
+
+ <echo>maven.jarResources.basedir: ${maven.jarResources.basedir}</echo>
<copy todir="${maven.build.dest}">
<fileset dir="${maven.jarResources.basedir}">
1.18 +6 -0 jakarta-turbine-maven/xdocs/reference/user-guide.xml
Index: user-guide.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/xdocs/reference/user-guide.xml,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- user-guide.xml 26 Sep 2002 16:48:19 -0000 1.17
+++ user-guide.xml 30 Sep 2002 01:56:10 -0000 1.18
@@ -38,6 +38,7 @@
<li><a href="#Remote Repository Layout">Remote Repository Layout</a></li>
<li><a href="#Local Repository Layout">Local Repository Layout</a></li>
<li><a href="#Multi Project Builds">Multi Project Builds</a></li>
+ <li><a href="#Build Lifecyle">Build Lifecycle</a></li>
</ol>
</p>
</section>
@@ -843,6 +844,11 @@
</ul>
</p>
+ </section>
+
+ <section name="Build Lifecycle">
+ <p>
+ </p>
</section>
<!--
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
