werken 2002/06/27 21:22:15
Modified: . jars.list project-ng.xml project.xml
src/java/org/apache/maven/app Maven.java
Log:
Updating jelly version.
Revision Changes Path
1.34 +1 -1 jakarta-turbine-maven/jars.list
Index: jars.list
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/jars.list,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- jars.list 28 Jun 2002 02:34:43 -0000 1.33
+++ jars.list 28 Jun 2002 04:22:14 -0000 1.34
@@ -34,7 +34,7 @@
commons-graph-0.8.jar
commons-grant-1.0-b1.jar
commons-io-0.2-dev.20020614.122300.jar
-commons-jelly-1.0-dev.20020627.091114.jar
+commons-jelly-1.0-dev.20020628.033340.jar
commons-jexl-1.0-dev.jar
commons-lang-1.0-dev.jar
commons-logging-1.0.jar
1.13 +1 -1 jakarta-turbine-maven/project-ng.xml
Index: project-ng.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/project-ng.xml,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- project-ng.xml 28 Jun 2002 02:34:43 -0000 1.12
+++ project-ng.xml 28 Jun 2002 04:22:14 -0000 1.13
@@ -319,7 +319,7 @@
<dependency>
<id>commons-jelly</id>
- <version>1.0-dev.20020627.091114</version>
+ <version>1.0-dev.20020628.033340</version>
<url>http://jakarta.apache.org/commons/sandbox/jelly/</url>
</dependency>
1.132 +1 -1 jakarta-turbine-maven/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/project.xml,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -r1.131 -r1.132
--- project.xml 28 Jun 2002 02:34:43 -0000 1.131
+++ project.xml 28 Jun 2002 04:22:14 -0000 1.132
@@ -330,7 +330,7 @@
<dependency>
<id>commons-jelly</id>
- <version>1.0-dev.20020627.091114</version>
+ <version>1.0-dev.20020628.033340</version>
<url>http://jakarta.apache.org/commons/sandbox/jelly/</url>
</dependency>
1.35 +26 -4 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.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- Maven.java 28 Jun 2002 02:49:31 -0000 1.34
+++ Maven.java 28 Jun 2002 04:22:14 -0000 1.35
@@ -1145,8 +1145,6 @@
public void verifyProject() throws Exception
{
- ProjectVerifier verifier = new ProjectVerifier();
-
String localRepoProp = getProperty( "maven.repo.local" );
if ( localRepoProp == null )
@@ -1193,6 +1191,32 @@
throw new RepoConfigException( "maven.repo.remote not set" );
}
+ File localRepo = new File( localRepoProp );
+
+ if ( ! localRepo.exists() )
+ {
+ System.err.println( "Directory '" + localRepo + "' does not exist." );
+ System.err.println( "Attempting to create." );
+
+ if (!localRepo.mkdirs())
+ {
+ throw new RepoConfigException( "Unable to create directory '" +
localRepo + "'" );
+ }
+ }
+
+ if ( ! localRepo.isDirectory() )
+ {
+ throw new RepoConfigException( localRepo + " is not a directory." );
+ }
+
+ if ( ! localRepo.canWrite() )
+ {
+ throw new RepoConfigException( localRepo + " is not writable." );
+ }
+
+
+ ProjectVerifier verifier = new ProjectVerifier();
+
verifier.setMavenRemoteRepo( remoteRepoProp );
verifier.setMavenLocalRepo( localRepoProp );
verifier.setMavenProject( getProjectDescriptor().getProject() );
@@ -1295,8 +1319,6 @@
{
failed = true;
System.err.println( e.getLocalizedMessage() );
- System.out.println( "" );
- return;
}
catch (NoActionDefinitionException e)
{
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
