maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vsive...@apache.org
Subject svn commit: r574739 - in /maven/plugins/trunk/maven-javadoc-plugin/src: main/java/org/apache/maven/plugin/javadoc/ test/java/org/apache/maven/plugin/javadoc/ test/java/org/apache/maven/plugin/javadoc/stubs/ test/resources/unit/jdk6-test/ test/resources...
Date Wed, 12 Sep 2007 00:52:23 GMT
Author: vsiveton
Date: Tue Sep 11 17:52:22 2007
New Revision: 574739

URL: http://svn.apache.org/viewvc?rev=574739&view=rev
Log:
MJAVADOC-148: Support of -top option in standard doclet JDK 6.0

o added the new -top option
o updated javadoc
o added a test case

Added:
    maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/Jdk6TestMavenProjectStub.java
  (with props)
    maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/jdk6-test/
    maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/jdk6-test/jdk6/
    maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/jdk6-test/jdk6-test-plugin-config.xml
  (with props)
    maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/jdk6-test/jdk6/test/
    maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/jdk6-test/jdk6/test/App.java
  (with props)
    maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/jdk6-test/jdk6/test/AppSample.java
  (with props)
    maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/jdk6-test/jdk6/test/MyAnnotationType.java
  (with props)
    maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/jdk6-test/jdk6/test/package-info.java
  (with props)
    maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/jdk6-test/jdk6/test2/
    maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/jdk6-test/jdk6/test2/App2.java
  (with props)
Modified:
    maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java
    maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/JavadocReportTest.java

Modified: maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java?rev=574739&r1=574738&r2=574739&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
Tue Sep 11 17:52:22 2007
@@ -119,6 +119,13 @@
      */
     private static final float SINCE_JAVADOC_1_5 = 1.5f;
 
+    /**
+     * For Javadoc options appears since Java 6.0.
+     * See <a href="http://java.sun.com/javase/6/docs/technotes/guides/javadoc/index.html">
+     * Javadoc Technology</a>
+     */
+    private static final float SINCE_JAVADOC_1_6 = 1.6f;
+
     // ----------------------------------------------------------------------
     // Mojo parameters
     // ----------------------------------------------------------------------
@@ -925,6 +932,17 @@
     private Taglet[] taglets;
 
     /**
+     * Specifies the top text to be placed at the top of each output file.
+     * <br/>
+     * See <a href="http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6227616">6227616</a>.
+     * <br/>
+     * Since Java 6.0
+     *
+     * @parameter expression="${top}"
+     */
+    private String top;
+
+    /**
      * Includes one "Use" page for each documented class and package.
      * <br/>
      * See <a href="http://java.sun.com/j2se/1.4.2/docs/tooldoldocs/windows/javadoc.html#use">use</a>.
@@ -1351,6 +1369,8 @@
                 }
             }
 
+            addArgIfNotEmpty( arguments, "-top", quotedArgument( StringUtils.replace( top,
"\n", "" ) ), false, false,
+                              SINCE_JAVADOC_1_6 );
             addArgIf( arguments, use, "-use" );
             addArgIf( arguments, version, "-version" );
             addArgIfNotEmpty( arguments, "-windowtitle", quotedArgument( getWindowtitle()
), false, false );
@@ -2127,7 +2147,7 @@
      * @param value               the argument value to be added.
      * @param requiredJavaVersion the required Java version, for example 1.31f or 1.4f
      * @see #addArgIf(java.util.List,boolean,String)
-     * @see <a href="http://jakarta.apache.org/commons/lang/api/org/apache/commons/lang/SystemUtils.html#isJavaVersionAtLeast(float)">SystemUtils.html#isJavaVersionAtLeast(float)</a>
+     * @see #isJavaDocVersionAtLeast(float)
      */
     private void addArgIf( List arguments, boolean b, String value, float requiredJavaVersion
)
     {
@@ -2168,6 +2188,33 @@
      * @param value       the argument value to be added.
      * @param repeatKey   repeat or not the key in the command line
      * @param splitValue  if <code>true</code> given value will be tokenized
by comma
+     * @param requiredJavaVersion the required Java version, for example 1.31f or 1.4f
+     * @see #addArgIfNotEmpty(List, String, String, boolean, boolean)
+     * @see #isJavaDocVersionAtLeast(float)
+     */
+    private void addArgIfNotEmpty( List arguments, String key, String value, boolean repeatKey,
boolean splitValue, float requiredJavaVersion )
+    {
+        if ( isJavaDocVersionAtLeast( requiredJavaVersion ) )
+        {
+            addArgIfNotEmpty( arguments, key, value, repeatKey, splitValue );
+        }
+        else
+        {
+            getLog().warn( key + " option is not supported on Java version < " + requiredJavaVersion
);
+        }
+    }
+
+    /**
+     * Convenience method to add an argument to the <code>command line</code>
+     * if the the value is not null or empty.
+     * <p/>
+     * Moreover, the value could be comma separated.
+     *
+     * @param arguments
+     * @param key         the argument name.
+     * @param value       the argument value to be added.
+     * @param repeatKey   repeat or not the key in the command line
+     * @param splitValue  if <code>true</code> given value will be tokenized
by comma
      */
     private void addArgIfNotEmpty( List arguments, String key, String value, boolean repeatKey,
boolean splitValue )
     {
@@ -2244,7 +2291,7 @@
      * @param requiredJavaVersion the required Java version, for example 1.31f or 1.4f
      * @param repeatKey           repeat or not the key in the command line
      * @see #addArgIfNotEmpty(java.util.List,String,String)
-     * @see <a href="http://jakarta.apache.org/commons/lang/api/org/apache/commons/lang/SystemUtils.html#isJavaVersionAtLeast(float)">SystemUtils.html#isJavaVersionAtLeast(float)</a>
+     * @see #isJavaDocVersionAtLeast(float)
      */
     private void addArgIfNotEmpty( List arguments, String key, String value, float requiredJavaVersion,
                                    boolean repeatKey )
@@ -2574,6 +2621,7 @@
      * @param javadocOutputDirectory
      * @param files
      * @throws MavenReportException if any
+     * @see #isJavaDocVersionAtLeast(float)
      */
     private void addCommandLineArgFile( Commandline cmd, File javadocOutputDirectory, List
files )
         throws MavenReportException

Modified: maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/JavadocReportTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/JavadocReportTest.java?rev=574739&r1=574738&r2=574739&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/JavadocReportTest.java
(original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/JavadocReportTest.java
Tue Sep 11 17:52:22 2007
@@ -603,7 +603,7 @@
         if ( !SystemUtils.isJavaVersionAtLeast( 1.5f ) )
         {
             getContainer().getLogger().warn(
-                                             "JdkDK 5.0 or more is required to run javadoc
for "
+                                             "JDK 5.0 or more is required to run javadoc
for "
                                                  + "'org.apache.maven.plugin.javadoc.JavadocReportTest#testJdk5()'."
);
             return;
         }
@@ -778,5 +778,45 @@
         }
 
         assertTrue( true );
+    }
+
+    /**
+     * Method to test the jdk6 javadoc
+     *
+     * @throws Exception
+     */
+    public void testJdk6()
+        throws Exception
+    {
+        if ( !SystemUtils.isJavaVersionAtLeast( 1.6f ) )
+        {
+            getContainer().getLogger().warn(
+                                             "JDK 6.0 or more is required to run javadoc
for "
+                                                 + "'org.apache.maven.plugin.javadoc.JavadocReportTest#testJdk6()'."
);
+            return;
+        }
+
+        File testPom = new File( getBasedir(), "src/test/resources/unit/jdk6-test/jdk6-test-plugin-config.xml"
);
+        JavadocReport mojo = (JavadocReport) lookupMojo( "javadoc", testPom );
+        mojo.execute();
+
+        File index = new File( getBasedir(), "target/test/unit/jdk6-test/target/site/apidocs/index.html"
);
+        assertTrue( FileUtils.fileExists( index.getAbsolutePath() ) );
+
+        File overviewSummary = new File( getBasedir(),
+                                         "target/test/unit/jdk6-test/target/site/apidocs/overview-summary.html"
);
+        assertTrue( FileUtils.fileExists( overviewSummary.getAbsolutePath() ) );
+        String readed = readFile( overviewSummary );
+        assertTrue( readed.indexOf( "Top - Copyright &#169; All rights reserved." ) !=
-1 );
+        assertTrue( readed.indexOf( "Header - Copyright &#169; All rights reserved."
) != -1 );
+        assertTrue( readed.indexOf( "Footer - Copyright &#169; All rights reserved."
) != -1 );
+
+        File packageSummary = new File( getBasedir(),
+                                        "target/test/unit/jdk6-test/target/site/apidocs/jdk6/test/package-summary.html"
);
+        assertTrue( FileUtils.fileExists( packageSummary.getAbsolutePath() ) );
+        readed = readFile( packageSummary );
+        assertTrue( readed.indexOf( "Top - Copyright &#169; All rights reserved." ) !=
-1 );
+        assertTrue( readed.indexOf( "Header - Copyright &#169; All rights reserved."
) != -1 );
+        assertTrue( readed.indexOf( "Footer - Copyright &#169; All rights reserved."
) != -1 );
     }
 }

Added: maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/Jdk6TestMavenProjectStub.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/Jdk6TestMavenProjectStub.java?rev=574739&view=auto
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/Jdk6TestMavenProjectStub.java
(added)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/Jdk6TestMavenProjectStub.java
Tue Sep 11 17:52:22 2007
@@ -0,0 +1,112 @@
+package org.apache.maven.plugin.javadoc.stubs;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.
+ */
+
+import org.apache.maven.model.Build;
+import org.apache.maven.model.Model;
+import org.apache.maven.model.Scm;
+import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
+import org.apache.maven.plugin.testing.stubs.MavenProjectStub;
+
+import java.io.File;
+import java.io.FileReader;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author <a href="mailto:vincent.siveton@gmail.com">Vincent Siveton</a>
+ */
+public class Jdk6TestMavenProjectStub
+    extends MavenProjectStub
+{
+    private Scm scm;
+
+    private Build build;
+
+    public Jdk6TestMavenProjectStub()
+    {
+        MavenXpp3Reader pomReader = new MavenXpp3Reader();
+        Model model = null;
+
+        try
+        {
+            model = pomReader.read( new FileReader( new File( getBasedir()
+                + "/src/test/resources/unit/jdk6-test/jdk6-test-plugin-config.xml" ) ) );
+            setModel( model );
+        }
+        catch ( Exception e )
+        {
+            throw new RuntimeException( e );
+        }
+
+        setGroupId( model.getGroupId() );
+        setArtifactId( model.getArtifactId() );
+        setVersion( model.getVersion() );
+        setName( model.getName() );
+        setUrl( model.getUrl() );
+        setPackaging( model.getPackaging() );
+
+        Scm scm = new Scm();
+        scm.setConnection( "scm:svn:http://svn.apache.org/maven/sample/trunk" );
+        setScm( scm );
+
+        Build build = new Build();
+        build.setFinalName( model.getArtifactId() );
+        build.setDirectory( getBasedir() + "/target/test/unit/jdk6-test/target" );
+        setBuild( build );
+
+        String basedir = getBasedir().getAbsolutePath();
+        List compileSourceRoots = new ArrayList();
+        compileSourceRoots.add( basedir + "/src/test/resources/unit/jdk6-test/" );
+        setCompileSourceRoots( compileSourceRoots );
+    }
+
+    /**
+     * @see org.apache.maven.plugin.testing.stubs.MavenProjectStub#getScm()
+     */
+    public Scm getScm()
+    {
+        return scm;
+    }
+
+    /**
+     * @see org.apache.maven.plugin.testing.stubs.MavenProjectStub#setScm(org.apache.maven.model.Scm)
+     */
+    public void setScm( Scm scm )
+    {
+        this.scm = scm;
+    }
+
+    /**
+     * @see org.apache.maven.plugin.testing.stubs.MavenProjectStub#getBuild()
+     */
+    public Build getBuild()
+    {
+        return build;
+    }
+
+    /**
+     * @see org.apache.maven.plugin.testing.stubs.MavenProjectStub#setBuild(org.apache.maven.model.Build)
+     */
+    public void setBuild( Build build )
+    {
+        this.build = build;
+    }
+}

Propchange: maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/Jdk6TestMavenProjectStub.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/Jdk6TestMavenProjectStub.java
------------------------------------------------------------------------------
    svn:keywords = "Author Date Id Revision"

Added: maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/jdk6-test/jdk6-test-plugin-config.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/jdk6-test/jdk6-test-plugin-config.xml?rev=574739&view=auto
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/jdk6-test/jdk6-test-plugin-config.xml
(added)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/jdk6-test/jdk6-test-plugin-config.xml
Tue Sep 11 17:52:22 2007
@@ -0,0 +1,75 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you 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>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>jdk6.test</groupId>
+  <artifactId>jdk6-test</artifactId>
+  <packaging>jar</packaging>
+  <version>1.0-SNAPSHOT</version>
+  <inceptionYear>2006</inceptionYear>
+  <name>Maven Javadoc Plugin jdk6 Test</name>
+  <url>http://maven.apache.org</url>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-javadoc-plugin</artifactId>
+        <configuration>
+          <project implementation="org.apache.maven.plugin.javadoc.stubs.Jdk6TestMavenProjectStub"/>
+          <localRepository>${localRepository}</localRepository>
+          <outputDirectory>${basedir}/target/test/unit/jdk6-test/target/site/apidocs</outputDirectory>
+          <source>1.6</source>
+          <windowtitle>Maven Javadoc Plugin Taglet jdk6 1.0-SNAPSHOT API</windowtitle>
+          <quiet>true</quiet>
+          <header>
+            <![CDATA[
+<table border="0" cellpadding="0">
+<tr>
+  <td><img src="{@docRoot}/icon.gif" width="32" /></td>
+  <td>Header - Copyright &#169; All rights reserved.</td>
+</tr>
+</table>
+              ]]>
+          </header>
+          <footer>
+            <![CDATA[
+<table border="0" cellpadding="0">
+<tr>
+  <td><img src="{@docRoot}/icon.gif" width="32" /></td>
+  <td>Footer - Copyright &#169; All rights reserved.</td>
+</tr>
+</table>
+              ]]>
+          </footer>
+          <top>
+            <![CDATA[
+<table border="0" cellpadding="0">
+<tr>
+  <td><img src="{@docRoot}/icon.gif" width="32" /></td>
+  <td>Top - Copyright &#169; All rights reserved.</td>
+</tr>
+</table>
+              ]]></top>
+          <debug>true</debug>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+</project>

Propchange: maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/jdk6-test/jdk6-test-plugin-config.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/jdk6-test/jdk6-test-plugin-config.xml
------------------------------------------------------------------------------
    svn:keywords = "Author Date Id Revision"

Added: maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/jdk6-test/jdk6/test/App.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/jdk6-test/jdk6/test/App.java?rev=574739&view=auto
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/jdk6-test/jdk6/test/App.java
(added)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/jdk6-test/jdk6/test/App.java
Tue Sep 11 17:52:22 2007
@@ -0,0 +1,48 @@
+package jdk6.test;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.
+ */
+
+/**
+ * Sample class inside the package to be included in the javadoc
+ *
+ * @author <a href="mailto:vincent.siveton@gmail.com">Vincent Siveton</a>
+ */
+public class App
+{
+    /**
+     * The main method
+     *
+     * @param args  an array of strings that contains the arguments
+     */
+    public static void main( String[] args )
+    {
+        System.out.println( "Sample Application." );
+    }
+
+    /**
+     * Sample method that prints out the parameter string.
+     *
+     * @param str   The string value to be printed.
+     */
+    protected void sampleMethod( String str )
+    {
+        System.out.println( str );
+    }
+}

Propchange: maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/jdk6-test/jdk6/test/App.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/jdk6-test/jdk6/test/App.java
------------------------------------------------------------------------------
    svn:keywords = "Author Date Id Revision"

Added: maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/jdk6-test/jdk6/test/AppSample.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/jdk6-test/jdk6/test/AppSample.java?rev=574739&view=auto
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/jdk6-test/jdk6/test/AppSample.java
(added)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/jdk6-test/jdk6/test/AppSample.java
Tue Sep 11 17:52:22 2007
@@ -0,0 +1,78 @@
+package jdk6.test;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.
+ */
+
+import java.io.File;
+import java.io.IOException;
+
+/**
+ * Sample class inside the package to be included in the javadoc
+ *
+ * @author <a href="mailto:vincent.siveton@gmail.com">Vincent Siveton</a>
+ */
+public class AppSample
+{
+    /**
+     * Contains the file to be set
+     */
+    protected File file;
+
+    /**
+     * The main method
+     *
+     * @param args  an array of strings that contains the arguments
+     */
+    public static void main( String[] args )
+    {
+        System.out.println( "Another Sample Application" );
+    }
+
+    /**
+     * Setter method for variable file
+     *
+     * @param file the value to be set
+     */
+    public void setFile( File file )
+    {
+        this.file = file;
+    }
+
+    /**
+     * Getter method for variable file
+     *
+     * @return a File object
+     */
+    public File getFile()
+    {
+        return file;
+    }
+
+    /**
+     * Create new file
+     *
+     * @throws java.io.IOException  thrown if an I/O error occurred during file creation
+     */
+    public void createFile()
+        throws IOException
+    {
+        File f = new File( file.getAbsolutePath() );
+        f.createNewFile();
+    }
+}

Propchange: maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/jdk6-test/jdk6/test/AppSample.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/jdk6-test/jdk6/test/AppSample.java
------------------------------------------------------------------------------
    svn:keywords = "Author Date Id Revision"

Added: maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/jdk6-test/jdk6/test/MyAnnotationType.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/jdk6-test/jdk6/test/MyAnnotationType.java?rev=574739&view=auto
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/jdk6-test/jdk6/test/MyAnnotationType.java
(added)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/jdk6-test/jdk6/test/MyAnnotationType.java
Tue Sep 11 17:52:22 2007
@@ -0,0 +1,35 @@
+package jdk6.test;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.
+ */
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+/**
+ * Sample annotation type
+ *
+ * @author <a href="mailto:vincent.siveton@gmail.com">Vincent Siveton</a>
+ */
+@Retention(RUNTIME)
+public @interface MyAnnotationType
+{
+    public String value();
+}

Propchange: maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/jdk6-test/jdk6/test/MyAnnotationType.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/jdk6-test/jdk6/test/MyAnnotationType.java
------------------------------------------------------------------------------
    svn:keywords = "Author Date Id Revision"

Added: maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/jdk6-test/jdk6/test/package-info.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/jdk6-test/jdk6/test/package-info.java?rev=574739&view=auto
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/jdk6-test/jdk6/test/package-info.java
(added)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/jdk6-test/jdk6/test/package-info.java
Tue Sep 11 17:52:22 2007
@@ -0,0 +1,4 @@
+/**
+ * <b>Test the package-info</b>
+ */
+package jdk6.test;

Propchange: maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/jdk6-test/jdk6/test/package-info.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/jdk6-test/jdk6/test/package-info.java
------------------------------------------------------------------------------
    svn:keywords = "Author Date Id Revision"

Added: maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/jdk6-test/jdk6/test2/App2.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/jdk6-test/jdk6/test2/App2.java?rev=574739&view=auto
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/jdk6-test/jdk6/test2/App2.java
(added)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/jdk6-test/jdk6/test2/App2.java
Tue Sep 11 17:52:22 2007
@@ -0,0 +1,48 @@
+package jdk6.test2;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.
+ */
+
+/**
+ * Sample class inside the package to be included in the javadoc
+ *
+ * @author <a href="mailto:vincent.siveton@gmail.com">Vincent Siveton</a>
+ */
+public class App2
+{
+    /**
+     * The main method
+     *
+     * @param args  an array of strings that contains the arguments
+     */
+    public static void main( String[] args )
+    {
+        System.out.println( "Sample Application." );
+    }
+
+    /**
+     * Sample method that prints out the parameter string.
+     *
+     * @param str   The string value to be printed.
+     */
+    protected void sampleMethod( String str )
+    {
+        System.out.println( str );
+    }
+}

Propchange: maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/jdk6-test/jdk6/test2/App2.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/jdk6-test/jdk6/test2/App2.java
------------------------------------------------------------------------------
    svn:keywords = "Author Date Id Revision"



Mime
View raw message