svn commit: r589140 - in /maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/main/java/org/apache/maven/jxr/java/src/html: Pass1.java Pass2.java
Author: vsiveton
Date: Sat Oct 27 08:46:18 2007
New Revision: 589140
URL: http://svn.apache.org/viewvc?rev=589140view=rev
Log:
o imptoved the rendering to make difference between Javadoc comments (i.e. /**
... */) and other comments (i.e. /* ... */)
o added encoding option for JavaDocBuilder
o improve performance
Modified:
maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/main/java/org/apache/maven/jxr/java/src/html/Pass1.java
maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/main/java/org/apache/maven/jxr/java/src/html/Pass2.java
Modified:
maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/main/java/org/apache/maven/jxr/java/src/html/Pass1.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/main/java/org/apache/maven/jxr/java/src/html/Pass1.java?rev=589140r1=589139r2=589140view=diff
==
---
maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/main/java/org/apache/maven/jxr/java/src/html/Pass1.java
(original)
+++
maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/main/java/org/apache/maven/jxr/java/src/html/Pass1.java
Sat Oct 27 08:46:18 2007
@@ -23,7 +23,6 @@
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
-import java.io.FileReader;
import java.io.IOException;
import java.io.InputStreamReader;
import java.io.LineNumberReader;
@@ -48,11 +47,6 @@
import org.codehaus.plexus.util.FileUtils;
import org.codehaus.plexus.util.StringUtils;
-import com.thoughtworks.qdox.JavaDocBuilder;
-import com.thoughtworks.qdox.model.Annotation;
-import com.thoughtworks.qdox.model.DocletTag;
-import com.thoughtworks.qdox.model.JavaMethod;
-
import antlr.ANTLRException;
/**
@@ -67,6 +61,32 @@
/** Logger for this class */
private static final Logger log = Logger.getLogger( Pass1.class );
+/**
+ * Default Javadoc tags.
+ *
+ * @see a
href=http://java.sun.com/j2se/1.5.0/docs/tooldocs/windows/javadoc.html#javadoctags;http://java.sun.com/j2se/1.5.0/docs/tooldocs/windows/javadoc.html#javadoctags/a
+ */
+private static final String[] TAGS = {
+@author,
+[EMAIL PROTECTED],
+[EMAIL PROTECTED],
+@deprecated,
+@exception,
+[EMAIL PROTECTED],
+[EMAIL PROTECTED],
+[EMAIL PROTECTED],
+[EMAIL PROTECTED],
+@param,
+@return,
+@see,
+@serial,
+@serialData,
+@serialField,
+@since,
+@throws,
+[EMAIL PROTECTED],
+@version };
+
int currentColumn;
int currentChar;
@@ -495,7 +515,7 @@
int i = 0;
StringBuffer sb = new StringBuffer();
-sb.append( SPAN CLASS=\multiLinesComment\ );
+sb.append( SPAN CLASS=\singleLineComment\ );
while ( i length )
{
@@ -521,7 +541,7 @@
if ( currentChar == '\n' )
{
-sb.append( SPAN CLASS=\multiLinesComment\ );
+sb.append( SPAN CLASS=\singleLineComment\ );
currentColumn = 0;
}
@@ -534,27 +554,17 @@
String comment = sb.toString();
-// Highlight Javadoc reserved words
-File javaFile = t.getFile();
-JavaDocBuilder builder = new JavaDocBuilder();
-builder.addSource( new FileReader( javaFile ) );
-DocletTag[] classTags = builder.getClasses()[0].getTags();
-for ( int j = 0; j classTags.length; j++ )
-{
-comment = StringUtils.replace( comment, @ +
classTags[j].getName(), B@ + classTags[j].getName()
-+ /B );
-}
-JavaMethod[] methods = builder.getClasses()[0].getMethods();
-for ( int j = 0; j methods.length; j++ )
+// Javadoc comments
+if ( comment.startsWith( SPAN CLASS=\singleLineComment\/** ) )
{
-DocletTag[] methodTags = methods[j].getTags();
-for ( int k = 0; k methodTags.length; k++ )
+comment = StringUtils.replace( comment, singleLineComment,
multiLinesComment );
+
+// Highlight Javadoc reserved words
+for ( int j = 0; j TAGS.length; j++ )
{
-comment = StringUtils.replace( comment, @ +
methodTags[k].getName(), B@ + methodTags[k].getName()
-+ /B );
+comment = StringUtils.replace( comment, TAGS[j], B +
TAGS[j] + /B );
}
}
-
output.write( comment );
if ( currentChar == '\n' )
Modified:
maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/main/java/org/apache/maven/jxr/java/src/html/Pass2.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/main/java/org/apache/maven/jxr/java/src/html/Pass2.java?rev=589140r1=589139r2=589140view=diff
==
---
svn commit: r589217 - in /maven/plugins/trunk/maven-source-plugin/src/main/java/org/apache/maven/plugin/source: AbstractSourceJarMojo.java SourceJarMojo.java TestSourceJarMojo.java
Author: dennisl
Date: Sat Oct 27 14:07:44 2007
New Revision: 589217
URL: http://svn.apache.org/viewvc?rev=589217view=rev
Log:
[MSOURCES-22] configuration option for source:jar to exclude resources
Modified:
maven/plugins/trunk/maven-source-plugin/src/main/java/org/apache/maven/plugin/source/AbstractSourceJarMojo.java
maven/plugins/trunk/maven-source-plugin/src/main/java/org/apache/maven/plugin/source/SourceJarMojo.java
maven/plugins/trunk/maven-source-plugin/src/main/java/org/apache/maven/plugin/source/TestSourceJarMojo.java
Modified:
maven/plugins/trunk/maven-source-plugin/src/main/java/org/apache/maven/plugin/source/AbstractSourceJarMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-source-plugin/src/main/java/org/apache/maven/plugin/source/AbstractSourceJarMojo.java?rev=589217r1=589216r2=589217view=diff
==
---
maven/plugins/trunk/maven-source-plugin/src/main/java/org/apache/maven/plugin/source/AbstractSourceJarMojo.java
(original)
+++
maven/plugins/trunk/maven-source-plugin/src/main/java/org/apache/maven/plugin/source/AbstractSourceJarMojo.java
Sat Oct 27 14:07:44 2007
@@ -55,6 +55,15 @@
private boolean attach;
/**
+ * Specifies whether or not to exclude resources from the sources-jar. This
+ * can be convenient if your project includes large resources, such as
+ * images, and you don't want to include them in the sources-jar.
+ *
+ * @parameter expression=${source.excludeResources} default-value=false
+ */
+protected boolean excludeResources;
+
+/**
* @component
*/
private MavenProjectHelper projectHelper;
Modified:
maven/plugins/trunk/maven-source-plugin/src/main/java/org/apache/maven/plugin/source/SourceJarMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-source-plugin/src/main/java/org/apache/maven/plugin/source/SourceJarMojo.java?rev=589217r1=589216r2=589217view=diff
==
---
maven/plugins/trunk/maven-source-plugin/src/main/java/org/apache/maven/plugin/source/SourceJarMojo.java
(original)
+++
maven/plugins/trunk/maven-source-plugin/src/main/java/org/apache/maven/plugin/source/SourceJarMojo.java
Sat Oct 27 14:07:44 2007
@@ -20,11 +20,9 @@
*/
import org.apache.maven.project.MavenProject;
-import org.apache.maven.model.Resource;
+import java.util.Collections;
import java.util.List;
-import java.util.ArrayList;
-import java.util.Iterator;
/**
* This plugin bundles all the sources into a jar archive.
@@ -45,7 +43,14 @@
protected List getResources( MavenProject project )
{
-return project.getResources();
+if ( excludeResources )
+{
+return Collections.EMPTY_LIST;
+}
+else
+{
+return project.getResources();
+}
}
protected String getClassifier()
Modified:
maven/plugins/trunk/maven-source-plugin/src/main/java/org/apache/maven/plugin/source/TestSourceJarMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-source-plugin/src/main/java/org/apache/maven/plugin/source/TestSourceJarMojo.java?rev=589217r1=589216r2=589217view=diff
==
---
maven/plugins/trunk/maven-source-plugin/src/main/java/org/apache/maven/plugin/source/TestSourceJarMojo.java
(original)
+++
maven/plugins/trunk/maven-source-plugin/src/main/java/org/apache/maven/plugin/source/TestSourceJarMojo.java
Sat Oct 27 14:07:44 2007
@@ -20,11 +20,9 @@
*/
import org.apache.maven.project.MavenProject;
-import org.apache.maven.model.Resource;
+import java.util.Collections;
import java.util.List;
-import java.util.ArrayList;
-import java.util.Iterator;
/**
* This plugin bundles all the test sources into a jar archive.
@@ -43,7 +41,14 @@
protected List getResources( MavenProject project )
{
-return project.getTestResources();
+if ( excludeResources )
+{
+return Collections.EMPTY_LIST;
+}
+else
+{
+return project.getTestResources();
+}
}
protected String getClassifier()
svn propchange: r589208 - svn:log
Author: dennisl Revision: 589208 Modified property: svn:log Modified: svn:log at Sat Oct 27 14:10:37 2007 -- --- svn:log (original) +++ svn:log Sat Oct 27 14:10:37 2007 @@ -1,3 +1,3 @@ -[MSOURCE-18] Honour targetPath +[MSOURCES-18] Honour targetPath Submitted by: Tim Pizey Reviewed by: Dennis Lundberg
svn commit: r589219 - in /maven/plugins/trunk/maven-source-plugin/src: main/java/org/apache/maven/plugin/source/ test/java/org/apache/maven/plugin/source/ test/java/org/apache/maven/plugin/source/stub
Author: dennisl Date: Sat Oct 27 14:28:44 2007 New Revision: 589219 URL: http://svn.apache.org/viewvc?rev=589219view=rev Log: o Fix license-headers. Modified: maven/plugins/trunk/maven-source-plugin/src/main/java/org/apache/maven/plugin/source/AbstractSourceJarMojo.java maven/plugins/trunk/maven-source-plugin/src/main/java/org/apache/maven/plugin/source/AggregatorSourceJarMojo.java maven/plugins/trunk/maven-source-plugin/src/main/java/org/apache/maven/plugin/source/SourceJarMojo.java maven/plugins/trunk/maven-source-plugin/src/main/java/org/apache/maven/plugin/source/TestSourceJarMojo.java maven/plugins/trunk/maven-source-plugin/src/test/java/org/apache/maven/plugin/source/AbstractSourcePluginTestCase.java maven/plugins/trunk/maven-source-plugin/src/test/java/org/apache/maven/plugin/source/SourceJarMojoTest.java maven/plugins/trunk/maven-source-plugin/src/test/java/org/apache/maven/plugin/source/TestSourceJarMojoTest.java maven/plugins/trunk/maven-source-plugin/src/test/java/org/apache/maven/plugin/source/stubs/Project001Stub.java maven/plugins/trunk/maven-source-plugin/src/test/java/org/apache/maven/plugin/source/stubs/Project003Stub.java maven/plugins/trunk/maven-source-plugin/src/test/java/org/apache/maven/plugin/source/stubs/Project005Stub.java maven/plugins/trunk/maven-source-plugin/src/test/java/org/apache/maven/plugin/source/stubs/Project007Stub.java maven/plugins/trunk/maven-source-plugin/src/test/java/org/apache/maven/plugin/source/stubs/SourcePluginArtifactStub.java maven/plugins/trunk/maven-source-plugin/src/test/resources/unit/project-001/src/main/java/foo/project001/App.java maven/plugins/trunk/maven-source-plugin/src/test/resources/unit/project-001/src/test/java/foo/project001/AppTest.java maven/plugins/trunk/maven-source-plugin/src/test/resources/unit/project-003/src/main/java/foo/project003/App.java maven/plugins/trunk/maven-source-plugin/src/test/resources/unit/project-003/src/test/java/foo/project003/AppTest.java maven/plugins/trunk/maven-source-plugin/src/test/resources/unit/project-007/src/main/java/foo/project007/App.java Modified: maven/plugins/trunk/maven-source-plugin/src/main/java/org/apache/maven/plugin/source/AbstractSourceJarMojo.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-source-plugin/src/main/java/org/apache/maven/plugin/source/AbstractSourceJarMojo.java?rev=589219r1=589218r2=589219view=diff == --- maven/plugins/trunk/maven-source-plugin/src/main/java/org/apache/maven/plugin/source/AbstractSourceJarMojo.java (original) +++ maven/plugins/trunk/maven-source-plugin/src/main/java/org/apache/maven/plugin/source/AbstractSourceJarMojo.java Sat Oct 27 14:28:44 2007 @@ -9,7 +9,7 @@ * 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 + * 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 Modified: maven/plugins/trunk/maven-source-plugin/src/main/java/org/apache/maven/plugin/source/AggregatorSourceJarMojo.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-source-plugin/src/main/java/org/apache/maven/plugin/source/AggregatorSourceJarMojo.java?rev=589219r1=589218r2=589219view=diff == --- maven/plugins/trunk/maven-source-plugin/src/main/java/org/apache/maven/plugin/source/AggregatorSourceJarMojo.java (original) +++ maven/plugins/trunk/maven-source-plugin/src/main/java/org/apache/maven/plugin/source/AggregatorSourceJarMojo.java Sat Oct 27 14:28:44 2007 @@ -1,5 +1,24 @@ package org.apache.maven.plugin.source; +/* + * 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.plugin.MojoExecutionException; /** Modified: maven/plugins/trunk/maven-source-plugin/src/main/java/org/apache/maven/plugin/source/SourceJarMojo.java URL:
svn commit: r589220 - in /maven/plugins/trunk/maven-source-plugin/src: main/java/org/apache/maven/plugin/source/ site/ site/apt/ site/apt/examples/ site/fml/ test/java/org/apache/maven/plugin/source/
Author: dennisl Date: Sat Oct 27 14:30:30 2007 New Revision: 589220 URL: http://svn.apache.org/viewvc?rev=589220view=rev Log: o Set EOL style to native. o Add subversion keywords. Modified: maven/plugins/trunk/maven-source-plugin/src/main/java/org/apache/maven/plugin/source/AbstractSourceJarMojo.java (contents, props changed) maven/plugins/trunk/maven-source-plugin/src/main/java/org/apache/maven/plugin/source/AggregatorSourceJarMojo.java (props changed) maven/plugins/trunk/maven-source-plugin/src/main/java/org/apache/maven/plugin/source/SourceJarMojo.java (contents, props changed) maven/plugins/trunk/maven-source-plugin/src/main/java/org/apache/maven/plugin/source/TestSourceJarMojo.java (props changed) maven/plugins/trunk/maven-source-plugin/src/site/apt/examples/configureplugin.apt (props changed) maven/plugins/trunk/maven-source-plugin/src/site/apt/index.apt (props changed) maven/plugins/trunk/maven-source-plugin/src/site/apt/usage.apt (props changed) maven/plugins/trunk/maven-source-plugin/src/site/fml/faq.fml (props changed) maven/plugins/trunk/maven-source-plugin/src/site/site.xml (props changed) maven/plugins/trunk/maven-source-plugin/src/test/java/org/apache/maven/plugin/source/AbstractSourcePluginTestCase.java (props changed) maven/plugins/trunk/maven-source-plugin/src/test/java/org/apache/maven/plugin/source/SourceJarMojoTest.java (props changed) maven/plugins/trunk/maven-source-plugin/src/test/java/org/apache/maven/plugin/source/TestSourceJarMojoTest.java (props changed) maven/plugins/trunk/maven-source-plugin/src/test/java/org/apache/maven/plugin/source/stubs/Project001Stub.java (props changed) maven/plugins/trunk/maven-source-plugin/src/test/java/org/apache/maven/plugin/source/stubs/Project003Stub.java (props changed) maven/plugins/trunk/maven-source-plugin/src/test/java/org/apache/maven/plugin/source/stubs/Project005Stub.java (props changed) maven/plugins/trunk/maven-source-plugin/src/test/java/org/apache/maven/plugin/source/stubs/Project007Stub.java (props changed) maven/plugins/trunk/maven-source-plugin/src/test/java/org/apache/maven/plugin/source/stubs/SourcePluginArtifactStub.java (props changed) maven/plugins/trunk/maven-source-plugin/src/test/resources/unit/project-001/pom.xml (props changed) maven/plugins/trunk/maven-source-plugin/src/test/resources/unit/project-001/src/main/java/foo/project001/App.java (props changed) maven/plugins/trunk/maven-source-plugin/src/test/resources/unit/project-001/src/main/resources/.cvsignore (props changed) maven/plugins/trunk/maven-source-plugin/src/test/resources/unit/project-001/src/main/resources/default-configuration.properties (props changed) maven/plugins/trunk/maven-source-plugin/src/test/resources/unit/project-001/src/test/java/foo/project001/AppTest.java (props changed) maven/plugins/trunk/maven-source-plugin/src/test/resources/unit/project-001/src/test/resources/.cvsignore (props changed) maven/plugins/trunk/maven-source-plugin/src/test/resources/unit/project-001/src/test/resources/test-default-configuration.properties (props changed) maven/plugins/trunk/maven-source-plugin/src/test/resources/unit/project-003/pom.xml (props changed) maven/plugins/trunk/maven-source-plugin/src/test/resources/unit/project-003/src/main/java/foo/project003/App.java (props changed) maven/plugins/trunk/maven-source-plugin/src/test/resources/unit/project-003/src/main/resources/default-configuration.properties (props changed) maven/plugins/trunk/maven-source-plugin/src/test/resources/unit/project-003/src/main/resources/excluded-file.txt (props changed) maven/plugins/trunk/maven-source-plugin/src/test/resources/unit/project-003/src/test/java/foo/project003/AppTest.java (props changed) maven/plugins/trunk/maven-source-plugin/src/test/resources/unit/project-003/src/test/resources/excluded-file.txt (props changed) maven/plugins/trunk/maven-source-plugin/src/test/resources/unit/project-003/src/test/resources/test-default-configuration.properties (props changed) maven/plugins/trunk/maven-source-plugin/src/test/resources/unit/project-005/pom.xml (props changed) maven/plugins/trunk/maven-source-plugin/src/test/resources/unit/project-007/pom.xml (props changed) maven/plugins/trunk/maven-source-plugin/src/test/resources/unit/project-007/src/main/java/foo/project007/App.java (props changed) maven/plugins/trunk/maven-source-plugin/src/test/resources/unit/project-007/src/main/resources/default-configuration.properties (props changed) maven/plugins/trunk/maven-source-plugin/src/test/resources/unit/project-007/src/main/resources/templates/configuration-template.properties (props changed) Modified:
svn commit: r589223 - /maven/plugins/trunk/maven-source-plugin/src/main/java/org/apache/maven/plugin/source/AbstractSourceJarMojo.java
Author: dennisl
Date: Sat Oct 27 14:56:01 2007
New Revision: 589223
URL: http://svn.apache.org/viewvc?rev=589223view=rev
Log:
o Fix errors reported by Checkstyle.
Modified:
maven/plugins/trunk/maven-source-plugin/src/main/java/org/apache/maven/plugin/source/AbstractSourceJarMojo.java
Modified:
maven/plugins/trunk/maven-source-plugin/src/main/java/org/apache/maven/plugin/source/AbstractSourceJarMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-source-plugin/src/main/java/org/apache/maven/plugin/source/AbstractSourceJarMojo.java?rev=589223r1=589222r2=589223view=diff
==
---
maven/plugins/trunk/maven-source-plugin/src/main/java/org/apache/maven/plugin/source/AbstractSourceJarMojo.java
(original)
+++
maven/plugins/trunk/maven-source-plugin/src/main/java/org/apache/maven/plugin/source/AbstractSourceJarMojo.java
Sat Oct 27 14:56:01 2007
@@ -35,10 +35,15 @@
import java.util.Iterator;
import java.util.List;
+/**
+ * Base class for bundling sources into a jar archive.
+ *
+ * @version $Id$
+ */
public abstract class AbstractSourceJarMojo
extends AbstractMojo
{
-private static final String[] DEFAULT_INCLUDES = new String[]{**/*,};
+private static final String[] DEFAULT_INCLUDES = new String[]{**/*};
/**
* @parameter expression=${project}
@@ -124,9 +129,9 @@
{
if ( project.getArtifact().getClassifier() != null )
{
-getLog().warn( NOT adding sources to artifacts with classifier as
Maven only supports one classifier +
-per artifact. Current artifact [ +
project.getArtifact().getId() + ] has a [ +
-project.getArtifact().getClassifier() + ] classifier. );
+getLog().warn( NOT adding sources to artifacts with classifier as
Maven only supports one classifier
++ per artifact. Current artifact [ +
project.getArtifact().getId() + ] has a [
++ project.getArtifact().getClassifier() + ] classifier. );
}
else
{
svn commit: r589225 - /maven/plugins/trunk/maven-source-plugin/pom.xml
Author: dennisl Date: Sat Oct 27 15:03:46 2007 New Revision: 589225 URL: http://svn.apache.org/viewvc?rev=589225view=rev Log: o Use latest parent. Modified: maven/plugins/trunk/maven-source-plugin/pom.xml Modified: maven/plugins/trunk/maven-source-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-source-plugin/pom.xml?rev=589225r1=589224r2=589225view=diff == --- maven/plugins/trunk/maven-source-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-source-plugin/pom.xml Sat Oct 27 15:03:46 2007 @@ -20,7 +20,7 @@ parent artifactIdmaven-plugins/artifactId groupIdorg.apache.maven.plugins/groupId -version8/version +version10/version /parent modelVersion4.0.0/modelVersion artifactIdmaven-source-plugin/artifactId
svn commit: r589227 - in /maven/plugins/trunk/maven-source-plugin/src/main/java/org/apache/maven/plugin/source: AbstractSourceJarMojo.java AggregatorSourceJarMojo.java
Author: dennisl
Date: Sat Oct 27 15:26:35 2007
New Revision: 589227
URL: http://svn.apache.org/viewvc?rev=589227view=rev
Log:
o Improve documentation.
Modified:
maven/plugins/trunk/maven-source-plugin/src/main/java/org/apache/maven/plugin/source/AbstractSourceJarMojo.java
maven/plugins/trunk/maven-source-plugin/src/main/java/org/apache/maven/plugin/source/AggregatorSourceJarMojo.java
Modified:
maven/plugins/trunk/maven-source-plugin/src/main/java/org/apache/maven/plugin/source/AbstractSourceJarMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-source-plugin/src/main/java/org/apache/maven/plugin/source/AbstractSourceJarMojo.java?rev=589227r1=589226r2=589227view=diff
==
---
maven/plugins/trunk/maven-source-plugin/src/main/java/org/apache/maven/plugin/source/AbstractSourceJarMojo.java
(original)
+++
maven/plugins/trunk/maven-source-plugin/src/main/java/org/apache/maven/plugin/source/AbstractSourceJarMojo.java
Sat Oct 27 15:26:35 2007
@@ -69,6 +69,8 @@
protected boolean excludeResources;
/**
+ * Used for attaching the source jar to the project.
+ *
* @component
*/
private MavenProjectHelper projectHelper;
@@ -96,6 +98,8 @@
protected String finalName;
/**
+ * Contains the full list of projects in the reactor.
+ *
* @parameter expression=${reactorProjects}
*/
protected List reactorProjects;
Modified:
maven/plugins/trunk/maven-source-plugin/src/main/java/org/apache/maven/plugin/source/AggregatorSourceJarMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-source-plugin/src/main/java/org/apache/maven/plugin/source/AggregatorSourceJarMojo.java?rev=589227r1=589226r2=589227view=diff
==
---
maven/plugins/trunk/maven-source-plugin/src/main/java/org/apache/maven/plugin/source/AggregatorSourceJarMojo.java
(original)
+++
maven/plugins/trunk/maven-source-plugin/src/main/java/org/apache/maven/plugin/source/AggregatorSourceJarMojo.java
Sat Oct 27 15:26:35 2007
@@ -22,7 +22,7 @@
import org.apache.maven.plugin.MojoExecutionException;
/**
- * Aggregrate sources for all modules in a aggregator project.
+ * Aggregrate sources for all modules in an aggregator project.
*
* @goal aggregate
* @phase package
svn commit: r589238 - /maven/site/trunk/src/site/apt/plugins/index.apt
Author: dennisl
Date: Sat Oct 27 16:05:53 2007
New Revision: 589238
URL: http://svn.apache.org/viewvc?rev=589238view=rev
Log:
o Update versions.
Modified:
maven/site/trunk/src/site/apt/plugins/index.apt
Modified: maven/site/trunk/src/site/apt/plugins/index.apt
URL:
http://svn.apache.org/viewvc/maven/site/trunk/src/site/apt/plugins/index.apt?rev=589238r1=589237r2=589238view=diff
==
--- maven/site/trunk/src/site/apt/plugins/index.apt (original)
+++ maven/site/trunk/src/site/apt/plugins/index.apt Sat Oct 27 16:05:53 2007
@@ -41,7 +41,7 @@
*---*+--+
| packaging types / tools | | These plugins relate to packaging
respective artifact types.
*---++--+
-| {{{/plugins/maven-ear-plugin/} ear}}| 2.3|
Generate an EAR from the current project.
+| {{{/plugins/maven-ear-plugin/} ear}}| 2.3.1 |
Generate an EAR from the current project.
*---++--+
| {{{/plugins/maven-ejb-plugin/} ejb}}| 2.1| Build
an EJB (and optional client) from the current project.
*---++--+
@@ -55,7 +55,7 @@
*---+---+--+
| {{{/plugins/maven-changelog-plugin/} changelog}}| 2.1|
Generate a list of recent changes from your SCM.
*---+---+--+
-| {{{/plugins/maven-changes-plugin/} changes}}| 2.0-beta-2 |
Generate a report from issue tracking or a change document.
+| {{{/plugins/maven-changes-plugin/} changes}}| 2.0-beta-3 |
Generate a report from issue tracking or a change document.
*---++--+
| {{{/plugins/maven-checkstyle-plugin/} checkstyle}} | 2.1|
Generate a checkstyle report.
*---++--+
@@ -101,9 +101,9 @@
*---++--+
| {{{/plugins/maven-plugin-plugin/} plugin}} | 2.3| Create
a Maven plugin descriptor for any Mojo's found in the source tree, to include
in the JAR.
*---++--+
-| {{{/plugins/maven-release-plugin/} release}}| 2.0-beta-6 |
Release the current project - updating the POM and tagging in the SCM.
+| {{{/plugins/maven-release-plugin/} release}}| 2.0-beta-7 |
Release the current project - updating the POM and tagging in the SCM.
*---++--+
-| {{{/plugins/maven-remote-resources-plugin/} remote-resources}}|
1.0-alpha-4 | Copy remote resources to the output directory for inclusion in
the artifact.
+| {{{/plugins/maven-remote-resources-plugin/} remote-resources}}|
1.0-alpha-6 | Copy remote resources to the output directory for inclusion in
the artifact.
*---++--+
| {{{/plugins/maven-repository-plugin/} repository}} | 2.0| Plugin
to help with repository-based tasks.
*---++--+
svn commit: r589261 - in /maven/core-integration-testing/trunk/core-integration-testing-plugins/maven-it-plugin-all: ./ src/ src/main/ src/main/java/ src/main/java/org/ src/main/java/org/apache/ src/m
Author: brianf Date: Sat Oct 27 19:16:30 2007 New Revision: 589261 URL: http://svn.apache.org/viewvc?rev=589261view=rev Log: adding new coreit plugin to consolidate some of the others. Added: maven/core-integration-testing/trunk/core-integration-testing-plugins/maven-it-plugin-all/ (with props) maven/core-integration-testing/trunk/core-integration-testing-plugins/maven-it-plugin-all/pom.xml maven/core-integration-testing/trunk/core-integration-testing-plugins/maven-it-plugin-all/src/ maven/core-integration-testing/trunk/core-integration-testing-plugins/maven-it-plugin-all/src/main/ maven/core-integration-testing/trunk/core-integration-testing-plugins/maven-it-plugin-all/src/main/java/ maven/core-integration-testing/trunk/core-integration-testing-plugins/maven-it-plugin-all/src/main/java/org/ maven/core-integration-testing/trunk/core-integration-testing-plugins/maven-it-plugin-all/src/main/java/org/apache/ maven/core-integration-testing/trunk/core-integration-testing-plugins/maven-it-plugin-all/src/main/java/org/apache/maven/ maven/core-integration-testing/trunk/core-integration-testing-plugins/maven-it-plugin-all/src/main/java/org/apache/maven/plugin/ maven/core-integration-testing/trunk/core-integration-testing-plugins/maven-it-plugin-all/src/main/java/org/apache/maven/plugin/coreit/ maven/core-integration-testing/trunk/core-integration-testing-plugins/maven-it-plugin-all/src/main/java/org/apache/maven/plugin/coreit/AggregatorDependenciesMojo.java Propchange: maven/core-integration-testing/trunk/core-integration-testing-plugins/maven-it-plugin-all/ -- --- svn:ignore (added) +++ svn:ignore Sat Oct 27 19:16:30 2007 @@ -0,0 +1,4 @@ +.classpath +.project +.settings +target Added: maven/core-integration-testing/trunk/core-integration-testing-plugins/maven-it-plugin-all/pom.xml URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-testing-plugins/maven-it-plugin-all/pom.xml?rev=589261view=auto == --- maven/core-integration-testing/trunk/core-integration-testing-plugins/maven-it-plugin-all/pom.xml (added) +++ maven/core-integration-testing/trunk/core-integration-testing-plugins/maven-it-plugin-all/pom.xml Sat Oct 27 19:16:30 2007 @@ -0,0 +1,43 @@ +?xml version=1.0 encoding=UTF-8? + +!-- + ~ Copyright 2005-2006 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=http://maven.apache.org/POM/4.0.0; xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance; + xsi:schemaLocation=http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd; + parent +artifactIdmaven-it-plugins/artifactId +groupIdorg.apache.maven.its.plugins/groupId +version2.1-SNAPSHOT/version + /parent + modelVersion4.0.0/modelVersion + artifactIdmaven-it-plugin-all/artifactId + packagingmaven-plugin/packaging + nameMaven Integration Test Plugin :: This plugin should contain the mojos needed by all tests./name + inceptionYear2007/inceptionYear + + properties +maven.test.skiptrue/maven.test.skip + /properties + + dependencies +dependency + groupIdorg.apache.maven/groupId + artifactIdmaven-plugin-api/artifactId + version2.0/version +/dependency + /dependencies +/project Added: maven/core-integration-testing/trunk/core-integration-testing-plugins/maven-it-plugin-all/src/main/java/org/apache/maven/plugin/coreit/AggregatorDependenciesMojo.java URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-testing-plugins/maven-it-plugin-all/src/main/java/org/apache/maven/plugin/coreit/AggregatorDependenciesMojo.java?rev=589261view=auto == --- maven/core-integration-testing/trunk/core-integration-testing-plugins/maven-it-plugin-all/src/main/java/org/apache/maven/plugin/coreit/AggregatorDependenciesMojo.java (added) +++ maven/core-integration-testing/trunk/core-integration-testing-plugins/maven-it-plugin-all/src/main/java/org/apache/maven/plugin/coreit/AggregatorDependenciesMojo.java Sat Oct 27 19:16:30 2007 @@ -0,0 +1,22 @@ +package org.apache.maven.plugin.coreit; + +import org.apache.maven.plugin.AbstractMojo; +import
svn commit: r589262 - /maven/core-integration-testing/trunk/core-integration-testing-plugins/pom.xml
Author: brianf Date: Sat Oct 27 19:16:49 2007 New Revision: 589262 URL: http://svn.apache.org/viewvc?rev=589262view=rev Log: adding new coreit plugin to consolidate some of the others. Modified: maven/core-integration-testing/trunk/core-integration-testing-plugins/pom.xml Modified: maven/core-integration-testing/trunk/core-integration-testing-plugins/pom.xml URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-testing-plugins/pom.xml?rev=589262r1=589261r2=589262view=diff == --- maven/core-integration-testing/trunk/core-integration-testing-plugins/pom.xml (original) +++ maven/core-integration-testing/trunk/core-integration-testing-plugins/pom.xml Sat Oct 27 19:16:49 2007 @@ -21,7 +21,8 @@ modulemaven-it-plugin-parameter-implementation/module modulemaven-it-plugin-setter/module modulemaven-it-plugin-touch/module -modulemaven-it-plugin-uses-properties/module +modulemaven-it-plugin-uses-properties/module +modulemaven-it-plugin-all/module /modules build
