svn commit: r750186 - /maven/plugins/trunk/maven-site-plugin/src/it/MSITE-304/verify.bsh

[dennisl]

Author: dennisl
Date: Wed Mar  4 22:04:11 2009
New Revision: 750186

URL: http://svn.apache.org/viewvc?rev=750186&view=rev
Log:
o Fix IT because of r738305.
o Improve error messages.

Modified:
    maven/plugins/trunk/maven-site-plugin/src/it/MSITE-304/verify.bsh

Modified: maven/plugins/trunk/maven-site-plugin/src/it/MSITE-304/verify.bsh
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/MSITE-304/verify.bsh?rev=750186&r1=750185&r2=750186&view=diff
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/it/MSITE-304/verify.bsh (original)
+++ maven/plugins/trunk/maven-site-plugin/src/it/MSITE-304/verify.bsh Wed Mar  
4 22:04:11 2009
@@ -27,50 +27,52 @@
     File target = new File( basedir, "target" );
     if ( !target.exists() || !target.isDirectory() )
     {
-        System.err.println( "Target file is missing or not a directory." );
+        System.err.println( "Target directory '" + target + "' is missing or 
not a directory." );
         return false;
     }
 
     File stagingDirectory = new File ( target, "staging" );
     if ( !stagingDirectory.exists() || !stagingDirectory.isDirectory() )
     {
-        System.err.println( "Staging directory is missing or not a directory." 
);
+        System.err.println( "Staging directory '" + stagingDirectory + "' is 
missing or not a directory." );
         return false;
     }
 
-    File parentDirectory = new File ( stagingDirectory, 
"localhost/tmp/www.example.com/parent" );
+    String tmpDir = System.getProperty( "java.io.tmpdir" );
+    String strippedTmpDir = tmpDir.replaceAll( "[\\:\\?\\*]", "" );
+
+    File parentDirectory = new File ( stagingDirectory, "localhost/" + 
strippedTmpDir + "/www.example.com/parent" );
     if ( !parentDirectory.exists() || !parentDirectory.isDirectory() )
     {
-        System.err.println( "Staging directory for parent is missing or not a 
directory." );
+        System.err.println( "Staging directory for parent '" + parentDirectory 
+ "' is missing or not a directory." );
         return false;
     }
 
-    File childDirectory = new File ( stagingDirectory, 
"localhost/tmp/www.example.com/parent/child" );
+    File childDirectory = new File ( stagingDirectory, "localhost/" + 
strippedTmpDir + "/www.example.com/parent/child" );
     if ( !childDirectory.exists() || !childDirectory.isDirectory() )
     {
-        System.err.println( "Staging directory for child is missing or not a 
directory." );
+        System.err.println( "Staging directory for child '" + childDirectory + 
"' is missing or not a directory." );
         return false;
     }
 
-    String tmpDir = System.getProperty( "java.io.tmpdir" );
     File stageDeployDirectory = new File ( tmpDir + "/www.example.com/parent" 
);
     if ( !stageDeployDirectory.exists() || !stageDeployDirectory.isDirectory() 
)
     {
-        System.err.println( "Stage deploy directory is missing or not a 
directory." );
+        System.err.println( "Stage deploy directory '" + stageDeployDirectory 
+ "' is missing or not a directory." );
         return false;
     }
 
     File validChildStageDeployDirectory = new File ( stageDeployDirectory, 
"staging/child" );
     if ( !validChildStageDeployDirectory.exists() || 
!validChildStageDeployDirectory.isDirectory() )
     {
-        System.err.println( "Valid stage deploy directory for child is missing 
or not a directory." );
+        System.err.println( "Valid stage deploy directory for child '" + 
validChildStageDeployDirectory + "' is missing or not a directory." );
         return false;
     }
 
     File invalidChildStageDeployDirectory = new File ( stageDeployDirectory, 
"child/staging" );
     if ( invalidChildStageDeployDirectory.exists() && 
invalidChildStageDeployDirectory.isDirectory() )
     {
-        System.err.println( "Invalid stage deploy directory for child is 
present." );
+        System.err.println( "Invalid stage deploy directory for child '" + 
invalidChildStageDeployDirectory + "' is present." );
         return false;
     }
 }