Author: bentmann
Date: Thu Aug 14 15:43:55 2008
New Revision: 686070
URL: http://svn.apache.org/viewvc?rev=686070&view=rev
Log:
o Fixed IT
Modified:
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-110/pom.xml
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-110/test-module/pom.xml
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-110/verify.bsh
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-110/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-110/pom.xml?rev=686070&r1=686069&r2=686070&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-110/pom.xml
(original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-110/pom.xml Thu
Aug 14 15:43:55 2008
@@ -49,32 +49,18 @@
<executions>
<execution>
<id>javadoc</id>
+ <inherited>false</inherited>
<phase>package</phase>
<goals>
<goal>javadoc</goal>
</goals>
<configuration>
<aggregate>false</aggregate>
- <sourcepath>
- test-module/src/main/java
- </sourcepath>
+ <sourcepath>test-module/src/main/java</sourcepath>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
- <repositories>
- <repository>
- <id>codehaus.snapshots</id>
- <name>CodeHaus Snapshots</name>
- <url>http://snapshots.repository.codehaus.org</url>
- <releases>
- <enabled>false</enabled>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </repository>
- </repositories>
-</project>
\ No newline at end of file
+</project>
Modified:
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-110/test-module/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-110/test-module/pom.xml?rev=686070&r1=686069&r2=686070&view=diff
==============================================================================
---
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-110/test-module/pom.xml
(original)
+++
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-110/test-module/pom.xml
Thu Aug 14 15:43:55 2008
@@ -31,15 +31,4 @@
<packaging>jar</packaging>
<version>1.0-SNAPSHOT</version>
<name>Test Module</name>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-javadoc-plugin</artifactId>
- <inherited>false</inherited>
- <configuration>
- <debug>true</debug>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
\ No newline at end of file
+</project>
Modified:
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-110/verify.bsh
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-110/verify.bsh?rev=686070&r1=686069&r2=686070&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-110/verify.bsh
(original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-110/verify.bsh Thu
Aug 14 15:43:55 2008
@@ -31,23 +31,17 @@
return false;
}
- File apidocs = new File( basedir, "target/site/apidocs" );
+ File apidocs = new File( target, "site/apidocs" );
if ( !apidocs.exists() || !apidocs.isDirectory() )
{
System.err.println( "target/site/apidocs file is missing or a
directory." );
return false;
}
- target = new File( basedir, "test-module/target" );
- if ( !target.exists() || !target.isDirectory() )
+ File htmlFile = new File( apidocs, "Test.html" );
+ if ( !htmlFile.isFile() )
{
- System.err.println( "test-module/target file is missing or a
directory." );
- return false;
- }
- apidocs = new File( basedir, "test-module/target/site/apidocs" );
- if ( !apidocs.exists() || !apidocs.isDirectory() )
- {
- System.err.println( "test-module/target/site/apidocs file is missing
or a directory." );
+ System.err.println( "target/site/apidocs/Test.html file is missing or
a a file." );
return false;
}
}
