Author: vsiveton
Date: Sat May 24 07:07:04 2008
New Revision: 659825

URL: http://svn.apache.org/viewvc?rev=659825&view=rev
Log:
MJAVADOC-190: Javadoc tool -excludedocfilessubdir has no effect

o added comments and updated javadoc
o used the excludedocfilessubdir in JavadocUtil#copyJavadocResources() 

Added:
    
maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/ResourcesWithExcludesTestMavenProjectStub.java
   (with props)
    
maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/resources-with-excludes-test/
    
maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/resources-with-excludes-test/resources-with-excludes-test-plugin-config.xml
   (with props)
    
maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/resources-with-excludes-test/src/
    
maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/resources-with-excludes-test/src/main/
    
maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/resources-with-excludes-test/src/main/java/
    
maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/resources-with-excludes-test/src/main/java/resources/
    
maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/resources-with-excludes-test/src/main/java/resources/test/
    
maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/resources-with-excludes-test/src/main/java/resources/test/App.java
   (with props)
    
maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/resources-with-excludes-test/src/main/java/resources/test2/
    
maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/resources-with-excludes-test/src/main/java/resources/test2/App2.java
   (with props)
    
maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/resources-with-excludes-test/src/main/javadoc/
    
maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/resources-with-excludes-test/src/main/javadoc/resources/
    
maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/resources-with-excludes-test/src/main/javadoc/resources/test/
    
maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/resources-with-excludes-test/src/main/javadoc/resources/test/doc-files/
    
maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/resources-with-excludes-test/src/main/javadoc/resources/test/doc-files/maven-feather.png
   (with props)
    
maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/resources-with-excludes-test/src/main/javadoc/resources/test2/
    
maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/resources-with-excludes-test/src/main/javadoc/resources/test2/doc-files/
    
maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/resources-with-excludes-test/src/main/javadoc/resources/test2/doc-files/maven-feather.png
   (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/main/java/org/apache/maven/plugin/javadoc/JavadocUtil.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=659825&r1=659824&r2=659825&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
 Sat May 24 07:07:04 2008
@@ -618,7 +618,8 @@
     private String doctitle;
 
     /**
-     * Excludes any "doc-files" subdirectories with the given names.
+     * Excludes any "doc-files" subdirectories with the given names. Multiple 
patterns can be excluded
+     * by separating them with colons (<code>:</code>).
      * <br/>
      * See <a 
href="http://java.sun.com/j2se/1.4.2/docs/tooldocs/windows/javadoc.html#excludedocfilessubdir";>
      * excludedocfilessubdir</a>.
@@ -1276,6 +1277,10 @@
 
         if ( docfilessubdirs )
         {
+            /*
+             * Workaround since -docfilessubdirs doesn't seem to be used 
correctly by the javadoc tool
+             * (see other note about -sourcepath). Take care of the 
-excludedocfilessubdir option.
+             */
             try
             {
                 copyJavadocResources( javadocOutputDirectory );
@@ -1670,6 +1675,11 @@
                 sourcePaths.addAll( getExecutionProjectSourceRoots( project ) 
);
             }
 
+            /*
+             * Should be after the source path (i.e. -sourcepath 
'.../src/main/java;.../src/main/javadoc') and
+             * *not* the opposite. If not, the javadoc tool always copies doc 
files, even if -docfilessubdirs is
+             * not setted.
+             */
             if ( getJavadocDirectory() != null )
             {
                 File javadocDir = getJavadocDirectory();
@@ -2870,7 +2880,7 @@
 
         if ( getJavadocDirectory() != null )
         {
-            JavadocUtil.copyJavadocResources( outputDirectory, 
getJavadocDirectory() );
+            JavadocUtil.copyJavadocResources( outputDirectory, 
getJavadocDirectory(), excludedocfilessubdir );
         }
 
         if ( aggregate && project.isExecutionRoot() )
@@ -2883,7 +2893,7 @@
                 {
                     String javadocDirRelative = PathUtils.toRelative( 
project.getBasedir(), getJavadocDirectory().getAbsolutePath() );
                     File javadocDir = new File( subProject.getBasedir(), 
javadocDirRelative );
-                    JavadocUtil.copyJavadocResources( outputDirectory, 
javadocDir );
+                    JavadocUtil.copyJavadocResources( outputDirectory, 
javadocDir, excludedocfilessubdir );
                 }
             }
         }

Modified: 
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocUtil.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocUtil.java?rev=659825&r1=659824&r2=659825&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocUtil.java
 (original)
+++ 
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocUtil.java
 Sat May 24 07:07:04 2008
@@ -30,10 +30,12 @@
 import java.net.PasswordAuthentication;
 import java.net.URL;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Properties;
 import java.util.Set;
+import java.util.StringTokenizer;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.regex.PatternSyntaxException;
@@ -255,15 +257,30 @@
      *
      * @param outputDirectory the output directory
      * @param javadocDir the javadoc directory
-     * @throws java.io.IOException if any
+     * @param excludedocfilessubdir the excludedocfilessubdir parameter
+     * @throws IOException if any
      */
-    protected static void copyJavadocResources( File outputDirectory, File 
javadocDir )
+    protected static void copyJavadocResources( File outputDirectory, File 
javadocDir, String excludedocfilessubdir )
         throws IOException
     {
+        List excludes = new ArrayList();
+        excludes.addAll( Arrays.asList( FileUtils.getDefaultExcludes() ) );
+
+        if ( StringUtils.isNotEmpty( excludedocfilessubdir ) )
+        {
+            StringTokenizer st = new StringTokenizer( excludedocfilessubdir, 
":" );
+            String current;
+            while ( st.hasMoreTokens() )
+            {
+                current = st.nextToken();
+                excludes.add( "**/" + current + "/*" );
+            }
+        }
+
         if ( javadocDir.exists() && javadocDir.isDirectory() )
         {
-            List docFiles = FileUtils.getDirectoryNames( javadocDir, 
"**/doc-files", StringUtils.join( FileUtils
-                .getDefaultExcludes(), "," ), false, true );
+            List docFiles = FileUtils.getDirectoryNames( javadocDir, 
"**/doc-files", StringUtils.join( excludes
+                .iterator(), "," ), false, true );
             for ( Iterator it = docFiles.iterator(); it.hasNext(); )
             {
                 String docFile = (String) it.next();

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=659825&r1=659824&r2=659825&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
 Sat May 24 07:07:04 2008
@@ -683,6 +683,30 @@
         File feather2 = new File( getBasedir(),
                                   
"target/test/unit/resources-test/target/site/apidocs/resources/test2/doc-files/maven-feather.png"
 );
         assertFalse( FileUtils.fileExists( feather2.getAbsolutePath() ) );
+
+        // with excludes
+        testPom = new File( getBasedir(),
+                                 
"src/test/resources/unit/resources-with-excludes-test/resources-with-excludes-test-plugin-config.xml"
 );
+        mojo = (JavadocReport) lookupMojo( "javadoc", testPom );
+        mojo.execute();
+
+        app = new File( getBasedir(),
+                             
"target/test/unit/resources-with-excludes-test/target/site/apidocs/resources/test/App.html"
 );
+        assertTrue( FileUtils.fileExists( app.getAbsolutePath() ) );
+        readed = readFile( app );
+        assertTrue( readed.indexOf( "<img src=\"doc-files/maven-feather.png\" 
alt=\"Maven\"/>" ) != -1 );
+        feather = new File( getBasedir(),
+                                 
"target/test/unit/resources-with-excludes-test/target/site/apidocs/resources/test/doc-files/maven-feather.png"
 );
+        assertFalse( FileUtils.fileExists( feather.getAbsolutePath() ) );
+
+        app2 = new File( getBasedir(),
+                              
"target/test/unit/resources-with-excludes-test/target/site/apidocs/resources/test2/App2.html"
 );
+        assertTrue( FileUtils.fileExists( app2.getAbsolutePath() ) );
+        readed = readFile( app2 );
+        assertTrue( readed.indexOf( "<img src=\"doc-files/maven-feather.png\" 
alt=\"Maven\"/>" ) != -1 );
+        feather2 = new File( getBasedir(),
+                                  
"target/test/unit/resources-with-excludes-test/target/site/apidocs/resources/test2/doc-files/maven-feather.png"
 );
+        assertTrue( FileUtils.fileExists( feather2.getAbsolutePath() ) );
     }
 
     /**

Added: 
maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/ResourcesWithExcludesTestMavenProjectStub.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/ResourcesWithExcludesTestMavenProjectStub.java?rev=659825&view=auto
==============================================================================
--- 
maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/ResourcesWithExcludesTestMavenProjectStub.java
 (added)
+++ 
maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/ResourcesWithExcludesTestMavenProjectStub.java
 Sat May 24 07:07:04 2008
@@ -0,0 +1,96 @@
+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.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:[EMAIL PROTECTED]">Vincent Siveton</a>
+ */
+public class ResourcesWithExcludesTestMavenProjectStub extends MavenProjectStub
+{
+    private Build build;
+
+    public ResourcesWithExcludesTestMavenProjectStub()
+    {
+        MavenXpp3Reader pomReader = new MavenXpp3Reader();
+        Model model = null;
+
+        try
+        {
+            model =
+                pomReader.read( new FileReader( new File( getBasedir(), 
"resources-with-excludes-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() );
+
+        Build build = new Build();
+        build.setFinalName( model.getArtifactId() );
+        build.setSourceDirectory( getBasedir() + "/src/main/java" );
+        build.setDirectory( super.getBasedir() + 
"/target/test/unit/resources-with-excludes-test/target" );
+        setBuild( build );
+
+        List compileSourceRoots = new ArrayList();
+        compileSourceRoots.add( getBasedir() + "/src/main/java" );
+        setCompileSourceRoots( compileSourceRoots );
+    }
+
+    /**
+     * @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;
+    }
+
+    /**
+     * @see org.apache.maven.plugin.testing.stubs.MavenProjectStub#getBasedir()
+     */
+    public File getBasedir()
+    {
+        return new File( super.getBasedir() + 
"/src/test/resources/unit/resources-with-excludes-test" );
+    }
+}

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

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

Added: 
maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/resources-with-excludes-test/resources-with-excludes-test-plugin-config.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/resources-with-excludes-test/resources-with-excludes-test-plugin-config.xml?rev=659825&view=auto
==============================================================================
--- 
maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/resources-with-excludes-test/resources-with-excludes-test-plugin-config.xml
 (added)
+++ 
maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/resources-with-excludes-test/resources-with-excludes-test-plugin-config.xml
 Sat May 24 07:07:04 2008
@@ -0,0 +1,48 @@
+<!--
+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>resources.test</groupId>
+  <artifactId>resources-with-excludes-test</artifactId>
+  <packaging>jar</packaging>
+  <version>1.0-SNAPSHOT</version>
+  <inceptionYear>2008</inceptionYear>
+  <name>Maven Javadoc Plugin resources 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.ResourcesWithExcludesTestMavenProjectStub"/>
+          <localRepository>${localRepository}</localRepository>
+          
<outputDirectory>${basedir}/target/test/unit/resources-with-excludes-test/target/site/apidocs</outputDirectory>
+          <windowtitle>Maven Javadoc Plugin resources 1.0-SNAPSHOT 
API</windowtitle>
+          
<javadocDirectory>${basedir}/src/test/resources/unit/resources-with-excludes-test/src/main/javadoc</javadocDirectory>
+          <quiet>true</quiet>
+          <debug>true</debug>
+          <docfilessubdirs>true</docfilessubdirs>
+          <excludedocfilessubdir>test</excludedocfilessubdir>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+</project>

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

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

Added: 
maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/resources-with-excludes-test/src/main/java/resources/test/App.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/resources-with-excludes-test/src/main/java/resources/test/App.java?rev=659825&view=auto
==============================================================================
--- 
maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/resources-with-excludes-test/src/main/java/resources/test/App.java
 (added)
+++ 
maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/resources-with-excludes-test/src/main/java/resources/test/App.java
 Sat May 24 07:07:04 2008
@@ -0,0 +1,49 @@
+package resources.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
+ * <img src="doc-files/maven-feather.png" alt="Maven"/>
+ *
+ * @author <a href="mailto:[EMAIL PROTECTED]">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/resources-with-excludes-test/src/main/java/resources/test/App.java
------------------------------------------------------------------------------
    svn:eol-style = native

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

Added: 
maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/resources-with-excludes-test/src/main/java/resources/test2/App2.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/resources-with-excludes-test/src/main/java/resources/test2/App2.java?rev=659825&view=auto
==============================================================================
--- 
maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/resources-with-excludes-test/src/main/java/resources/test2/App2.java
 (added)
+++ 
maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/resources-with-excludes-test/src/main/java/resources/test2/App2.java
 Sat May 24 07:07:04 2008
@@ -0,0 +1,49 @@
+package resources.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
+ * <img src="doc-files/maven-feather.png" alt="Maven"/>
+ *
+ * @author <a href="mailto:[EMAIL PROTECTED]">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/resources-with-excludes-test/src/main/java/resources/test2/App2.java
------------------------------------------------------------------------------
    svn:eol-style = native

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

Added: 
maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/resources-with-excludes-test/src/main/javadoc/resources/test/doc-files/maven-feather.png
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/resources-with-excludes-test/src/main/javadoc/resources/test/doc-files/maven-feather.png?rev=659825&view=auto
==============================================================================
Binary file - no diff available.

Propchange: 
maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/resources-with-excludes-test/src/main/javadoc/resources/test/doc-files/maven-feather.png
------------------------------------------------------------------------------
    svn:mime-type = image/png

Added: 
maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/resources-with-excludes-test/src/main/javadoc/resources/test2/doc-files/maven-feather.png
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/resources-with-excludes-test/src/main/javadoc/resources/test2/doc-files/maven-feather.png?rev=659825&view=auto
==============================================================================
Binary file - no diff available.

Propchange: 
maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/resources-with-excludes-test/src/main/javadoc/resources/test2/doc-files/maven-feather.png
------------------------------------------------------------------------------
    svn:mime-type = image/png


Reply via email to