jvanzyl 2002/09/29 21:12:56
Modified: . maven.xml
src/java/org/apache/maven/app Maven.java PluginManager.java
ProjectVerifier.java
src/test log4j.properties
Log:
o All is working again, the plugin downloading is working, the installer
works so I'll get some sleep take a last look tomorrow and release.
Revision Changes Path
1.50 +7 -0 jakarta-turbine-maven/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/maven.xml,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- maven.xml 30 Sep 2002 01:56:09 -0000 1.49
+++ maven.xml 30 Sep 2002 04:12:56 -0000 1.50
@@ -341,6 +341,13 @@
<!-- ================================================================== -->
<!-- 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 -->
<!-- ================================================================== -->
+ <!-- 1. (Re)move current Maven installation -->
+ <!-- 2. Bootstrap -->
+ <!-- 3. maven maven:installer -->
+ <!-- 4. Install maven (with the freshly created installer) -->
+ <!-- 5. maven -->
+ <!-- 6. maven -DmainSite=true site:generate -->
+ <!-- ================================================================== -->
<postGoal name="java:jar-resources">
<j:if test="${maven.test.distribution}">
1.109 +4 -1 jakarta-turbine-maven/src/java/org/apache/maven/app/Maven.java
Index: Maven.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/app/Maven.java,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -r1.108 -r1.109
--- Maven.java 30 Sep 2002 02:07:33 -0000 1.108
+++ Maven.java 30 Sep 2002 04:12:56 -0000 1.109
@@ -751,6 +751,8 @@
createProjectVerifier();
initializePlugins();
loadProjectBuildFile();
+
+ //verifyProject();
}
/**
@@ -821,6 +823,7 @@
*/
public void verifyProject() throws Exception
{
+ projectVerifier.setMavenProject(getProject());
getProjectVerifier().doExecute();
}
1.33 +1 -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.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- PluginManager.java 30 Sep 2002 02:08:52 -0000 1.32
+++ PluginManager.java 30 Sep 2002 04:12:56 -0000 1.33
@@ -296,7 +296,6 @@
log.debug("VERIFYING PLUGIN");
// Retrieve the dependencies that this plugin requires.
getProjectVerifier().setMavenProject(pluginProject);
- getProjectVerifier().clearFailedDependencies();
getProjectVerifier().doExecute();
// Mark the plugin as processed.
1.6 +11 -4
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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ProjectVerifier.java 30 Sep 2002 01:56:10 -0000 1.5
+++ ProjectVerifier.java 30 Sep 2002 04:12:56 -0000 1.6
@@ -331,7 +331,13 @@
setMavenRemoteRepo(remoteRepoProp);
setMavenLocalRepo(localRepoProp);
- setMavenProject((Project) getContext().getVariable("pom"));
+
+ // The project may have already been set by the plugin manager.
+ if (getMavenProject() == null)
+ {
+ setMavenProject((Project) getContext().getVariable("pom"));
+ }
+
setProject((GrantProject) getContext()
.getVariable("maven.ant.project"));
@@ -361,7 +367,7 @@
* Clear the failed dependencies. Required when reusing the
* project verifier.
*/
- public void clearFailedDependencies()
+ private void clearFailedDependencies()
{
failedDependencies.clear();
}
@@ -399,7 +405,7 @@
String path = dja.getPath();
File jarFile = new File(getMavenLocalRepo(), path);
- log.debug("Looking for " + jarFile.getCanonicalPath());
+ log.debug("Looking for " + jarFile.getCanonicalPath() + "\n\n");
if (jarFile.exists() == false || jar.endsWith("SNAPSHOT.jar"))
{
@@ -415,6 +421,7 @@
// run update-jars or something else has gone wrong. So
// We'll add the jar to our list of failed dependencies
// and get them when we're done checking all the JARs.
+ log.debug("failed dependency: " + dja.getPath());
failedDependencies.add(dja);
}
}
1.4 +10 -0 jakarta-turbine-maven/src/test/log4j.properties
Index: log4j.properties
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/test/log4j.properties,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- log4j.properties 30 Sep 2002 01:29:40 -0000 1.3
+++ log4j.properties 30 Sep 2002 04:12:56 -0000 1.4
@@ -91,3 +91,13 @@
log4j.appender.ant.layout = org.apache.log4j.PatternLayout
log4j.appender.ant.layout.conversionPattern = %c: %m%n
log4j.appender.ant.append = true
+
+# ------------------------------------------------------------------------
+# H T T P U T I L S
+# ------------------------------------------------------------------------
+#log4j.category.org.apache.maven.util.HttpUtils = ${log.level}, httputils
+#log4j.appender.httputils = org.apache.log4j.FileAppender
+#log4j.appender.httputils.file = log.httputils
+#log4j.appender.httputils.layout = org.apache.log4j.PatternLayout
+#log4j.appender.httputils.layout.conversionPattern = %c: %m%n
+#log4j.appender.httputils.append = true
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
