You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by jv...@apache.org on 2002/12/08 21:32:40 UTC
cvs commit: jakarta-turbine-maven/src/test/java/org/apache/maven/util ExpandTest.java
jvanzyl 2002/12/08 12:32:40
Modified: src/java/org/apache/maven Maven.java
src/java/org/apache/maven/jelly/tags/project MavenTag.java
src/java/org/apache/maven/plugin PluginManager.java
src/java/org/apache/maven/util HttpUtils.java
src/java/org/apache/maven/verifier
UnsatisfiedDependencyException.java
src/test/java/org/apache/maven/ant MavenTaskTest.java
src/test/java/org/apache/maven/util ExpandTest.java
Log:
Revision Changes Path
1.10 +2 -2 jakarta-turbine-maven/src/java/org/apache/maven/Maven.java
Index: Maven.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/Maven.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Maven.java 7 Dec 2002 23:12:46 -0000 1.9
+++ Maven.java 8 Dec 2002 20:32:39 -0000 1.10
@@ -372,7 +372,7 @@
public void verifyProject()
throws Exception
{
- getContext().getProjectVerifier().execute();
+ getContext().getProjectVerifier().verify();
}
/** Run maven.
1.22 +3 -3 jakarta-turbine-maven/src/java/org/apache/maven/jelly/tags/project/MavenTag.java
Index: MavenTag.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/jelly/tags/project/MavenTag.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- MavenTag.java 6 Dec 2002 16:32:25 -0000 1.21
+++ MavenTag.java 8 Dec 2002 20:32:39 -0000 1.22
@@ -87,7 +87,7 @@
/** project base directory */
private File basedir;
- /** goals to execute */
+ /** goals to verify */
private String goals;
/** whether to ignore exceptions */
@@ -96,7 +96,7 @@
/**
* Process the tag. Set up a new maven instance with the same maven home
* as the one under <code>maven.obj</code> in the context, add the provided
- * goals and execute.
+ * goals and verify.
*
* @param output for providing xml output
* @throws Exception if anything goes wrong. FIXME
1.14 +2 -2 jakarta-turbine-maven/src/java/org/apache/maven/plugin/PluginManager.java
Index: PluginManager.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/plugin/PluginManager.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- PluginManager.java 7 Dec 2002 02:19:08 -0000 1.13
+++ PluginManager.java 8 Dec 2002 20:32:39 -0000 1.14
@@ -908,7 +908,7 @@
if ( isPluginProcessed( name ) == false )
{
// Retrieve the dependencies that this plugin requires.
- //getContext().getProjectVerifier().execute();
+ //getContext().getProjectVerifier().verify();
DependencyVerifier dependencyVerifier = new DependencyVerifier();
dependencyVerifier.setContext( getContext() );
dependencyVerifier.setProject( pluginProject );
1.13 +6 -17 jakarta-turbine-maven/src/java/org/apache/maven/util/HttpUtils.java
Index: HttpUtils.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/util/HttpUtils.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- HttpUtils.java 3 Dec 2002 02:50:57 -0000 1.12
+++ HttpUtils.java 8 Dec 2002 20:32:40 -0000 1.13
@@ -210,12 +210,11 @@
}
// REVISIT: at this point even non HTTP connections may support the
+
// if-modified-since behaviour - we just check the date of the
// content and skip the write if it is not newer.
// Some protocols (FTP) dont include dates, of course.
- logx( "Getting: " + source );
-
InputStream is = null;
for ( int i = 0; i < 3; i++ )
{
@@ -226,22 +225,22 @@
}
catch ( IOException ex )
{
- logx( "Error opening connection " + ex );
+ // do nothing
}
}
if ( is == null )
{
- logx( "Can't get " + file + " to " + destinationFile );
if ( ignoreErrors )
{
return false;
}
+
+ // This will never happen with maven's use of this class.
throw new Exception(
"Can't get " + file + " to " + destinationFile );
}
FileOutputStream fos = new FileOutputStream( destinationFile );
- logx( "Writing " + destinationFile );
byte[] buffer = new byte[100 * 1024];
int length;
@@ -273,12 +272,11 @@
}
catch ( FileNotFoundException fnfe )
{
- logx( "Error getting " + source + " ; it does not exist." );
+ // do nothing.
}
catch ( Exception e )
{
- e.printStackTrace();
- logx( "Error getting " + file + " to " + destinationFile );
+ // do nothing.
}
return retrievedFile;
@@ -347,14 +345,5 @@
file.setLastModified( modifiedTime );
return true;
- }
-
- /** We need to move to the commons-logging goodies here.
- * Log a message to System.out
- * @param message the message to log
- */
- private static void logx( String message )
- {
- System.out.println( message );
}
}
1.2 +2 -2 jakarta-turbine-maven/src/java/org/apache/maven/verifier/UnsatisfiedDependencyException.java
Index: UnsatisfiedDependencyException.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/verifier/UnsatisfiedDependencyException.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- UnsatisfiedDependencyException.java 5 Dec 2002 02:30:17 -0000 1.1
+++ UnsatisfiedDependencyException.java 8 Dec 2002 20:32:40 -0000 1.2
@@ -68,7 +68,7 @@
{
/**
* Constructs a UnsatisfiedDependencyException with the specified detail message.
- * @param message the detail message.
+ * @param message Detailed message.
*/
public UnsatisfiedDependencyException( String message )
{
1.2 +2 -2 jakarta-turbine-maven/src/test/java/org/apache/maven/ant/MavenTaskTest.java
Index: MavenTaskTest.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/test/java/org/apache/maven/ant/MavenTaskTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MavenTaskTest.java 26 Nov 2002 23:34:54 -0000 1.1
+++ MavenTaskTest.java 8 Dec 2002 20:32:40 -0000 1.2
@@ -119,8 +119,8 @@
public void testExecute() throws Exception
{
- // JUnitDoclet begin method execute
- // JUnitDoclet end method execute
+ // JUnitDoclet begin method verify
+ // JUnitDoclet end method verify
}
1.2 +2 -2 jakarta-turbine-maven/src/test/java/org/apache/maven/util/ExpandTest.java
Index: ExpandTest.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/test/java/org/apache/maven/util/ExpandTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ExpandTest.java 26 Nov 2002 23:36:08 -0000 1.1
+++ ExpandTest.java 8 Dec 2002 20:32:40 -0000 1.2
@@ -54,8 +54,8 @@
public void testExecute() throws Exception
{
- // JUnitDoclet begin method execute
- // JUnitDoclet end method execute
+ // JUnitDoclet begin method verify
+ // JUnitDoclet end method verify
}
public void testSetDest() throws Exception