svn commit: r806904 - in /maven/plugins/trunk/maven-site-plugin/src/it/site-attach-descriptor: ./ goals.txt pom.xml src/main/ src/site/apt/ src/site/xdoc/releases/ verify.bsh

[ol...@apache.org]

Author: olamy
Date: Sat Aug 22 23:16:33 2009
New Revision: 806904

URL: http://svn.apache.org/viewvc?rev=806904&view=rev
Log:
add it for mojo site:attach-descriptor

Added:
    maven/plugins/trunk/maven-site-plugin/src/it/site-attach-descriptor/
      - copied from r806903, maven/plugins/trunk/maven-site-plugin/src/it/site-deploy/
Removed:
    maven/plugins/trunk/maven-site-plugin/src/it/site-attach-descriptor/src/main/
    maven/plugins/trunk/maven-site-plugin/src/it/site-attach-descriptor/src/site/apt/
    maven/plugins/trunk/maven-site-plugin/src/it/site-attach-descriptor/src/site/xdoc/releases/
Modified:
    maven/plugins/trunk/maven-site-plugin/src/it/site-attach-descriptor/goals.txt
    maven/plugins/trunk/maven-site-plugin/src/it/site-attach-descriptor/pom.xml
    maven/plugins/trunk/maven-site-plugin/src/it/site-attach-descriptor/verify.bsh

Modified: maven/plugins/trunk/maven-site-plugin/src/it/site-attach-descriptor/goals.txt
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/site-attach-descriptor/goals.txt?rev=806904&r1=806903&r2=806904&view=diff
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/it/site-attach-descriptor/goals.txt (original)
+++ maven/plugins/trunk/maven-site-plugin/src/it/site-attach-descriptor/goals.txt Sat Aug 22 23:16:33 2009
@@ -1 +1 @@
-clean site:site site:deploy
\ No newline at end of file
+clean site:attach-descriptor deploy
\ No newline at end of file

Modified: maven/plugins/trunk/maven-site-plugin/src/it/site-attach-descriptor/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/site-attach-descriptor/pom.xml?rev=806904&r1=806903&r2=806904&view=diff
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/it/site-attach-descriptor/pom.xml (original)
+++ maven/plugins/trunk/maven-site-plugin/src/it/site-attach-descriptor/pom.xml Sat Aug 22 23:16:33 2009
@@ -22,22 +22,31 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <groupId>test</groupId>
-  <artifactId>site-deploy</artifactId>
+  <artifactId>site-attach-descriptor</artifactId>
   <packaging>pom</packaging>
   <version>1.0-SNAPSHOT</version>
-  <name>site-deploy It</name>
+  <name>site-attach-descriptor It</name>
   <properties>
     <currentVersion>2.0.7</currentVersion>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>
   <distributionManagement>
-    <site>
+    <snapshotRepository>
+      <uniqueVersion>false</uniqueVersion>
       <id>site-deploy</id>
       <name>Example company web server</name>
-      <url>file://@project.build.directory@/it/site-deploy/target/site-deployed/</url>
-    </site>
+      <url>file://@project.build.directory@/it/site-attach-descriptor/target/snapshot-repo/</url>    
+    </snapshotRepository>
   </distributionManagement>  
   <build>
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <artifactId>maven-site-plugin</artifactId>
+          <version>@project.version@</version>
+        </plugin>
+      </plugins>    
+    </pluginManagement>
     <plugins>
       <plugin>
         <artifactId>maven-site-plugin</artifactId>

Modified: maven/plugins/trunk/maven-site-plugin/src/it/site-attach-descriptor/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/site-attach-descriptor/verify.bsh?rev=806904&r1=806903&r2=806904&view=diff
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/it/site-attach-descriptor/verify.bsh (original)
+++ maven/plugins/trunk/maven-site-plugin/src/it/site-attach-descriptor/verify.bsh Sat Aug 22 23:16:33 2009
@@ -32,47 +32,13 @@
         return false;
     }
 
-    File siteDirectory = new File ( target, "site-deployed" );
-    if ( !siteDirectory.exists() || !siteDirectory.isDirectory() )
+    File siteDescriptor = new File ( target, "snapshot-repo/test/site-attach-descriptor/1.0-SNAPSHOT/site-attach-descriptor-1.0-SNAPSHOT-site.xml" );
+    if ( !siteDescriptor.exists() || siteDescriptor.isDirectory() )
     {
-        System.err.println( "site file is missing or not a directory." );
+        System.err.println( "siteDescriptor file is missing or not a directory." );
         return false;
-    }
-
-    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" );
-    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" );
-    if ( !release16.exists() || release16.isDirectory() )
-    {
-        System.err.println( "release16 file is missing or a directory." );
-        return false;
-    }
-
-    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" );
-    int indexOf = downloadContent.indexOf( "Download Maven 2.0.7" );
-    if ( indexOf < 0)
-    {
-        System.err.println( "download.html doesn't contain Download Maven 2.0.7" );
-        return false;
-    }
-
+    }    
+    
     
 }
 catch( IOException e )