svn commit: r389939 - in /maven/plugins/trunk/maven-javadoc-plugin: ./ src/main/java/org/apache/maven/plugin/javadoc/

[brett]

Author: brett
Date: Wed Mar 29 16:33:24 2006
New Revision: 389939

URL: http://svn.apache.org/viewcvs?rev=389939&view=rev
Log:
- minor changes, set version to 2.0

Modified:
    maven/plugins/trunk/maven-javadoc-plugin/pom.xml
    
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java
    
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/DocletArtifact.java
    
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/OfflineLink.java

Modified: maven/plugins/trunk/maven-javadoc-plugin/pom.xml
URL: 
http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-javadoc-plugin/pom.xml?rev=389939&r1=389938&r2=389939&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/pom.xml Wed Mar 29 16:33:24 2006
@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?><project>
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
   <parent>
     <artifactId>maven-plugins</artifactId>
     <groupId>org.apache.maven.plugins</groupId>
@@ -8,7 +9,7 @@
   <artifactId>maven-javadoc-plugin</artifactId>
   <packaging>maven-plugin</packaging>
   <name>Maven Javadoc Plugin</name>
-  <version>2.0-beta-4-SNAPSHOT</version>
+  <version>2.0-SNAPSHOT</version>
   <build>
     <plugins>
       <plugin>

Modified: 
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java
URL: 
http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java?rev=389939&r1=389938&r2=389939&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java
 (original)
+++ 
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java
 Wed Mar 29 16:33:24 2006
@@ -1345,9 +1345,9 @@
      * @return InputStream An input stream for reading the resource, or 
<tt>null</tt>
      *         if the resource could not be found
      */
-    private static InputStream getStream( String resource )
+    private InputStream getStream( String resource )
     {
-        return JavadocReport.class.getClassLoader().getResourceAsStream( 
resource );
+        return getClass().getClassLoader().getResourceAsStream( resource );
     }
 
     /**

Modified: 
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/DocletArtifact.java
URL: 
http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/DocletArtifact.java?rev=389939&r1=389938&r2=389939&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/DocletArtifact.java
 (original)
+++ 
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/DocletArtifact.java
 Wed Mar 29 16:33:24 2006
@@ -16,10 +16,8 @@
  * limitations under the License.
  */
 
-
 public class DocletArtifact
 {
-
     private String groupId;
 
     private String artifactId;

Modified: 
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/OfflineLink.java
URL: 
http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/OfflineLink.java?rev=389939&r1=389938&r2=389939&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/OfflineLink.java
 (original)
+++ 
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/OfflineLink.java
 Wed Mar 29 16:33:24 2006
@@ -1,7 +1,5 @@
 package org.apache.maven.plugin.javadoc;
 
-import java.io.File;
-
 /*
  * Copyright 2004-2005 The Apache Software Foundation.
  *
@@ -17,6 +15,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
+import java.io.File;
 
 public class OfflineLink
 {