You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2011/07/13 22:29:54 UTC
svn commit: r1146397 [1/2] - in
/maven/plugins/branches/maven-site-plugin-3.x/src/it: MSITE-159/ MSITE-265/
MSITE-304/ MSITE-312/ MSITE-322/ MSITE-354/ MSITE-456/ MSITE-458/
MSITE-484/ MSITE-512/ MSITE-537/ MSITE-548/ MSITE-566/ emma-plugin-it/
full-re...
Author: hboutemy
Date: Wed Jul 13 20:29:52 2011
New Revision: 1146397
URL: http://svn.apache.org/viewvc?rev=1146397&view=rev
Log:
avoid stream leaks in ITs
Modified:
maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-159/verify.bsh
maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-265/verify.bsh
maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-304/prebuild.bsh
maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-304/verify.bsh
maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-312/verify.bsh
maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-322/verify.bsh
maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-354/verify.bsh
maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-456/verify.bsh
maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-458/verify.bsh
maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-484/verify.groovy
maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-512/verify.groovy
maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-537/verify.bsh
maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-548/verify.bsh
maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-566/verify.bsh
maven/plugins/branches/maven-site-plugin-3.x/src/it/emma-plugin-it/verify.bsh
maven/plugins/branches/maven-site-plugin-3.x/src/it/full-reporting/verify.groovy
maven/plugins/branches/maven-site-plugin-3.x/src/it/inheritedMenus-m3/verify.bsh
maven/plugins/branches/maven-site-plugin-3.x/src/it/inheritedMenus/verify.bsh
maven/plugins/branches/maven-site-plugin-3.x/src/it/interpolation/verify.bsh
maven/plugins/branches/maven-site-plugin-3.x/src/it/new-configuration/verify.groovy
maven/plugins/branches/maven-site-plugin-3.x/src/it/no-version/verify.groovy
maven/plugins/branches/maven-site-plugin-3.x/src/it/report-changes-generation/verify.bsh
maven/plugins/branches/maven-site-plugin-3.x/src/it/site-attach-descriptor/verify.bsh
maven/plugins/branches/maven-site-plugin-3.x/src/it/site-deploy/verify.bsh
maven/plugins/branches/maven-site-plugin-3.x/src/it/site-inheritance/verify.bsh
maven/plugins/branches/maven-site-plugin-3.x/src/it/site-jar/verify.bsh
maven/plugins/branches/maven-site-plugin-3.x/src/it/site-stage-deploy/verify.bsh
maven/plugins/branches/maven-site-plugin-3.x/src/it/surefire-report/verify.groovy
maven/plugins/branches/maven-site-plugin-3.x/src/it/top-parent-no-site/verify.bsh
Modified: maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-159/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-159/verify.bsh?rev=1146397&r1=1146396&r2=1146397&view=diff
==============================================================================
--- maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-159/verify.bsh (original)
+++ maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-159/verify.bsh Wed Jul 13 20:29:52 2011
@@ -26,21 +26,21 @@ boolean result = true;
try
{
- final File siteDirectory = new File ( basedir, "target/site" );
+ final File siteDirectory = new File( basedir, "target/site" );
if ( !siteDirectory.exists() || !siteDirectory.isDirectory() )
{
System.err.println( "site is missing or not a directory." );
result = false;
}
- File index = new File ( siteDirectory, "index.html" );
+ File index = new File( siteDirectory, "index.html" );
if ( !index.exists() || index.isDirectory() )
{
System.err.println( "no index file or is a directory." );
result = false;
}
- String content = IOUtil.toString ( new FileInputStream ( index ), "UTF-8" );
+ String content = FileUtils.fileRead( index, "UTF-8" );
int index1 = content.indexOf( "<a href=\"http://webhost.company.com/index.html\" class=\"externalLink\" title=\"Breadcrumb\">Breadcrumb</a>" );
int index2 = content.indexOf( "<a href=\"http://webhost.company.com/\" class=\"externalLink\" title=\"Link\">Link</a>" );
int index3 = content.indexOf( "<a href=\"http://webhost.company.com/\" class=\"externalLink\" title=\"Menu\">Menu</a>" );
@@ -50,7 +50,7 @@ try
result = false;
}
}
-catch( IOException e )
+catch ( IOException e )
{
e.printStackTrace();
result = false;
Modified: maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-265/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-265/verify.bsh?rev=1146397&r1=1146396&r2=1146397&view=diff
==============================================================================
--- maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-265/verify.bsh (original)
+++ maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-265/verify.bsh Wed Jul 13 20:29:52 2011
@@ -32,40 +32,39 @@ try
return false;
}
- File siteDirectory = new File ( target, "site" );
+ File siteDirectory = new File( target, "site" );
if ( !siteDirectory.exists() || !siteDirectory.isDirectory() )
{
System.err.println( "site file is missing or not a directory." );
return false;
}
- File releaseDirectory = new File ( siteDirectory, "releases" );
+ File releaseDirectory = new File( siteDirectory, "releases" );
if ( !releaseDirectory.exists() || !releaseDirectory.isDirectory() )
{
System.err.println( "releaseDirectory file is missing or not a directory." );
return false;
}
- File release163 = new File ( releaseDirectory, "release1.6.3.html" );
+ File release163 = new File( releaseDirectory, "release1.6.3.html" );
if ( !release163.exists() || release163.isDirectory() )
{
System.err.println( "release163 file is missing or a directory." );
return false;
}
- File release16 = new File ( releaseDirectory, "release1.6.html" );
+ File release16 = new File( releaseDirectory, "release1.6.html" );
if ( !release16.exists() || release16.isDirectory() )
{
System.err.println( "release16 file is missing or a directory." );
return false;
}
- File download = new File ( siteDirectory, "download.html" );
+ File download = new File( siteDirectory, "download.html" );
if ( !download.exists() || download.isDirectory() )
{
System.err.println( "download.html file is missing or a directory." );
return false;
}
- FileInputStream fis = new FileInputStream ( download );
- String downloadContent = IOUtil.toString ( fis, "UTF-8" );
+ String downloadContent = FileUtils.fileRead( download, "UTF-8" );
int indexOf = downloadContent.indexOf( "Download Maven 2.0.7" );
if ( indexOf < 0)
{
@@ -83,14 +82,14 @@ try
return false;
}
- File reports = new File ( siteDirectory, "project-reports.html" );
+ File reports = new File( siteDirectory, "project-reports.html" );
if ( !reports.exists() || reports.isDirectory() )
{
System.err.println( "project-reports.html file is missing or a directory." );
return false;
}
}
-catch( IOException e )
+catch ( IOException e )
{
e.printStackTrace();
result = false;
Modified: maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-304/prebuild.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-304/prebuild.bsh?rev=1146397&r1=1146396&r2=1146397&view=diff
==============================================================================
--- maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-304/prebuild.bsh (original)
+++ maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-304/prebuild.bsh Wed Jul 13 20:29:52 2011
@@ -24,10 +24,10 @@ boolean result = true;
try
{
String tmpDir = System.getProperty( "java.io.tmpdir" );
- File dirToClean = new File(tmpDir, "www.example.com" );
+ File dirToClean = new File( tmpDir, "www.example.com" );
FileUtils.deleteDirectory( dirToClean );
}
-catch( IOException e )
+catch ( IOException e )
{
e.printStackTrace();
result = false;
Modified: maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-304/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-304/verify.bsh?rev=1146397&r1=1146396&r2=1146397&view=diff
==============================================================================
--- maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-304/verify.bsh (original)
+++ maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-304/verify.bsh Wed Jul 13 20:29:52 2011
@@ -31,7 +31,7 @@ try
return false;
}
- File stagingDirectory = new File ( target, "staging" );
+ File stagingDirectory = new File( target, "staging" );
if ( !stagingDirectory.exists() || !stagingDirectory.isDirectory() )
{
System.err.println( "Staging directory '" + stagingDirectory + "' is missing or not a directory." );
@@ -40,35 +40,35 @@ try
String tmpDir = System.getProperty( "java.io.tmpdir" );
- File childDirectory = new File ( stagingDirectory, "MSITE-304-child" );
+ File childDirectory = new File( stagingDirectory, "MSITE-304-child" );
if ( !childDirectory.exists() || !childDirectory.isDirectory() )
{
System.err.println( "Staging directory for child '" + childDirectory + "' is missing or not a directory." );
return false;
}
- File stageDeployDirectory = new File ( tmpDir + "/www.example.com/parent" );
+ File stageDeployDirectory = new File( tmpDir + "/www.example.com/parent" );
if ( !stageDeployDirectory.exists() || !stageDeployDirectory.isDirectory() )
{
System.err.println( "Stage deploy directory '" + stageDeployDirectory + "' is missing or not a directory." );
return false;
}
- File validChildStageDeployDirectory = new File ( stageDeployDirectory, "staging/MSITE-304-child" );
+ File validChildStageDeployDirectory = new File( stageDeployDirectory, "staging/MSITE-304-child" );
if ( !validChildStageDeployDirectory.exists() || !validChildStageDeployDirectory.isDirectory() )
{
System.err.println( "Valid stage deploy directory for child '" + validChildStageDeployDirectory + "' is missing or not a directory." );
return false;
}
- File invalidChildStageDeployDirectory = new File ( stageDeployDirectory, "MSITE-304-child/staging" );
+ File invalidChildStageDeployDirectory = new File( stageDeployDirectory, "MSITE-304-child/staging" );
if ( invalidChildStageDeployDirectory.exists() && invalidChildStageDeployDirectory.isDirectory() )
{
System.err.println( "Invalid stage deploy directory for child '" + invalidChildStageDeployDirectory + "' is present." );
return false;
}
}
-catch( IOException e )
+catch ( IOException e )
{
e.printStackTrace();
result = false;
Modified: maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-312/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-312/verify.bsh?rev=1146397&r1=1146396&r2=1146397&view=diff
==============================================================================
--- maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-312/verify.bsh (original)
+++ maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-312/verify.bsh Wed Jul 13 20:29:52 2011
@@ -25,21 +25,21 @@ boolean result = true;
try
{
- final File parentDirectory = new File ( basedir, "target/site" );
+ final File parentDirectory = new File( basedir, "target/site" );
if ( !parentDirectory.exists() || !parentDirectory.isDirectory() )
{
System.err.println( "parent is missing or not a directory." );
return false;
}
- File parentIndex = new File ( parentDirectory, "index.html" );
+ File parentIndex = new File( parentDirectory, "index.html" );
if ( !parentIndex.exists() || parentIndex.isDirectory() )
{
System.err.println( "no index file in parent or is a directory." );
return false;
}
- String content = IOUtil.toString ( new FileInputStream ( parentIndex ), "UTF-8" );
+ String content = FileUtils.fileRead( parentIndex, "UTF-8" );
int index1 = content.indexOf( "<a href=\"./\" title=\"Parent\">Parent</a>" );
int index2 = content.indexOf( "<a href=\"inherited/parent\" title=\"parent\">parent</a>" );
int index3 = content.indexOf( "<a href=\"inherited/${childprop}\" title=\"${childprop}\">${childprop}</a>" );
@@ -50,21 +50,21 @@ try
return false;
}
- final File childDirectory = new File ( basedir, "child/target/site" );
+ final File childDirectory = new File( basedir, "child/target/site" );
if ( !childDirectory.exists() || !childDirectory.isDirectory() )
{
System.err.println( "child is missing or not a directory." );
return false;
}
- File childIndex = new File ( childDirectory, "index.html" );
+ File childIndex = new File( childDirectory, "index.html" );
if ( !childIndex.exists() || childIndex.isDirectory() )
{
System.err.println( "no index file in child or is a directory." );
return false;
}
- content = IOUtil.toString ( new FileInputStream ( childIndex ), "UTF-8" );
+ content = FileUtils.fileRead( childIndex, "UTF-8" );
int index1 = content.indexOf( "<a href=\"../\" title=\"Parent\">Parent</a>" );
int index2 = content.indexOf( "<a href=\"inherited/parent\" title=\"parent\">parent</a>" );
int index3 = content.indexOf( "<a href=\"inherited/${childprop}\" title=\"${childprop}\">${childprop}</a>" );
@@ -85,7 +85,7 @@ try
return false;
}
}
-catch( IOException e )
+catch ( IOException e )
{
e.printStackTrace();
result = false;
Modified: maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-322/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-322/verify.bsh?rev=1146397&r1=1146396&r2=1146397&view=diff
==============================================================================
--- maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-322/verify.bsh (original)
+++ maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-322/verify.bsh Wed Jul 13 20:29:52 2011
@@ -28,28 +28,28 @@ try
{
// STAGING
- File topLevelDirectory = new File ( basedir, "target/staging" );
+ File topLevelDirectory = new File( basedir, "target/staging" );
if ( !topLevelDirectory.exists() || !topLevelDirectory.isDirectory() )
{
System.err.println( "Staging directory '" + topLevelDirectory + "' is missing or not a directory." );
return false;
}
- File moduleDirectory = new File ( topLevelDirectory, "mymodule" );
+ File moduleDirectory = new File( topLevelDirectory, "mymodule" );
if ( !moduleDirectory.exists() || !moduleDirectory.isDirectory() )
{
System.err.println( "Staging module directory '" + moduleDirectory + "' is missing or not a directory." );
return false;
}
- File frDirectory = new File ( topLevelDirectory, "fr" );
+ File frDirectory = new File( topLevelDirectory, "fr" );
if ( !frDirectory.exists() || !frDirectory.isDirectory() )
{
System.err.println( "Staging fr directory '" + frDirectory + "' is missing or not a directory." );
return false;
}
- File frModuleDirectory = new File ( frDirectory, "mymodule" );
+ File frModuleDirectory = new File( frDirectory, "mymodule" );
if ( !frModuleDirectory.exists() || !frModuleDirectory.isDirectory() )
{
System.err.println( "Staging fr module directory '" + frModuleDirectory + "' is missing or not a directory." );
@@ -58,28 +58,28 @@ try
// DEPLOY
- topLevelDirectory = new File ( basedir, "deploy" );
+ topLevelDirectory = new File( basedir, "deploy" );
if ( !topLevelDirectory.exists() || !topLevelDirectory.isDirectory() )
{
System.err.println( "Deploy directory '" + topLevelDirectory + "' is missing or not a directory." );
return false;
}
- moduleDirectory = new File ( topLevelDirectory, "mymodule" );
+ moduleDirectory = new File( topLevelDirectory, "mymodule" );
if ( !moduleDirectory.exists() || !moduleDirectory.isDirectory() )
{
System.err.println( "Staging module directory '" + moduleDirectory + "' is missing or not a directory." );
return false;
}
- frDirectory = new File ( topLevelDirectory, "fr" );
+ frDirectory = new File( topLevelDirectory, "fr" );
if ( !frDirectory.exists() || !frDirectory.isDirectory() )
{
System.err.println( "Staging fr directory '" + frDirectory + "' is missing or not a directory." );
return false;
}
- frModuleDirectory = new File ( frDirectory, "mymodule" );
+ frModuleDirectory = new File( frDirectory, "mymodule" );
if ( !frModuleDirectory.exists() || !frModuleDirectory.isDirectory() )
{
System.err.println( "Staging fr module directory '" + frModuleDirectory + "' is missing or not a directory." );
@@ -88,35 +88,35 @@ try
// STAGE DEPLOY
- topLevelDirectory = new File ( topLevelDirectory, "staging" );
+ topLevelDirectory = new File( topLevelDirectory, "staging" );
if ( !topLevelDirectory.exists() || !topLevelDirectory.isDirectory() )
{
System.err.println( "Stage deploy directory '" + topLevelDirectory + "' is missing or not a directory." );
return false;
}
- moduleDirectory = new File ( topLevelDirectory, "mymodule" );
+ moduleDirectory = new File( topLevelDirectory, "mymodule" );
if ( !moduleDirectory.exists() || !moduleDirectory.isDirectory() )
{
System.err.println( "Staging module directory '" + moduleDirectory + "' is missing or not a directory." );
return false;
}
- frDirectory = new File ( topLevelDirectory, "fr" );
+ frDirectory = new File( topLevelDirectory, "fr" );
if ( !frDirectory.exists() || !frDirectory.isDirectory() )
{
System.err.println( "Staging fr directory '" + frDirectory + "' is missing or not a directory." );
return false;
}
- frModuleDirectory = new File ( frDirectory, "mymodule" );
+ frModuleDirectory = new File( frDirectory, "mymodule" );
if ( !frModuleDirectory.exists() || !frModuleDirectory.isDirectory() )
{
System.err.println( "Staging fr module directory '" + frModuleDirectory + "' is missing or not a directory." );
return false;
}
}
-catch( IOException e )
+catch ( IOException e )
{
e.printStackTrace();
result = false;
Modified: maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-354/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-354/verify.bsh?rev=1146397&r1=1146396&r2=1146397&view=diff
==============================================================================
--- maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-354/verify.bsh (original)
+++ maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-354/verify.bsh Wed Jul 13 20:29:52 2011
@@ -38,7 +38,7 @@ try
return false;
}
- File projectInfo = new File ( site, "project-info.html" );
+ File projectInfo = new File( site, "project-info.html" );
if ( projectInfo.exists() || projectInfo.isDirectory() )
{
System.err.println( "project-info.html file is present although it shouldn't, or is a directory." );
Modified: maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-456/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-456/verify.bsh?rev=1146397&r1=1146396&r2=1146397&view=diff
==============================================================================
--- maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-456/verify.bsh (original)
+++ maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-456/verify.bsh Wed Jul 13 20:29:52 2011
@@ -25,21 +25,21 @@ boolean result = true;
try
{
- File parentSiteDirectory = new File ( basedir, "target/site" );
+ File parentSiteDirectory = new File( basedir, "target/site" );
if ( !parentSiteDirectory.exists() || !parentSiteDirectory.isDirectory() )
{
System.err.println( "parent site is missing or not a directory." );
result = false;
}
- File parentIndex = new File ( parentSiteDirectory, "index.html" );
+ File parentIndex = new File( parentSiteDirectory, "index.html" );
if ( !parentIndex.exists() || parentIndex.isDirectory() )
{
System.err.println( "no index file in parent or is a directory." );
result = false;
}
- String content = IOUtil.toString ( new FileInputStream ( parentIndex ), "UTF-8" );
+ String content = FileUtils.fileRead( parentIndex, "UTF-8" );
int index1 = content.indexOf( "<a href=\"child/index.html\" title=\"MSITE-456 - child\">MSITE-456 - child</a>" );
int index2 = content.indexOf( "<a href=\"project-info.html\" title=\"Project Information\">Project Information</a>" );
@@ -53,28 +53,28 @@ try
// CHILD
- File childDirectory = new File ( basedir, "child" );
+ File childDirectory = new File( basedir, "child" );
if ( !childDirectory.exists() || !childDirectory.isDirectory() )
{
System.err.println( "child is missing or not a directory." );
result = false;
}
- File childSiteDirectory = new File ( childDirectory, "target/site" );
+ File childSiteDirectory = new File( childDirectory, "target/site" );
if ( !childSiteDirectory.exists() || !childSiteDirectory.isDirectory() )
{
System.err.println( "child site is missing or not a directory." );
result = false;
}
- File childIndex = new File ( childSiteDirectory, "index.html" );
+ File childIndex = new File( childSiteDirectory, "index.html" );
if ( !childIndex.exists() || childIndex.isDirectory() )
{
System.err.println( "no index file in child or is a directory." );
result = false;
}
- content = IOUtil.toString ( new FileInputStream ( childIndex ), "UTF-8" );
+ content = FileUtils.fileRead( childIndex, "UTF-8" );
index1 = content.indexOf( "<a href=\"../index.html\" title=\"MSITE-456 - parent\">MSITE-456 - parent</a>" );
index2 = content.indexOf( "<a href=\"project-info.html\" title=\"Project Information\">Project Information</a>" );
@@ -84,7 +84,7 @@ try
result = false;
}
}
-catch( IOException e )
+catch ( IOException e )
{
e.printStackTrace();
result = false;
Modified: maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-458/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-458/verify.bsh?rev=1146397&r1=1146396&r2=1146397&view=diff
==============================================================================
--- maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-458/verify.bsh (original)
+++ maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-458/verify.bsh Wed Jul 13 20:29:52 2011
@@ -55,7 +55,7 @@ try
result = false;
}
}
-catch( IOException e )
+catch ( IOException e )
{
e.printStackTrace();
result = false;
Modified: maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-484/verify.groovy
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-484/verify.groovy?rev=1146397&r1=1146396&r2=1146397&view=diff
==============================================================================
--- maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-484/verify.groovy (original)
+++ maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-484/verify.groovy Wed Jul 13 20:29:52 2011
@@ -18,11 +18,11 @@
* under the License.
*/
-assert new File(basedir, 'target/site/issue-tracking.html').exists();
+assert new File( basedir, 'target/site/issue-tracking.html' ).exists();
-assert new File(basedir, 'parent-usage-test/target/site/xref/index.html').exists();
-assert new File(basedir, 'parent-usage-test/target/site/xref-test/index.html').exists();
-assert new File(basedir, 'parent-usage-test/target/site/issue-tracking.html').exists();
-assert new File(basedir, 'parent-usage-test/target/site/apidocs').exists();
+assert new File( basedir, 'parent-usage-test/target/site/xref/index.html' ).exists();
+assert new File( basedir, 'parent-usage-test/target/site/xref-test/index.html' ).exists();
+assert new File( basedir, 'parent-usage-test/target/site/issue-tracking.html' ).exists();
+assert new File( basedir, 'parent-usage-test/target/site/apidocs' ).exists();
return true;
\ No newline at end of file
Modified: maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-512/verify.groovy
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-512/verify.groovy?rev=1146397&r1=1146396&r2=1146397&view=diff
==============================================================================
--- maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-512/verify.groovy (original)
+++ maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-512/verify.groovy Wed Jul 13 20:29:52 2011
@@ -18,11 +18,11 @@
* under the License.
*/
-assert new File(basedir, 'parent-usage-test/target/site/xref/index.html').exists();
-assert new File(basedir, 'parent-usage-test/target/site/xref-test/index.html').exists();
-assert new File(basedir, 'parent-usage-test/target/site/apidocs').exists();
+assert new File( basedir, 'parent-usage-test/target/site/xref/index.html' ).exists();
+assert new File( basedir, 'parent-usage-test/target/site/xref-test/index.html' ).exists();
+assert new File( basedir, 'parent-usage-test/target/site/apidocs' ).exists();
-assert new File(basedir, 'parent-usage-test/target/site/apidocs').exists();
-assert !new File(basedir, 'parent-usage-test/target/site/apidocs/org/apache/maven/titi/AppFoo.html').exists();
+assert new File( basedir, 'parent-usage-test/target/site/apidocs' ).exists();
+assert !new File( basedir, 'parent-usage-test/target/site/apidocs/org/apache/maven/titi/AppFoo.html' ).exists();
return true;
\ No newline at end of file
Modified: maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-537/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-537/verify.bsh?rev=1146397&r1=1146396&r2=1146397&view=diff
==============================================================================
--- maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-537/verify.bsh (original)
+++ maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-537/verify.bsh Wed Jul 13 20:29:52 2011
@@ -25,7 +25,7 @@ boolean result = true;
try
{
- final File stageDeployDirectory = new File ( basedir, "staging" );
+ final File stageDeployDirectory = new File( basedir, "staging" );
if ( !stageDeployDirectory.exists() || !stageDeployDirectory.isDirectory() )
{
System.err.println( "stageDeployDirectory is missing or not a directory." );
@@ -33,14 +33,14 @@ try
}
// module directory
- final File moduleDirectory = new File ( stageDeployDirectory, "module" );
+ final File moduleDirectory = new File( stageDeployDirectory, "module" );
if ( !moduleDirectory.exists() || !moduleDirectory.isDirectory() )
{
System.err.println( "stage deploy moduleDirectory is missing or not a directory." );
return false;
}
}
-catch( IOException e )
+catch ( IOException e )
{
e.printStackTrace();
result = false;
Modified: maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-548/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-548/verify.bsh?rev=1146397&r1=1146396&r2=1146397&view=diff
==============================================================================
--- maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-548/verify.bsh (original)
+++ maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-548/verify.bsh Wed Jul 13 20:29:52 2011
@@ -25,42 +25,42 @@ boolean result = true;
try
{
- File deployDirectory = new File ( basedir, "deploy" );
+ File deployDirectory = new File( basedir, "deploy" );
if ( !deployDirectory.exists() || !deployDirectory.isDirectory() )
{
System.err.println( "deploy directory is missing or not a directory:" + deployDirectory.getAbsolutePath() );
return false;
}
- File rootDirectory = new File ( deployDirectory, "MSITE-548" );
+ File rootDirectory = new File( deployDirectory, "MSITE-548" );
if ( !rootDirectory.exists() || !rootDirectory.isDirectory() )
{
System.err.println( "rootDirectory file is missing or not a directory." );
return false;
}
- File junkDirectory = new File ( rootDirectory, "junk" );
+ File junkDirectory = new File( rootDirectory, "junk" );
if ( !junkDirectory.exists() || !junkDirectory.isDirectory() )
{
System.err.println( "junkDirectory file is missing or not a directory." );
return false;
}
- File module1Directory = new File ( deployDirectory, "module1" );
+ File module1Directory = new File( deployDirectory, "module1" );
if ( !module1Directory.exists() || !module1Directory.isDirectory() )
{
System.err.println( "module1Directory file is missing or not a directory." );
return false;
}
- File module2Directory = new File ( deployDirectory, "module-2" );
+ File module2Directory = new File( deployDirectory, "module-2" );
if ( !module2Directory.exists() || !module2Directory.isDirectory() )
{
System.err.println( "module2Directory file is missing or not a directory." );
return false;
}
}
-catch( IOException e )
+catch ( IOException e )
{
e.printStackTrace();
result = false;
Modified: maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-566/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-566/verify.bsh?rev=1146397&r1=1146396&r2=1146397&view=diff
==============================================================================
--- maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-566/verify.bsh (original)
+++ maven/plugins/branches/maven-site-plugin-3.x/src/it/MSITE-566/verify.bsh Wed Jul 13 20:29:52 2011
@@ -32,14 +32,14 @@ try
result = false;
}
- File siteDescriptor = new File ( target, "test-1.0-SNAPSHOT-site.xml" );
+ File siteDescriptor = new File( target, "test-1.0-SNAPSHOT-site.xml" );
if ( !siteDescriptor.exists() || siteDescriptor.isDirectory() )
{
System.err.println( "siteDescriptor file is missing from target or is a directory." );
result = false;
}
- String content = IOUtil.toString ( new FileInputStream ( siteDescriptor ), "UTF-8" );
+ String content = FileUtils.fileRead( siteDescriptor, "UTF-8" );
int index1 = content.indexOf( "name=\"${project.name}\"" );
int index2 = content.indexOf( "<menu name=\"${menu.title}\">" );
int index3 = content.indexOf( "<!-- a comment -->" );
@@ -57,14 +57,14 @@ try
result = false;
}
- File index = new File ( site, "index.html" );
+ File index = new File( site, "index.html" );
if ( !index.exists() || index.isDirectory() )
{
System.err.println( "index.html is missing from target or is a directory." );
result = false;
}
- content = IOUtil.toString ( new FileInputStream ( index ), "UTF-8" );
+ content = FileUtils.fileRead( index, "UTF-8" );
index1 = content.indexOf( "MSITE-566 IT" );
index2 = content.indexOf( "<h5>Documentation</h5>" );
if ( index1 < 0 || index2 < 0 )
@@ -73,7 +73,7 @@ try
result = false;
}
}
-catch( IOException e )
+catch ( IOException e )
{
e.printStackTrace();
result = false;
Modified: maven/plugins/branches/maven-site-plugin-3.x/src/it/emma-plugin-it/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/it/emma-plugin-it/verify.bsh?rev=1146397&r1=1146396&r2=1146397&view=diff
==============================================================================
--- maven/plugins/branches/maven-site-plugin-3.x/src/it/emma-plugin-it/verify.bsh (original)
+++ maven/plugins/branches/maven-site-plugin-3.x/src/it/emma-plugin-it/verify.bsh Wed Jul 13 20:29:52 2011
@@ -1,24 +1,28 @@
-File aEmmaIndex = new File(basedir, "a/target/site/emma/index.html");
-if(!aEmmaIndex.exists() || aEmmaIndex.length() == 0) {
- System.out.println("Missing 'index.html' for A");
+File aEmmaIndex = new File( basedir, "a/target/site/emma/index.html" );
+if ( !aEmmaIndex.exists() || aEmmaIndex.length() == 0 )
+{
+ System.out.println( "Missing 'index.html' for A" );
return false;
}
-File aEmmaFiles = new File(basedir, "a/target/site/emma/_files");
-if(!aEmmaFiles.exists() || aEmmaFiles.list().length == 0) {
- System.out.println("Missing or empty directory '_files' for A");
+File aEmmaFiles = new File( basedir, "a/target/site/emma/_files" );
+if ( !aEmmaFiles.exists() || aEmmaFiles.list().length == 0 )
+{
+ System.out.println( "Missing or empty directory '_files' for A" );
return false;
}
-File bEmmaIndex = new File(basedir, "b/target/site/emma/index.html");
-if(!bEmmaIndex.exists() || bEmmaIndex.length() == 0) {
- System.out.println("Missing 'index.html' for B");
+File bEmmaIndex = new File( basedir, "b/target/site/emma/index.html" );
+if ( !bEmmaIndex.exists() || bEmmaIndex.length() == 0 )
+{
+ System.out.println( "Missing 'index.html' for B" );
return false;
}
-File bEmmaFiles = new File(basedir, "b/target/site/emma/_files");
-if(!bEmmaFiles.exists() || bEmmaFiles.list().length == 0) {
- System.out.println("Missing or empty directory '_files' for B");
+File bEmmaFiles = new File( basedir, "b/target/site/emma/_files" );
+if ( !bEmmaFiles.exists() || bEmmaFiles.list().length == 0 )
+{
+ System.out.println( "Missing or empty directory '_files' for B" );
return false;
}
Modified: maven/plugins/branches/maven-site-plugin-3.x/src/it/full-reporting/verify.groovy
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/it/full-reporting/verify.groovy?rev=1146397&r1=1146396&r2=1146397&view=diff
==============================================================================
--- maven/plugins/branches/maven-site-plugin-3.x/src/it/full-reporting/verify.groovy (original)
+++ maven/plugins/branches/maven-site-plugin-3.x/src/it/full-reporting/verify.groovy Wed Jul 13 20:29:52 2011
@@ -17,29 +17,29 @@
* specific language governing permissions and limitations
* under the License.
*/
-assert new File(basedir, 'target/surefire-reports').exists();
-assert new File(basedir, 'target/surefire-reports/org.apache.maven.plugins.site.its.AppTest.txt').exists();
-content = new File(basedir, 'target/surefire-reports/org.apache.maven.plugins.site.its.AppTest.txt').text;
+assert new File( basedir, 'target/surefire-reports' ).exists();
+assert new File( basedir, 'target/surefire-reports/org.apache.maven.plugins.site.its.AppTest.txt' ).exists();
+content = new File( basedir, 'target/surefire-reports/org.apache.maven.plugins.site.its.AppTest.txt').text;
assert content.contains( 'Test set: org.apache.maven.plugins.site.its.AppTest' );
assert content.contains( 'Tests run: 1, Failures: 0, Errors: 0, Skipped: 0' );
-assert new File(basedir, 'target/site/surefire-report.html').exists();
-assert new File(basedir, 'target/site/index.html').exists();
-assert new File(basedir, 'target/site/checkstyle.html').exists();
-assert new File(basedir, 'target/site/cpd.html').exists();
-assert new File(basedir, 'target/site/apidocs/index.html').exists();
-assert new File(basedir, 'target/site/apidocs/org/apache/maven/plugins/site/its/App.html').exists();
-assert new File(basedir, 'target/site/cobertura/index.html').exists();
-assert new File(basedir, 'target/site/xref/index.html').exists();
-assert new File(basedir, 'target/site/xref-test/index.html').exists();
+assert new File( basedir, 'target/site/surefire-report.html' ).exists();
+assert new File( basedir, 'target/site/index.html' ).exists();
+assert new File( basedir, 'target/site/checkstyle.html' ).exists();
+assert new File( basedir, 'target/site/cpd.html' ).exists();
+assert new File( basedir, 'target/site/apidocs/index.html' ).exists();
+assert new File( basedir, 'target/site/apidocs/org/apache/maven/plugins/site/its/App.html' ).exists();
+assert new File( basedir, 'target/site/cobertura/index.html' ).exists();
+assert new File( basedir, 'target/site/xref/index.html' ).exists();
+assert new File( basedir, 'target/site/xref-test/index.html' ).exists();
-assert new File(basedir, 'target/site/taglist.html').exists();
-assert new File(basedir, 'target/site/team-list.html').exists();
+assert new File( basedir, 'target/site/taglist.html' ).exists();
+assert new File( basedir, 'target/site/team-list.html' ).exists();
-assert new File(basedir, 'target/site/dependencies.html').exists();
-content = new File(basedir, 'target/site/dependencies.html').text;
+assert new File( basedir, 'target/site/dependencies.html' ).exists();
+content = new File( basedir, 'target/site/dependencies.html').text;
assert content.contains( 'junit:junit:jar:3.8.2' );
return true;
\ No newline at end of file
Modified: maven/plugins/branches/maven-site-plugin-3.x/src/it/inheritedMenus-m3/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/it/inheritedMenus-m3/verify.bsh?rev=1146397&r1=1146396&r2=1146397&view=diff
==============================================================================
--- maven/plugins/branches/maven-site-plugin-3.x/src/it/inheritedMenus-m3/verify.bsh (original)
+++ maven/plugins/branches/maven-site-plugin-3.x/src/it/inheritedMenus-m3/verify.bsh Wed Jul 13 20:29:52 2011
@@ -25,28 +25,28 @@ boolean result = true;
try
{
- File parentDirectory = new File ( basedir, "parentNotAsRef" );
+ File parentDirectory = new File( basedir, "parentNotAsRef" );
if ( !parentDirectory.exists() || !parentDirectory.isDirectory() )
{
System.err.println( "parent is missing or not a directory." );
result = false;
}
- File parentSiteDirectory = new File ( parentDirectory, "target/site" );
+ File parentSiteDirectory = new File( parentDirectory, "target/site" );
if ( !parentSiteDirectory.exists() || !parentSiteDirectory.isDirectory() )
{
System.err.println( "parent site is missing or not a directory." );
result = false;
}
- File parentIndex = new File ( parentSiteDirectory, "index.html" );
+ File parentIndex = new File( parentSiteDirectory, "index.html" );
if ( !parentIndex.exists() || parentIndex.isDirectory() )
{
System.err.println( "no index file in parent or is a directory." );
result = false;
}
- String content = IOUtil.toString ( new FileInputStream ( parentIndex ), "UTF-8" );
+ String content = FileUtils.fileRead( parentIndex, "UTF-8" );
int index1 = content.indexOf( "<strong>Parent Relative Home Inherited</strong>" );
int index2 = content.indexOf( "<strong>Parent Relative Home Inherited with dot</strong>" );
int index3 = content.indexOf( "<a href=\"./\" title=\"Parent Absolute Home Inherited\">Parent Absolute Home Inherited</a>" );
@@ -83,28 +83,28 @@ try
// CHILD
- File childDirectory = new File ( parentDirectory, "childNotAsRef" );
+ File childDirectory = new File( parentDirectory, "childNotAsRef" );
if ( !childDirectory.exists() || !childDirectory.isDirectory() )
{
System.err.println( "child is missing or not a directory." );
result = false;
}
- File childSiteDirectory = new File ( childDirectory, "target/site" );
+ File childSiteDirectory = new File( childDirectory, "target/site" );
if ( !childSiteDirectory.exists() || !childSiteDirectory.isDirectory() )
{
System.err.println( "child site is missing or not a directory." );
result = false;
}
- File childIndex = new File ( childSiteDirectory, "index.html" );
+ File childIndex = new File( childSiteDirectory, "index.html" );
if ( !childIndex.exists() || childIndex.isDirectory() )
{
System.err.println( "no index file in child or is a directory." );
result = false;
}
- content = IOUtil.toString ( new FileInputStream ( childIndex ), "UTF-8" );
+ content = FileUtils.fileRead( childIndex, "UTF-8" );
index1 = content.indexOf( "<a href=\"../index.html\" title=\"Parent Relative Home Inherited\">Parent Relative Home Inherited</a>" );
index2 = content.indexOf( "<a href=\"../index.html\" title=\"Parent Relative Home Inherited with dot\">Parent Relative Home Inherited with dot</a>" );
index3 = content.indexOf( "<a href=\"../\" title=\"Parent Absolute Home Inherited\">Parent Absolute Home Inherited</a>" );
@@ -137,7 +137,7 @@ try
result = false;
}
- File childSummary = new File ( childSiteDirectory, "project-summary.html" );
+ File childSummary = new File( childSiteDirectory, "project-summary.html" );
if ( !childSummary.exists() || childSummary.isDirectory() )
{
System.err.println( "no summary file in child or is a directory." );
@@ -148,28 +148,28 @@ try
// GRANDCHILD
- File grandChildDirectory = new File ( childDirectory, "grandChildNotAsRef" );
+ File grandChildDirectory = new File( childDirectory, "grandChildNotAsRef" );
if ( !grandChildDirectory.exists() || !grandChildDirectory.isDirectory() )
{
System.err.println( "grandchild is missing or not a directory." );
result = false;
}
- File grandChildSiteDirectory = new File ( grandChildDirectory, "target/site" );
+ File grandChildSiteDirectory = new File( grandChildDirectory, "target/site" );
if ( !grandChildSiteDirectory.exists() || !grandChildSiteDirectory.isDirectory() )
{
System.err.println( "grandchild site is missing or not a directory." );
result = false;
}
- File grandChildIndex = new File ( grandChildSiteDirectory, "index.html" );
+ File grandChildIndex = new File( grandChildSiteDirectory, "index.html" );
if ( !grandChildIndex.exists() || grandChildIndex.isDirectory() )
{
System.err.println( "no index file in grandchild or is a directory." );
result = false;
}
- content = IOUtil.toString ( new FileInputStream ( grandChildIndex ), "UTF-8" );
+ content = FileUtils.fileRead( grandChildIndex, "UTF-8" );
index1 = content.indexOf( "<a href=\"../../index.html\" title=\"Parent Relative Home Inherited\">Parent Relative Home Inherited</a>" );
index2 = content.indexOf( "<a href=\"../../index.html\" title=\"Parent Relative Home Inherited with dot\">Parent Relative Home Inherited with dot</a>" );
index3 = content.indexOf( "<a href=\"../../\" title=\"Parent Absolute Home Inherited\">Parent Absolute Home Inherited</a>" );
@@ -202,7 +202,7 @@ try
result = false;
}
- File grandChildScm = new File ( grandChildSiteDirectory, "source-repository.html" );
+ File grandChildScm = new File( grandChildSiteDirectory, "source-repository.html" );
if ( !grandChildScm.exists() || grandChildScm.isDirectory() )
{
System.err.println( "no source-repository file in grandchild or is a directory." );
@@ -210,7 +210,7 @@ try
}
}
-catch( IOException e )
+catch ( IOException e )
{
e.printStackTrace();
result = false;
Modified: maven/plugins/branches/maven-site-plugin-3.x/src/it/inheritedMenus/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/it/inheritedMenus/verify.bsh?rev=1146397&r1=1146396&r2=1146397&view=diff
==============================================================================
--- maven/plugins/branches/maven-site-plugin-3.x/src/it/inheritedMenus/verify.bsh (original)
+++ maven/plugins/branches/maven-site-plugin-3.x/src/it/inheritedMenus/verify.bsh Wed Jul 13 20:29:52 2011
@@ -25,28 +25,28 @@ boolean result = true;
try
{
- File parentDirectory = new File ( basedir, "parentNotAsRef" );
+ File parentDirectory = new File( basedir, "parentNotAsRef" );
if ( !parentDirectory.exists() || !parentDirectory.isDirectory() )
{
System.err.println( "parent is missing or not a directory." );
result = false;
}
- File parentSiteDirectory = new File ( parentDirectory, "target/site" );
+ File parentSiteDirectory = new File( parentDirectory, "target/site" );
if ( !parentSiteDirectory.exists() || !parentSiteDirectory.isDirectory() )
{
System.err.println( "parent site is missing or not a directory." );
result = false;
}
- File parentIndex = new File ( parentSiteDirectory, "index.html" );
+ File parentIndex = new File( parentSiteDirectory, "index.html" );
if ( !parentIndex.exists() || parentIndex.isDirectory() )
{
System.err.println( "no index file in parent or is a directory." );
result = false;
}
- String content = IOUtil.toString ( new FileInputStream ( parentIndex ), "UTF-8" );
+ String content = FileUtils.fileRead( parentIndex, "UTF-8" );
int index1 = content.indexOf( "<strong>Parent Relative Home Inherited</strong>" );
int index2 = content.indexOf( "<strong>Parent Relative Home Inherited with dot</strong>" );
int index3 = content.indexOf( "<a href=\"./\" title=\"Parent Absolute Home Inherited\">Parent Absolute Home Inherited</a>" );
@@ -83,28 +83,28 @@ try
// CHILD
- File childDirectory = new File ( parentDirectory, "childNotAsRef" );
+ File childDirectory = new File( parentDirectory, "childNotAsRef" );
if ( !childDirectory.exists() || !childDirectory.isDirectory() )
{
System.err.println( "child is missing or not a directory." );
result = false;
}
- File childSiteDirectory = new File ( childDirectory, "target/site" );
+ File childSiteDirectory = new File( childDirectory, "target/site" );
if ( !childSiteDirectory.exists() || !childSiteDirectory.isDirectory() )
{
System.err.println( "child site is missing or not a directory." );
result = false;
}
- File childIndex = new File ( childSiteDirectory, "index.html" );
+ File childIndex = new File( childSiteDirectory, "index.html" );
if ( !childIndex.exists() || childIndex.isDirectory() )
{
System.err.println( "no index file in child or is a directory." );
result = false;
}
- content = IOUtil.toString ( new FileInputStream ( childIndex ), "UTF-8" );
+ content = FileUtils.fileRead( childIndex, "UTF-8" );
index1 = content.indexOf( "<a href=\"../index.html\" title=\"Parent Relative Home Inherited\">Parent Relative Home Inherited</a>" );
index2 = content.indexOf( "<a href=\"../index.html\" title=\"Parent Relative Home Inherited with dot\">Parent Relative Home Inherited with dot</a>" );
index3 = content.indexOf( "<a href=\"../\" title=\"Parent Absolute Home Inherited\">Parent Absolute Home Inherited</a>" );
@@ -137,7 +137,7 @@ try
result = false;
}
- File childSummary = new File ( childSiteDirectory, "project-summary.html" );
+ File childSummary = new File( childSiteDirectory, "project-summary.html" );
if ( !childSummary.exists() || childSummary.isDirectory() )
{
System.err.println( "no summary file in child or is a directory." );
@@ -148,28 +148,28 @@ try
// GRANDCHILD
- File grandChildDirectory = new File ( childDirectory, "grandChildNotAsRef" );
+ File grandChildDirectory = new File( childDirectory, "grandChildNotAsRef" );
if ( !grandChildDirectory.exists() || !grandChildDirectory.isDirectory() )
{
System.err.println( "grandchild is missing or not a directory." );
result = false;
}
- File grandChildSiteDirectory = new File ( grandChildDirectory, "target/site" );
+ File grandChildSiteDirectory = new File( grandChildDirectory, "target/site" );
if ( !grandChildSiteDirectory.exists() || !grandChildSiteDirectory.isDirectory() )
{
System.err.println( "grandchild site is missing or not a directory." );
result = false;
}
- File grandChildIndex = new File ( grandChildSiteDirectory, "index.html" );
+ File grandChildIndex = new File( grandChildSiteDirectory, "index.html" );
if ( !grandChildIndex.exists() || grandChildIndex.isDirectory() )
{
System.err.println( "no index file in grandchild or is a directory." );
result = false;
}
- content = IOUtil.toString ( new FileInputStream ( grandChildIndex ), "UTF-8" );
+ content = FileUtils.fileRead( grandChildIndex, "UTF-8" );
index1 = content.indexOf( "<a href=\"../../index.html\" title=\"Parent Relative Home Inherited\">Parent Relative Home Inherited</a>" );
index2 = content.indexOf( "<a href=\"../../index.html\" title=\"Parent Relative Home Inherited with dot\">Parent Relative Home Inherited with dot</a>" );
index3 = content.indexOf( "<a href=\"../../\" title=\"Parent Absolute Home Inherited\">Parent Absolute Home Inherited</a>" );
@@ -202,7 +202,7 @@ try
result = false;
}
- File grandChildScm = new File ( grandChildSiteDirectory, "source-repository.html" );
+ File grandChildScm = new File( grandChildSiteDirectory, "source-repository.html" );
if ( !grandChildScm.exists() || grandChildScm.isDirectory() )
{
System.err.println( "no source-repository file in grandchild or is a directory." );
@@ -210,7 +210,7 @@ try
}
}
-catch( IOException e )
+catch ( IOException e )
{
e.printStackTrace();
result = false;
Modified: maven/plugins/branches/maven-site-plugin-3.x/src/it/interpolation/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/it/interpolation/verify.bsh?rev=1146397&r1=1146396&r2=1146397&view=diff
==============================================================================
--- maven/plugins/branches/maven-site-plugin-3.x/src/it/interpolation/verify.bsh (original)
+++ maven/plugins/branches/maven-site-plugin-3.x/src/it/interpolation/verify.bsh Wed Jul 13 20:29:52 2011
@@ -49,7 +49,7 @@ try
result = false;
}
}
-catch( IOException e )
+catch ( IOException e )
{
e.printStackTrace();
result = false;
Modified: maven/plugins/branches/maven-site-plugin-3.x/src/it/new-configuration/verify.groovy
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/it/new-configuration/verify.groovy?rev=1146397&r1=1146396&r2=1146397&view=diff
==============================================================================
--- maven/plugins/branches/maven-site-plugin-3.x/src/it/new-configuration/verify.groovy (original)
+++ maven/plugins/branches/maven-site-plugin-3.x/src/it/new-configuration/verify.groovy Wed Jul 13 20:29:52 2011
@@ -17,22 +17,22 @@
* specific language governing permissions and limitations
* under the License.
*/
-assert !new File(basedir, 'target/surefire-reports').exists();
-assert !new File(basedir, 'target/surefire-reports/org.apache.maven.plugins.site.its.AppTest.txt').exists();
+assert !new File( basedir, 'target/surefire-reports' ).exists();
+assert !new File( basedir, 'target/surefire-reports/org.apache.maven.plugins.site.its.AppTest.txt' ).exists();
-assert !new File(basedir, 'target/site/surefire-report.html').exists();
-assert new File(basedir, 'target/site/index.html').exists();
-assert !new File(basedir, 'target/site/checkstyle.html').exists();
-assert !new File(basedir, 'target/site/cpd.html').exists();
-assert new File(basedir, 'target/site/apidocs/index.html').exists();
-assert !new File(basedir, 'target/site/apidocs/org/apache/maven/plugins/site/its/App.html').exists();
-assert !new File(basedir, 'target/site/cobertura/index.html').exists();
-assert !new File(basedir, 'target/site/xref/index.html').exists();
-assert !new File(basedir, 'target/site/xref-test/index.html').exists();
+assert !new File( basedir, 'target/site/surefire-report.html' ).exists();
+assert new File( basedir, 'target/site/index.html' ).exists();
+assert !new File( basedir, 'target/site/checkstyle.html' ).exists();
+assert !new File( basedir, 'target/site/cpd.html' ).exists();
+assert new File( basedir, 'target/site/apidocs/index.html' ).exists();
+assert !new File( basedir, 'target/site/apidocs/org/apache/maven/plugins/site/its/App.html' ).exists();
+assert !new File( basedir, 'target/site/cobertura/index.html' ).exists();
+assert !new File( basedir, 'target/site/xref/index.html' ).exists();
+assert !new File( basedir, 'target/site/xref-test/index.html' ).exists();
-assert !new File(basedir, 'target/site/taglist.html').exists();
-assert !new File(basedir, 'target/site/team-list.html').exists();
+assert !new File( basedir, 'target/site/taglist.html' ).exists();
+assert !new File( basedir, 'target/site/team-list.html' ).exists();
-assert !new File(basedir, 'target/site/dependencies.html').exists();
+assert !new File( basedir, 'target/site/dependencies.html' ).exists();
return true;
\ No newline at end of file
Modified: maven/plugins/branches/maven-site-plugin-3.x/src/it/no-version/verify.groovy
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/it/no-version/verify.groovy?rev=1146397&r1=1146396&r2=1146397&view=diff
==============================================================================
--- maven/plugins/branches/maven-site-plugin-3.x/src/it/no-version/verify.groovy (original)
+++ maven/plugins/branches/maven-site-plugin-3.x/src/it/no-version/verify.groovy Wed Jul 13 20:29:52 2011
@@ -17,15 +17,15 @@
* specific language governing permissions and limitations
* under the License.
*/
-assert new File(basedir, 'target/surefire-reports').exists();
-assert new File(basedir, 'target/surefire-reports/org.apache.maven.plugins.site.its.AppTest.txt').exists();
-content = new File(basedir, 'target/surefire-reports/org.apache.maven.plugins.site.its.AppTest.txt').text;
+assert new File( basedir, 'target/surefire-reports' ).exists();
+assert new File( basedir, 'target/surefire-reports/org.apache.maven.plugins.site.its.AppTest.txt' ).exists();
+content = new File( basedir, 'target/surefire-reports/org.apache.maven.plugins.site.its.AppTest.txt' ).text;
assert content.contains( 'Test set: org.apache.maven.plugins.site.its.AppTest' );
assert content.contains( 'Tests run: 1, Failures: 0, Errors: 0, Skipped: 0' );
-assert new File(basedir, 'target/site/surefire-report.html').exists();
-assert !new File(basedir, 'target/site/index.html').exists();
+assert new File( basedir, 'target/site/surefire-report.html' ).exists();
+assert !new File( basedir, 'target/site/index.html' ).exists();
return true;
\ No newline at end of file
Modified: maven/plugins/branches/maven-site-plugin-3.x/src/it/report-changes-generation/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/it/report-changes-generation/verify.bsh?rev=1146397&r1=1146396&r2=1146397&view=diff
==============================================================================
--- maven/plugins/branches/maven-site-plugin-3.x/src/it/report-changes-generation/verify.bsh (original)
+++ maven/plugins/branches/maven-site-plugin-3.x/src/it/report-changes-generation/verify.bsh Wed Jul 13 20:29:52 2011
@@ -33,18 +33,17 @@ try
System.err.println( "report file is missing or a directory." );
return false;
}
- FileInputStream fis = new FileInputStream ( report );
- String reportContent = IOUtil.toString ( fis );
+ String reportContent = FileUtils.fileRead( report );
int indexOf = reportContent.indexOf( "Changes Report" );
- if ( indexOf < 0)
+ if ( indexOf < 0 )
{
System.err.println( "changes-report.html doesn't contains Changes Report title" );
return false;
}
indexOf = reportContent.indexOf( "href=\"http://myjira/browse/MCHANGES-88\"" );
- if ( indexOf < 0)
+ if ( indexOf < 0 )
{
System.err.println( "changes-report.html doesn't contains jira issue link" );
return false;
@@ -52,7 +51,7 @@ try
// Test for output problem caused by only using <dueTo> elements
indexOf = reportContent.indexOf( "Thanks to , " );
- if ( indexOf != -1)
+ if ( indexOf != -1 )
{
System.err.println( "changes-report.html has too many dueTos in the Map" );
return false;
@@ -60,20 +59,20 @@ try
// Tests output problems caused by only using <fixes> element
indexOf = reportContent.indexOf( "bug-12345" );
- if ( indexOf < 0)
+ if ( indexOf < 0 )
{
System.err.println( "changes-report.html doesn't contains issue text for issue specified with <fixes> element" );
return false;
}
indexOf = reportContent.indexOf( "Fixes ." );
- if ( indexOf != -1)
+ if ( indexOf != -1 )
{
System.err.println( "changes-report.html doesn't handle empty fixes attribute properly" );
return false;
}
}
-catch( Throwable e )
+catch ( Throwable e )
{
e.printStackTrace();
result = false;
Modified: maven/plugins/branches/maven-site-plugin-3.x/src/it/site-attach-descriptor/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/it/site-attach-descriptor/verify.bsh?rev=1146397&r1=1146396&r2=1146397&view=diff
==============================================================================
--- maven/plugins/branches/maven-site-plugin-3.x/src/it/site-attach-descriptor/verify.bsh (original)
+++ maven/plugins/branches/maven-site-plugin-3.x/src/it/site-attach-descriptor/verify.bsh Wed Jul 13 20:29:52 2011
@@ -32,14 +32,14 @@ try
return false;
}
- File siteDescriptor = new File ( target, "site-attach-descriptor-1.0-SNAPSHOT-site.xml" );
+ File siteDescriptor = new File( target, "site-attach-descriptor-1.0-SNAPSHOT-site.xml" );
if ( !siteDescriptor.exists() || siteDescriptor.isDirectory() )
{
System.err.println( "siteDescriptor file is missing from target or is a directory." );
return false;
}
- File siteDescriptorSwedish = new File ( target, "site-attach-descriptor-1.0-SNAPSHOT-site_sv.xml" );
+ File siteDescriptorSwedish = new File( target, "site-attach-descriptor-1.0-SNAPSHOT-site_sv.xml" );
if ( !siteDescriptorSwedish.exists() || siteDescriptorSwedish.isDirectory() )
{
System.err.println( "siteDescriptorSwedish file is missing from target or is a directory." );
@@ -47,7 +47,7 @@ try
}
- File artifactsDirectory = new File ( target, "snapshot-repo/org/apache/maven/plugins/site/its/site-attach-descriptor/1.0-SNAPSHOT");
+ File artifactsDirectory = new File( target, "snapshot-repo/org/apache/maven/plugins/site/its/site-attach-descriptor/1.0-SNAPSHOT");
File[] files = artifactsDirectory.listFiles();
for (int i = 0; i < files.length; i++)
{
@@ -62,7 +62,7 @@ try
}
-catch( IOException e )
+catch ( IOException e )
{
e.printStackTrace();
result = false;
Modified: maven/plugins/branches/maven-site-plugin-3.x/src/it/site-deploy/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/it/site-deploy/verify.bsh?rev=1146397&r1=1146396&r2=1146397&view=diff
==============================================================================
--- maven/plugins/branches/maven-site-plugin-3.x/src/it/site-deploy/verify.bsh (original)
+++ maven/plugins/branches/maven-site-plugin-3.x/src/it/site-deploy/verify.bsh Wed Jul 13 20:29:52 2011
@@ -32,40 +32,39 @@ try
return false;
}
- File siteDirectory = new File ( target, "site-deployed" );
+ File siteDirectory = new File( target, "site-deployed" );
if ( !siteDirectory.exists() || !siteDirectory.isDirectory() )
{
System.err.println( "site file is missing or not a directory." );
return false;
}
- File releaseDirectory = new File ( siteDirectory, "releases" );
+ File releaseDirectory = new File( siteDirectory, "releases" );
if ( !releaseDirectory.exists() || !releaseDirectory.isDirectory() )
{
System.err.println( "releaseDirectory file is missing or not a directory." );
return false;
}
- File release163 = new File ( releaseDirectory, "release1.6.3.html" );
+ File release163 = new File( releaseDirectory, "release1.6.3.html" );
if ( !release163.exists() || release163.isDirectory() )
{
System.err.println( "release163 file is missing or a directory." );
return false;
}
- File release16 = new File ( releaseDirectory, "release1.6.html" );
+ File release16 = new File( releaseDirectory, "release1.6.html" );
if ( !release16.exists() || release16.isDirectory() )
{
System.err.println( "release16 file is missing or a directory." );
return false;
}
- File download = new File ( siteDirectory, "download.html" );
+ File download = new File( siteDirectory, "download.html" );
if ( !download.exists() || download.isDirectory() )
{
System.err.println( "download.html file is missing or a directory." );
return false;
}
- FileInputStream fis = new FileInputStream ( download );
- String downloadContent = IOUtil.toString ( fis, "UTF-8" );
+ String downloadContent = FileUtils.fileRead( download, "UTF-8" );
int indexOf = downloadContent.indexOf( "Download Maven 2.0.7" );
if ( indexOf < 0)
{
@@ -75,7 +74,7 @@ try
}
-catch( IOException e )
+catch ( IOException e )
{
e.printStackTrace();
result = false;
Modified: maven/plugins/branches/maven-site-plugin-3.x/src/it/site-inheritance/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/it/site-inheritance/verify.bsh?rev=1146397&r1=1146396&r2=1146397&view=diff
==============================================================================
--- maven/plugins/branches/maven-site-plugin-3.x/src/it/site-inheritance/verify.bsh (original)
+++ maven/plugins/branches/maven-site-plugin-3.x/src/it/site-inheritance/verify.bsh Wed Jul 13 20:29:52 2011
@@ -25,7 +25,7 @@ boolean result = true;
try
{
- final File siteDirectory = new File ( basedir, "webhost.company.com" );
+ final File siteDirectory = new File( basedir, "webhost.company.com" );
if ( !siteDirectory.exists() || !siteDirectory.isDirectory() )
{
System.err.println( "site is missing or not a directory." );
@@ -36,7 +36,7 @@ try
// DEPLOY
- final File deployDirectory = new File ( siteDirectory, "deploy" );
+ final File deployDirectory = new File( siteDirectory, "deploy" );
if ( !deployDirectory.exists() || !deployDirectory.isDirectory() )
{
System.err.println( "deployDirectory is missing or not a directory." );
@@ -44,21 +44,21 @@ try
}
// junk directory (aggregator)
- File junkDirectory = new File ( deployDirectory, "junk" );
+ File junkDirectory = new File( deployDirectory, "junk" );
if ( !junkDirectory.exists() || !junkDirectory.isDirectory() )
{
System.err.println( "deployed junkDirectory is missing or not a directory." );
result = false;
}
- File index = new File ( junkDirectory, "index.html" );
+ File index = new File( junkDirectory, "index.html" );
if ( !index.exists() || index.isDirectory() )
{
System.err.println( "no index file in deployed junk or is a directory." );
result = false;
}
- String content = IOUtil.toString ( new FileInputStream ( index ), "UTF-8" );
+ String content = FileUtils.fileRead( index, "UTF-8" );
int indexOf = content.indexOf( "<a href=\"../index.html\" title=\"Aggregator\">Aggregator</a>" );
if ( indexOf < 0)
{
@@ -67,14 +67,14 @@ try
}
// deploy directory (main site)
- index = new File ( deployDirectory, "index.html" );
+ index = new File( deployDirectory, "index.html" );
if ( !index.exists() || index.isDirectory() )
{
System.err.println( "no index file in deploy or is a directory." );
result = false;
}
- content = IOUtil.toString ( new FileInputStream ( index ), "UTF-8" );
+ content = FileUtils.fileRead( index, "UTF-8" );
int index1 = content.indexOf( "<a href=\"www/website/deep/down/below/index.html\" title=\"Child and Module\">Child and Module</a>" );
int index2 = content.indexOf( "<a href=\"inheriting_child/index.html\" title=\"Inheriting Child\">Inheriting Child</a>" );
int index3 = content.indexOf( "<a href=\"www/website/module/index.html\" title=\"Module\">Module</a>" );
@@ -86,14 +86,14 @@ try
}
// parent directory
- File parentDirectory = new File ( deployDirectory, "www/website" );
+ File parentDirectory = new File( deployDirectory, "www/website" );
if ( !parentDirectory.exists() || !parentDirectory.isDirectory() )
{
System.err.println( "deployed parentDirectory is missing or not a directory." );
result = false;
}
- index = new File ( parentDirectory, "index.html" );
+ index = new File( parentDirectory, "index.html" );
if ( index.exists() || index.isDirectory() )
{
System.err.println( "incorrect index file in deployed parent!" );
@@ -101,21 +101,21 @@ try
}
// child_and_module
- File deepDownBelow = new File ( parentDirectory, "deep/down/below" );
+ File deepDownBelow = new File( parentDirectory, "deep/down/below" );
if ( !deepDownBelow.exists() || !deepDownBelow.isDirectory() )
{
System.err.println( "deployed deepDownBelow is missing or not a directory." );
result = false;
}
- index = new File ( deepDownBelow, "index.html" );
+ index = new File( deepDownBelow, "index.html" );
if ( !index.exists() || index.isDirectory() )
{
System.err.println( "incorrect index file in deployed deepDownBelow!" );
result = false;
}
- content = IOUtil.toString ( new FileInputStream ( index ), "UTF-8" );
+ content = FileUtils.fileRead( index, "UTF-8" );
index1 = content.indexOf( "<a href=\"../../../../../index.html\" title=\"breadcrumbs Parent\">breadcrumbs Parent</a>" );
index2 = content.indexOf( "<a href=\"index.html\" title=\"breadcrumbs /Child\">breadcrumbs /Child</a>" );
index3 = content.indexOf( "<a href=\"../../../../../index.html\" title=\"links ./Parent\">links ./Parent</a>" );
@@ -127,21 +127,21 @@ try
}
// inheriting_child
- File inheritingChild = new File ( deployDirectory, "inheriting_child" );
+ File inheritingChild = new File( deployDirectory, "inheriting_child" );
if ( !inheritingChild.exists() || !inheritingChild.isDirectory() )
{
System.err.println( "deployed inheritingChild is missing or not a directory." );
result = false;
}
- index = new File ( inheritingChild, "index.html" );
+ index = new File( inheritingChild, "index.html" );
if ( !index.exists() || index.isDirectory() )
{
System.err.println( "incorrect index file in deployed inheritingChild!" );
result = false;
}
- content = IOUtil.toString ( new FileInputStream ( index ), "UTF-8" );
+ content = FileUtils.fileRead( index, "UTF-8" );
index1 = content.indexOf( "<a href=\"../index.html\" title=\"breadcrumbs /Parent\">breadcrumbs /Parent</a>" );
index2 = content.indexOf( "<a href=\"index.html\" title=\"breadcrumbs ./Child\">breadcrumbs ./Child</a>" );
index3 = content.indexOf( "<a href=\"../index.html\" title=\"links Parent\">links Parent</a>" );
@@ -153,21 +153,21 @@ try
}
// module
- File moduleDirectory = new File ( parentDirectory, "module" );
+ File moduleDirectory = new File( parentDirectory, "module" );
if ( !moduleDirectory.exists() || !moduleDirectory.isDirectory() )
{
System.err.println( "deployed moduleDirectory is missing or not a directory." );
result = false;
}
- index = new File ( moduleDirectory, "index.html" );
+ index = new File( moduleDirectory, "index.html" );
if ( !index.exists() || index.isDirectory() )
{
System.err.println( "incorrect index file in deployed moduleDirectory!" );
result = false;
}
- content = IOUtil.toString ( new FileInputStream ( index ), "UTF-8" );
+ content = FileUtils.fileRead( index, "UTF-8" );
index1 = content.indexOf( "<a href=\"index.html\" title=\"breadcrumbs Module\">breadcrumbs Module</a>" );
index2 = content.indexOf( "<a href=\"index.html\" title=\"links ./Module\">links ./Module</a>" );
index3 = content.indexOf( "<a href=\"../sub_module/index.html\" title=\"Sub-Module\">Sub-Module</a>" );
@@ -179,21 +179,21 @@ try
// sub_module
- File subModuleDirectory = new File ( parentDirectory, "sub_module" );
+ File subModuleDirectory = new File( parentDirectory, "sub_module" );
if ( !subModuleDirectory.exists() || !subModuleDirectory.isDirectory() )
{
System.err.println( "deployed subModuleDirectory is missing or not a directory." );
result = false;
}
- index = new File ( subModuleDirectory, "index.html" );
+ index = new File( subModuleDirectory, "index.html" );
if ( !index.exists() || index.isDirectory() )
{
System.err.println( "incorrect index file in deployed subModuleDirectory!" );
result = false;
}
- content = IOUtil.toString ( new FileInputStream ( index ), "UTF-8" );
+ content = FileUtils.fileRead( index, "UTF-8" );
index1 = content.indexOf( "<a href=\"../module/index.html\" title=\"breadcrumbs /Module\">breadcrumbs /Module</a>" );
index2 = content.indexOf( "<a href=\"index.html\" title=\"breadcrumbs ./SubModule\">breadcrumbs ./SubModule</a>" );
index3 = content.indexOf( "<a href=\"../module/index.html\" title=\"links Module\">links Module</a>" );
@@ -208,7 +208,7 @@ try
// STAGE
- final File stageDirectory = new File ( siteDirectory, "stage" );
+ final File stageDirectory = new File( siteDirectory, "stage" );
if ( !stageDirectory.exists() || !stageDirectory.isDirectory() )
{
System.err.println( "stage directory is missing or not a directory." );
@@ -222,21 +222,21 @@ try
// junk directory (aggregator)
- junkDirectory = new File ( stageDirectory, "junk" );
+ junkDirectory = new File( stageDirectory, "junk" );
if ( !junkDirectory.exists() || !junkDirectory.isDirectory() )
{
System.err.println( "staged junkDirectory is missing or not a directory." );
result = false;
}
- index = new File ( junkDirectory, "index.html" );
+ index = new File( junkDirectory, "index.html" );
if ( !index.exists() || index.isDirectory() )
{
System.err.println( "no index file in staged junk or is a directory." );
result = false;
}
- content = IOUtil.toString ( new FileInputStream ( index ), "UTF-8" );
+ content = FileUtils.fileRead( index, "UTF-8" );
int indexOf = content.indexOf( "<a href=\"../index.html\" title=\"Aggregator\">Aggregator</a>" );
if ( indexOf < 0)
{
@@ -245,14 +245,14 @@ try
}
// deploy directory (main site)
- index = new File ( stageDirectory, "index.html" );
+ index = new File( stageDirectory, "index.html" );
if ( !index.exists() || index.isDirectory() )
{
System.err.println( "no index file in stage or is a directory." );
result = false;
}
- content = IOUtil.toString ( new FileInputStream ( index ), "UTF-8" );
+ content = FileUtils.fileRead( index, "UTF-8" );
int index1 = content.indexOf( "<a href=\"www/website/deep/down/below/index.html\" title=\"Child and Module\">Child and Module</a>" );
int index2 = content.indexOf( "<a href=\"inheriting_child/index.html\" title=\"Inheriting Child\">Inheriting Child</a>" );
int index3 = content.indexOf( "<a href=\"www/website/module/index.html\" title=\"Module\">Module</a>" );
@@ -264,14 +264,14 @@ try
}
// parent directory
- parentDirectory = new File ( stageDirectory, "www/website" );
+ parentDirectory = new File( stageDirectory, "www/website" );
if ( !parentDirectory.exists() || !parentDirectory.isDirectory() )
{
System.err.println( "staged parentDirectory is missing or not a directory." );
result = false;
}
- index = new File ( parentDirectory, "index.html" );
+ index = new File( parentDirectory, "index.html" );
if ( index.exists() || index.isDirectory() )
{
System.err.println( "incorrect staged index file in parent!" );
@@ -279,21 +279,21 @@ try
}
// child_and_module
- deepDownBelow = new File ( parentDirectory, "deep/down/below" );
+ deepDownBelow = new File( parentDirectory, "deep/down/below" );
if ( !deepDownBelow.exists() || !deepDownBelow.isDirectory() )
{
System.err.println( "staged deepDownBelow is missing or not a directory." );
result = false;
}
- index = new File ( deepDownBelow, "index.html" );
+ index = new File( deepDownBelow, "index.html" );
if ( !index.exists() || index.isDirectory() )
{
System.err.println( "incorrect index file in staged deepDownBelow!" );
result = false;
}
- content = IOUtil.toString ( new FileInputStream ( index ), "UTF-8" );
+ content = FileUtils.fileRead( index, "UTF-8" );
index1 = content.indexOf( "<a href=\"../../../../../index.html\" title=\"breadcrumbs Parent\">breadcrumbs Parent</a>" );
index2 = content.indexOf( "<a href=\"index.html\" title=\"breadcrumbs /Child\">breadcrumbs /Child</a>" );
index3 = content.indexOf( "<a href=\"../../../../../index.html\" title=\"links ./Parent\">links ./Parent</a>" );
@@ -305,21 +305,21 @@ try
}
// inheriting_child
- inheritingChild = new File ( stageDirectory, "inheriting_child" );
+ inheritingChild = new File( stageDirectory, "inheriting_child" );
if ( !inheritingChild.exists() || !inheritingChild.isDirectory() )
{
System.err.println( "staged inheritingChild is missing or not a directory." );
result = false;
}
- index = new File ( inheritingChild, "index.html" );
+ index = new File( inheritingChild, "index.html" );
if ( !index.exists() || index.isDirectory() )
{
System.err.println( "incorrect index file in staged inheritingChild!" );
result = false;
}
- content = IOUtil.toString ( new FileInputStream ( index ), "UTF-8" );
+ content = FileUtils.fileRead( index, "UTF-8" );
index1 = content.indexOf( "<a href=\"../index.html\" title=\"breadcrumbs /Parent\">breadcrumbs /Parent</a>" );
index2 = content.indexOf( "<a href=\"index.html\" title=\"breadcrumbs ./Child\">breadcrumbs ./Child</a>" );
index3 = content.indexOf( "<a href=\"../index.html\" title=\"links Parent\">links Parent</a>" );
@@ -331,21 +331,21 @@ try
}
// module
- moduleDirectory = new File ( parentDirectory, "module" );
+ moduleDirectory = new File( parentDirectory, "module" );
if ( !moduleDirectory.exists() || !moduleDirectory.isDirectory() )
{
System.err.println( "staged moduleDirectory is missing or not a directory." );
result = false;
}
- index = new File ( moduleDirectory, "index.html" );
+ index = new File( moduleDirectory, "index.html" );
if ( !index.exists() || index.isDirectory() )
{
System.err.println( "incorrect index file in staged moduleDirectory!" );
result = false;
}
- content = IOUtil.toString ( new FileInputStream ( index ), "UTF-8" );
+ content = FileUtils.fileRead( index, "UTF-8" );
index1 = content.indexOf( "<a href=\"index.html\" title=\"breadcrumbs Module\">breadcrumbs Module</a>" );
index2 = content.indexOf( "<a href=\"index.html\" title=\"links ./Module\">links ./Module</a>" );
index3 = content.indexOf( "<a href=\"../sub_module/index.html\" title=\"Sub-Module\">Sub-Module</a>" );
@@ -357,21 +357,21 @@ try
// sub_module
- subModuleDirectory = new File ( parentDirectory, "sub_module" );
+ subModuleDirectory = new File( parentDirectory, "sub_module" );
if ( !subModuleDirectory.exists() || !subModuleDirectory.isDirectory() )
{
System.err.println( "staged subModuleDirectory is missing or not a directory." );
result = false;
}
- index = new File ( subModuleDirectory, "index.html" );
+ index = new File( subModuleDirectory, "index.html" );
if ( !index.exists() || index.isDirectory() )
{
System.err.println( "incorrect index file in staged subModuleDirectory!" );
result = false;
}
- content = IOUtil.toString ( new FileInputStream ( index ), "UTF-8" );
+ content = FileUtils.fileRead( index, "UTF-8" );
index1 = content.indexOf( "<a href=\"../module/index.html\" title=\"breadcrumbs /Module\">breadcrumbs /Module</a>" );
index2 = content.indexOf( "<a href=\"index.html\" title=\"breadcrumbs ./SubModule\">breadcrumbs ./SubModule</a>" );
index3 = content.indexOf( "<a href=\"../module/index.html\" title=\"links Module\">links Module</a>" );
@@ -386,7 +386,7 @@ try
// STAGE DEPLOY
- final File stageDeployDirectory = new File ( siteDirectory, "stage-deploy" );
+ final File stageDeployDirectory = new File( siteDirectory, "stage-deploy" );
if ( !stageDeployDirectory.exists() || !stageDeployDirectory.isDirectory() )
{
System.err.println( "stage-deploy directory is missing or not a directory." );
@@ -399,21 +399,21 @@ try
// target/it/site-inheritance/webhost.company.com/deploy/
// junk directory (aggregator)
- junkDirectory = new File ( stageDeployDirectory, "junk" );
+ junkDirectory = new File( stageDeployDirectory, "junk" );
if ( !junkDirectory.exists() || !junkDirectory.isDirectory() )
{
System.err.println( "stage-deployed junkDirectory is missing or not a directory." );
result = false;
}
- index = new File ( junkDirectory, "index.html" );
+ index = new File( junkDirectory, "index.html" );
if ( !index.exists() || index.isDirectory() )
{
System.err.println( "no index file in stage-deployed junk or is a directory." );
result = false;
}
- content = IOUtil.toString ( new FileInputStream ( index ), "UTF-8" );
+ content = FileUtils.fileRead( index, "UTF-8" );
int indexOf = content.indexOf( "<a href=\"../index.html\" title=\"Aggregator\">Aggregator</a>" );
if ( indexOf < 0)
{
@@ -422,14 +422,14 @@ try
}
// deploy directory (main site)
- index = new File ( stageDeployDirectory, "index.html" );
+ index = new File( stageDeployDirectory, "index.html" );
if ( !index.exists() || index.isDirectory() )
{
System.err.println( "no index file in stage-deploy or is a directory." );
result = false;
}
- content = IOUtil.toString ( new FileInputStream ( index ), "UTF-8" );
+ content = FileUtils.fileRead( index, "UTF-8" );
int index1 = content.indexOf( "<a href=\"www/website/deep/down/below/index.html\" title=\"Child and Module\">Child and Module</a>" );
int index2 = content.indexOf( "<a href=\"inheriting_child/index.html\" title=\"Inheriting Child\">Inheriting Child</a>" );
int index3 = content.indexOf( "<a href=\"www/website/module/index.html\" title=\"Module\">Module</a>" );
@@ -441,14 +441,14 @@ try
}
// parent directory
- parentDirectory = new File ( stageDeployDirectory, "www/website" );
+ parentDirectory = new File( stageDeployDirectory, "www/website" );
if ( !parentDirectory.exists() || !parentDirectory.isDirectory() )
{
System.err.println( "stage-deployed parentDirectory is missing or not a directory." );
result = false;
}
- index = new File ( parentDirectory, "index.html" );
+ index = new File( parentDirectory, "index.html" );
if ( index.exists() || index.isDirectory() )
{
System.err.println( "incorrect index file in stage-deployed parent!" );
@@ -456,21 +456,21 @@ try
}
// child_and_module
- deepDownBelow = new File ( parentDirectory, "deep/down/below" );
+ deepDownBelow = new File( parentDirectory, "deep/down/below" );
if ( !deepDownBelow.exists() || !deepDownBelow.isDirectory() )
{
System.err.println( "stage-deployed deepDownBelow is missing or not a directory." );
result = false;
}
- index = new File ( deepDownBelow, "index.html" );
+ index = new File( deepDownBelow, "index.html" );
if ( !index.exists() || index.isDirectory() )
{
System.err.println( "incorrect index file in stage-deployed deepDownBelow!" );
result = false;
}
- content = IOUtil.toString ( new FileInputStream ( index ), "UTF-8" );
+ content = FileUtils.fileRead( index, "UTF-8" );
index1 = content.indexOf( "<a href=\"../../../../../index.html\" title=\"breadcrumbs Parent\">breadcrumbs Parent</a>" );
index2 = content.indexOf( "<a href=\"index.html\" title=\"breadcrumbs /Child\">breadcrumbs /Child</a>" );
index3 = content.indexOf( "<a href=\"../../../../../index.html\" title=\"links ./Parent\">links ./Parent</a>" );
@@ -482,21 +482,21 @@ try
}
// inheriting_child
- inheritingChild = new File ( stageDeployDirectory, "inheriting_child" );
+ inheritingChild = new File( stageDeployDirectory, "inheriting_child" );
if ( !inheritingChild.exists() || !inheritingChild.isDirectory() )
{
System.err.println( "stage-deployed inheritingChild is missing or not a directory." );
result = false;
}
- index = new File ( inheritingChild, "index.html" );
+ index = new File( inheritingChild, "index.html" );
if ( !index.exists() || index.isDirectory() )
{
System.err.println( "incorrect index file in stage-deployed inheritingChild!" );
result = false;
}
- content = IOUtil.toString ( new FileInputStream ( index ), "UTF-8" );
+ content = FileUtils.fileRead( index, "UTF-8" );
index1 = content.indexOf( "<a href=\"../index.html\" title=\"breadcrumbs /Parent\">breadcrumbs /Parent</a>" );
index2 = content.indexOf( "<a href=\"index.html\" title=\"breadcrumbs ./Child\">breadcrumbs ./Child</a>" );
index3 = content.indexOf( "<a href=\"../index.html\" title=\"links Parent\">links Parent</a>" );
@@ -508,21 +508,21 @@ try
}
// module
- moduleDirectory = new File ( parentDirectory, "module" );
+ moduleDirectory = new File( parentDirectory, "module" );
if ( !moduleDirectory.exists() || !moduleDirectory.isDirectory() )
{
System.err.println( "stage-deployed moduleDirectory is missing or not a directory." );
result = false;
}
- index = new File ( moduleDirectory, "index.html" );
+ index = new File( moduleDirectory, "index.html" );
if ( !index.exists() || index.isDirectory() )
{
System.err.println( "incorrect index file in stage-deployed moduleDirectory!" );
result = false;
}
- content = IOUtil.toString ( new FileInputStream ( index ), "UTF-8" );
+ content = FileUtils.fileRead( index, "UTF-8" );
index1 = content.indexOf( "<a href=\"index.html\" title=\"breadcrumbs Module\">breadcrumbs Module</a>" );
index2 = content.indexOf( "<a href=\"index.html\" title=\"links ./Module\">links ./Module</a>" );
index3 = content.indexOf( "<a href=\"../sub_module/index.html\" title=\"Sub-Module\">Sub-Module</a>" );
@@ -534,21 +534,21 @@ try
// sub_module
- subModuleDirectory = new File ( parentDirectory, "sub_module" );
+ subModuleDirectory = new File( parentDirectory, "sub_module" );
if ( !subModuleDirectory.exists() || !subModuleDirectory.isDirectory() )
{
System.err.println( "stage-deployed subModuleDirectory is missing or not a directory." );
result = false;
}
- index = new File ( subModuleDirectory, "index.html" );
+ index = new File( subModuleDirectory, "index.html" );
if ( !index.exists() || index.isDirectory() )
{
System.err.println( "incorrect index file in stage-deployed subModuleDirectory!" );
result = false;
}
- content = IOUtil.toString ( new FileInputStream ( index ), "UTF-8" );
+ content = FileUtils.fileRead( index, "UTF-8" );
index1 = content.indexOf( "<a href=\"../module/index.html\" title=\"breadcrumbs /Module\">breadcrumbs /Module</a>" );
index2 = content.indexOf( "<a href=\"index.html\" title=\"breadcrumbs ./SubModule\">breadcrumbs ./SubModule</a>" );
index3 = content.indexOf( "<a href=\"../module/index.html\" title=\"links Module\">links Module</a>" );
@@ -560,7 +560,7 @@ try
}
}
-catch( IOException e )
+catch ( IOException e )
{
e.printStackTrace();
result = false;
Modified: maven/plugins/branches/maven-site-plugin-3.x/src/it/site-jar/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/it/site-jar/verify.bsh?rev=1146397&r1=1146396&r2=1146397&view=diff
==============================================================================
--- maven/plugins/branches/maven-site-plugin-3.x/src/it/site-jar/verify.bsh (original)
+++ maven/plugins/branches/maven-site-plugin-3.x/src/it/site-jar/verify.bsh Wed Jul 13 20:29:52 2011
@@ -34,7 +34,7 @@ try
return false;
}
- File siteJar = new File ( target, "site-jar-1.0-SNAPSHOT-site.jar" );
+ File siteJar = new File( target, "site-jar-1.0-SNAPSHOT-site.jar" );
if ( !siteJar.exists() || siteJar.isDirectory() )
{
System.err.println( "siteJar file is missing or a directory." );
@@ -68,7 +68,7 @@ try
}
}
-catch( IOException e )
+catch ( IOException e )
{
e.printStackTrace();
result = false;