jvanzyl 2002/07/09 06:27:43
Modified: . build-bootstrap.xml gump.xml jars.list project.xml
src/bin forehead.conf
src/java/org/apache/maven ProjectVerifier.java
src/java/org/apache/maven/ant GetList.java
src/java/org/apache/maven/app Maven.java
src/plugins/java plugin.jelly plugin.properties
Log:
o The maven bootstrap process and maven itself now deal with the new
repository structure:
<repo>
|
+--<project0>
|
+-- project.xml
|
+-- /jars
|
+-- /distributions
Revision Changes Path
1.120 +4 -13 jakarta-turbine-maven/build-bootstrap.xml
Index: build-bootstrap.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/build-bootstrap.xml,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -r1.119 -r1.120
--- build-bootstrap.xml 9 Jul 2002 00:57:44 -0000 1.119
+++ build-bootstrap.xml 9 Jul 2002 13:27:43 -0000 1.120
@@ -11,7 +11,7 @@
<property
name="maven.get.jars.baseUrl"
- value="http://jakarta.apache.org/turbine/jars";
+ value="http://jakarta.apache.org/turbine/jars2";
/>
<property
@@ -375,7 +375,9 @@
reference="install-patternset"
/>
- <copy todir="${maven.home}/lib">
+ <copy
+ todir="${maven.home}/lib"
+ flatten="yes">
<fileset dir="${maven.repo.local}">
<patternset refid="install-patternset"/>
</fileset>
@@ -424,17 +426,6 @@
<patternset refid="install-patternset"/>
</fileset>
</copy>
-
- <!-- This JAR is used by InstallAnywhere. The installation
- process creates the ${maven.home} directory so this JAR
- is the contents of the ${maven.home} directory so there
- is no enclosing top-level directory.
- -->
-
- <jar
- jarfile="target/maven-install.jar"
- basedir="${maven.home}"
- />
<!-- This JAR can be used directly by developers wishing to
install Maven manually. An enclosing top-level directory
1.5 +2 -2 jakarta-turbine-maven/gump.xml
Index: gump.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/gump.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gump.xml 4 Jul 2002 22:12:03 -0000 1.4
+++ gump.xml 9 Jul 2002 13:27:43 -0000 1.5
@@ -1,4 +1,4 @@
-<module name="jakarta-turbine-maven">
+<module name="Maven">
<description>Java Project Management Tools</description>
@@ -9,7 +9,7 @@
<!-- This is really the cvs module. We need to change this but -->
<!-- I will leave this for now until everything works. -->
- <project name="jakarta-turbine-maven">
+ <project name="Maven">
<!-- Standard Maven target to produce Javadocs, source -->
<!-- and binary distributions. -->
1.41 +31 -32 jakarta-turbine-maven/jars.list
Index: jars.list
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/jars.list,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- jars.list 8 Jul 2002 13:30:37 -0000 1.40
+++ jars.list 9 Jul 2002 13:27:43 -0000 1.41
@@ -21,35 +21,34 @@
# and keeps our required JARs in a single location. When we do the
# grand renaming it will be easy to accommodate those changes.
#-------------------------------------------------------------------------
-ant-1.4.1.jar
-ant-optional-1.4.1.jar
-antlr-2.7.1.jar
-bcel-5.0.jar
-checkstyle-2.2.jar
-commons-beanutils-1.4-dev.jar
-commons-betwixt-1.0-dev.jar
-commons-cli-1.0-dev.jar
-commons-collections-2.0.jar
-commons-digester-1.2.jar
-commons-graph-0.8.jar
-commons-grant-1.0-b1.jar
-commons-io-0.2-dev.20020614.122300.jar
-commons-jelly-1.0-dev.20020708.012849.jar
-commons-jexl-1.0-dev.jar
-commons-lang-1.0-dev.jar
-commons-logging-1.0.jar
-commons-util-1.0-rc2-dev.jar
-dom4j-1.4-dev-3.jar
-forehead-1.0-beta-2.jar
-jdepend-2.2.jar
-junit-3.7.jar
-logkit-1.0.1.jar
-log4j-1.1.3.jar
-oro-2.0.6.jar
-regexp-1.2.jar
-velocity-1.4-dev.jar
-velocity-dvsl-0.43.jar
-xercesImpl-2.0.0.jar
-xmlParserAPIs-2.0.0.jar
-werkz-1.0-beta-3.jar
-
+ant/jars/ant-1.4.1.jar
+ant/jars/ant-optional-1.4.1.jar
+antlr/jars/antlr-2.7.1.jar
+bcel/jars/bcel-5.0.jar
+checkstyle/jars/checkstyle-2.2.jar
+commons-beanutils/jars/commons-beanutils-1.4-dev.jar
+commons-betwixt/jars/commons-betwixt-1.0-dev.jar
+commons-cli/jars/commons-cli-1.0-dev.jar
+commons-collections/jars/commons-collections-2.0.jar
+commons-digester/jars/commons-digester-1.2.jar
+commons-graph/jars/commons-graph-0.8.jar
+commons-grant/jars/commons-grant-1.0-b1.jar
+commons-io/jars/commons-io-0.2-dev.20020614.122300.jar
+commons-jelly/jars/commons-jelly-1.0-dev.20020708.012849.jar
+commons-jexl/jars/commons-jexl-1.0-dev.jar
+commons-lang/jars/commons-lang-1.0-dev.jar
+commons-logging/jars/commons-logging-1.0.jar
+commons-util/jars/commons-util-1.0-rc2-dev.jar
+dom4j/jars/dom4j-1.4-dev-3.jar
+forehead/jars/forehead-1.0-beta-2.jar
+jdepend/jars/jdepend-2.2.jar
+junit/jars/junit-3.7.jar
+logkit/jars/logkit-1.0.1.jar
+log4j/jars/log4j-1.1.3.jar
+oro/jars/oro-2.0.6.jar
+regexp/jars/regexp-1.2.jar
+velocity/jars/velocity-1.4-dev.jar
+velocity-dvsl/jars/velocity-dvsl-0.43.jar
+xerces/jars/xerces-2.0.0.jar
+xml-apis/jars/xml-apis-2.0.2.jar
+werkz/jars/werkz-1.0-beta-3.jar
1.145 +4 -3 jakarta-turbine-maven/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/project.xml,v
retrieving revision 1.144
retrieving revision 1.145
diff -u -r1.144 -r1.145
--- project.xml 8 Jul 2002 13:35:09 -0000 1.144
+++ project.xml 9 Jul 2002 13:27:43 -0000 1.145
@@ -305,9 +305,10 @@
</dependency>
<dependency>
- <id>ant-optional</id>
+ <id>ant</id>
<version>1.4.1</version>
<url>http://jakarta.apache.org/ant/</url>
+ <jar>ant-optional-1.4.1.jar</jar>
</dependency>
<dependency>
@@ -439,8 +440,8 @@
forked
-->
<dependency>
- <id>xmlParserAPIs</id>
- <version>2.0.0</version>
+ <id>xml-apis</id>
+ <version>2.0.2</version>
<url>http://xml.apache.org/xerces2-j/</url>
</dependency>
<!-- Documentation dependencies -->
1.2 +2 -3 jakarta-turbine-maven/src/bin/forehead.conf
Index: forehead.conf
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/bin/forehead.conf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- forehead.conf 19 Jun 2002 17:21:52 -0000 1.1
+++ forehead.conf 9 Jul 2002 13:27:43 -0000 1.2
@@ -10,11 +10,10 @@
${tools.jar}
${maven.home}/lib/commons-grant-1.0-b1.jar
${maven.home}/lib/ant-1.4.1.jar
- ${maven.home}/lib/xercesImpl-2.0.0.jar
- ${maven.home}/lib/xmlParserAPIs-2.0.0.jar
+ ${maven.home}/lib/xerces-2.0.0.jar
+ ${maven.home}/lib/xml-apis-2.0.2.jar
${maven.home}/lib/ant-optional-1.4.1.jar
${maven.home}/lib/junit-3.7.jar
- ${maven.home}/lib/xmlParserAPIs-2.0.0.jar
[root.maven]
${maven.home}/lib/*.jar
1.10 +5 -4
jakarta-turbine-maven/src/java/org/apache/maven/ProjectVerifier.java
Index: ProjectVerifier.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/ProjectVerifier.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ProjectVerifier.java 10 Jun 2002 09:44:39 -0000 1.9
+++ ProjectVerifier.java 9 Jul 2002 13:27:43 -0000 1.10
@@ -228,14 +228,15 @@
Dependency dependency = (Dependency) i.next();
String jar = dependency.getJar();
- File jarFile = new File(getMavenLocalRepo(), jar);
+ File jarFile = new File(
getMavenLocalRepo()+"/jars/"+dependency.getId(), jar);
+
if (jarFile.exists() == false)
{
// We are missing a dependency. Either the user didn't
// 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.
- failedDependencies.add(jar);
+ failedDependencies.add(dependency.getId() + "/jars/" + jar);
}
}
@@ -271,7 +272,7 @@
for (Iterator i = failedDependencies.iterator(); i.hasNext();)
{
String dependency = (String) i.next();
- File destinationFile = new File(getMavenLocalRepo(),
+ File destinationFile = new File(getMavenLocalRepo(),
dependency);
if (nonDistMap.containsKey(dependency))
1.6 +9 -0 jakarta-turbine-maven/src/java/org/apache/maven/ant/GetList.java
Index: GetList.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/ant/GetList.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- GetList.java 3 Jun 2002 03:44:56 -0000 1.5
+++ GetList.java 9 Jul 2002 13:27:43 -0000 1.6
@@ -157,6 +157,15 @@
{
String file = (String) j.next();
File destinationFile = new File(dest, file);
+
+ // The directory structure for this project may
+ // not exists so create it if missing.
+ File directory = destinationFile.getParentFile();
+ if (directory.exists() == false)
+ {
+ directory.mkdirs();
+ }
+
URL source = new URL(baseUrl + file);
HttpUtils.getFile(source, destinationFile, file, verbose,
1.53 +3 -3 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.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- Maven.java 8 Jul 2002 22:03:23 -0000 1.52
+++ Maven.java 9 Jul 2002 13:27:43 -0000 1.53
@@ -973,8 +973,9 @@
*/
private void loadProperties()
{
+ //!! FIXME: the value for the remote repo shouldn't be hard-coded.
this.properties.setProperty("maven.repo.remote",
- "http://jakarta.apache.org/turbine/jars/";);
+ "http://jakarta.apache.org/turbine/jars2/";);
Enumeration propNames = System.getProperties().propertyNames();
String eachName = null;
@@ -1120,7 +1121,7 @@
public void verifyProject() throws Exception
{
String localRepoProp = getProperty("maven.repo.local");
-
+
if (localRepoProp == null)
{
localRepoProp = getProperty("lib.repo");
@@ -1188,7 +1189,6 @@
throw new RepoConfigException(localRepo + " is not writable.");
}
-
ProjectVerifier verifier = new ProjectVerifier();
verifier.setMavenRemoteRepo(remoteRepoProp);
1.5 +1 -1 jakarta-turbine-maven/src/plugins/java/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/plugins/java/plugin.jelly,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- plugin.jelly 8 Jul 2002 16:47:24 -0000 1.4
+++ plugin.jelly 9 Jul 2002 13:27:43 -0000 1.5
@@ -32,7 +32,7 @@
<path id="maven.dependency.classpath">
<j:forEach var="dep" items="${pom.dependencies}">
- <pathelement location="${maven.repo.local}/${dep.jar}"/>
+ <pathelement location="${maven.repo.local}/${dep.id}/jars/${dep.jar}"/>
</j:forEach>
</path>
1.5 +1 -1 jakarta-turbine-maven/src/plugins/java/plugin.properties
Index: plugin.properties
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/plugins/java/plugin.properties,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- plugin.properties 8 Jul 2002 13:06:52 -0000 1.4
+++ plugin.properties 9 Jul 2002 13:27:43 -0000 1.5
@@ -17,7 +17,7 @@
maven.jar.excludes = **/package.html
-maven.repo.remote = http://jakarta.apache.org/turbine/jars/
+maven.repo.remote = http://jakarta.apache.org/turbine/jars2/
maven.jarResources.basedir=${basedir}
#
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
