svn commit: r806903 - in /maven/plugins/trunk/maven-site-plugin/src/it/site-deploy: ./ goals.txt pom.xml verify.bsh

[ol...@apache.org]

Author: olamy
Date: Sat Aug 22 22:38:08 2009
New Revision: 806903

URL: http://svn.apache.org/viewvc?rev=806903&view=rev
Log:
add it for mojo site:deploy

Added:
    maven/plugins/trunk/maven-site-plugin/src/it/site-deploy/
      - copied from r806886, maven/plugins/trunk/maven-site-plugin/src/it/MSITE-265/
    maven/plugins/trunk/maven-site-plugin/src/it/site-deploy/goals.txt   (with props)
    maven/plugins/trunk/maven-site-plugin/src/it/site-deploy/pom.xml
      - copied, changed from r806897, maven/plugins/trunk/maven-site-plugin/src/it/MSITE-265/pom.xml
Modified:
    maven/plugins/trunk/maven-site-plugin/src/it/site-deploy/verify.bsh

Added: maven/plugins/trunk/maven-site-plugin/src/it/site-deploy/goals.txt
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/site-deploy/goals.txt?rev=806903&view=auto
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/it/site-deploy/goals.txt (added)
+++ maven/plugins/trunk/maven-site-plugin/src/it/site-deploy/goals.txt Sat Aug 22 22:38:08 2009
@@ -0,0 +1 @@
+clean site:site site:deploy
\ No newline at end of file

Propchange: maven/plugins/trunk/maven-site-plugin/src/it/site-deploy/goals.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/plugins/trunk/maven-site-plugin/src/it/site-deploy/goals.txt
------------------------------------------------------------------------------
    svn:keywords = "Author Date Id Revision"

Copied: maven/plugins/trunk/maven-site-plugin/src/it/site-deploy/pom.xml (from r806897, maven/plugins/trunk/maven-site-plugin/src/it/MSITE-265/pom.xml)
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/site-deploy/pom.xml?p2=maven/plugins/trunk/maven-site-plugin/src/it/site-deploy/pom.xml&p1=maven/plugins/trunk/maven-site-plugin/src/it/MSITE-265/pom.xml&r1=806897&r2=806903&rev=806903&view=diff
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/it/MSITE-265/pom.xml (original)
+++ maven/plugins/trunk/maven-site-plugin/src/it/site-deploy/pom.xml Sat Aug 22 22:38:08 2009
@@ -22,22 +22,26 @@
   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>MSITE-265</artifactId>
+  <artifactId>site-deploy</artifactId>
   <packaging>pom</packaging>
   <version>1.0-SNAPSHOT</version>
-  <name>MSITE-265 It</name>
+  <name>site-deploy It</name>
   <properties>
     <currentVersion>2.0.7</currentVersion>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>
+  <distributionManagement>
+    <site>
+      <id>site-deploy</id>
+      <name>Example company web server</name>
+      <url>file://@project.build.directory@/it/site-deploy/target/site-deployed/</url>
+    </site>
+  </distributionManagement>  
   <build>
     <plugins>
       <plugin>
         <artifactId>maven-site-plugin</artifactId>
         <version>@project.version@</version>
-        <configuration>
-          <locales>en,ca,cs,da,de,es,fr,hu,it,ja,ko,nl,no,pl,pt,pt_BR,sk,sv,tr,zh_CN</locales>
-        </configuration>
       </plugin>
     </plugins>
   </build>
@@ -55,11 +59,6 @@
           </reportSet>
         </reportSets>
       </plugin>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>taglist-maven-plugin</artifactId>
-        <version>2.0</version>
-      </plugin>
     </plugins>
   </reporting>
 </project>

Modified: maven/plugins/trunk/maven-site-plugin/src/it/site-deploy/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/site-deploy/verify.bsh?rev=806903&r1=806886&r2=806903&view=diff
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/it/site-deploy/verify.bsh (original)
+++ maven/plugins/trunk/maven-site-plugin/src/it/site-deploy/verify.bsh Sat Aug 22 22:38:08 2009
@@ -32,7 +32,7 @@
         return false;
     }
 
-    File siteDirectory = new File ( target, "site" );
+    File siteDirectory = new File ( target, "site-deployed" );
     if ( !siteDirectory.exists() || !siteDirectory.isDirectory() )
     {
         System.err.println( "site file is missing or not a directory." );
@@ -72,23 +72,8 @@
         System.err.println( "download.html doesn't contain Download Maven 2.0.7" );
         return false;
     }
-    if ( downloadContent.indexOf( "charset=UTF-8" ) < 0)
-    {
-        System.err.println( "download.html doesn't contain 'charset=UTF-8' directive" );
-        return false;
-    }
-    if ( downloadContent.indexOf( "demo character: &#x20ac; (euro)" ) < 0)
-    {
-        System.err.println( "download.html doesn't contain euro symbol" );
-        return false;
-    }
 
-    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 )
 {