aheritier    2004/07/09 13:30:34

  Modified:    javadoc/src/plugin-test maven.xml project.xml
  Added:       javadoc/src/plugin-test/test01 .cvsignore maven.xml
                        project.xml
               javadoc/src/plugin-test/test01/src/main/org/apache/maven
                        Dummy.java Dummy2.java package.html
               javadoc/src/plugin-test/test01/src/main/org/apache/maven/doc-files
                        example.txt
               javadoc/src/plugin-test/test01/src/main/org/apache/maven2
                        Dummy3.java Dummy4.java package.html
               javadoc/src/plugin-test/test01/src/main/org/apache/maven2/doc-files
                        example.txt
               javadoc/src/plugin-test/test02 .cvsignore maven.xml
                        project.xml
               javadoc/src/plugin-test/test02/src/main/org/apache/maven
                        Dummy.java Dummy2.java package.html
               javadoc/src/plugin-test/test02/src/main/org/apache/maven/doc-files
                        example.txt
               javadoc/src/plugin-test/test02/src/main/org/apache/maven2
                        Dummy3.java Dummy4.java package.html
               javadoc/src/plugin-test/test02/src/main/org/apache/maven2/doc-files
                        example.txt
               javadoc/src/plugin-test/test03 .cvsignore maven.xml
                        project.xml
               javadoc/src/plugin-test/test03/src/main/org/apache/maven
                        Dummy.java Dummy2.java package.html
               javadoc/src/plugin-test/test03/src/main/org/apache/maven/doc-files
                        example.txt
               javadoc/src/plugin-test/test03/src/main/org/apache/maven2
                        Dummy3.java Dummy4.java package.html
               javadoc/src/plugin-test/test03/src/main/org/apache/maven2/doc-files
                        example.txt
               javadoc/src/plugin-test/test03/src/opt/org/apache/maven3
                        Dummy5.java Dummy6.java package.html
               javadoc/src/plugin-test/test03/src/opt/org/apache/maven3/doc-files
                        example.txt
  Removed:     javadoc/src/plugin-test/src/main/org/apache/maven Dummy.java
                        Dummy2.java package.html
               javadoc/src/plugin-test/src/main/org/apache/maven/doc-files
                        example.txt
               javadoc/src/plugin-test/src/main/org/apache/maven2
                        Dummy3.java Dummy4.java package.html
               javadoc/src/plugin-test/src/main/org/apache/maven2/doc-files
                        example.txt
               javadoc/src/plugin-test/src/opt/org/apache/maven3
                        Dummy5.java Dummy6.java package.html
               javadoc/src/plugin-test/src/opt/org/apache/maven3/doc-files
                        example.txt
  Log:
  split tests to increase the number of cases
  
  Revision  Changes    Path
  1.11      +5 -45     maven-plugins/javadoc/src/plugin-test/maven.xml
  
  Index: maven.xml
  ===================================================================
  RCS file: /home/cvs/maven-plugins/javadoc/src/plugin-test/maven.xml,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- maven.xml 9 Jul 2004 18:46:36 -0000       1.10
  +++ maven.xml 9 Jul 2004 20:30:32 -0000       1.11
  @@ -22,51 +22,11 @@
            xmlns:ant="jelly:ant">
            
     <goal name="testPlugin">
  -    <attainGoal name="test-javadoc"/>
  -    <attainGoal name="test-javadoc-multi-src"/>
  -    <attainGoal name="test-javadoc-jar"/>
  +    <maven:reactor basedir="${basedir}"
  +      includes="test*/project.xml"
  +      goals="testPlugin"
  +      banner="Test"
  +      ignoreFailures="false"/>
     </goal>
     
  -  <goal name="test-javadoc">
  -    <delete dir="${maven.build.dir}" failonerror="false"/>
  -    <attainGoal name="maven-javadoc-plugin:report"/>
  -    <assert:assertFileExists file="${maven.javadoc.destdir}/index.html"/>
  -    <!-- assert that doc-files are copied - Issue MPJAVADOC-24 -->
  -    <assert:assertFileExists 
file="${maven.javadoc.destdir}/org/apache/maven/doc-files/example.txt"/>
  -    <assert:assertFileExists 
file="${maven.javadoc.destdir}/org/apache/maven2/doc-files/example.txt"/>
  -    <!-- assert that javadoc for classes Dummy, Dummy2, Dummy3 are generated -->
  -    <assert:assertFileExists 
file="${maven.javadoc.destdir}/org/apache/maven/Dummy.html"/>
  -    <assert:assertFileExists 
file="${maven.javadoc.destdir}/org/apache/maven/Dummy2.html"/>
  -    <assert:assertFileExists 
file="${maven.javadoc.destdir}/org/apache/maven2/Dummy3.html"/>
  -    <!-- assert that javadoc for classe Dummy4 isn't generated -->
  -    <assert:assertFileNotFound 
file="${maven.javadoc.destdir}/org/apache/maven2/Dummy4.html"/>
  -  </goal>
  -  
  -  <goal name="test-javadoc-multi-src">
  -    <delete dir="${maven.build.dir}" failonerror="false"/>
  -    <ant:path id="test.src.set">
  -      <ant:pathelement path="${basedir}/src/opt"/>
  -    </ant:path>
  -    <maven:addPath id="maven.compile.src.set" refid="test.src.set"/>
  -    <attainGoal name="maven-javadoc-plugin:report"/>
  -    <assert:assertFileExists file="${maven.javadoc.destdir}/index.html"/>
  -    <!-- assert that doc-files are copied - Issue MPJAVADOC-24 -->
  -    <assert:assertFileExists 
file="${maven.javadoc.destdir}/org/apache/maven/doc-files/example.txt"/>
  -    <assert:assertFileExists 
file="${maven.javadoc.destdir}/org/apache/maven2/doc-files/example.txt"/>
  -    <assert:assertFileExists 
file="${maven.javadoc.destdir}/org/apache/maven3/doc-files/example.txt"/>
  -    <!-- assert that javadoc for classes Dummy, Dummy2, Dummy3, Dummy5, Dummy6 are 
generated -->
  -    <assert:assertFileExists 
file="${maven.javadoc.destdir}/org/apache/maven/Dummy.html"/>
  -    <assert:assertFileExists 
file="${maven.javadoc.destdir}/org/apache/maven/Dummy2.html"/>
  -    <assert:assertFileExists 
file="${maven.javadoc.destdir}/org/apache/maven2/Dummy3.html"/>
  -    <assert:assertFileExists 
file="${maven.javadoc.destdir}/org/apache/maven3/Dummy5.html"/>
  -    <assert:assertFileExists 
file="${maven.javadoc.destdir}/org/apache/maven3/Dummy6.html"/>
  -    <!-- assert that javadoc for classe Dummy4 isn't generated -->
  -    <assert:assertFileNotFound 
file="${maven.javadoc.destdir}/org/apache/maven2/Dummy4.html"/>
  -  </goal>
  -  
  -  <goal name="test-javadoc-jar">
  -    <delete file="${maven.build.dir}/${maven.final.name}_javadoc.jar" 
failonerror="false"/>
  -    <attainGoal name="javadoc:jar"/>
  -    <assert:assertFileExists 
file="${maven.build.dir}/${maven.final.name}_javadoc.jar"/>
  -  </goal>
   </project>
  
  
  
  1.6       +13 -15    maven-plugins/javadoc/src/plugin-test/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/maven-plugins/javadoc/src/plugin-test/project.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- project.xml       9 Jul 2004 18:38:05 -0000       1.5
  +++ project.xml       9 Jul 2004 20:30:32 -0000       1.6
  @@ -21,19 +21,19 @@
   <project>
     <pomVersion>3</pomVersion>
     <id>test-maven-javadoc-plugin</id>
  -  <name>Test project for Maven JavaDoc Plugin</name>
  +  <name>Tests project for Maven JavaDoc Plugin</name>
     <groupId>maven</groupId>
     <currentVersion>1.0-SNAPSHOT</currentVersion>
     <organization>
       <name>Apache Software Foundation</name>
       <url>http://www.apache.org/</url>
  -    <logo>http://maven.apache.org/images/jakarta-logo-blue.gif</logo>
  +    <logo>http://maven.apache.org/images/apache-maven-project.png</logo>
     </organization>
     <inceptionYear>2001</inceptionYear>
     <package>org.apache</package>
     <logo>http://maven.apache.org/images/maven.jpg</logo>
  -  <description>Test for Maven JavaDoc plugin</description>
  -  <shortDescription>Test for Maven JavaDoc plugin</shortDescription>
  +  <description>Tests for Maven JavaDoc plugin</description>
  +  <shortDescription>Tests for Maven JavaDoc plugin</shortDescription>
     <url>http://maven.apache.org/reference/plugins/javadoc/index.html</url>
     <siteDirectory>/www/maven.apache.org/reference/plugins/javadoc/</siteDirectory>
     <repository>
  @@ -50,17 +50,15 @@
           <role>Documentation</role>
         </roles>
       </developer>
  +    <developer>
  +      <name>Arnaud Heritier</name>
  +      <id>aheritier</id>
  +      <email>[EMAIL PROTECTED]</email>
  +      <roles>
  +        <role>Developer</role>
  +      </roles>
  +    </developer>
     </developers>
   
  -  <build>
  -    <sourceDirectory>src/main</sourceDirectory>
  -    <sourceModifications>
  -      <sourceModification>
  -        <className>org.apache.maven.Dummy</className>
  -        <excludes>
  -          <exclude>**/Dummy4.*</exclude>
  -        </excludes>
  -      </sourceModification>
  -    </sourceModifications>
  -  </build>
  +  <build/>
   </project>
  
  
  
  1.1                  maven-plugins/javadoc/src/plugin-test/test01/.cvsignore
  
  Index: .cvsignore
  ===================================================================
  gump.xml
  *.log
  targetdist
  dist
  target
  
  
  
  1.1                  maven-plugins/javadoc/src/plugin-test/test01/maven.xml
  
  Index: maven.xml
  ===================================================================
  <!-- 
  /*
   * Copyright 2001-2004 The Apache Software Foundation.
   * 
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
   * You may obtain a copy of the License at
   * 
   *      http://www.apache.org/licenses/LICENSE-2.0
   * 
   * Unless required by applicable law or agreed to in writing, software
   * distributed under the License is distributed on an "AS IS" BASIS,
   * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   * See the License for the specific language governing permissions and
   * limitations under the License.
   */
   -->
  <project xmlns:util="jelly:util"
           xmlns:maven="jelly:maven"
           xmlns:j="jelly:core"
           xmlns:assert="assert"
           xmlns:ant="jelly:ant">
           
    <goal name="testPlugin">
      <delete dir="${maven.build.dir}" failonerror="false"/>
      <delete file="${maven.build.dir}/${maven.final.name}_javadoc.jar" 
failonerror="false"/>
      <attainGoal name="javadoc:jar"/>
      <assert:assertFileExists file="${maven.javadoc.destdir}/index.html"/>
      <!-- assert that doc-files are copied - Issue MPJAVADOC-24 -->
      <assert:assertFileExists 
file="${maven.javadoc.destdir}/org/apache/maven/doc-files/example.txt"/>
      <assert:assertFileExists 
file="${maven.javadoc.destdir}/org/apache/maven2/doc-files/example.txt"/>
      <!-- assert that javadoc for classes Dummy, Dummy2, Dummy3, Dummy4 are generated 
-->
      <assert:assertFileExists 
file="${maven.javadoc.destdir}/org/apache/maven/Dummy.html"/>
      <assert:assertFileExists 
file="${maven.javadoc.destdir}/org/apache/maven/Dummy2.html"/>
      <assert:assertFileExists 
file="${maven.javadoc.destdir}/org/apache/maven2/Dummy3.html"/>
      <assert:assertFileExists 
file="${maven.javadoc.destdir}/org/apache/maven2/Dummy4.html"/>
      <!-- assert that the jar is created -->
      <assert:assertFileExists 
file="${maven.build.dir}/${maven.final.name}_javadoc.jar"/>
    </goal>
  
  </project>
  
  
  1.1                  maven-plugins/javadoc/src/plugin-test/test01/project.xml
  
  Index: project.xml
  ===================================================================
  <?xml version="1.0" encoding="UTF-8"?>
  <!-- 
  /*
   * Copyright 2001-2004 The Apache Software Foundation.
   * 
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
   * You may obtain a copy of the License at
   * 
   *      http://www.apache.org/licenses/LICENSE-2.0
   * 
   * Unless required by applicable law or agreed to in writing, software
   * distributed under the License is distributed on an "AS IS" BASIS,
   * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   * See the License for the specific language governing permissions and
   * limitations under the License.
   */
   -->
  
  
  <project>
    <pomVersion>3</pomVersion>
    <id>test-maven-javadoc-plugin-01</id>
    <name>Javadoc for a simple project</name>
    <groupId>maven</groupId>
    <currentVersion>1.0-SNAPSHOT</currentVersion>
    <organization>
      <name>Apache Software Foundation</name>
      <url>http://www.apache.org/</url>
      <logo>http://maven.apache.org/images/apache-maven-project.png</logo>
    </organization>
    <inceptionYear>2001</inceptionYear>
    <package>org.apache</package>
    <logo>http://maven.apache.org/images/maven.jpg</logo>
    <description>Javadoc for a simple project</description>
    <shortDescription>Javadoc for a simple project</shortDescription>
    <url>http://maven.apache.org/reference/plugins/javadoc/index.html</url>
    <siteDirectory>/www/maven.apache.org/reference/plugins/javadoc/</siteDirectory>
    <repository>
      <connection>scm:cvs:pserver:[EMAIL 
PROTECTED]:/home/cvspublic:maven-plugins/javadoc/</connection>
      <url>http://cvs.apache.org/viewcvs/maven-plugins/javadoc/</url>
    </repository>
    <developers>
      <developer>
        <name>dIon Gillard</name>
        <id>dion</id>
        <email>[EMAIL PROTECTED]</email>
        <organization>Multitask Consulting</organization>
        <roles>
          <role>Documentation</role>
        </roles>
      </developer>
      <developer>
        <name>Arnaud Heritier</name>
        <id>aheritier</id>
        <email>[EMAIL PROTECTED]</email>
        <roles>
          <role>Developer</role>
        </roles>
      </developer>
    </developers>
  
    <build>
      <sourceDirectory>src/main</sourceDirectory>
    </build>
  </project>
  
  
  1.1                  
maven-plugins/javadoc/src/plugin-test/test01/src/main/org/apache/maven/Dummy.java
  
  Index: Dummy.java
  ===================================================================
  package org.apache.maven;
  
  public class Dummy
  {
      public String badChecky = "error";
  
      public Dummy() {}
  } 
  
  
  
  1.1                  
maven-plugins/javadoc/src/plugin-test/test01/src/main/org/apache/maven/Dummy2.java
  
  Index: Dummy2.java
  ===================================================================
  package org.apache.maven;
  
  public class Dummy2
  {
      public String badChecky = "error";
  
      public Dummy dummy = new Dummy();
  } 
  
  
  
  1.1                  
maven-plugins/javadoc/src/plugin-test/test01/src/main/org/apache/maven/package.html
  
  Index: package.html
  ===================================================================
  <html>
  <head></head>
  <body>
  Package documentation. <br/>
  <a href="doc-files/example.txt">example.txt</a> in doc-files directory.
  </body>
  </html>
  
  
  1.1                  
maven-plugins/javadoc/src/plugin-test/test01/src/main/org/apache/maven/doc-files/example.txt
  
  Index: example.txt
  ===================================================================
  This an example
  
  
  1.1                  
maven-plugins/javadoc/src/plugin-test/test01/src/main/org/apache/maven2/Dummy3.java
  
  Index: Dummy3.java
  ===================================================================
  package org.apache.maven2;
  
  /**
   * Test MPJAVADOC-28 : [EMAIL PROTECTED] org.apache.maven}
   * 
   */
  public class Dummy3
  {
      public String badChecky = "error";
  } 
  
  
  1.1                  
maven-plugins/javadoc/src/plugin-test/test01/src/main/org/apache/maven2/Dummy4.java
  
  Index: Dummy4.java
  ===================================================================
  package org.apache.maven2;
  
  public class Dummy4
  {
      public String badChecky = "error";
  } 
  
  
  1.1                  
maven-plugins/javadoc/src/plugin-test/test01/src/main/org/apache/maven2/package.html
  
  Index: package.html
  ===================================================================
  <html>
  <head></head>
  <body>
  Package documentation. <br/>
  <a href="doc-files/example.txt">example.txt</a> in doc-files directory.
  </body>
  </html>
  
  
  1.1                  
maven-plugins/javadoc/src/plugin-test/test01/src/main/org/apache/maven2/doc-files/example.txt
  
  Index: example.txt
  ===================================================================
  This an example
  
  
  1.1                  maven-plugins/javadoc/src/plugin-test/test02/.cvsignore
  
  Index: .cvsignore
  ===================================================================
  gump.xml
  *.log
  targetdist
  dist
  target
  
  
  
  1.1                  maven-plugins/javadoc/src/plugin-test/test02/maven.xml
  
  Index: maven.xml
  ===================================================================
  <!-- 
  /*
   * Copyright 2001-2004 The Apache Software Foundation.
   * 
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
   * You may obtain a copy of the License at
   * 
   *      http://www.apache.org/licenses/LICENSE-2.0
   * 
   * Unless required by applicable law or agreed to in writing, software
   * distributed under the License is distributed on an "AS IS" BASIS,
   * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   * See the License for the specific language governing permissions and
   * limitations under the License.
   */
   -->
  <project xmlns:util="jelly:util"
           xmlns:maven="jelly:maven"
           xmlns:j="jelly:core"
           xmlns:assert="assert"
           xmlns:ant="jelly:ant">
           
    <goal name="testPlugin">
      <delete dir="${maven.build.dir}" failonerror="false"/>
      <attainGoal name="maven-javadoc-plugin:report"/>
      <assert:assertFileExists file="${maven.javadoc.destdir}/index.html"/>
      <!-- assert that doc-files are copied - Issue MPJAVADOC-24 -->
      <assert:assertFileExists 
file="${maven.javadoc.destdir}/org/apache/maven/doc-files/example.txt"/>
      <assert:assertFileExists 
file="${maven.javadoc.destdir}/org/apache/maven2/doc-files/example.txt"/>
      <!-- assert that javadoc for classes Dummy, Dummy2, Dummy3 are generated -->
      <assert:assertFileExists 
file="${maven.javadoc.destdir}/org/apache/maven/Dummy.html"/>
      <assert:assertFileExists 
file="${maven.javadoc.destdir}/org/apache/maven/Dummy2.html"/>
      <assert:assertFileExists 
file="${maven.javadoc.destdir}/org/apache/maven2/Dummy3.html"/>
      <!-- assert that javadoc for classe Dummy4 isn't generated -->
      <assert:assertFileNotFound 
file="${maven.javadoc.destdir}/org/apache/maven2/Dummy4.html"/>
    </goal>
    
  </project>
  
  
  1.1                  maven-plugins/javadoc/src/plugin-test/test02/project.xml
  
  Index: project.xml
  ===================================================================
  <?xml version="1.0" encoding="UTF-8"?>
  <!-- 
  /*
   * Copyright 2001-2004 The Apache Software Foundation.
   * 
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
   * You may obtain a copy of the License at
   * 
   *      http://www.apache.org/licenses/LICENSE-2.0
   * 
   * Unless required by applicable law or agreed to in writing, software
   * distributed under the License is distributed on an "AS IS" BASIS,
   * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   * See the License for the specific language governing permissions and
   * limitations under the License.
   */
   -->
  
  
  <project>
    <pomVersion>3</pomVersion>
    <id>test-maven-javadoc-plugin-02</id>
    <name>Javadoc for a project with sourceModifications</name>
    <groupId>maven</groupId>
    <currentVersion>1.0-SNAPSHOT</currentVersion>
    <organization>
      <name>Apache Software Foundation</name>
      <url>http://www.apache.org/</url>
      <logo>http://maven.apache.org/images/apache-maven-project.png</logo>
    </organization>
    <inceptionYear>2001</inceptionYear>
    <package>org.apache</package>
    <logo>http://maven.apache.org/images/maven.jpg</logo>
    <description>Javadoc for a project with sourceModifications</description>
    <shortDescription>Javadoc for a project with sourceModifications</shortDescription>
    <url>http://maven.apache.org/reference/plugins/javadoc/index.html</url>
    <siteDirectory>/www/maven.apache.org/reference/plugins/javadoc/</siteDirectory>
    <repository>
      <connection>scm:cvs:pserver:[EMAIL 
PROTECTED]:/home/cvspublic:maven-plugins/javadoc/</connection>
      <url>http://cvs.apache.org/viewcvs/maven-plugins/javadoc/</url>
    </repository>
    <developers>
      <developer>
        <name>dIon Gillard</name>
        <id>dion</id>
        <email>[EMAIL PROTECTED]</email>
        <organization>Multitask Consulting</organization>
        <roles>
          <role>Documentation</role>
        </roles>
      </developer>
      <developer>
        <name>Arnaud Heritier</name>
        <id>aheritier</id>
        <email>[EMAIL PROTECTED]</email>
        <roles>
          <role>Developer</role>
        </roles>
      </developer>
    </developers>
  
    <build>
      <sourceDirectory>src/main</sourceDirectory>
      <sourceModifications>
        <sourceModification>
          <className>org.apache.maven.Dummy</className>
          <excludes>
            <exclude>**/Dummy4.*</exclude>
          </excludes>
        </sourceModification>
      </sourceModifications>
    </build>
  </project>
  
  
  1.1                  
maven-plugins/javadoc/src/plugin-test/test02/src/main/org/apache/maven/Dummy.java
  
  Index: Dummy.java
  ===================================================================
  package org.apache.maven;
  
  public class Dummy
  {
      public String badChecky = "error";
  
      public Dummy() {}
  } 
  
  
  
  1.1                  
maven-plugins/javadoc/src/plugin-test/test02/src/main/org/apache/maven/Dummy2.java
  
  Index: Dummy2.java
  ===================================================================
  package org.apache.maven;
  
  public class Dummy2
  {
      public String badChecky = "error";
  
      public Dummy dummy = new Dummy();
  } 
  
  
  
  1.1                  
maven-plugins/javadoc/src/plugin-test/test02/src/main/org/apache/maven/package.html
  
  Index: package.html
  ===================================================================
  <html>
  <head></head>
  <body>
  Package documentation. <br/>
  <a href="doc-files/example.txt">example.txt</a> in doc-files directory.
  </body>
  </html>
  
  
  1.1                  
maven-plugins/javadoc/src/plugin-test/test02/src/main/org/apache/maven/doc-files/example.txt
  
  Index: example.txt
  ===================================================================
  This an example
  
  
  1.1                  
maven-plugins/javadoc/src/plugin-test/test02/src/main/org/apache/maven2/Dummy3.java
  
  Index: Dummy3.java
  ===================================================================
  package org.apache.maven2;
  
  /**
   * Test MPJAVADOC-28 : [EMAIL PROTECTED] org.apache.maven}
   * 
   */
  public class Dummy3
  {
      public String badChecky = "error";
  } 
  
  
  1.1                  
maven-plugins/javadoc/src/plugin-test/test02/src/main/org/apache/maven2/Dummy4.java
  
  Index: Dummy4.java
  ===================================================================
  package org.apache.maven2;
  
  public class Dummy4
  {
      public String badChecky = "error";
  } 
  
  
  1.1                  
maven-plugins/javadoc/src/plugin-test/test02/src/main/org/apache/maven2/package.html
  
  Index: package.html
  ===================================================================
  <html>
  <head></head>
  <body>
  Package documentation. <br/>
  <a href="doc-files/example.txt">example.txt</a> in doc-files directory.
  </body>
  </html>
  
  
  1.1                  
maven-plugins/javadoc/src/plugin-test/test02/src/main/org/apache/maven2/doc-files/example.txt
  
  Index: example.txt
  ===================================================================
  This an example
  
  
  1.1                  maven-plugins/javadoc/src/plugin-test/test03/.cvsignore
  
  Index: .cvsignore
  ===================================================================
  gump.xml
  *.log
  targetdist
  dist
  target
  
  
  
  1.1                  maven-plugins/javadoc/src/plugin-test/test03/maven.xml
  
  Index: maven.xml
  ===================================================================
  <!-- 
  /*
   * Copyright 2001-2004 The Apache Software Foundation.
   * 
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
   * You may obtain a copy of the License at
   * 
   *      http://www.apache.org/licenses/LICENSE-2.0
   * 
   * Unless required by applicable law or agreed to in writing, software
   * distributed under the License is distributed on an "AS IS" BASIS,
   * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   * See the License for the specific language governing permissions and
   * limitations under the License.
   */
   -->
  <project xmlns:util="jelly:util"
           xmlns:maven="jelly:maven"
           xmlns:j="jelly:core"
           xmlns:assert="assert"
           xmlns:ant="jelly:ant">
           
    <goal name="testPlugin">
      <delete dir="${maven.build.dir}" failonerror="false"/>
      <ant:path id="test.src.set">
        <ant:pathelement path="${basedir}/src/opt"/>
      </ant:path>
      <maven:addPath id="maven.compile.src.set" refid="test.src.set"/>
      <attainGoal name="maven-javadoc-plugin:report"/>
      <assert:assertFileExists file="${maven.javadoc.destdir}/index.html"/>
      <!-- assert that doc-files are copied - Issue MPJAVADOC-24 -->
      <assert:assertFileExists 
file="${maven.javadoc.destdir}/org/apache/maven/doc-files/example.txt"/>
      <assert:assertFileExists 
file="${maven.javadoc.destdir}/org/apache/maven2/doc-files/example.txt"/>
      <assert:assertFileExists 
file="${maven.javadoc.destdir}/org/apache/maven3/doc-files/example.txt"/>
      <!-- assert that javadoc for classes Dummy, Dummy2, Dummy3, Dummy5, Dummy6 are 
generated -->
      <assert:assertFileExists 
file="${maven.javadoc.destdir}/org/apache/maven/Dummy.html"/>
      <assert:assertFileExists 
file="${maven.javadoc.destdir}/org/apache/maven/Dummy2.html"/>
      <assert:assertFileExists 
file="${maven.javadoc.destdir}/org/apache/maven2/Dummy3.html"/>
      <assert:assertFileExists 
file="${maven.javadoc.destdir}/org/apache/maven3/Dummy5.html"/>
      <assert:assertFileExists 
file="${maven.javadoc.destdir}/org/apache/maven3/Dummy6.html"/>
      <!-- assert that javadoc for classe Dummy4 isn't generated -->
      <assert:assertFileNotFound 
file="${maven.javadoc.destdir}/org/apache/maven2/Dummy4.html"/>
    </goal>
  
  </project>
  
  
  1.1                  maven-plugins/javadoc/src/plugin-test/test03/project.xml
  
  Index: project.xml
  ===================================================================
  <?xml version="1.0" encoding="UTF-8"?>
  <!-- 
  /*
   * Copyright 2001-2004 The Apache Software Foundation.
   * 
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
   * You may obtain a copy of the License at
   * 
   *      http://www.apache.org/licenses/LICENSE-2.0
   * 
   * Unless required by applicable law or agreed to in writing, software
   * distributed under the License is distributed on an "AS IS" BASIS,
   * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   * See the License for the specific language governing permissions and
   * limitations under the License.
   */
   -->
  
  
  <project>
    <pomVersion>3</pomVersion>
    <id>test-maven-javadoc-plugin-03</id>
    <name>Javadoc for a project with sourceModifications and multiple sources 
directories</name>
    <groupId>maven</groupId>
    <currentVersion>1.0-SNAPSHOT</currentVersion>
    <organization>
      <name>Apache Software Foundation</name>
      <url>http://www.apache.org/</url>
      <logo>http://maven.apache.org/images/apache-maven-project.png</logo>
    </organization>
    <inceptionYear>2001</inceptionYear>
    <package>org.apache</package>
    <logo>http://maven.apache.org/images/maven.jpg</logo>
    <description>Javadoc for a project with sourceModifications and multiple sources 
directories</description>
    <shortDescription>Javadoc for a project with sourceModifications and multiple 
sources directories</shortDescription>
    <url>http://maven.apache.org/reference/plugins/javadoc/index.html</url>
    <siteDirectory>/www/maven.apache.org/reference/plugins/javadoc/</siteDirectory>
    <repository>
      <connection>scm:cvs:pserver:[EMAIL 
PROTECTED]:/home/cvspublic:maven-plugins/javadoc/</connection>
      <url>http://cvs.apache.org/viewcvs/maven-plugins/javadoc/</url>
    </repository>
    <developers>
      <developer>
        <name>dIon Gillard</name>
        <id>dion</id>
        <email>[EMAIL PROTECTED]</email>
        <organization>Multitask Consulting</organization>
        <roles>
          <role>Documentation</role>
        </roles>
      </developer>
      <developer>
        <name>Arnaud Heritier</name>
        <id>aheritier</id>
        <email>[EMAIL PROTECTED]</email>
        <roles>
          <role>Developer</role>
        </roles>
      </developer>
    </developers>
  
    <build>
      <sourceDirectory>src/main</sourceDirectory>
      <sourceModifications>
        <sourceModification>
          <className>org.apache.maven.Dummy</className>
          <excludes>
            <exclude>**/Dummy4.*</exclude>
          </excludes>
        </sourceModification>
      </sourceModifications>
    </build>
  </project>
  
  
  1.1                  
maven-plugins/javadoc/src/plugin-test/test03/src/main/org/apache/maven/Dummy.java
  
  Index: Dummy.java
  ===================================================================
  package org.apache.maven;
  
  public class Dummy
  {
      public String badChecky = "error";
  
      public Dummy() {}
  } 
  
  
  
  1.1                  
maven-plugins/javadoc/src/plugin-test/test03/src/main/org/apache/maven/Dummy2.java
  
  Index: Dummy2.java
  ===================================================================
  package org.apache.maven;
  
  public class Dummy2
  {
      public String badChecky = "error";
  
      public Dummy dummy = new Dummy();
  } 
  
  
  
  1.1                  
maven-plugins/javadoc/src/plugin-test/test03/src/main/org/apache/maven/package.html
  
  Index: package.html
  ===================================================================
  <html>
  <head></head>
  <body>
  Package documentation. <br/>
  <a href="doc-files/example.txt">example.txt</a> in doc-files directory.
  </body>
  </html>
  
  
  1.1                  
maven-plugins/javadoc/src/plugin-test/test03/src/main/org/apache/maven/doc-files/example.txt
  
  Index: example.txt
  ===================================================================
  This an example
  
  
  1.1                  
maven-plugins/javadoc/src/plugin-test/test03/src/main/org/apache/maven2/Dummy3.java
  
  Index: Dummy3.java
  ===================================================================
  package org.apache.maven2;
  
  /**
   * Test MPJAVADOC-28 : [EMAIL PROTECTED] org.apache.maven}
   * 
   */
  public class Dummy3
  {
      public String badChecky = "error";
  } 
  
  
  1.1                  
maven-plugins/javadoc/src/plugin-test/test03/src/main/org/apache/maven2/Dummy4.java
  
  Index: Dummy4.java
  ===================================================================
  package org.apache.maven2;
  
  public class Dummy4
  {
      public String badChecky = "error";
  } 
  
  
  1.1                  
maven-plugins/javadoc/src/plugin-test/test03/src/main/org/apache/maven2/package.html
  
  Index: package.html
  ===================================================================
  <html>
  <head></head>
  <body>
  Package documentation. <br/>
  <a href="doc-files/example.txt">example.txt</a> in doc-files directory.
  </body>
  </html>
  
  
  1.1                  
maven-plugins/javadoc/src/plugin-test/test03/src/main/org/apache/maven2/doc-files/example.txt
  
  Index: example.txt
  ===================================================================
  This an example
  
  
  1.1                  
maven-plugins/javadoc/src/plugin-test/test03/src/opt/org/apache/maven3/Dummy5.java
  
  Index: Dummy5.java
  ===================================================================
  package org.apache.maven3;
  
  public class Dummy5
  {
      public String badChecky = "error";
  } 
  
  
  1.1                  
maven-plugins/javadoc/src/plugin-test/test03/src/opt/org/apache/maven3/Dummy6.java
  
  Index: Dummy6.java
  ===================================================================
  package org.apache.maven3;
  
  public class Dummy6
  {
      public String badChecky = "error";
  } 
  
  
  1.1                  
maven-plugins/javadoc/src/plugin-test/test03/src/opt/org/apache/maven3/package.html
  
  Index: package.html
  ===================================================================
  <html>
  <head></head>
  <body>
  Package documentation. <br/>
  <a href="doc-files/example.txt">example.txt</a> in doc-files directory.
  </body>
  </html>
  
  
  1.1                  
maven-plugins/javadoc/src/plugin-test/test03/src/opt/org/apache/maven3/doc-files/example.txt
  
  Index: example.txt
  ===================================================================
  This an example
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to