svn commit: r463979 - /maven/plugins/trunk/maven-docck-plugin/pom.xml
Author: dennisl Date: Sat Oct 14 09:36:14 2006 New Revision: 463979 URL: http://svn.apache.org/viewvc?view=revrev=463979 Log: [maven-release-plugin] prepare for next development iteration Modified: maven/plugins/trunk/maven-docck-plugin/pom.xml Modified: maven/plugins/trunk/maven-docck-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-docck-plugin/pom.xml?view=diffrev=463979r1=463978r2=463979 == --- maven/plugins/trunk/maven-docck-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-docck-plugin/pom.xml Sat Oct 14 09:36:14 2006 @@ -25,7 +25,7 @@ /parent artifactIdmaven-docck-plugin/artifactId packagingmaven-plugin/packaging - version1.0-beta-1/version + version1.0-beta-2-SNAPSHOT/version nameMaven Documentation Checker Plugin/name prerequisites maven2.0/maven @@ -105,10 +105,4 @@ scopetest/scope /dependency /dependencies - - scm - connectionscm:svn:https://svn.apache.org/repos/asf/maven/plugins/tags/maven-docck-plugin-1.0-beta-1/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/plugins/tags/maven-docck-plugin-1.0-beta-1/developerConnection - urlhttps://svn.apache.org/repos/asf/maven/plugins/tags/maven-docck-plugin-1.0-beta-1/url - /scm /project
svn commit: r468766 - /maven/plugins/trunk/maven-changelog-plugin/src/main/java/org/apache/maven/changelog/
Author: dennisl Date: Sat Oct 28 15:26:56 2006 New Revision: 468766 URL: http://svn.apache.org/viewvc?view=revrev=468766 Log: o Remove a directory that was left behind when the plugin was moved to its correct java package. Removed: maven/plugins/trunk/maven-changelog-plugin/src/main/java/org/apache/maven/changelog/
svn commit: r468790 - /maven/plugins/trunk/maven-changelog-plugin/src/main/java/org/apache/maven/plugin/changelog/ChangeLogReport.java
Author: dennisl
Date: Sat Oct 28 16:57:18 2006
New Revision: 468790
URL: http://svn.apache.org/viewvc?view=revrev=468790
Log:
[MCHANGELOG-16] when using svn, links are wrong.
o Rearrange the code so that displayFileDetailUrl is used if and only if it
is supplied in the configuration.
o Add a special token %FILE% that can be put anywhere in
displayFileDetailUrl. The token will be replaced with the actual path to the
file when the report is generated. This enables the user to have more complex
URLs than was previously possible.
Modified:
maven/plugins/trunk/maven-changelog-plugin/src/main/java/org/apache/maven/plugin/changelog/ChangeLogReport.java
Modified:
maven/plugins/trunk/maven-changelog-plugin/src/main/java/org/apache/maven/plugin/changelog/ChangeLogReport.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changelog-plugin/src/main/java/org/apache/maven/plugin/changelog/ChangeLogReport.java?view=diffrev=468790r1=468789r2=468790
==
---
maven/plugins/trunk/maven-changelog-plugin/src/main/java/org/apache/maven/plugin/changelog/ChangeLogReport.java
(original)
+++
maven/plugins/trunk/maven-changelog-plugin/src/main/java/org/apache/maven/plugin/changelog/ChangeLogReport.java
Sat Oct 28 16:57:18 2006
@@ -69,6 +69,12 @@
extends AbstractMavenReport
{
/**
+ * A special token that represents the SCM relative path for a file.
+ * It can be used in codedisplayFileDetailUrl/code.
+ */
+private static final String FILE_TOKEN = %FILE%;
+
+/**
* Used to specify whether to build the log using range, tag or date.
*
* @parameter expression=${changelog.type} default-value=range
@@ -244,7 +250,19 @@
private String connectionType;
/**
- * Allows the user to specify the file detail URL to use when viewing an
scm file.
+ * A template string that is used to create the URL to the file details.
+ * There is a special token that you can use in your template:
+ * ul
+ * licode%FILE%/code - this is the path to a file/li
+ * /ul
+ * p
+ * Example:
+ *
codehttp://checkstyle.cvs.sourceforge.net/checkstyle%FILE%?view=markup/code
+ * /p
+ * p
+ * strongNote:/strong If you don't supply the token in your template,
+ * the path of the file will simply be appended to your template URL.
+ * /p
*
* @parameter expression=${project.scm.url}
*/
@@ -987,29 +1005,6 @@
rpt_MultiRepoParam = +
rpt_TmpMultiRepoParam.substring( 1 );
}
-else
-{
-idx = displayFileDetailUrl.indexOf( ? );
-
-if ( idx 0 )
-{
-String fileDetailUrl = displayFileDetailUrl.substring(
0, idx );
-
-String rpt_TmpMultiRepoParam =
displayFileDetailUrl.substring( idx + 1 );
-
-displayFileDetailUrl = fileDetailUrl;
-
-rpt_OneRepoParam = ? + rpt_TmpMultiRepoParam;
-
-rpt_MultiRepoParam = + rpt_TmpMultiRepoParam;
-}
-else
-{
-rpt_OneRepoParam = ;
-
-rpt_MultiRepoParam = ;
-}
-}
}
else
{
@@ -1090,7 +1085,21 @@
if ( displayFileDetailUrl != null )
{
-if ( connection.startsWith( scm:perforce ) )
+if ( !scmUrl.equals( displayFileDetailUrl ) )
+{
+// Use the given URL to create links to the files
+if( displayFileDetailUrl.indexOf( FILE_TOKEN ) 0 )
+{
+linkFile = displayFileDetailUrl.replaceAll( FILE_TOKEN,
name );
+}
+else
+{
+// This is here so that we are backwards compatible with
the
+// format used before the special token was introduced
+linkFile = displayFileDetailUrl + name;
+}
+}
+else if ( connection.startsWith( scm:perforce ) )
{
String path = getAbsolutePath( displayFileDetailUrl, name );
linkFile = path + ?ac=22;
svn commit: r468792 - /maven/plugins/trunk/maven-changelog-plugin/src/test/java/org/apache/maven/changelog/
Author: dennisl Date: Sat Oct 28 16:58:52 2006 New Revision: 468792 URL: http://svn.apache.org/viewvc?view=revrev=468792 Log: o Remove a directory that was left behind when the plugin was moved to its correct java package. Removed: maven/plugins/trunk/maven-changelog-plugin/src/test/java/org/apache/maven/changelog/
svn commit: r468945 - in /maven/shared/trunk/maven-model-converter/src: main/java/org/apache/maven/model/converter/plugins/PCCChanges.java test/java/org/apache/maven/model/converter/plugins/PCCChanges
Author: dennisl
Date: Sun Oct 29 09:27:41 2006
New Revision: 468945
URL: http://svn.apache.org/viewvc?view=revrev=468945
Log:
[MNG-2491] [maven-model-converter] Fix parameter name for changes-plugin.
Modified:
maven/shared/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/plugins/PCCChanges.java
maven/shared/trunk/maven-model-converter/src/test/java/org/apache/maven/model/converter/plugins/PCCChangesTest.java
Modified:
maven/shared/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/plugins/PCCChanges.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/plugins/PCCChanges.java?view=diffrev=468945r1=468944r2=468945
==
---
maven/shared/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/plugins/PCCChanges.java
(original)
+++
maven/shared/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/plugins/PCCChanges.java
Sun Oct 29 09:27:41 2006
@@ -49,6 +49,6 @@
Properties projectProperties )
throws ProjectConverterException
{
-addConfigurationChild( configuration, projectProperties,
maven.changes.issue.template, link_template );
+addConfigurationChild( configuration, projectProperties,
maven.changes.issue.template, issueLinkTemplate );
}
}
Modified:
maven/shared/trunk/maven-model-converter/src/test/java/org/apache/maven/model/converter/plugins/PCCChangesTest.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-model-converter/src/test/java/org/apache/maven/model/converter/plugins/PCCChangesTest.java?view=diffrev=468945r1=468944r2=468945
==
---
maven/shared/trunk/maven-model-converter/src/test/java/org/apache/maven/model/converter/plugins/PCCChangesTest.java
(original)
+++
maven/shared/trunk/maven-model-converter/src/test/java/org/apache/maven/model/converter/plugins/PCCChangesTest.java
Sun Oct 29 09:27:41 2006
@@ -44,7 +44,7 @@
pluginConfigurationConverter.buildConfiguration( configuration,
v3Model, projectProperties );
-String value = configuration.getChild( link_template
).getValue();
+String value = configuration.getChild( issueLinkTemplate
).getValue();
Assert.assertEquals( check link_template value,
%URL%/browse/%ISSUE%, value );
}
catch ( ProjectConverterException e )
svn commit: r469009 - in /maven/plugins/trunk/maven-release-plugin/src/site: apt/examples/ fml/
Author: dennisl Date: Sun Oct 29 13:50:14 2006 New Revision: 469009 URL: http://svn.apache.org/viewvc?view=revrev=469009 Log: o Set EOL style to native. Modified: maven/plugins/trunk/maven-release-plugin/src/site/apt/examples/generate-release-poms.apt (props changed) maven/plugins/trunk/maven-release-plugin/src/site/apt/examples/lock-files.apt (props changed) maven/plugins/trunk/maven-release-plugin/src/site/apt/examples/perform-release.apt (props changed) maven/plugins/trunk/maven-release-plugin/src/site/apt/examples/prepare-release.apt (props changed) maven/plugins/trunk/maven-release-plugin/src/site/apt/examples/run-goals-before-commit.apt (props changed) maven/plugins/trunk/maven-release-plugin/src/site/fml/faq.fml (contents, props changed) Propchange: maven/plugins/trunk/maven-release-plugin/src/site/apt/examples/generate-release-poms.apt -- svn:eol-style = native Propchange: maven/plugins/trunk/maven-release-plugin/src/site/apt/examples/lock-files.apt -- svn:eol-style = native Propchange: maven/plugins/trunk/maven-release-plugin/src/site/apt/examples/perform-release.apt -- svn:eol-style = native Propchange: maven/plugins/trunk/maven-release-plugin/src/site/apt/examples/prepare-release.apt -- svn:eol-style = native Propchange: maven/plugins/trunk/maven-release-plugin/src/site/apt/examples/run-goals-before-commit.apt -- svn:eol-style = native Modified: maven/plugins/trunk/maven-release-plugin/src/site/fml/faq.fml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-release-plugin/src/site/fml/faq.fml?view=diffrev=469009r1=469008r2=469009 == --- maven/plugins/trunk/maven-release-plugin/src/site/fml/faq.fml (original) +++ maven/plugins/trunk/maven-release-plugin/src/site/fml/faq.fml Sun Oct 29 13:50:14 2006 @@ -1,28 +1,28 @@ -?xml version=1.0? - -!-- - ~ Copyright 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. - -- - -faqs id=FAQ title=Frequently Asked Questions - part id=General - faq id=versioning - questionReleasing from a parent pom, won't all its modules have the same release version and dev version as this parent?/question - answer - pMaven Release Plugin will prompt for each project's version./p - /answer - /faq - /part +?xml version=1.0? + +!-- + ~ Copyright 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. + -- + +faqs id=FAQ title=Frequently Asked Questions + part id=General + faq id=versioning + questionReleasing from a parent pom, won't all its modules have the same release version and dev version as this parent?/question + answer + pMaven Release Plugin will prompt for each project's version./p + /answer + /faq + /part /faqs Propchange: maven/plugins/trunk/maven-release-plugin/src/site/fml/faq.fml -- svn:eol-style = native
svn commit: r470583 - /maven/components/trunk/doap_Maven.rdf
Author: dennisl Date: Thu Nov 2 14:53:45 2006 New Revision: 470583 URL: http://svn.apache.org/viewvc?view=revrev=470583 Log: o Set EOL style to native. Modified: maven/components/trunk/doap_Maven.rdf (props changed) Propchange: maven/components/trunk/doap_Maven.rdf -- svn:eol-style = native
svn commit: r470591 - /maven/plugins/trunk/maven-doap-plugin/src/main/java/org/apache/maven/plugin/doap/DoapMojo.java
Author: dennisl
Date: Thu Nov 2 15:16:40 2006
New Revision: 470591
URL: http://svn.apache.org/viewvc?view=revrev=470591
Log:
o Make sure that the URLs for mailing-list and download-page don't have two
slashes after each other in them.
Modified:
maven/plugins/trunk/maven-doap-plugin/src/main/java/org/apache/maven/plugin/doap/DoapMojo.java
Modified:
maven/plugins/trunk/maven-doap-plugin/src/main/java/org/apache/maven/plugin/doap/DoapMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-doap-plugin/src/main/java/org/apache/maven/plugin/doap/DoapMojo.java?view=diffrev=470591r1=470590r2=470591
==
---
maven/plugins/trunk/maven-doap-plugin/src/main/java/org/apache/maven/plugin/doap/DoapMojo.java
(original)
+++
maven/plugins/trunk/maven-doap-plugin/src/main/java/org/apache/maven/plugin/doap/DoapMojo.java
Thu Nov 2 15:16:40 2006
@@ -72,6 +72,7 @@
/**
* The language which should be displayed in the DOAP file. The POM
doesn't have any
* notions of language yet.
+ *
* @parameter expression=${language} default-value=Java
*/
private String language;
@@ -150,8 +151,8 @@
element( shortdesc, project.getDescription() );
element( description, project.getDescription() );
rdfResourceElement( bug-database,
project.getIssueManagement().getUrl() );
-rdfResourceElement( mailing-list, project.getUrl() +
/mail-lists.html );
-rdfResourceElement( download-page, project.getUrl() +
/download.html );
+rdfResourceElement( mailing-list, composeUrl( project.getUrl() ,
/mail-lists.html ) );
+rdfResourceElement( download-page, composeUrl( project.getUrl() ,
/download.html ) );
element( programming-language, language );
//TODO: how to lookup category, map it, or just declare it.
rdfResourceElement( category, http://projects.apache.org/category/;
+ category );
@@ -247,6 +248,26 @@
rdfResourceElement( foaf:mbox, mailto:; + d.getEmail() );
w.endElement();
w.endElement();
+}
+}
+
+/**
+ * Compose a URL from two parts: a base URL and a file path. This method
+ * makes sure that there will not be two slash '/' characters after each
+ * other.
+ *
+ * @param base The base URL
+ * @param path The file
+ */
+private String composeUrl( String base, String path )
+{
+if ( base.endsWith( / ) path.startsWith( / ) )
+{
+return base + path.substring( 1 );
+}
+else
+{
+return base + path;
}
}
}
svn commit: r470592 - /maven/plugins/trunk/maven-doap-plugin/
Author: dennisl Date: Thu Nov 2 15:18:33 2006 New Revision: 470592 URL: http://svn.apache.org/viewvc?view=revrev=470592 Log: o Ignore target directory and IDEA files. Modified: maven/plugins/trunk/maven-doap-plugin/ (props changed) Propchange: maven/plugins/trunk/maven-doap-plugin/ -- --- svn:ignore (original) +++ svn:ignore Thu Nov 2 15:18:33 2006 @@ -1,5 +1,4 @@ +target *.iml *.ipr *.iws -*~ -target
svn commit: r470593 - /maven/plugins/trunk/maven-doap-plugin/
Author: dennisl Date: Thu Nov 2 15:22:47 2006 New Revision: 470593 URL: http://svn.apache.org/viewvc?view=revrev=470593 Log: o Put back ignore pattern that was removed by accident. Modified: maven/plugins/trunk/maven-doap-plugin/ (props changed) Propchange: maven/plugins/trunk/maven-doap-plugin/ -- --- svn:ignore (original) +++ svn:ignore Thu Nov 2 15:22:47 2006 @@ -2,3 +2,4 @@ *.iml *.ipr *.iws +*~
svn commit: r470602 - /maven/components/trunk/doap_Maven.rdf
Author: dennisl Date: Thu Nov 2 15:43:22 2006 New Revision: 470602 URL: http://svn.apache.org/viewvc?view=revrev=470602 Log: [MNG-2117] Update doap file descriptor o Regenerate the doap descriptor using the latest version of the DOAP plugin. Modified: maven/components/trunk/doap_Maven.rdf Modified: maven/components/trunk/doap_Maven.rdf URL: http://svn.apache.org/viewvc/maven/components/trunk/doap_Maven.rdf?view=diffrev=470602r1=470601r2=470602 == --- maven/components/trunk/doap_Maven.rdf (original) +++ maven/components/trunk/doap_Maven.rdf Thu Nov 2 15:43:22 2006 @@ -23,8 +23,8 @@ shortdescMaven is a project development management and comprehension tool. Based on the concept of a project object model: builds, dependency management, documentation creation, site publication, and distribution publication are all controlled from the declarative file. Maven can be extended by plugins to utilise a number of other development tools for reporting or the build process./shortdesc descriptionMaven is a project development management and comprehension tool. Based on the concept of a project object model: builds, dependency management, documentation creation, site publication, and distribution publication are all controlled from the declarative file. Maven can be extended by plugins to utilise a number of other development tools for reporting or the build process./description bug-database rdf:resource=http://jira.codehaus.org/browse/MNG/ -mailing-list rdf:resource=http://maven.apache.org//mail-lists.html/ -download-page rdf:resource=http://maven.apache.org//download.html/ +mailing-list rdf:resource=http://maven.apache.org/mail-lists.html/ +download-page rdf:resource=http://maven.apache.org/download.html/ programming-languageJava/programming-language category rdf:resource=http://projects.apache.org/category/build-management/ repository @@ -109,6 +109,12 @@ foaf:Person foaf:nameCarlos Sanchez/foaf:name foaf:mbox rdf:resource=mailto:[EMAIL PROTECTED]/ + /foaf:Person +/maintainer +maintainer + foaf:Person +foaf:nameDennis Lundberg/foaf:name +foaf:mbox rdf:resource=mailto:[EMAIL PROTECTED]/ /foaf:Person /maintainer /Project
svn commit: r470612 - in /maven/site/trunk/src/site: apt/glossary.apt xdoc/developers/mojo-api-specification.xml
Author: dennisl
Date: Thu Nov 2 16:08:33 2006
New Revision: 470612
URL: http://svn.apache.org/viewvc?view=revrev=470612
Log:
[MNG-1290] What is a Mojo?
o Added explanations to /glossary.html and
/developers/mojo-api-specifications.html.
Modified:
maven/site/trunk/src/site/apt/glossary.apt
maven/site/trunk/src/site/xdoc/developers/mojo-api-specification.xml
Modified: maven/site/trunk/src/site/apt/glossary.apt
URL:
http://svn.apache.org/viewvc/maven/site/trunk/src/site/apt/glossary.apt?view=diffrev=470612r1=470611r2=470612
==
--- maven/site/trunk/src/site/apt/glossary.apt (original)
+++ maven/site/trunk/src/site/apt/glossary.apt Thu Nov 2 16:08:33 2006
@@ -43,6 +43,11 @@
Examples of plugins are: jar, eclipse, war. Plugins are primarily written
in Java, but Maven
also supports writing plug-ins in Beanshell and Ant Scripting.
+ * {Mojo}:
+A plugin written in Java consists of one or more mojos. A mojo is a Java
class that implements
+the org.apache.maven.plugin.Mojo interface. This means that a mojo is the
implementation for
+a goal in a plugin.
+
~~ * {Goal}: and phases
~~Goals are what are executed to perform an action on the project. For
example, the
~~jar:jar will compile the current project and produce a JAR.
Modified: maven/site/trunk/src/site/xdoc/developers/mojo-api-specification.xml
URL:
http://svn.apache.org/viewvc/maven/site/trunk/src/site/xdoc/developers/mojo-api-specification.xml?view=diffrev=470612r1=470611r2=470612
==
--- maven/site/trunk/src/site/xdoc/developers/mojo-api-specification.xml
(original)
+++ maven/site/trunk/src/site/xdoc/developers/mojo-api-specification.xml Thu
Nov 2 16:08:33 2006
@@ -25,7 +25,9 @@
body
section name=Introduction
pStarting with Maven 2.0, plugins can be written in Java or any of a
-number of scripting languages. Additionally, Maven tries to stay out of
+number of scripting languages. Plugins consists of one or more Mojos,
+each one being the implementation for one of the plugin's goals.
+Maven tries to stay out of
the way of the programmer with its new Mojo API. This opens up the
opportunity for many Mojos to be reused outside of Maven, or bridged
into Maven from external systems like Ant./p
svn commit: r470801 - /maven/site/trunk/pom.xml
Author: dennisl Date: Fri Nov 3 05:21:14 2006 New Revision: 470801 URL: http://svn.apache.org/viewvc?view=revrev=470801 Log: o Change minotaur.o.a to people.o.a. Modified: maven/site/trunk/pom.xml Modified: maven/site/trunk/pom.xml URL: http://svn.apache.org/viewvc/maven/site/trunk/pom.xml?view=diffrev=470801r1=470800r2=470801 == --- maven/site/trunk/pom.xml (original) +++ maven/site/trunk/pom.xml Fri Nov 3 05:21:14 2006 @@ -41,7 +41,7 @@ distributionManagement site idapache.website/id - urlscp://minotaur.apache.org/www/maven.apache.org//url + urlscp://people.apache.org/www/maven.apache.org//url /site /distributionManagement
svn commit: r470805 - /maven/plugins/trunk/pom.xml
Author: dennisl Date: Fri Nov 3 05:30:16 2006 New Revision: 470805 URL: http://svn.apache.org/viewvc?view=revrev=470805 Log: o Change minotaur.a.o to people.a.o. Modified: maven/plugins/trunk/pom.xml Modified: maven/plugins/trunk/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/pom.xml?view=diffrev=470805r1=470804r2=470805 == --- maven/plugins/trunk/pom.xml (original) +++ maven/plugins/trunk/pom.xml Fri Nov 3 05:30:16 2006 @@ -66,7 +66,7 @@ distributionManagement site idapache.website/id - urlscp://minotaur.apache.org/www/maven.apache.org/plugins//url + urlscp://people.apache.org/www/maven.apache.org/plugins//url /site /distributionManagement modules
svn commit: r470871 - /maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteMojo.java
Author: dennisl
Date: Fri Nov 3 08:31:21 2006
New Revision: 470871
URL: http://svn.apache.org/viewvc?view=revrev=470871
Log:
o Fix typo in a warning message.
Modified:
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteMojo.java
Modified:
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteMojo.java?view=diffrev=470871r1=470870r2=470871
==
---
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteMojo.java
(original)
+++
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteMojo.java
Fri Nov 3 08:31:21 2006
@@ -774,7 +774,7 @@
}
catch ( ProjectBuildingException e )
{
-getLog().warn( Unable to load parent project from
repository: + e.getMessage() );
+getLog().warn( Unable to load parent project from a
relative path: + e.getMessage() );
}
}
svn commit: r471896 - /maven/plugins/trunk/maven-verifier-plugin/src/site/site.xml
Author: dennisl Date: Mon Nov 6 14:19:29 2006 New Revision: 471896 URL: http://svn.apache.org/viewvc?view=revrev=471896 Log: o Add back the menu item for the verifications file format. Modified: maven/plugins/trunk/maven-verifier-plugin/src/site/site.xml Modified: maven/plugins/trunk/maven-verifier-plugin/src/site/site.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-verifier-plugin/src/site/site.xml?view=diffrev=471896r1=471895r2=471896 == --- maven/plugins/trunk/maven-verifier-plugin/src/site/site.xml (original) +++ maven/plugins/trunk/maven-verifier-plugin/src/site/site.xml Mon Nov 6 14:19:29 2006 @@ -20,6 +20,10 @@ body menu name=Examples item name=Sample Verifications href=examples/sample-verifications.html/ - /menu +/menu + +menu name=Reference + item name=Verifications File Format href=verifications.html/ +/menu /body /project
svn commit: r471916 - /maven/plugins/trunk/maven-dependency-plugin/
Author: dennisl Date: Mon Nov 6 14:53:42 2006 New Revision: 471916 URL: http://svn.apache.org/viewvc?view=revrev=471916 Log: o Ignore IDEA files. Modified: maven/plugins/trunk/maven-dependency-plugin/ (props changed) Propchange: maven/plugins/trunk/maven-dependency-plugin/ -- --- svn:ignore (original) +++ svn:ignore Mon Nov 6 14:53:42 2006 @@ -2,3 +2,6 @@ .classpath .project cobertura.ser +*.iml +*.ipr +*.iws
svn commit: r472648 - in /maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle: CheckstyleReportGenerator.java CheckstyleReportListener.java
Author: dennisl
Date: Wed Nov 8 13:16:19 2006
New Revision: 472648
URL: http://svn.apache.org/viewvc?view=revrev=472648
Log:
o Fix the remaining Checkstyle errors.
Modified:
maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleReportGenerator.java
maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleReportListener.java
Modified:
maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleReportGenerator.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleReportGenerator.java?view=diffrev=472648r1=472647r2=472648
==
---
maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleReportGenerator.java
(original)
+++
maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleReportGenerator.java
Wed Nov 8 13:16:19 2006
@@ -33,6 +33,9 @@
import java.util.List;
import java.util.ResourceBundle;
+/**
+ * Generate a report based on CheckstyleResults.
+ */
public class CheckstyleReportGenerator
{
private Log log;
@@ -424,8 +427,8 @@
// Read MessageFormat Javadoc about single quote:
//
http://java.sun.com/j2se/1.4.2/docs/api/java/text/MessageFormat.html
String msgWithoutSingleQuote = StringUtils.replace(
message, ', );
-if ( message.equals( event.getMessage() ) ||
- msgWithoutSingleQuote.equals( event.getMessage()
) )
+if ( message.equals( event.getMessage() )
+|| msgWithoutSingleQuote.equals(
event.getMessage() ) )
{
count++;
}
Modified:
maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleReportListener.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleReportListener.java?view=diffrev=472648r1=472647r2=472648
==
---
maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleReportListener.java
(original)
+++
maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleReportListener.java
Wed Nov 8 13:16:19 2006
@@ -102,9 +102,9 @@
*/
public void fileStarted( AuditEvent event )
{
-for (Iterator it = sourceDirectories.iterator(); it.hasNext(); )
+for ( Iterator it = sourceDirectories.iterator(); it.hasNext(); )
{
-File sourceDirectory = (File)it.next();
+File sourceDirectory = (File) it.next();
currentFile = StringUtils.substring( event.getFileName(),
sourceDirectory.getPath().length() + 1 );
currentFile = StringUtils.replace( currentFile, \\, / );
svn commit: r472649 - in /maven/plugins/trunk/maven-checkstyle-plugin: pom.xml src/test/java/org/apache/maven/plugin/checkstyle/CheckstyleReportListenerTest.java src/test/java/org/apache/maven/plugin/
Author: dennisl
Date: Wed Nov 8 13:18:00 2006
New Revision: 472649
URL: http://svn.apache.org/viewvc?view=revrev=472649
Log:
[MCHECKSTYLE-56] Use Release 4.2 of Checkstyle.
Modified:
maven/plugins/trunk/maven-checkstyle-plugin/pom.xml
maven/plugins/trunk/maven-checkstyle-plugin/src/test/java/org/apache/maven/plugin/checkstyle/CheckstyleReportListenerTest.java
maven/plugins/trunk/maven-checkstyle-plugin/src/test/java/org/apache/maven/plugin/checkstyle/CheckstyleResultsTest.java
Modified: maven/plugins/trunk/maven-checkstyle-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/pom.xml?view=diffrev=472649r1=472648r2=472649
==
--- maven/plugins/trunk/maven-checkstyle-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-checkstyle-plugin/pom.xml Wed Nov 8 13:18:00 2006
@@ -85,7 +85,7 @@
dependency
groupIdcheckstyle/groupId
artifactIdcheckstyle/artifactId
- version4.1/version
+ version4.2/version
/dependency
dependency
groupIdorg.apache.maven.reporting/groupId
@@ -111,7 +111,7 @@
dependency
groupIdcheckstyle/groupId
artifactIdcheckstyle-optional/artifactId
- version4.1/version
+ version4.2/version
/dependency
dependency
groupIdorg.apache.maven.shared/groupId
Modified:
maven/plugins/trunk/maven-checkstyle-plugin/src/test/java/org/apache/maven/plugin/checkstyle/CheckstyleReportListenerTest.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/src/test/java/org/apache/maven/plugin/checkstyle/CheckstyleReportListenerTest.java?view=diffrev=472649r1=472648r2=472649
==
---
maven/plugins/trunk/maven-checkstyle-plugin/src/test/java/org/apache/maven/plugin/checkstyle/CheckstyleReportListenerTest.java
(original)
+++
maven/plugins/trunk/maven-checkstyle-plugin/src/test/java/org/apache/maven/plugin/checkstyle/CheckstyleReportListenerTest.java
Wed Nov 8 13:18:00 2006
@@ -62,20 +62,20 @@
AuditEvent event = new AuditEvent( this, /source/path/file1, null );
fireFileStarted( event );
-LocalizedMessage message = new LocalizedMessage( 0, 0, , , null,
SeverityLevel.INFO, getClass() );
+LocalizedMessage message = new LocalizedMessage( 0, 0, , , null,
SeverityLevel.INFO, null, getClass() );
fireAddError( new AuditEvent( this, /source/path/file1, message ) );
fireFileFinished( event );
event = new AuditEvent( this, /source/path/file2, null );
fireFileStarted( event );
-message = new LocalizedMessage( 0, 0, , , null,
SeverityLevel.WARNING, getClass() );
+message = new LocalizedMessage( 0, 0, , , null,
SeverityLevel.WARNING, null, getClass() );
fireAddError( new AuditEvent( this, /source/path/file2, message ) );
fireAddError( new AuditEvent( this, /source/path/file2, message ) );
fireFileFinished( event );
event = new AuditEvent( this, /source/path/file3, null );
fireFileStarted( event );
-message = new LocalizedMessage( 0, 0, , , null,
SeverityLevel.ERROR, getClass() );
+message = new LocalizedMessage( 0, 0, , , null,
SeverityLevel.ERROR, null, getClass() );
fireAddError( new AuditEvent( this, /source/path/file3, message ) );
fireAddError( new AuditEvent( this, /source/path/file3, message ) );
fireAddError( new AuditEvent( this, /source/path/file3, message ) );
@@ -83,7 +83,7 @@
event = new AuditEvent( this, /source/path/file4, null );
fireFileStarted( event );
-message = new LocalizedMessage( 0, 0, , , null,
SeverityLevel.IGNORE, getClass() );
+message = new LocalizedMessage( 0, 0, , , null,
SeverityLevel.IGNORE, null, getClass() );
fireAddError( new AuditEvent( this, /source/path/file4, message ) );
fireAddError( new AuditEvent( this, /source/path/file4, message ) );
fireAddError( new AuditEvent( this, /source/path/file4, message ) );
Modified:
maven/plugins/trunk/maven-checkstyle-plugin/src/test/java/org/apache/maven/plugin/checkstyle/CheckstyleResultsTest.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/src/test/java/org/apache/maven/plugin/checkstyle/CheckstyleResultsTest.java?view=diffrev=472649r1=472648r2=472649
==
---
maven/plugins/trunk/maven-checkstyle-plugin/src/test/java/org/apache/maven/plugin/checkstyle/CheckstyleResultsTest.java
(original)
+++
maven/plugins/trunk/maven-checkstyle-plugin/src/test/java/org/apache/maven/plugin/checkstyle/CheckstyleResultsTest.java
Wed Nov 8 13:18:00 2006
@@ -62,24 +62,24 @@
{
Map files = new HashMap();
-LocalizedMessage message = new LocalizedMessage( 0, 0, , , null
svn commit: r472667 - /maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleReportGenerator.java
Author: dennisl
Date: Wed Nov 8 14:35:22 2006
New Revision: 472667
URL: http://svn.apache.org/viewvc?view=revrev=472667
Log:
[MCHECKSTYLE-41] Rules summary count of duplicate JavadocMethod configurations
are merged
o Check for severity level in countRuleViolation().
Modified:
maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleReportGenerator.java
Modified:
maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleReportGenerator.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleReportGenerator.java?view=diffrev=472667r1=472666r2=472667
==
---
maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleReportGenerator.java
(original)
+++
maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleReportGenerator.java
Wed Nov 8 14:35:22 2006
@@ -227,6 +227,11 @@
return ret;
}
+/**
+ * Create the rules summary section of the report.
+ *
+ * @param results The results to summarize
+ */
private void doRulesSummary( CheckstyleResults results )
{
if ( checkstyleConfig == null )
@@ -274,6 +279,12 @@
sink.section1_();
}
+/**
+ * Create a summary for each Checkstyle rule.
+ *
+ * @param configChildren Configurations for each Checkstyle rule
+ * @param results The results to summarize
+ */
private void doRuleChildren( Configuration configChildren[],
CheckstyleResults results )
{
for ( int cci = 0; cci configChildren.length; cci++ )
@@ -292,6 +303,13 @@
}
}
+/**
+ * Create a summary for one Checkstyle rule.
+ *
+ * @param checkerConfig Configuration for the Checkstyle rule
+ * @param ruleName The name of the rule, for example JavadocMethod
+ * @param results The results to summarize
+ */
private void doRuleRow( Configuration checkerConfig, String ruleName,
CheckstyleResults results )
{
sink.tableRow();
@@ -351,11 +369,14 @@
sink.tableCell();
String fixedmessage = getConfigAttribute( checkerConfig, message,
null );
-sink.text( countRuleViolation( results.getFiles().values().iterator(),
ruleName, fixedmessage ) );
+// Grab the severity from the rule configuration, use null as default
value
+String configSeverity = getConfigAttribute( checkerConfig, severity,
null );
+sink.text( countRuleViolation( results.getFiles().values().iterator(),
ruleName, fixedmessage, configSeverity ) );
sink.tableCell_();
sink.tableCell();
-String configSeverity = getConfigAttribute( checkerConfig, severity,
error );
+// Grab the severity again from the rule configuration, this time use
error as default value
+configSeverity = getConfigAttribute( checkerConfig, severity,
error );
iconSeverity( configSeverity );
sink.nonBreakingSpace();
sink.text( StringUtils.capitalise( configSeverity ) );
@@ -394,7 +415,16 @@
return ret;
}
-private String countRuleViolation( Iterator files, String ruleName, String
message )
+/**
+ * Count the number of violations for the given rule.
+ *
+ * @param files An iterator over the set of files that has violations
+ * @param ruleName The name of the rule
+ * @param message A message that, if it's not null, will be matched to the
message from the violation
+ * @param severity A severity that, if it's not null, will be matched to
the severity from the violation
+ * @return The number of rule violations
+ */
+private String countRuleViolation( Iterator files, String ruleName, String
message, String severity )
{
long count = 0;
String sourceName;
@@ -429,6 +459,17 @@
String msgWithoutSingleQuote = StringUtils.replace(
message, ', );
if ( message.equals( event.getMessage() )
|| msgWithoutSingleQuote.equals(
event.getMessage() ) )
+{
+count++;
+}
+}
+// Check the severity. This helps to distinguish between
+// different configurations for the same rule, where each
+// configuration has a different severity, like
JavadocMetod.
+// See also http://jira.codehaus.org/browse/MCHECKSTYLE-41
+else if ( severity != null )
+{
+if ( severity.equals(
event.getSeverityLevel().getName() ) )
{
count++;
}
svn commit: r472675 - /maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleReportGenerator.java
Author: dennisl Date: Wed Nov 8 14:48:21 2006 New Revision: 472675 URL: http://svn.apache.org/viewvc?view=revrev=472675 Log: o Fix the Checkstyle error that I just introduced. Modified: maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleReportGenerator.java Modified: maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleReportGenerator.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleReportGenerator.java?view=diffrev=472675r1=472674r2=472675 == --- maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleReportGenerator.java (original) +++ maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleReportGenerator.java Wed Nov 8 14:48:21 2006 @@ -371,7 +371,8 @@ String fixedmessage = getConfigAttribute( checkerConfig, message, null ); // Grab the severity from the rule configuration, use null as default value String configSeverity = getConfigAttribute( checkerConfig, severity, null ); -sink.text( countRuleViolation( results.getFiles().values().iterator(), ruleName, fixedmessage, configSeverity ) ); +sink.text( countRuleViolation( results.getFiles().values().iterator(), ruleName, fixedmessage, + configSeverity ) ); sink.tableCell_(); sink.tableCell();
svn commit: r473408 - in /maven/plugins/trunk/maven-site-plugin/src: main/resources/ site/apt/ site/apt/examples/ site/fml/
Author: dennisl Date: Fri Nov 10 10:21:10 2006 New Revision: 473408 URL: http://svn.apache.org/viewvc?view=revrev=473408 Log: o Set EOL style to native. Modified: maven/plugins/trunk/maven-site-plugin/src/main/resources/site-plugin_no.properties (contents, props changed) maven/plugins/trunk/maven-site-plugin/src/site/apt/examples/creatingskins.apt (props changed) maven/plugins/trunk/maven-site-plugin/src/site/apt/examples/moduleexcludes.apt (props changed) maven/plugins/trunk/maven-site-plugin/src/site/apt/examples/sitedescriptor.apt (props changed) maven/plugins/trunk/maven-site-plugin/src/site/apt/examples/siterun.apt (props changed) maven/plugins/trunk/maven-site-plugin/src/site/apt/examples/templatefile.apt (props changed) maven/plugins/trunk/maven-site-plugin/src/site/apt/index.apt (props changed) maven/plugins/trunk/maven-site-plugin/src/site/apt/usage.apt (contents, props changed) maven/plugins/trunk/maven-site-plugin/src/site/fml/faq.fml (props changed) Modified: maven/plugins/trunk/maven-site-plugin/src/main/resources/site-plugin_no.properties URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/main/resources/site-plugin_no.properties?view=diffrev=473408r1=473407r2=473408 == --- maven/plugins/trunk/maven-site-plugin/src/main/resources/site-plugin_no.properties (original) +++ maven/plugins/trunk/maven-site-plugin/src/main/resources/site-plugin_no.properties Fri Nov 10 10:21:10 2006 @@ -1,31 +1,31 @@ -# --- -# Copyright 2001-2005 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. -# --- - -report.category.column.description = Beskrivelse -report.category.column.document= Dokument -report.category.sectionTitle = Oversikt -report.information.description1= Dette dokumentet gir en oversikt over diverse dokumenter og lenker som er en del av dette prosjektets generelle informasjon. All dette er automatisk generert av -report.information.description2= p\u00E5 vegne av prosjektet. -report.information.title = Prosjekt Informasjon -report.menu.parentproject = Hovedprosjekt -report.menu.projectdocumentation = Prosjekt dokumentasjon -report.menu.projectinformation = Prosjekt informasjon -report.menu.projectmodules = Moduler -report.menu.projectreports = Prosjekt rapporter -report.project.description1= Dette dokumentet gir en oversikt over diverse rapporter som er automatisk generert av -report.project.description2= Hver rapport er kortfattet beskrevet under. -report.project.title = Genererte rapporter - +# --- +# Copyright 2001-2005 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. +# --- + +report.category.column.description = Beskrivelse +report.category.column.document= Dokument +report.category.sectionTitle = Oversikt +report.information.description1= Dette dokumentet gir en oversikt over diverse dokumenter og lenker som er en del av dette prosjektets generelle informasjon. All dette er automatisk generert av +report.information.description2= p\u00E5 vegne av prosjektet. +report.information.title = Prosjekt Informasjon +report.menu.parentproject = Hovedprosjekt +report.menu.projectdocumentation = Prosjekt dokumentasjon +report.menu.projectinformation = Prosjekt informasjon +report.menu.projectmodules = Moduler +report.menu.projectreports = Prosjekt rapporter +report.project.description1= Dette dokumentet gir en oversikt over diverse rapporter som er automatisk generert
svn commit: r473529 - in /maven/plugins/trunk/maven-site-plugin/src/test/projects: site-plugin-test4/pom.xml site-plugin-test5/pom.xml site-plugin-test9/pom.xml
Author: dennisl Date: Fri Nov 10 14:19:02 2006 New Revision: 473529 URL: http://svn.apache.org/viewvc?view=revrev=473529 Log: o Remove end of xml comment that was left behind by mistake. Modified: maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test4/pom.xml maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test5/pom.xml maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test9/pom.xml Modified: maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test4/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test4/pom.xml?view=diffrev=473529r1=473528r2=473529 == --- maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test4/pom.xml (original) +++ maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test4/pom.xml Fri Nov 10 14:19:02 2006 @@ -27,7 +27,7 @@ version1.0-SNAPSHOT/version inceptionYear2005/inceptionYear nameMaven Site Plugin Test3/name - descriptionAn index already exists./description -- + descriptionAn index already exists./description urlhttp://maven.apache.org/url dependencies dependency Modified: maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test5/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test5/pom.xml?view=diffrev=473529r1=473528r2=473529 == --- maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test5/pom.xml (original) +++ maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test5/pom.xml Fri Nov 10 14:19:02 2006 @@ -27,7 +27,7 @@ version1.0-SNAPSHOT/version inceptionYear2005/inceptionYear nameMaven Site Plugin Test5/name - descriptionTwo indexes exists./description -- + descriptionTwo indexes exists./description urlhttp://maven.apache.org/url dependencies dependency Modified: maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test9/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test9/pom.xml?view=diffrev=473529r1=473528r2=473529 == --- maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test9/pom.xml (original) +++ maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test9/pom.xml Fri Nov 10 14:19:02 2006 @@ -27,7 +27,7 @@ version1.0-SNAPSHOT/version inceptionYear2005/inceptionYear nameMaven Site Plugin Test9/name - descriptionMNG-560 honnor locales./description -- + descriptionMNG-560 honnor locales./description urlhttp://maven.apache.org/url dependencies dependency
svn commit: r473595 - /maven/plugins/trunk/maven-site-plugin/src/site/apt/examples/sitedescriptor.apt
Author: dennisl Date: Fri Nov 10 16:34:42 2006 New Revision: 473595 URL: http://svn.apache.org/viewvc?view=revrev=473595 Log: [MSITE-133] Fix documentation of skinning: groupId seems to be org.apache.maven.skins instead of org.apache.maven. Modified: maven/plugins/trunk/maven-site-plugin/src/site/apt/examples/sitedescriptor.apt Modified: maven/plugins/trunk/maven-site-plugin/src/site/apt/examples/sitedescriptor.apt URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/site/apt/examples/sitedescriptor.apt?view=diffrev=473595r1=473594r2=473595 == --- maven/plugins/trunk/maven-site-plugin/src/site/apt/examples/sitedescriptor.apt (original) +++ maven/plugins/trunk/maven-site-plugin/src/site/apt/examples/sitedescriptor.apt Fri Nov 10 16:34:42 2006 @@ -96,7 +96,7 @@ +-+ ... skin -groupIdorg.apache.maven/groupId +groupIdorg.apache.maven.skins/groupId artifactIdmaven-classic-skin/artifactId version1.0/version /skin
svn commit: r473599 - in /maven/plugins/trunk/maven-site-plugin/src: main/java/org/apache/maven/plugins/site/ test/projects/site-plugin-test11/ test/projects/site-plugin-test11/framework/ test/project
Author: dennisl Date: Fri Nov 10 16:41:49 2006 New Revision: 473599 URL: http://svn.apache.org/viewvc?view=revrev=473599 Log: [MSITE-91] src/site/site.xml hardcoded in AbstractSiteMojo.java. o By using getRelativePath(...) the relativity between parent and child can be maintained. Added: maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/ (with props) maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/framework/ (with props) maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/framework/pom.xml (with props) maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/framework/source/ maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/framework/source/mysite/ maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/framework/source/mysite/apt/ maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/framework/source/mysite/apt/index.apt (with props) maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/framework/source/mysite/apt/test1.apt (with props) maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/framework/source/mysite/site.xml (with props) maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/framework/src/ maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/framework/src/main/ maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/framework/src/main/java/ maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/framework/src/main/java/org/ maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/framework/src/main/java/org/apache/ maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/framework/src/main/java/org/apache/maven/ maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/framework/src/main/java/org/apache/maven/plugin/ maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/framework/src/main/java/org/apache/maven/plugin/site/ maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/framework/src/main/java/org/apache/maven/plugin/site/test11/ maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/framework/src/main/java/org/apache/maven/plugin/site/test11/App.java (with props) maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/framework/src/test/ maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/framework/src/test/java/ maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/framework/src/test/java/org/ maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/framework/src/test/java/org/apache/ maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/framework/src/test/java/org/apache/maven/ maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/framework/src/test/java/org/apache/maven/plugin/ maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/framework/src/test/java/org/apache/maven/plugin/site/ maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/framework/src/test/java/org/apache/maven/plugin/site/test11/ maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/framework/src/test/java/org/apache/maven/plugin/site/test11/AppTest.java (with props) maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/framework2/ (with props) maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/framework2/pom.xml (with props) maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/framework2/source/ maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/framework2/source/mysite/ maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/framework2/source/mysite/apt/ maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/framework2/source/mysite/apt/index.apt (with props) maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/framework2/source/mysite/apt/test2.apt (with props) maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/framework2/source/mysite/site.xml (with props) maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/framework2/src/ maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/framework2/src/main/ maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/framework2/src/main/java/ maven/plugins/trunk/maven-site-plugin/src/test/projects/site-plugin-test11/framework2/src
svn commit: r473788 - in /maven/plugins/trunk/maven-site-plugin/src: main/java/org/apache/maven/plugins/site/AbstractSiteMojo.java main/java/org/apache/maven/plugins/site/AbstractSiteRenderingMojo.jav
Author: dennisl
Date: Sat Nov 11 12:00:23 2006
New Revision: 473788
URL: http://svn.apache.org/viewvc?view=revrev=473788
Log:
o Fix typos.
Modified:
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteMojo.java
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteRenderingMojo.java
maven/plugins/trunk/maven-site-plugin/src/site/apt/examples/sitedescriptor.apt
Modified:
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteMojo.java?view=diffrev=473788r1=473787r2=473788
==
---
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteMojo.java
(original)
+++
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteMojo.java
Sat Nov 11 12:00:23 2006
@@ -528,7 +528,7 @@
}
catch ( MalformedURLException e1 )
{
-getLog().warn( Unable to load an URL for ' + to + ': +
e.getMessage() );
+getLog().warn( Unable to load a URL for ' + to + ': +
e.getMessage() );
}
}
@@ -544,7 +544,7 @@
}
catch ( MalformedURLException e1 )
{
-getLog().warn( Unable to load an URL for ' + from + ': +
e.getMessage() );
+getLog().warn( Unable to load a URL for ' + from + ': +
e.getMessage() );
}
}
@@ -825,7 +825,7 @@
}
/**
- * Interporlating several expressions in the site descriptor content.
Actually, the expressions could be on
+ * Interpolating several expressions in the site descriptor content.
Actually, the expressions could be on
* the project, the environment variables and the specific properties like
codeencoding/code.
* p/
* For instance:
Modified:
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteRenderingMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteRenderingMojo.java?view=diffrev=473788r1=473787r2=473788
==
---
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteRenderingMojo.java
(original)
+++
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteRenderingMojo.java
Sat Nov 11 12:00:23 2006
@@ -213,7 +213,7 @@
catch ( IOException e )
{
throw new MojoExecutionException(
- The site descriptor cannot
interpolated properties: + e.getMessage(), e );
+ The site descriptor cannot
interpolate properties: + e.getMessage(), e );
}
decoration = readDecorationModel( siteDescriptorContent );
@@ -520,7 +520,7 @@
catch ( IOException e )
{
throw new MojoExecutionException(
- The site descriptor cannot
interpolated properties: + e.getMessage(), e );
+ The site descriptor cannot
interpolate properties: + e.getMessage(), e );
}
decorationModel = readDecorationModel( siteDescriptorContent );
Modified:
maven/plugins/trunk/maven-site-plugin/src/site/apt/examples/sitedescriptor.apt
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/site/apt/examples/sitedescriptor.apt?view=diffrev=473788r1=473787r2=473788
==
---
maven/plugins/trunk/maven-site-plugin/src/site/apt/examples/sitedescriptor.apt
(original)
+++
maven/plugins/trunk/maven-site-plugin/src/site/apt/examples/sitedescriptor.apt
Sat Nov 11 12:00:23 2006
@@ -110,10 +110,10 @@
* Expressions
- The site.xml could contained some expressions, like
$\{project.name\}. Each expression will be
- evaluated when site rendering.
+ The site.xml can contain some expressions, like
$\{project.name\}. Each expression will be
+ evaluated when the site is rendered.
- Expressions could be:
+ Expressions can be:
* $\{project.*\}, for instance $\{project.organization.name\}
referenced in project/organization/name/
svn commit: r474566 - /maven/components/trunk/maven-settings/settings.mdo
Author: dennisl Date: Mon Nov 13 15:22:15 2006 New Revision: 474566 URL: http://svn.apache.org/viewvc?view=revrev=474566 Log: o Make sure that descriptions end with a period, if they have a defaultValue. This way it will look nice when we upgrade to a newer version of Modello. Modified: maven/components/trunk/maven-settings/settings.mdo Modified: maven/components/trunk/maven-settings/settings.mdo URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-settings/settings.mdo?view=diffrev=474566r1=474565r2=474566 == --- maven/components/trunk/maven-settings/settings.mdo (original) +++ maven/components/trunk/maven-settings/settings.mdo Mon Nov 13 15:22:15 2006 @@ -750,7 +750,7 @@ field nameenabled/name version1.0.0/version - descriptionWhether to use this repository for downloading this type of artifact/description + descriptionWhether to use this repository for downloading this type of artifact./description typeboolean/type defaultValuetrue/defaultValue /field
svn commit: r474568 - /maven/components/branches/maven-2.0.x/maven-settings/settings.mdo
Author: dennisl Date: Mon Nov 13 15:24:45 2006 New Revision: 474568 URL: http://svn.apache.org/viewvc?view=revrev=474568 Log: o Merge from trunk revision r474566. Modified: maven/components/branches/maven-2.0.x/maven-settings/settings.mdo Modified: maven/components/branches/maven-2.0.x/maven-settings/settings.mdo URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-settings/settings.mdo?view=diffrev=474568r1=474567r2=474568 == --- maven/components/branches/maven-2.0.x/maven-settings/settings.mdo (original) +++ maven/components/branches/maven-2.0.x/maven-settings/settings.mdo Mon Nov 13 15:24:45 2006 @@ -750,7 +750,7 @@ field nameenabled/name version1.0.0/version - descriptionWhether to use this repository for downloading this type of artifact/description + descriptionWhether to use this repository for downloading this type of artifact./description typeboolean/type defaultValuetrue/defaultValue /field
svn commit: r475031 - in /maven/plugins/trunk/maven-site-plugin/src: main/java/org/apache/maven/plugins/site/AbstractSiteMojo.java site/apt/examples/sitedescriptor.apt
Author: dennisl
Date: Tue Nov 14 14:49:09 2006
New Revision: 475031
URL: http://svn.apache.org/viewvc?view=revrev=475031
Log:
[MSITE-192] Docs don't indicate where site.xml should be created
Modified:
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteMojo.java
maven/plugins/trunk/maven-site-plugin/src/site/apt/examples/sitedescriptor.apt
Modified:
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteMojo.java?view=diffrev=475031r1=475030r2=475031
==
---
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteMojo.java
(original)
+++
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteMojo.java
Tue Nov 14 14:49:09 2006
@@ -76,7 +76,7 @@
protected I18N i18n;
/**
- * Directory containing source for apt, fml and xdoc docs.
+ * Directory containing the site.xml file and the source for apt, fml and
xdoc docs.
*
* @parameter expression=${basedir}/src/site
* @required
Modified:
maven/plugins/trunk/maven-site-plugin/src/site/apt/examples/sitedescriptor.apt
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/site/apt/examples/sitedescriptor.apt?view=diffrev=475031r1=475030r2=475031
==
---
maven/plugins/trunk/maven-site-plugin/src/site/apt/examples/sitedescriptor.apt
(original)
+++
maven/plugins/trunk/maven-site-plugin/src/site/apt/examples/sitedescriptor.apt
Tue Nov 14 14:49:09 2006
@@ -30,7 +30,8 @@
You can create your own site descriptor for your project when you want to
override the navigation tree for the site.
For example, aside from the report distributions you want to put additional
content to your site. In order for them
- to be accessible in the generated site, you must configure your site
descriptor.
+ to be accessible in the generated site, you must configure your site
descriptor. You create the site descriptor in
+ a file called site.xml which should be located in your src/site
directory.
* Publish Date
svn commit: r475039 - /maven/site/trunk/src/site/apt/guides/mini/guide-manifest.apt
Author: dennisl
Date: Tue Nov 14 15:01:26 2006
New Revision: 475039
URL: http://svn.apache.org/viewvc?view=revrev=475039
Log:
[MJAR-46] Document manifestFile element in configuration
o The example in this guide was incorrect.
Modified:
maven/site/trunk/src/site/apt/guides/mini/guide-manifest.apt
Modified: maven/site/trunk/src/site/apt/guides/mini/guide-manifest.apt
URL:
http://svn.apache.org/viewvc/maven/site/trunk/src/site/apt/guides/mini/guide-manifest.apt?view=diffrev=475039r1=475038r2=475039
==
--- maven/site/trunk/src/site/apt/guides/mini/guide-manifest.apt (original)
+++ maven/site/trunk/src/site/apt/guides/mini/guide-manifest.apt Tue Nov 14
15:01:26 2006
@@ -80,7 +80,6 @@
mainClasscom.mycompany.app.App/mainClass
packageNamecom.mycompany.app/packageName
!-- options
- manifestFile/path/to/MANIFEST.MF/manifestFile
addClasspathtrue/addClasspath
addExtensions/
classpathPrefix/
@@ -90,6 +89,7 @@
modedevelopment/mode
url${pom.url}/url
/manifestEntries
+
manifestFilesrc/main/resources/META-INF/MANIFEST.MF/manifestFile
/archive
/configuration
/plugin
svn commit: r475046 - in /maven/site/trunk/src/site: apt/ apt/guides/introduction/ apt/guides/mini/ apt/maven-developers/ apt/plugin-developers/ apt/plugin-developers/cookbook/ apt/repository/ apt/run
Author: dennisl
Date: Tue Nov 14 15:05:57 2006
New Revision: 475046
URL: http://svn.apache.org/viewvc?view=revrev=475046
Log:
o Set EOL style to native.
Modified:
maven/site/trunk/src/site/apt/guides/introduction/introduction-to-optional-and-excludes-dependencies.apt
(props changed)
maven/site/trunk/src/site/apt/guides/mini/guide-3rd-party-jars-remote.apt
(contents, props changed)
maven/site/trunk/src/site/apt/maven-developers/index.apt (props changed)
maven/site/trunk/src/site/apt/plugin-developers/cookbook/index.apt (props
changed)
maven/site/trunk/src/site/apt/plugin-developers/index.apt (props changed)
maven/site/trunk/src/site/apt/repository/index.apt (props changed)
maven/site/trunk/src/site/apt/run-maven/cookbook/index.apt (props changed)
maven/site/trunk/src/site/apt/run-maven/index.apt (props changed)
maven/site/trunk/src/site/apt/todo.apt (props changed)
maven/site/trunk/src/site/apt/users/cookbook/index.apt (props changed)
maven/site/trunk/src/site/apt/users/index.apt (props changed)
maven/site/trunk/src/site/resources/ant/build-a1.xml (props changed)
maven/site/trunk/src/site/resources/ant/build-a2.xml (props changed)
maven/site/trunk/src/site/resources/ant/build-a3.xml (props changed)
maven/site/trunk/src/site/resources/ant/build-a4.xml (props changed)
Propchange:
maven/site/trunk/src/site/apt/guides/introduction/introduction-to-optional-and-excludes-dependencies.apt
--
svn:eol-style = native
Modified:
maven/site/trunk/src/site/apt/guides/mini/guide-3rd-party-jars-remote.apt
URL:
http://svn.apache.org/viewvc/maven/site/trunk/src/site/apt/guides/mini/guide-3rd-party-jars-remote.apt?view=diffrev=475046r1=475045r2=475046
==
--- maven/site/trunk/src/site/apt/guides/mini/guide-3rd-party-jars-remote.apt
(original)
+++ maven/site/trunk/src/site/apt/guides/mini/guide-3rd-party-jars-remote.apt
Tue Nov 14 15:05:57 2006
@@ -1,59 +1,59 @@
- --
- Guide to deploying 3rd party JARs to remote repository
- --
- Allan Ramirez
- --
- 22 February 2006
- --
-
-Guide to deploying 3rd party JARs to remote repository
-
- Same concept of the
{{{guide-installing-3rd-party-jars.html}install:install-file}}
- goal of the maven-install-plugin where the 3rd party JAR is installed
- in the local repository. But this time instead to local repository the
- JAR will be install both in the local and remote repository.
-
- To deploy a 3rd party JAR use the deploy:deploy-file goal under
- maven-deploy-plugin.
-
- First, the wagon-provider(wagon-ftp, wagon-file, etc..) must be placed to
- your %M2_HOME%/lib.
-
- Then execute the command:
-
-++
-mvn deploy:deploy-file -DgroupId=group-id \
- -DartifactId=artifact-id \
- -Dversion=version \
- -Dpackaging=type-of-packaging \
- -Dfile=path-to-file \
- -DrepositoryId=id-to-map-on-server-section-of-settings.xml \
- -Durl=url-of-the-repositor-to-deploy
-++
-
-* Deploying a 3rd party JAR with a generic POM
-
- By default, deploy:deploy-file generates a generic POM(.pom) to be deploy
- together with the 3rd party JAR. To disable this feature we should set the
- generatePOM argument to false.
-
-++
--DgeneratePom=false
-++
-
-* Deploying a 3rd party JAR with a customed POM
-
- If a POM is already existing for the 3rd Party JAR and you want to deploy
- it together with the JAR we should use the pomFile argument of the
- deploy-file goal. See sample below.
-
-++
-mvn deploy:deploy-file -DpomFile=path-to-pom \
- -Dfile=path-to-file \
- -DrepositoryId=id-to-map-on-server-section-of-settings.xml \
- -Durl=url-of-the-repositor-to-deploy
-++
-
- Note that groupId, artifactId, version and packaging
- arguments are not included here because deploy-file goal will get these
+ --
+ Guide to deploying 3rd party JARs to remote repository
+ --
+ Allan Ramirez
+ --
+ 22 February 2006
+ --
+
+Guide to deploying 3rd party JARs to remote repository
+
+ Same concept of the
{{{guide-installing-3rd-party-jars.html}install:install-file}}
+ goal of the maven-install-plugin where the 3rd party JAR is installed
+ in the local repository. But this time instead to local repository the
+ JAR will be install both in the local and remote repository.
+
+ To deploy a 3rd party JAR use the deploy:deploy-file goal under
+ maven-deploy-plugin.
+
+ First, the wagon-provider(wagon-ftp, wagon-file, etc..) must be placed to
+ your %M2_HOME%/lib.
+
+ Then execute the command:
+
+++
+mvn deploy:deploy-file -DgroupId=group-id \
+ -DartifactId=artifact-id \
+ -Dversion=version \
+ -Dpackaging=type-of-packaging \
+ -Dfile=path-to-file \
+ -DrepositoryId=id-to-map-on-server-section-of-settings.xml \
+ -Durl
svn commit: r475057 - /maven/plugins/trunk/maven-jar-plugin/src/site/apt/examples/manifest-customization.apt
Author: dennisl
Date: Tue Nov 14 15:32:10 2006
New Revision: 475057
URL: http://svn.apache.org/viewvc?view=revrev=475057
Log:
[MJAR-57] Specification and Implementation details missing from manifest
o Remove Specification and Implementation details from the manifest example.
o Explain that Specification and Implementation details were removed in version
2.1 of the plugin.
o Add configuration example showing how to get them back.
Modified:
maven/plugins/trunk/maven-jar-plugin/src/site/apt/examples/manifest-customization.apt
Modified:
maven/plugins/trunk/maven-jar-plugin/src/site/apt/examples/manifest-customization.apt
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-jar-plugin/src/site/apt/examples/manifest-customization.apt?view=diffrev=475057r1=475056r2=475057
==
---
maven/plugins/trunk/maven-jar-plugin/src/site/apt/examples/manifest-customization.apt
(original)
+++
maven/plugins/trunk/maven-jar-plugin/src/site/apt/examples/manifest-customization.apt
Tue Nov 14 15:32:10 2006
@@ -12,14 +12,10 @@
+-+
Manifest-Version: 1.0
- Built-By: ${user.name}
+ Archiver-Version: Plexus Archiver
Created-By: Apache Maven
+ Built-By: ${user.name}
Build-Jdk: ${java.version}
- Extension-Name: ${project.artifactId}
- Specification-Vendor: ${project.organization.name}
- Implementation-Vendor: ${project.organization.name}
- Implementation-Title: ${project.description}
- Implementation-Version: ${project.version}
+-+
Configuration can be done using the archive element. Below you will
@@ -47,6 +43,35 @@
url${pom.url}/url
keyvalue/key
/manifestEntries
+ /archive
+/configuration
+...
+ /plugin
+/plugins
+ /build
+ ...
+/project
++-+
+
+ Starting with version 2.1, the maven-jar-plugin no longer creates the
+ Specification and Implementation details in the manifest by default.
+ If you want them you have to say so explicitly in your plugin configuration:
+
++-+
+project
+ ...
+ build
+plugins
+ plugin
+groupIdorg.apache.maven.plugins/groupId
+artifactIdmaven-jar-plugin/artifactId
+...
+configuration
+ archive
+manifest
+
addDefaultSpecificationEntriestrue/addDefaultSpecificationEntries
+
addDefaultImplementationEntriestrue/addDefaultImplementationEntries
+/manifest
/archive
/configuration
...
svn commit: r475163 - in /maven/plugins/trunk/maven-docck-plugin/src/main/java/org/apache/maven/plugin/docck: AbstractCheckDocumentationMojo.java CheckPluginDocumentationMojo.java
Author: dennisl
Date: Wed Nov 15 00:56:01 2006
New Revision: 475163
URL: http://svn.apache.org/viewvc?view=revrev=475163
Log:
[MDOCCK-2] Make errors more detailed
Modified:
maven/plugins/trunk/maven-docck-plugin/src/main/java/org/apache/maven/plugin/docck/AbstractCheckDocumentationMojo.java
maven/plugins/trunk/maven-docck-plugin/src/main/java/org/apache/maven/plugin/docck/CheckPluginDocumentationMojo.java
Modified:
maven/plugins/trunk/maven-docck-plugin/src/main/java/org/apache/maven/plugin/docck/AbstractCheckDocumentationMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-docck-plugin/src/main/java/org/apache/maven/plugin/docck/AbstractCheckDocumentationMojo.java?view=diffrev=475163r1=475162r2=475163
==
---
maven/plugins/trunk/maven-docck-plugin/src/main/java/org/apache/maven/plugin/docck/AbstractCheckDocumentationMojo.java
(original)
+++
maven/plugins/trunk/maven-docck-plugin/src/main/java/org/apache/maven/plugin/docck/AbstractCheckDocumentationMojo.java
Wed Nov 15 00:56:01 2006
@@ -303,17 +303,17 @@
if ( StringUtils.isEmpty( project.getName() ) )
{
-reporter.error( Missing tag name. );
+reporter.error( pom.xml is missing the name tag. );
}
if ( StringUtils.isEmpty( project.getDescription() ) )
{
-reporter.error( Missing tag description. );
+reporter.error( pom.xml is missing the description tag. );
}
if ( StringUtils.isEmpty( project.getUrl() ) )
{
-reporter.error( Missing tag url. );
+reporter.error( pom.xml is missing the url tag. );
}
else
{
@@ -322,14 +322,14 @@
if ( project.getIssueManagement() == null )
{
-reporter.error( Missing tag issueManagement. );
+reporter.error( pom.xml is missing the issueManagement tag. );
}
else
{
IssueManagement issueMngt = project.getIssueManagement();
if ( StringUtils.isEmpty( issueMngt.getUrl() ) )
{
-reporter.error( Missing url tag in issueManagement. );
+reporter.error( pom.xml is missing the url tag in
issueManagement. );
}
else
{
@@ -339,30 +339,30 @@
if ( project.getPrerequisites() == null )
{
-reporter.error( Missing tag prerequisites );
+reporter.error( pom.xml is missing the prerequisites tag. );
}
else
{
Prerequisites prereq = project.getPrerequisites();
if ( StringUtils.isEmpty( prereq.getMaven() ) )
{
-reporter.error( Missing maven tag in prerequisites );
+reporter.error( pom.xml is missing the maven tag in
prerequisites. );
}
}
if ( StringUtils.isEmpty( project.getInceptionYear() ) )
{
-reporter.error( Missing tag inceptionYear );
+reporter.error( pom.xml is missing the inceptionYear tag. );
}
if ( project.getMailingLists().size() == 0 )
{
-reporter.warn( No mailingList specified );
+reporter.warn( pom.xml has no mailingList specified. );
}
if ( project.getScm() == null )
{
-reporter.warn( Missing tag scm );
+reporter.warn( pom.xml is missing the scm tag. );
}
else
{
@@ -370,7 +370,7 @@
if ( StringUtils.isEmpty( scm.getConnection() )
StringUtils.isEmpty( scm.getDeveloperConnection() )
StringUtils.isEmpty( scm.getUrl() ) )
{
-reporter.warn( Missing children under the scm tag );
+reporter.warn( pom.xml is missing the child tags under the
scm tag. );
}
else if ( scm.getUrl() != null )
{
@@ -380,14 +380,14 @@
if ( project.getOrganization() == null )
{
-reporter.error( Missing tag organization );
+reporter.error( pom.xml is missing the organization tag. );
}
else
{
Organization org = project.getOrganization();
if ( StringUtils.isEmpty( org.getName() ) )
{
-reporter.error( Missing name tag in organization );
+reporter.error( pom.xml is missing the name tag in
organization. );
}
else if ( org.getUrl() != null )
{
@@ -402,7 +402,7 @@
if ( licenses == null || licenses.isEmpty() )
{
-reporter.error( No license(s) specified. );
+reporter.error( pom.xml has no license specified. );
}
else
{
@@ -412,14 +412,14 @@
if ( StringUtils.isEmpty( license.getName
svn commit: r475925 - /maven/plugins/trunk/maven-surefire-plugin/src/site/apt/examples/inclusion-exclusion.apt
Author: dennisl Date: Thu Nov 16 12:59:37 2006 New Revision: 475925 URL: http://svn.apache.org/viewvc?view=revrev=475925 Log: o Fix typos. Modified: maven/plugins/trunk/maven-surefire-plugin/src/site/apt/examples/inclusion-exclusion.apt Modified: maven/plugins/trunk/maven-surefire-plugin/src/site/apt/examples/inclusion-exclusion.apt URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-surefire-plugin/src/site/apt/examples/inclusion-exclusion.apt?view=diffrev=475925r1=475924r2=475925 == --- maven/plugins/trunk/maven-surefire-plugin/src/site/apt/examples/inclusion-exclusion.apt (original) +++ maven/plugins/trunk/maven-surefire-plugin/src/site/apt/examples/inclusion-exclusion.apt Thu Nov 16 12:59:37 2006 @@ -14,13 +14,13 @@ with the following wildcard patterns: * **/Test*.java - includes all of its subdirectory and all java - filename that starts with Test. + filenames that start with Test. * **/*Test.java - includes all of its subdirectory and all java - filename that ends with Test. + filenames that end with Test. * **/*TestCase.java - includes all of its subdirectory and all java - filename that ends with TestCase. + filenames that end with TestCase. [] @@ -49,8 +49,8 @@ * Exclusions - There are certain times that some tests are causing the build to fail. - Excluding them is one of the best workaround to continue the build. + There are certain times when some tests are causing the build to fail. + Excluding them is one of the best workarounds to continue the build. Exclusions can be done by configuring the excludes property of the plugin.
svn commit: r476825 - in /maven/plugins/trunk/maven-ejb-plugin: ./ src/site/ src/site/apt/ src/site/apt/examples/
Author: dennisl
Date: Sun Nov 19 06:25:28 2006
New Revision: 476825
URL: http://svn.apache.org/viewvc?view=revrev=476825
Log:
[MEJB-17] review plugin documentation
Submitted by: Pete Marvin King
o Applied with modifications.
Added:
maven/plugins/trunk/maven-ejb-plugin/src/site/apt/examples/
maven/plugins/trunk/maven-ejb-plugin/src/site/apt/examples/ejb-client-dependency.apt
(with props)
maven/plugins/trunk/maven-ejb-plugin/src/site/apt/examples/generating-ejb-client.apt
(with props)
maven/plugins/trunk/maven-ejb-plugin/src/site/apt/index.apt (with props)
maven/plugins/trunk/maven-ejb-plugin/src/site/apt/usage.apt (with props)
Removed:
maven/plugins/trunk/maven-ejb-plugin/src/site/apt/howto.apt
maven/plugins/trunk/maven-ejb-plugin/src/site/apt/introduction.apt
Modified:
maven/plugins/trunk/maven-ejb-plugin/pom.xml
maven/plugins/trunk/maven-ejb-plugin/src/site/site.xml (contents, props
changed)
Modified: maven/plugins/trunk/maven-ejb-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ejb-plugin/pom.xml?view=diffrev=476825r1=476824r2=476825
==
--- maven/plugins/trunk/maven-ejb-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-ejb-plugin/pom.xml Sun Nov 19 06:25:28 2006
@@ -11,6 +11,9 @@
packagingmaven-plugin/packaging
nameMaven EJB Plugin/name
version2.1-SNAPSHOT/version
+ prerequisites
+maven2.0.4/maven
+ /prerequisites
issueManagement
systemJIRA/system
urlhttp://jira.codehaus.org/browse/MEJB/url
Added:
maven/plugins/trunk/maven-ejb-plugin/src/site/apt/examples/ejb-client-dependency.apt
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ejb-plugin/src/site/apt/examples/ejb-client-dependency.apt?view=autorev=476825
==
---
maven/plugins/trunk/maven-ejb-plugin/src/site/apt/examples/ejb-client-dependency.apt
(added)
+++
maven/plugins/trunk/maven-ejb-plugin/src/site/apt/examples/ejb-client-dependency.apt
Sun Nov 19 06:25:28 2006
@@ -0,0 +1,55 @@
+ --
+ Using the ejb-client as a dependency
+ --
+ Pete Marvin King
+ --
+ 15 July 2006
+ --
+
+Using the ejb-client as a dependency
+
+ The ejb client is capable of generating another artifact aside from the
primary one which is ejb. To choose the ejb client
+ as the dependency just specify the type as ejb-client.
+
+* Normal way of adding an ejb dependency
+
+ The following dependency declaration would include the primary ejb artifact
ejb-project-1.0-SNAPSHOT.jar in your
+ project's package.
+
+++
+ [...]
+ dependencies
+dependency
+ groupIdcom.example/groupId
+ artifactIdejb-project/artifactId
+ version1.0-SNAPSHOT/version
+ typeejb/type
+/dependency
+ /dependencies
+ [...]
+++
+
+* Using the ejb-client
+
+ Using this dependency declaration would instead use the ejb-client artifact
ejb-project-1.0-SNAPSHOT-client.jar
+ in your project's package.
+
+++
+ [...]
+ dependencies
+dependency
+ groupIdcom.example/groupId
+ artifactIdejb-project/artifactId
+ version1.0-SNAPSHOT/version
+ typeejb-client/type
+/dependency
+ /dependencies
+ [...]
+++
+
+
+ For more details on generating the ejb client check the
{{{generating-ejb-client.html}ejb-client guide}}.
+
+
+
+
Propchange:
maven/plugins/trunk/maven-ejb-plugin/src/site/apt/examples/ejb-client-dependency.apt
--
svn:eol-style = native
Added:
maven/plugins/trunk/maven-ejb-plugin/src/site/apt/examples/generating-ejb-client.apt
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ejb-plugin/src/site/apt/examples/generating-ejb-client.apt?view=autorev=476825
==
---
maven/plugins/trunk/maven-ejb-plugin/src/site/apt/examples/generating-ejb-client.apt
(added)
+++
maven/plugins/trunk/maven-ejb-plugin/src/site/apt/examples/generating-ejb-client.apt
Sun Nov 19 06:25:28 2006
@@ -0,0 +1,86 @@
+ --
+ Generating an ejb client
+ --
+ Stephane Nicoll
+ [EMAIL PROTECTED]
+ Pete Marvin King
+ --
+ 15 July 2006
+ --
+
+Generating an ejb client
+
+ Normally a thick-client application would only need the stubs and utility
classes of the ejb project.
+ The ejb plugin is capable of generating an ejb jar for client use.
+
+ To generate the ejb-client jar, you need to set generateClient to
true in the plugin's configuration:
+
+++
+ [...]
+ build
+[...]
+plugins
+ plugin
+groupIdorg.apache.maven.plugins/groupId
+artifactIdmaven-ejb-plugin/artifactId
+configuration
+ !-- this is false by default --
+ generateClienttrue/generateClient
+/configuration
svn commit: r476826 [2/2] - in /maven/plugins/trunk/maven-ejb-plugin/src/test: java/org/apache/maven/plugin/ejb/ java/org/apache/maven/plugin/ejb/stub/ java/org/apache/maven/plugin/ejb/utils/ resource
Modified:
maven/plugins/trunk/maven-ejb-plugin/src/test/java/org/apache/maven/plugin/ejb/stub/MavenProjectBuildStub.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ejb-plugin/src/test/java/org/apache/maven/plugin/ejb/stub/MavenProjectBuildStub.java?view=diffrev=476826r1=476825r2=476826
==
---
maven/plugins/trunk/maven-ejb-plugin/src/test/java/org/apache/maven/plugin/ejb/stub/MavenProjectBuildStub.java
(original)
+++
maven/plugins/trunk/maven-ejb-plugin/src/test/java/org/apache/maven/plugin/ejb/stub/MavenProjectBuildStub.java
Sun Nov 19 06:26:07 2006
@@ -1,343 +1,343 @@
-package org.apache.maven.plugin.ejb.stub;
-
-/*
- * Copyright 2001-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.
- */
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-
-import org.apache.maven.model.Build;
-import org.codehaus.plexus.util.FileUtils;
-
-/**
- * Stub
- */
-public class MavenProjectBuildStub
-extends MavenProjectBasicStub
-{
-public static final int RESOURCES_FILE = 1;
-
-public static final int ROOT_FILE = 2;
-
-public static final int OUTPUT_FILE = 3;
-
-public static final int SOURCE_FILE = 4;
-
-protected Build build;
-
-protected String srcDirectory;
-
-protected String targetDirectory;
-
-protected String buildDirectory;
-
-protected String outputDirectory;
-
-protected String testOutputDirectory;
-
-protected String resourcesDirectory;
-
-protected String testResourcesDirectory;
-
-protected String targetResourceDirectory;
-
-protected String targetTestResourcesDirectory;
-
-protected ArrayList targetClassesList;
-
-protected ArrayList sourceFileList;
-
-protected ArrayList resourcesFileList;
-
-protected ArrayList rootFileList;
-
-protected ArrayList directoryList;
-
-protected HashMap dataMap;
-
-public MavenProjectBuildStub( String key )
-throws Exception
-{
-super( key );
-
-build = new Build();
-resourcesFileList = new ArrayList();
-sourceFileList = new ArrayList();
-rootFileList = new ArrayList();
-directoryList = new ArrayList();
-targetClassesList = new ArrayList();
-dataMap = new HashMap();
-setupBuild();
-}
-
-public void addDirectory( String name )
-{
-if ( isValidPath( name ) )
-{
-directoryList.add( name );
-}
-}
-
-public void setOutputDirectory( String dir )
-{
-outputDirectory = buildDirectory + / + dir;
-build.setOutputDirectory( outputDirectory );
-}
-
-public void addFile( String name, int type )
-{
-if ( isValidPath( name ) )
-{
-List list = getList( type );
-
-list.add( name );
-}
-}
-
-public void addFile( String name, String data, int type )
-{
-File fileName = new File( name );
-
-addFile( name, type );
-dataMap.put( fileName.getName(), data );
-}
-
-public String getOutputDirectory()
-{
-return outputDirectory;
-}
-
-public String getTestOutputDirectory()
-{
-return testOutputDirectory;
-}
-
-public String getResourcesDirectory()
-{
-return resourcesDirectory;
-}
-
-public String getTestResourcesDirectory()
-{
-return testResourcesDirectory;
-}
-
-public Build getBuild()
-{
-return build;
-}
-
-/**
- * returns true if the path is relative
- * and false if absolute
- * also returns false if it is relative to
- * the parent
- *
- * @param path
- * @return
- */
-private boolean isValidPath( String path )
-{
-boolean bRetVal = true;
-
-if ( path.startsWith( c: ) || path.startsWith( .. ) ||
path.startsWith( / ) || path.startsWith( \\ ) )
-{
-bRetVal = false;
-}
-
-return bRetVal;
-}
-
-private void setupBuild()
-{
-// check getBasedir method for the exact path
-// we need to recreate the dir structure in
-// an isolated environment
-srcDirectory = testRootDir + /src;
-buildDirectory = testRootDir + /target;
-outputDirectory = buildDirectory +
svn commit: r476833 - /maven/plugins/trunk/maven-ejb-plugin/src/main/java/org/apache/maven/plugin/ejb/EjbMojo.java
Author: dennisl
Date: Sun Nov 19 06:53:08 2006
New Revision: 476833
URL: http://svn.apache.org/viewvc?view=revrev=476833
Log:
o Fix Checktyle errors.
Modified:
maven/plugins/trunk/maven-ejb-plugin/src/main/java/org/apache/maven/plugin/ejb/EjbMojo.java
Modified:
maven/plugins/trunk/maven-ejb-plugin/src/main/java/org/apache/maven/plugin/ejb/EjbMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ejb-plugin/src/main/java/org/apache/maven/plugin/ejb/EjbMojo.java?view=diffrev=476833r1=476832r2=476833
==
---
maven/plugins/trunk/maven-ejb-plugin/src/main/java/org/apache/maven/plugin/ejb/EjbMojo.java
(original)
+++
maven/plugins/trunk/maven-ejb-plugin/src/main/java/org/apache/maven/plugin/ejb/EjbMojo.java
Sun Nov 19 06:53:08 2006
@@ -281,19 +281,23 @@
}
catch ( ArchiverException e )
{
-throw new MojoExecutionException( There was a problem
creating the EJB client archive: + e.getMessage() , e );
+throw new MojoExecutionException(
+There was a problem creating the EJB client archive: +
e.getMessage(), e );
}
catch ( ManifestException e )
{
-throw new MojoExecutionException( There was a problem
creating the EJB client archive: + e.getMessage() , e );
+throw new MojoExecutionException(
+There was a problem creating the EJB client archive: +
e.getMessage(), e );
}
catch ( IOException e )
{
-throw new MojoExecutionException( There was a problem
creating the EJB client archive: + e.getMessage() , e );
+throw new MojoExecutionException(
+There was a problem creating the EJB client archive: +
e.getMessage(), e );
}
catch ( DependencyResolutionRequiredException e )
{
-throw new MojoExecutionException( There was a problem
creating the EJB client archive: + e.getMessage() , e );
+throw new MojoExecutionException(
+There was a problem creating the EJB client archive: +
e.getMessage(), e );
}
// TODO: shouldn't need classifer
svn commit: r476840 - in /maven/plugins/trunk/maven-ejb-plugin/src/site: fml/ fml/faq.fml site.xml
Author: dennisl Date: Sun Nov 19 07:59:10 2006 New Revision: 476840 URL: http://svn.apache.org/viewvc?view=revrev=476840 Log: o Add FAQ. Added: maven/plugins/trunk/maven-ejb-plugin/src/site/fml/ maven/plugins/trunk/maven-ejb-plugin/src/site/fml/faq.fml (with props) Modified: maven/plugins/trunk/maven-ejb-plugin/src/site/site.xml Added: maven/plugins/trunk/maven-ejb-plugin/src/site/fml/faq.fml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ejb-plugin/src/site/fml/faq.fml?view=autorev=476840 == --- maven/plugins/trunk/maven-ejb-plugin/src/site/fml/faq.fml (added) +++ maven/plugins/trunk/maven-ejb-plugin/src/site/fml/faq.fml Sun Nov 19 07:59:10 2006 @@ -0,0 +1,53 @@ +?xml version=1.0? + +!-- + ~ Copyright 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. + -- + +faqs id=FAQ title=Frequently Asked Questions + part id=General +faq id=How can I specify a Class-Path: entry in the manifest of an EJB jar? + questionHow can I specify a Class-Path: entry in the manifest of an EJB jar?/question + answer +p + You just have to configure it: + source +project + ... + build +plugins + plugin +groupIdorg.apache.maven.plugins/groupId +artifactIdmaven-ejb-plugin/artifactId +... +configuration + archive +manifest + addClasspathtrue/addClasspath +/manifest + /archive +/configuration +... + /plugin +/plugins + /build + ... +/project + /source +/p + /answer +/faq + /part +/faqs \ No newline at end of file Propchange: maven/plugins/trunk/maven-ejb-plugin/src/site/fml/faq.fml -- svn:eol-style = native Modified: maven/plugins/trunk/maven-ejb-plugin/src/site/site.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ejb-plugin/src/site/site.xml?view=diffrev=476840r1=476839r2=476840 == --- maven/plugins/trunk/maven-ejb-plugin/src/site/site.xml (original) +++ maven/plugins/trunk/maven-ejb-plugin/src/site/site.xml Sun Nov 19 07:59:10 2006 @@ -24,7 +24,7 @@ item name=Introduction href=index.html/ item name=Goals href=plugin-info.html/ item name=Usage href=usage.html/ - !-- item name=FAQ href=faq.html/ -- + item name=FAQ href=faq.html/ /menu menu name=Examples item name=Using the ejb client as a dependency href=examples/ejb-client-dependency.html/
svn commit: r476841 - /maven/plugins/trunk/maven-ejb-plugin/src/main/java/org/apache/maven/plugin/ejb/EjbMojo.java
Author: dennisl Date: Sun Nov 19 07:59:52 2006 New Revision: 476841 URL: http://svn.apache.org/viewvc?view=revrev=476841 Log: o Add @since to the ejbVersion parameter. Modified: maven/plugins/trunk/maven-ejb-plugin/src/main/java/org/apache/maven/plugin/ejb/EjbMojo.java Modified: maven/plugins/trunk/maven-ejb-plugin/src/main/java/org/apache/maven/plugin/ejb/EjbMojo.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ejb-plugin/src/main/java/org/apache/maven/plugin/ejb/EjbMojo.java?view=diffrev=476841r1=476840r2=476841 == --- maven/plugins/trunk/maven-ejb-plugin/src/main/java/org/apache/maven/plugin/ejb/EjbMojo.java (original) +++ maven/plugins/trunk/maven-ejb-plugin/src/main/java/org/apache/maven/plugin/ejb/EjbMojo.java Sun Nov 19 07:59:52 2006 @@ -150,6 +150,7 @@ * /p * @parameter default-value=2.1 * @required + * @since 2.1 */ private String ejbVersion;
svn commit: r478666 - in /maven/plugins/trunk/maven-changelog-plugin/src/site: apt/examples/modifying-scm-links.apt site.xml
Author: dennisl Date: Thu Nov 23 12:49:27 2006 New Revision: 478666 URL: http://svn.apache.org/viewvc?view=revrev=478666 Log: [MCHANGELOG-16] when using svn, links are wrong o Add documentation about the new configuration option. Added: maven/plugins/trunk/maven-changelog-plugin/src/site/apt/examples/modifying-scm-links.apt (with props) Modified: maven/plugins/trunk/maven-changelog-plugin/src/site/site.xml Added: maven/plugins/trunk/maven-changelog-plugin/src/site/apt/examples/modifying-scm-links.apt URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changelog-plugin/src/site/apt/examples/modifying-scm-links.apt?view=autorev=478666 == --- maven/plugins/trunk/maven-changelog-plugin/src/site/apt/examples/modifying-scm-links.apt (added) +++ maven/plugins/trunk/maven-changelog-plugin/src/site/apt/examples/modifying-scm-links.apt Thu Nov 23 12:49:27 2006 @@ -0,0 +1,56 @@ + -- + Modifying SCM Links + -- + Dennis Lundberg + -- + November 2006 + -- + + ~~ Copyright 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. + + ~~ NOTE: For help with the syntax of this file, see: + ~~ http://maven.apache.org/guides/mini/guide-apt-format.html + + +Modifying SCM Links + + The plugin normally works out of the box with the most popular web frontends + for SCM systems. If for some reason the links to the web frontend for your + SCM system are not correct, you can tweak the links by configuring the plugin + properly. This is done with the \displayFileDetailUrl\ element. + + To your aid you have a special token %FILE% that corresponds to the + relative path to the file in your repository. The path starts at the + project's root in your SCM system. + + The following configuration will use alternate URLs to your SCM system: + ++-+ +project + ... + reporting +plugins + plugin +groupIdorg.apache.maven.plugins/groupId +artifactIdmaven-changelog-plugin/artifactId +configuration + displayFileDetailUrlhttp://checkstyle.cvs.sourceforge.net/checkstyle%FILE%?view=markup/displayFileDetailUrl +/configuration + /plugin +/plugins + /reporting + ... +/project ++-+ Propchange: maven/plugins/trunk/maven-changelog-plugin/src/site/apt/examples/modifying-scm-links.apt -- svn:eol-style = native Modified: maven/plugins/trunk/maven-changelog-plugin/src/site/site.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changelog-plugin/src/site/site.xml?view=diffrev=478666r1=478665r2=478666 == --- maven/plugins/trunk/maven-changelog-plugin/src/site/site.xml (original) +++ maven/plugins/trunk/maven-changelog-plugin/src/site/site.xml Thu Nov 23 12:49:27 2006 @@ -25,6 +25,7 @@ item name=FAQ href=faq.html/ /menu menu name=Examples + item name=Modifying SCM Links href=/examples/modifying-scm-links.html/ item name=Selecting Reports href=/examples/selecting-reports.html/ item name=Using Date Type href=/examples/configuration-date-type.html/ item name=Using Range Type href=/examples/configuration-range-type.html/
svn commit: r478668 - /maven/plugins/trunk/maven-changelog-plugin/src/site/apt/usage.apt
Author: dennisl Date: Thu Nov 23 12:51:34 2006 New Revision: 478668 URL: http://svn.apache.org/viewvc?view=revrev=478668 Log: o Reformat SCM configuration. Modified: maven/plugins/trunk/maven-changelog-plugin/src/site/apt/usage.apt Modified: maven/plugins/trunk/maven-changelog-plugin/src/site/apt/usage.apt URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changelog-plugin/src/site/apt/usage.apt?view=diffrev=478668r1=478667r2=478668 == --- maven/plugins/trunk/maven-changelog-plugin/src/site/apt/usage.apt (original) +++ maven/plugins/trunk/maven-changelog-plugin/src/site/apt/usage.apt Thu Nov 23 12:51:34 2006 @@ -57,11 +57,11 @@ --- project ... -scm - connectionscm:svn:http://server/path/to/project/trunk/connection - developerConnectionscm:svn:https://path/to/project/trunk/developerConnection - urlscm:svn:http://server/path/to/view/trunk/url -/scm + scm +connectionscm:svn:http://server/path/to/project/trunk/connection + developerConnectionscm:svn:https://path/to/project/trunk/developerConnection +urlscm:svn:http://server/path/to/view/trunk/url + /scm ... /project ---
svn commit: r478669 - /maven/plugins/trunk/maven-changelog-plugin/src/site/apt/examples/selecting-reports.apt
Author: dennisl Date: Thu Nov 23 12:52:15 2006 New Revision: 478669 URL: http://svn.apache.org/viewvc?view=revrev=478669 Log: o Set EOL style to native. Modified: maven/plugins/trunk/maven-changelog-plugin/src/site/apt/examples/selecting-reports.apt (contents, props changed) Modified: maven/plugins/trunk/maven-changelog-plugin/src/site/apt/examples/selecting-reports.apt URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changelog-plugin/src/site/apt/examples/selecting-reports.apt?view=diffrev=478669r1=478668r2=478669 == --- maven/plugins/trunk/maven-changelog-plugin/src/site/apt/examples/selecting-reports.apt (original) +++ maven/plugins/trunk/maven-changelog-plugin/src/site/apt/examples/selecting-reports.apt Thu Nov 23 12:52:15 2006 @@ -1,62 +1,62 @@ - -- - Selecting Reports - -- - Dennis Lundberg - -- - October 2006 - -- - - ~~ Copyright 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. - - ~~ NOTE: For help with the syntax of this file, see: - ~~ http://maven.apache.org/guides/mini/guide-apt-format.html - - -Selecting Reports - - The plugin normally generates 3 reports: changelog, dev-activity and - file-activity. It is possible to configure the plugin so that only a few of - these reports are generated. This is done using \reportSets\. - - The following configuration will generate only the changelog and file-activity - reports. - -+-+ -project - ... - reporting -plugins - plugin -groupIdorg.apache.maven.plugins/groupId -artifactIdmaven-changelog-plugin/artifactId -reportSets - reportSet -iddual-report/id -configuration - typerange/type - range30/range -/configuration -reports - reportchangelog/report - reportfile-activity/report -/reports - /reportSet -/reportSets - /plugin -/plugins - /reporting - ... -/project -+-+ + -- + Selecting Reports + -- + Dennis Lundberg + -- + October 2006 + -- + + ~~ Copyright 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. + + ~~ NOTE: For help with the syntax of this file, see: + ~~ http://maven.apache.org/guides/mini/guide-apt-format.html + + +Selecting Reports + + The plugin normally generates 3 reports: changelog, dev-activity and + file-activity. It is possible to configure the plugin so that only a few of + these reports are generated. This is done using \reportSets\. + + The following configuration will generate only the changelog and file-activity + reports. + ++-+ +project + ... + reporting +plugins + plugin +groupIdorg.apache.maven.plugins/groupId +artifactIdmaven-changelog-plugin/artifactId +reportSets + reportSet +iddual-report/id +configuration + typerange/type + range30/range +/configuration +reports + reportchangelog/report + reportfile-activity/report +/reports + /reportSet +/reportSets + /plugin +/plugins + /reporting + ... +/project ++-+ Propchange: maven/plugins/trunk/maven-changelog-plugin/src/site/apt/examples/selecting-reports.apt -- svn:eol-style = native
svn commit: r480287 - /maven/plugins/trunk/maven-remote-resources-plugin/
Author: dennisl Date: Tue Nov 28 15:43:38 2006 New Revision: 480287 URL: http://svn.apache.org/viewvc?view=revrev=480287 Log: o Ignore target directory and IDEA files. Modified: maven/plugins/trunk/maven-remote-resources-plugin/ (props changed) Propchange: maven/plugins/trunk/maven-remote-resources-plugin/ -- --- svn:ignore (added) +++ svn:ignore Tue Nov 28 15:43:38 2006 @@ -0,0 +1,4 @@ +target +*.iml +*.ipr +*.iws
svn commit: r485924 - /maven/plugins/trunk/maven-source-plugin/src/site/apt/examples/configureplugin.apt
Author: dennisl Date: Mon Dec 11 14:30:49 2006 New Revision: 485924 URL: http://svn.apache.org/viewvc?view=revrev=485924 Log: o Fix errors in configuration example. Modified: maven/plugins/trunk/maven-source-plugin/src/site/apt/examples/configureplugin.apt Modified: maven/plugins/trunk/maven-source-plugin/src/site/apt/examples/configureplugin.apt URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-source-plugin/src/site/apt/examples/configureplugin.apt?view=diffrev=485924r1=485923r2=485924 == --- maven/plugins/trunk/maven-source-plugin/src/site/apt/examples/configureplugin.apt (original) +++ maven/plugins/trunk/maven-source-plugin/src/site/apt/examples/configureplugin.apt Mon Dec 11 14:30:49 2006 @@ -14,13 +14,17 @@ project ... build -groupIdorg.apache.maven.plugin/groupId -artifactIdmaven-source-plugin/artifactId -configuration - outputDirectory/absolute/path/to/the/output/directory/outputDirectory - finalNamefilename-of-generated-jar-file/finalName - attachfalse/attach -/configuration +plugins + plugin +groupIdorg.apache.maven.plugins/groupId +artifactIdmaven-source-plugin/artifactId +configuration + outputDirectory/absolute/path/to/the/output/directory/outputDirectory + finalNamefilename-of-generated-jar-file/finalName + attachfalse/attach +/configuration + /plugin +/plugins /build ... /project
svn commit: r485929 - in /maven/plugins/trunk/maven-javadoc-plugin/src: main/mdo/ site/apt/ site/apt/examples/ site/fml/ test/java/org/apache/maven/plugin/javadoc/ test/java/org/apache/maven/plugin/ja
Author: dennisl Date: Mon Dec 11 14:54:56 2006 New Revision: 485929 URL: http://svn.apache.org/viewvc?view=revrev=485929 Log: o Set EOL style to native. Modified: maven/plugins/trunk/maven-javadoc-plugin/src/main/mdo/javadocOptions.mdo (props changed) maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/aggregate.apt (props changed) maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/alternate-doclet.apt (props changed) maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/exclude-package-names.apt (props changed) maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/group-configuration.apt (props changed) maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/stylesheet-configuration.apt (props changed) maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/tag-configuration.apt (props changed) maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/index.apt (contents, props changed) maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/usage.apt (contents, props changed) maven/plugins/trunk/maven-javadoc-plugin/src/site/fml/faq.fml (props changed) maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/GroupTest.java (props changed) maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/JavadocJarTest.java (props changed) maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/JavadocReportTest.java (props changed) maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/TagTest.java (props changed) maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/AggregateProject1TestMavenProjectStub.java (props changed) maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/AggregateProject2TestMavenProjectStub.java (props changed) maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/AggregateTestMavenProjectStub.java (props changed) maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/CustomConfigurationMavenProjectStub.java (props changed) maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/DefaultArtifactHandlerStub.java (props changed) maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/DefaultConfigurationMavenProjectStub.java (props changed) maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/DocfilesTestMavenProjectStub.java (props changed) maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/DocletTestMavenProjectStub.java (props changed) maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/JavadocJarDefaultMavenProjectStub.java (props changed) maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/JavadocJarInvalidDestdirMavenProjectStub.java (props changed) maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/JavadocPluginArtifactStub.java (props changed) maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/QuotedPathMavenProjectStub.java (props changed) maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/stubs/SubpackagesTestMavenProjectStub.java (props changed) maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/aggregate-test/aggregate-test-plugin-config.xml (props changed) maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/aggregate-test/project1/aggregate-test-plugin-config.xml (props changed) maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/aggregate-test/project1/aggregate/test/project1/Project1App.java (props changed) maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/aggregate-test/project1/aggregate/test/project1/Project1AppSample.java (props changed) maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/aggregate-test/project1/aggregate/test/project1/Project1Sample.java (props changed) maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/aggregate-test/project1/aggregate/test/project1/Project1Test.java (props changed) maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/aggregate-test/project2/aggregate-test-plugin-config.xml (props changed) maven/plugins/trunk/maven-javadoc-plugin/src/test/resources/unit/aggregate-test/project2/aggregate/test/project2/Project2App.java (props changed) maven/plugins/trunk/maven-javadoc-plugin/src/test/resources
svn commit: r485933 - in /maven/plugins/trunk/maven-javadoc-plugin/src/site/apt: examples/aggregate.apt examples/exclude-package-names.apt examples/group-configuration.apt examples/stylesheet-configur
Author: dennisl Date: Mon Dec 11 15:01:22 2006 New Revision: 485933 URL: http://svn.apache.org/viewvc?view=revrev=485933 Log: o Fix indentation in configuration examples. Modified: maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/aggregate.apt maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/exclude-package-names.apt maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/group-configuration.apt maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/stylesheet-configuration.apt maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/tag-configuration.apt maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/usage.apt Modified: maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/aggregate.apt URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/aggregate.apt?view=diffrev=485933r1=485932r2=485933 == --- maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/aggregate.apt (original) +++ maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/aggregate.apt Mon Dec 11 15:01:22 2006 @@ -65,7 +65,7 @@ /configuration /plugin /plugins - ... +... /reporting ... /project Modified: maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/exclude-package-names.apt URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/exclude-package-names.apt?view=diffrev=485933r1=485932r2=485933 == --- maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/exclude-package-names.apt (original) +++ maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/exclude-package-names.apt Mon Dec 11 15:01:22 2006 @@ -45,7 +45,7 @@ /configuration /plugin /plugins - ... +... /reporting ... /project Modified: maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/group-configuration.apt URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/group-configuration.apt?view=diffrev=485933r1=485932r2=485933 == --- maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/group-configuration.apt (original) +++ maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/group-configuration.apt Mon Dec 11 15:01:22 2006 @@ -53,7 +53,7 @@ /configuration /plugin /plugins - ... +... /reporting ... /project Modified: maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/stylesheet-configuration.apt URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/stylesheet-configuration.apt?view=diffrev=485933r1=485932r2=485933 == --- maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/stylesheet-configuration.apt (original) +++ maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/stylesheet-configuration.apt Mon Dec 11 15:01:22 2006 @@ -46,7 +46,7 @@ /configuration /plugin /plugins - ... +... /reporting ... /project Modified: maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/tag-configuration.apt URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/tag-configuration.apt?view=diffrev=485933r1=485932r2=485933 == --- maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/tag-configuration.apt (original) +++ maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/tag-configuration.apt Mon Dec 11 15:01:22 2006 @@ -51,7 +51,7 @@ /configuration /plugin /plugins - ... +... /reporting ... /project Modified: maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/usage.apt URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/usage.apt?view=diffrev=485933r1=485932r2=485933 == --- maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/usage.apt (original) +++ maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/usage.apt Mon Dec 11 15:01:22 2006 @@ -36,17 +36,17 @@ +-+ project -... -reporting - plugins - plugin - groupIdorg.apache.maven.plugins/groupId - artifactIdmaven-javadoc-plugin/artifactId - /plugin - /plugins -... -/reporting -... + ... + reporting +plugins + plugin +groupIdorg.apache.maven.plugins/groupId +artifactIdmaven-javadoc-plugin/artifactId + /plugin +/plugins +... + /reporting + ... /project +-+
svn commit: r485937 - in /maven/plugins/trunk/maven-javadoc-plugin/src/site/apt: ./ examples/
Author: dennisl Date: Mon Dec 11 15:13:00 2006 New Revision: 485937 URL: http://svn.apache.org/viewvc?view=revrev=485937 Log: o Update to the new ASF license headers. Modified: maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/aggregate.apt maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/alternate-doclet.apt maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/exclude-package-names.apt maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/group-configuration.apt maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/stylesheet-configuration.apt maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/tag-configuration.apt maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/taglet-configuration.apt maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/index.apt maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/usage.apt Modified: maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/aggregate.apt URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/aggregate.apt?view=diffrev=485937r1=485936r2=485937 == --- maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/aggregate.apt (original) +++ maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/aggregate.apt Mon Dec 11 15:13:00 2006 @@ -6,23 +6,25 @@ June 2006 -- - ~~ Copyright 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. - - ~~ NOTE: For help with the syntax of this file, see: - ~~ http://maven.apache.org/guides/mini/guide-apt-format.html +~~ 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. +~~ NOTE: For help with the syntax of this file, see: +~~ http://maven.apache.org/guides/mini/guide-apt-format.html Aggregating Javadocs for Multi-Projects Modified: maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/alternate-doclet.apt URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/alternate-doclet.apt?view=diffrev=485937r1=485936r2=485937 == --- maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/alternate-doclet.apt (original) +++ maven/plugins/trunk/maven-javadoc-plugin/src/site/apt/examples/alternate-doclet.apt Mon Dec 11 15:13:00 2006 @@ -7,23 +7,25 @@ September 2006 -- - ~~ Copyright 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. - - ~~ NOTE: For help with the syntax of this file, see: - ~~ http://maven.apache.org/guides/mini/guide-apt-format.html +~~ 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
svn commit: r485942 - /maven/plugins/trunk/maven-javadoc-plugin/src/main/resources/org/apache/maven/plugin/javadoc/css/stylesheet.css
Author: dennisl Date: Mon Dec 11 15:21:30 2006 New Revision: 485942 URL: http://svn.apache.org/viewvc?view=revrev=485942 Log: o Enclose license inside a proper comment. Modified: maven/plugins/trunk/maven-javadoc-plugin/src/main/resources/org/apache/maven/plugin/javadoc/css/stylesheet.css Modified: maven/plugins/trunk/maven-javadoc-plugin/src/main/resources/org/apache/maven/plugin/javadoc/css/stylesheet.css URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/main/resources/org/apache/maven/plugin/javadoc/css/stylesheet.css?view=diffrev=485942r1=485941r2=485942 == --- maven/plugins/trunk/maven-javadoc-plugin/src/main/resources/org/apache/maven/plugin/javadoc/css/stylesheet.css (original) +++ maven/plugins/trunk/maven-javadoc-plugin/src/main/resources/org/apache/maven/plugin/javadoc/css/stylesheet.css Mon Dec 11 15:21:30 2006 @@ -1,3 +1,4 @@ +/* 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 @@ -6,7 +7,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 @@ -14,6 +15,7 @@ KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. +*/ /* Javadoc style sheet */
svn commit: r485944 - /maven/plugins/trunk/maven-gpg-plugin/
Author: dennisl Date: Mon Dec 11 15:36:16 2006 New Revision: 485944 URL: http://svn.apache.org/viewvc?view=revrev=485944 Log: o Ignore IDEA files. Modified: maven/plugins/trunk/maven-gpg-plugin/ (props changed) Propchange: maven/plugins/trunk/maven-gpg-plugin/ -- --- svn:ignore (original) +++ svn:ignore Mon Dec 11 15:36:16 2006 @@ -1 +1,4 @@ target +*.iml +*.ipr +*.iws
svn commit: r487139 - /maven/sandbox/plugins/maven-swizzle-plugin/pom.xml
Author: dennisl Date: Thu Dec 14 00:50:11 2006 New Revision: 487139 URL: http://svn.apache.org/viewvc?view=revrev=487139 Log: o Remove reporting plugins that are available in maven-plugin-surrogate-parent. You use mvn -Preporting ... to activate those plugins. Modified: maven/sandbox/plugins/maven-swizzle-plugin/pom.xml Modified: maven/sandbox/plugins/maven-swizzle-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/sandbox/plugins/maven-swizzle-plugin/pom.xml?view=diffrev=487139r1=487138r2=487139 == --- maven/sandbox/plugins/maven-swizzle-plugin/pom.xml (original) +++ maven/sandbox/plugins/maven-swizzle-plugin/pom.xml Thu Dec 14 00:50:11 2006 @@ -1,83 +1,71 @@ -!-- - -Copyright 2006 - -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 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-plugins/artifactId -groupIdorg.apache.maven.plugins/groupId -version4/version - /parent - modelVersion4.0.0/modelVersion - artifactIdmaven-swizzle-plugin/artifactId - packagingmaven-plugin/packaging - version1.0-SNAPSHOT/version - namemaven-swizzle-plugin Maven Mojo/name - urlhttp://maven.apache.org/url - build -plugins - plugin -groupIdorg.apache.maven.plugins/groupId -artifactIdmaven-site-plugin/artifactId -configuration - excludeModulesorg/codehaus/plexus/swizzle/*.vm/excludeModules -/configuration - /plugin -/plugins - /build - reporting -plugins - plugin -groupIdorg.apache.maven.plugins/groupId -artifactIdmaven-javadoc-plugin/artifactId - /plugin - plugin -groupIdorg.apache.maven.plugins/groupId -artifactIdmaven-jxr-plugin/artifactId - /plugin -/plugins - /reporting - dependencies -dependency - groupIdorg.apache.maven/groupId - artifactIdmaven-plugin-api/artifactId - version2.0/version -/dependency -dependency - groupIdjunit/groupId - artifactIdjunit/artifactId - version3.8.1/version - scopetest/scope -/dependency -dependency - groupIdorg.codehaus.plexus/groupId - artifactIdplexus-swizzle/artifactId - version1.0-SNAPSHOT/version -/dependency -dependency - groupIdorg.apache.maven.shared/groupId - artifactIdmaven-plugin-testing-harness/artifactId - version1.0-beta-1/version - scopetest/scope -/dependency - /dependencies -/project +!-- + +Copyright 2006 + +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 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-plugins/artifactId +groupIdorg.apache.maven.plugins/groupId +version4/version + /parent + modelVersion4.0.0/modelVersion + artifactIdmaven-swizzle-plugin/artifactId + packagingmaven-plugin/packaging + version1.0-SNAPSHOT/version + namemaven-swizzle-plugin Maven Mojo/name + urlhttp://maven.apache.org/url + build +plugins + plugin +groupIdorg.apache.maven.plugins/groupId +artifactIdmaven-site-plugin/artifactId +configuration + excludeModulesorg/codehaus/plexus/swizzle/*.vm/excludeModules
svn commit: r487159 - in /maven/sandbox/plugins/maven-swizzle-plugin: ./ src/main/java/org/apache/maven/plugin/swizzle/ src/site/ src/site/apt/ src/site/apt/examples/ src/site/fml/ src/test/java/org/a
Author: dennisl Date: Thu Dec 14 02:15:19 2006 New Revision: 487159 URL: http://svn.apache.org/viewvc?view=revrev=487159 Log: o Set EOL style to native. Modified: maven/sandbox/plugins/maven-swizzle-plugin/pom.xml (contents, props changed) maven/sandbox/plugins/maven-swizzle-plugin/src/main/java/org/apache/maven/plugin/swizzle/ReportMojo.java (props changed) maven/sandbox/plugins/maven-swizzle-plugin/src/site/apt/examples/generating-custom-report.apt (props changed) maven/sandbox/plugins/maven-swizzle-plugin/src/site/apt/examples/generating-resolved-issues-report.apt (props changed) maven/sandbox/plugins/maven-swizzle-plugin/src/site/apt/examples/generating-votes-report.apt (contents, props changed) maven/sandbox/plugins/maven-swizzle-plugin/src/site/apt/index.apt (contents, props changed) maven/sandbox/plugins/maven-swizzle-plugin/src/site/apt/usage.apt (contents, props changed) maven/sandbox/plugins/maven-swizzle-plugin/src/site/fml/faq.fml (props changed) maven/sandbox/plugins/maven-swizzle-plugin/src/site/site.xml (contents, props changed) maven/sandbox/plugins/maven-swizzle-plugin/src/test/java/org/apache/maven/plugin/swizzle/ReportMojoTest.java (props changed) maven/sandbox/plugins/maven-swizzle-plugin/src/test/resources/unit/MyResolvedIssuesExpectedResult.txt (contents, props changed) maven/sandbox/plugins/maven-swizzle-plugin/src/test/resources/unit/MyResolvedIssuesTemplate.vm (contents, props changed) maven/sandbox/plugins/maven-swizzle-plugin/src/test/resources/unit/ResolvedIssuesExpectedResult.txt (contents, props changed) maven/sandbox/plugins/maven-swizzle-plugin/src/test/resources/unit/VotesExpectedResult.txt (contents, props changed) maven/sandbox/plugins/maven-swizzle-plugin/src/test/resources/unit/custom-template-configuration-test.xml (props changed) maven/sandbox/plugins/maven-swizzle-plugin/src/test/resources/unit/resolved-issues-configuration-test.xml (props changed) maven/sandbox/plugins/maven-swizzle-plugin/src/test/resources/unit/simple.xml (props changed) maven/sandbox/plugins/maven-swizzle-plugin/src/test/resources/unit/votes-configuration-test.xml (props changed) Modified: maven/sandbox/plugins/maven-swizzle-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/sandbox/plugins/maven-swizzle-plugin/pom.xml?view=diffrev=487159r1=487158r2=487159 == --- maven/sandbox/plugins/maven-swizzle-plugin/pom.xml (original) +++ maven/sandbox/plugins/maven-swizzle-plugin/pom.xml Thu Dec 14 02:15:19 2006 @@ -1,71 +1,71 @@ -!-- - -Copyright 2006 - -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 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-plugins/artifactId -groupIdorg.apache.maven.plugins/groupId -version4/version - /parent - modelVersion4.0.0/modelVersion - artifactIdmaven-swizzle-plugin/artifactId - packagingmaven-plugin/packaging - version1.0-SNAPSHOT/version - namemaven-swizzle-plugin Maven Mojo/name - urlhttp://maven.apache.org/url - build -plugins - plugin -groupIdorg.apache.maven.plugins/groupId -artifactIdmaven-site-plugin/artifactId -configuration - excludeModulesorg/codehaus/plexus/swizzle/*.vm/excludeModules -/configuration - /plugin -/plugins - /build - dependencies -dependency - groupIdorg.apache.maven/groupId - artifactIdmaven-plugin-api/artifactId - version2.0/version -/dependency -dependency - groupIdjunit/groupId - artifactIdjunit/artifactId - version3.8.1/version - scopetest/scope -/dependency -dependency - groupIdorg.codehaus.plexus/groupId - artifactIdplexus-swizzle/artifactId - version1.0-SNAPSHOT/version -/dependency -dependency - groupIdorg.apache.maven.shared/groupId - artifactIdmaven-plugin-testing-harness/artifactId - version1.0-beta-1/version - scopetest/scope
svn commit: r487502 - in /maven/plugins/trunk/maven-site-plugin: pom.xml src/site/xdoc/i18n.xml
Author: dennisl Date: Fri Dec 15 01:44:20 2006 New Revision: 487502 URL: http://svn.apache.org/viewvc?view=revrev=487502 Log: o Revert changed issue management URLs. Modified: maven/plugins/trunk/maven-site-plugin/pom.xml maven/plugins/trunk/maven-site-plugin/src/site/xdoc/i18n.xml Modified: maven/plugins/trunk/maven-site-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/pom.xml?view=diffrev=487502r1=487501r2=487502 == --- maven/plugins/trunk/maven-site-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-site-plugin/pom.xml Fri Dec 15 01:44:20 2006 @@ -32,7 +32,7 @@ /prerequisites issueManagement systemJIRA/system -urlhttp://jira.org.codehaus.org/browse/MSITE/url +urlhttp://jira.codehaus.org/browse/MSITE/url /issueManagement contributors contributor Modified: maven/plugins/trunk/maven-site-plugin/src/site/xdoc/i18n.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/site/xdoc/i18n.xml?view=diffrev=487502r1=487501r2=487502 == --- maven/plugins/trunk/maven-site-plugin/src/site/xdoc/i18n.xml (original) +++ maven/plugins/trunk/maven-site-plugin/src/site/xdoc/i18n.xml Fri Dec 15 01:44:20 2006 @@ -202,7 +202,7 @@ it. /li li -When happy with it, create a new issue in a href=http://jira.org.codehaus.org/browse/MNG;JIRA/a +When happy with it, create a new issue in a href=http://jira.codehaus.org/browse/MNG;JIRA/a and attach the file there. /li /ol
svn commit: r487575 - /maven/plugins/trunk/maven-site-plugin/pom.xml
Author: dennisl Date: Fri Dec 15 06:54:26 2006 New Revision: 487575 URL: http://svn.apache.org/viewvc?view=revrev=487575 Log: o Revert changed issue management URL. Modified: maven/plugins/trunk/maven-site-plugin/pom.xml Modified: maven/plugins/trunk/maven-site-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/pom.xml?view=diffrev=487575r1=487574r2=487575 == --- maven/plugins/trunk/maven-site-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-site-plugin/pom.xml Fri Dec 15 06:54:26 2006 @@ -35,7 +35,7 @@ /prerequisites issueManagement systemJIRA/system -urlhttp://jira.org.codehaus.org/browse/MSITE/url +urlhttp://jira.codehaus.org/browse/MSITE/url /issueManagement contributors contributor
svn commit: r487979 - /maven/site/trunk/src/site/apt/guides/mini/guide-3rd-party-jars-local.apt
Author: dennisl Date: Sun Dec 17 05:30:09 2006 New Revision: 487979 URL: http://svn.apache.org/viewvc?view=revrev=487979 Log: [MNG-2703] Misprint in Guide to installing 3rd party JARs. Modified: maven/site/trunk/src/site/apt/guides/mini/guide-3rd-party-jars-local.apt Modified: maven/site/trunk/src/site/apt/guides/mini/guide-3rd-party-jars-local.apt URL: http://svn.apache.org/viewvc/maven/site/trunk/src/site/apt/guides/mini/guide-3rd-party-jars-local.apt?view=diffrev=487979r1=487978r2=487979 == --- maven/site/trunk/src/site/apt/guides/mini/guide-3rd-party-jars-local.apt (original) +++ maven/site/trunk/src/site/apt/guides/mini/guide-3rd-party-jars-local.apt Sun Dec 17 05:30:09 2006 @@ -10,7 +10,7 @@ Often times you will have 3rd party JARs that you need to put in your local repository for use in your builds. The JARs must be placed in the local repository in the correct place in order for it to be correctly - picked up by Maven. To make this easier, and then error prone, we have provide a goal in the install plug-in + picked up by Maven. To make this easier, and less error prone, we have provide a goal in the install plug-in which should make this relatively painless. To install a JAR in the local repository use the following command:
svn commit: r493484 - /maven/maven-1/plugins/trunk/changes/xdocs/index.xml
Author: dennisl Date: Sat Jan 6 07:06:42 2007 New Revision: 493484 URL: http://svn.apache.org/viewvc?view=revrev=493484 Log: o Fix syntax error in project.xml configuration example. Modified: maven/maven-1/plugins/trunk/changes/xdocs/index.xml Modified: maven/maven-1/plugins/trunk/changes/xdocs/index.xml URL: http://svn.apache.org/viewvc/maven/maven-1/plugins/trunk/changes/xdocs/index.xml?view=diffrev=493484r1=493483r2=493484 == --- maven/maven-1/plugins/trunk/changes/xdocs/index.xml (original) +++ maven/maven-1/plugins/trunk/changes/xdocs/index.xml Sat Jan 6 07:06:42 2007 @@ -42,7 +42,7 @@ source![CDATA[ reports reportmaven-changes-plugin/report -reports +/reports ]]/source p Then you have to create a codechanges.xml/code file in your codexdocs/code directory. Here's an example of a
svn commit: r494209 - /maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteRenderingMojo.java
Author: dennisl
Date: Mon Jan 8 13:52:23 2007
New Revision: 494209
URL: http://svn.apache.org/viewvc?view=revrev=494209
Log:
o Improve documentation for the moduleExcludes parameter.
Modified:
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteRenderingMojo.java
Modified:
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteRenderingMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteRenderingMojo.java?view=diffrev=494209r1=494208r2=494209
==
---
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteRenderingMojo.java
(original)
+++
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteRenderingMojo.java
Mon Jan 8 13:52:23 2007
@@ -65,8 +65,20 @@
extends AbstractSiteMojo
{
/**
- * module type exclusion mappings
- * ex: fml - **\/*-m1.fml (excludes -m1.fml files)
+ * Module type exclusion mappings
+ * ex: codefml - **#47;*-m1.fml/code (excludes fml files ending in
'-m1.fml' recursively)
+ * p/
+ * The configuration looks like this:
+ * pre
+ * lt;moduleExcludesgt;
+ *
lt;moduleTypegt;filename1.ext,**#47;*sample.extlt;/moduleTypegt;
+ * lt;!-- moduleType can be one of 'apt', 'fml' or 'xdoc'. --gt;
+ * lt;!-- The value is a comma separated list of --gt;
+ * lt;!-- filenames or fileset patterns. --gt;
+ * lt;!-- Here's an example: --gt;
+ * lt;xdocgt;changes.xml,navigation.xmllt;/xdocgt;
+ * lt;/moduleExcludesgt;
+ * /pre
*
* @parameter
*/
svn commit: r494246 - /maven/skins/trunk/pom.xml
Author: dennisl Date: Mon Jan 8 15:22:11 2007 New Revision: 494246 URL: http://svn.apache.org/viewvc?view=revrev=494246 Log: o Sync distributionManagement with the other projects. Modified: maven/skins/trunk/pom.xml Modified: maven/skins/trunk/pom.xml URL: http://svn.apache.org/viewvc/maven/skins/trunk/pom.xml?view=diffrev=494246r1=494245r2=494246 == --- maven/skins/trunk/pom.xml (original) +++ maven/skins/trunk/pom.xml Mon Jan 8 15:22:11 2007 @@ -21,7 +21,7 @@ /issueManagement distributionManagement site - idwebsite/id + idapache.website/id urlscp://people.apache.org/www/maven.apache.org/skins//url /site /distributionManagement
svn commit: r494263 - in /maven/skins/trunk/maven-stylus-skin/src/main/resources/images: external.png newwindow.png
Author: dennisl Date: Mon Jan 8 15:49:03 2007 New Revision: 494263 URL: http://svn.apache.org/viewvc?view=revrev=494263 Log: o Add missing images, copied from maven-default-skin. They are needed because of DOXIA-87. Added: maven/skins/trunk/maven-stylus-skin/src/main/resources/images/external.png - copied unchanged from r494245, maven/skins/trunk/maven-default-skin/src/main/resources/images/external.png maven/skins/trunk/maven-stylus-skin/src/main/resources/images/newwindow.png - copied unchanged from r494245, maven/skins/trunk/maven-default-skin/src/main/resources/images/newwindow.png
svn commit: r495936 - in /maven/plugins/trunk/maven-one-plugin: ./ src/main/java/org/apache/maven/plugins/mavenone/ src/main/resources/META-INF/plexus/ src/site/ src/site/apt/ src/site/apt/examples/ s
Author: dennisl Date: Sat Jan 13 09:54:21 2007 New Revision: 495936 URL: http://svn.apache.org/viewvc?view=revrev=495936 Log: o Update to the new ASF license headers. Modified: maven/plugins/trunk/maven-one-plugin/pom.xml maven/plugins/trunk/maven-one-plugin/src/main/java/org/apache/maven/plugins/mavenone/MavenOnePluginMojo.java maven/plugins/trunk/maven-one-plugin/src/main/java/org/apache/maven/plugins/mavenone/MavenOneRepositoryDeployMojo.java maven/plugins/trunk/maven-one-plugin/src/main/java/org/apache/maven/plugins/mavenone/MavenOneRepositoryInstallMojo.java maven/plugins/trunk/maven-one-plugin/src/main/java/org/apache/maven/plugins/mavenone/PomV3ConvertMojo.java maven/plugins/trunk/maven-one-plugin/src/main/resources/META-INF/plexus/components.xml maven/plugins/trunk/maven-one-plugin/src/site/apt/examples/pom.apt maven/plugins/trunk/maven-one-plugin/src/site/apt/index.apt maven/plugins/trunk/maven-one-plugin/src/site/apt/usage.apt maven/plugins/trunk/maven-one-plugin/src/site/fml/faq.fml maven/plugins/trunk/maven-one-plugin/src/site/site.xml Modified: maven/plugins/trunk/maven-one-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-one-plugin/pom.xml?view=diffrev=495936r1=495935r2=495936 == --- maven/plugins/trunk/maven-one-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-one-plugin/pom.xml Sat Jan 13 09:54:21 2007 @@ -1,5 +1,23 @@ ?xml version='1.0' encoding='UTF-8'? -project +!-- + ~ 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 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-plugins/artifactId groupIdorg.apache.maven.plugins/groupId Modified: maven/plugins/trunk/maven-one-plugin/src/main/java/org/apache/maven/plugins/mavenone/MavenOnePluginMojo.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-one-plugin/src/main/java/org/apache/maven/plugins/mavenone/MavenOnePluginMojo.java?view=diffrev=495936r1=495935r2=495936 == --- maven/plugins/trunk/maven-one-plugin/src/main/java/org/apache/maven/plugins/mavenone/MavenOnePluginMojo.java (original) +++ maven/plugins/trunk/maven-one-plugin/src/main/java/org/apache/maven/plugins/mavenone/MavenOnePluginMojo.java Sat Jan 13 09:54:21 2007 @@ -1,19 +1,22 @@ package org.apache.maven.plugins.mavenone; /* - * Copyright 2001-2005 The Apache Software Foundation. + * 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 * - * 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 * - * 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. + * 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.archiver.MavenArchiveConfiguration; Modified: maven/plugins/trunk/maven-one-plugin/src/main/java/org/apache/maven
svn commit: r496152 - /maven/components/trunk/maven-model/maven.mdo
Author: dennisl Date: Sun Jan 14 13:10:03 2007 New Revision: 496152 URL: http://svn.apache.org/viewvc?view=revrev=496152 Log: o Fix typos in descriptions. Modified: maven/components/trunk/maven-model/maven.mdo Modified: maven/components/trunk/maven-model/maven.mdo URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-model/maven.mdo?view=diffrev=496152r1=496151r2=496152 == --- maven/components/trunk/maven-model/maven.mdo (original) +++ maven/components/trunk/maven-model/maven.mdo Sun Jan 14 13:10:03 2007 @@ -2000,7 +2000,7 @@ version4.0.0/version description![CDATA[ A repository contains the information needed - for establishing connections with remote repoistory. + for establishing connections with remote repository. ]]/description fields field @@ -2066,7 +2066,7 @@ superClassRepositoryBase/superClass version4.0.0/version description -A repository contains the information needed for establishing connections with remote repoistory. +A repository contains the information needed for establishing connections with remote repository. /description fields field @@ -2105,7 +2105,7 @@ superClassRepositoryBase/superClass version4.0.0/version description -Repository contains the information needed for deploying to the remote repoistory. +Repository contains the information needed for deploying to the remote repository. /description fields field @@ -2134,7 +2134,7 @@ class nameRepositoryPolicy/name version4.0.0/version - descriptionDownload policy/description + descriptionDownload policy./description fields field nameenabled/name @@ -2187,7 +2187,7 @@ nameid/name version4.0.0/version description![CDATA[ -A unique identifier for a deployment locataion. This is used to match the site to configuration in +A unique identifier for a deployment location. This is used to match the site to configuration in the codesettings.xml/code file, for example. ]]/description typeString/type
svn commit: r496154 - /maven/components/branches/maven-2.0.x/maven-model/maven.mdo
Author: dennisl Date: Sun Jan 14 13:16:31 2007 New Revision: 496154 URL: http://svn.apache.org/viewvc?view=revrev=496154 Log: o Fix invalid XHTML in a comment. o Fix typos in descriptions. o Merge in revisions 490092 and 496152 from trunk. Modified: maven/components/branches/maven-2.0.x/maven-model/maven.mdo Modified: maven/components/branches/maven-2.0.x/maven-model/maven.mdo URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-model/maven.mdo?view=diffrev=496154r1=496153r2=496154 == --- maven/components/branches/maven-2.0.x/maven-model/maven.mdo (original) +++ maven/components/branches/maven-2.0.x/maven-model/maven.mdo Sun Jan 14 13:16:31 2007 @@ -1997,7 +1997,6 @@ version3.0.0/version description![CDATA[ A unique identifier for a version. This is usually identical to the name. -/a builds. ]]/description typeString/type /field @@ -2020,7 +2019,7 @@ version4.0.0/version description![CDATA[ A repository contains the information needed - for establishing connections with remote repoistory. + for establishing connections with remote repository. ]]/description fields field @@ -2086,7 +2085,7 @@ superClassRepositoryBase/superClass version4.0.0/version description -A repository contains the information needed for establishing connections with remote repoistory. +A repository contains the information needed for establishing connections with remote repository. /description fields field @@ -2125,7 +2124,7 @@ superClassRepositoryBase/superClass version4.0.0/version description -Repository contains the information needed for deploying to the remote repoistory. +Repository contains the information needed for deploying to the remote repository. /description fields field @@ -2154,7 +2153,7 @@ class nameRepositoryPolicy/name version4.0.0/version - descriptionDownload policy/description + descriptionDownload policy./description fields field nameenabled/name @@ -2207,7 +2206,7 @@ nameid/name version4.0.0/version description![CDATA[ -A unique identifier for a deployment locataion. This is used to match the site to configuration in +A unique identifier for a deployment location. This is used to match the site to configuration in the codesettings.xml/code file, for example. ]]/description typeString/type
svn commit: r497989 - in /maven/plugins/trunk/maven-changelog-plugin/src/site/apt: ./ examples/
Author: dennisl Date: Fri Jan 19 14:48:42 2007 New Revision: 497989 URL: http://svn.apache.org/viewvc?view=revrev=497989 Log: o Update to the new ASF license headers. Modified: maven/plugins/trunk/maven-changelog-plugin/src/site/apt/examples/configuration-date-type.apt maven/plugins/trunk/maven-changelog-plugin/src/site/apt/examples/configuration-range-type.apt maven/plugins/trunk/maven-changelog-plugin/src/site/apt/examples/configuration-tag-type.apt maven/plugins/trunk/maven-changelog-plugin/src/site/apt/examples/modifying-scm-links.apt maven/plugins/trunk/maven-changelog-plugin/src/site/apt/examples/selecting-reports.apt maven/plugins/trunk/maven-changelog-plugin/src/site/apt/index.apt maven/plugins/trunk/maven-changelog-plugin/src/site/apt/usage.apt Modified: maven/plugins/trunk/maven-changelog-plugin/src/site/apt/examples/configuration-date-type.apt URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changelog-plugin/src/site/apt/examples/configuration-date-type.apt?view=diffrev=497989r1=497988r2=497989 == --- maven/plugins/trunk/maven-changelog-plugin/src/site/apt/examples/configuration-date-type.apt (original) +++ maven/plugins/trunk/maven-changelog-plugin/src/site/apt/examples/configuration-date-type.apt Fri Jan 19 14:48:42 2007 @@ -4,19 +4,22 @@ July 2006 -- - ~~ Copyright 2006 The Apache Software Foundation. + ~~ 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 ~~ - ~~ 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 ~~ - ~~ 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. + ~~ 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. ~~ NOTE: For help with the syntax of this file, see: ~~ http://maven.apache.org/guides/mini/guide-apt-format.html Modified: maven/plugins/trunk/maven-changelog-plugin/src/site/apt/examples/configuration-range-type.apt URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changelog-plugin/src/site/apt/examples/configuration-range-type.apt?view=diffrev=497989r1=497988r2=497989 == --- maven/plugins/trunk/maven-changelog-plugin/src/site/apt/examples/configuration-range-type.apt (original) +++ maven/plugins/trunk/maven-changelog-plugin/src/site/apt/examples/configuration-range-type.apt Fri Jan 19 14:48:42 2007 @@ -4,19 +4,22 @@ July 2006 -- - ~~ Copyright 2006 The Apache Software Foundation. + ~~ 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 ~~ - ~~ 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 ~~ - ~~ 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. + ~~ 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
svn commit: r497994 - /maven/plugins/trunk/maven-changelog-plugin/pom.xml
Author: dennisl
Date: Fri Jan 19 14:57:23 2007
New Revision: 497994
URL: http://svn.apache.org/viewvc?view=revrev=497994
Log:
o Update to a released version of maven-plugin-testing-harness.
Modified:
maven/plugins/trunk/maven-changelog-plugin/pom.xml
Modified: maven/plugins/trunk/maven-changelog-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changelog-plugin/pom.xml?view=diffrev=497994r1=497993r2=497994
==
--- maven/plugins/trunk/maven-changelog-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-changelog-plugin/pom.xml Fri Jan 19 14:57:23 2007
@@ -242,9 +242,9 @@
version${maven-scm.version}/version
/dependency
dependency
- groupIdorg.apache.maven/groupId
+ groupIdorg.apache.maven.shared/groupId
artifactIdmaven-plugin-testing-harness/artifactId
- version1.0-SNAPSHOT/version
+ version1.0-beta-1/version
scopetest/scope
/dependency
/dependencies
svn commit: r501971 - /maven/site/trunk/src/site/apt/guides/getting-started/maven-in-five-minutes.apt
Author: dennisl
Date: Wed Jan 31 12:01:56 2007
New Revision: 501971
URL: http://svn.apache.org/viewvc?view=revrev=501971
Log:
[MNG-2801] broken link in basic documentation
Modified:
maven/site/trunk/src/site/apt/guides/getting-started/maven-in-five-minutes.apt
Modified:
maven/site/trunk/src/site/apt/guides/getting-started/maven-in-five-minutes.apt
URL:
http://svn.apache.org/viewvc/maven/site/trunk/src/site/apt/guides/getting-started/maven-in-five-minutes.apt?view=diffrev=501971r1=501970r2=501971
==
---
maven/site/trunk/src/site/apt/guides/getting-started/maven-in-five-minutes.apt
(original)
+++
maven/site/trunk/src/site/apt/guides/getting-started/maven-in-five-minutes.apt
Wed Jan 31 12:01:56 2007
@@ -12,7 +12,7 @@
Maven is a Java tool, so you must have {{{http://java.sun.com}Java}}
installed in order to proceed
- First, {{{download.html}download Maven}} and unzip it to your desired
installation directory, for example
+ First, {{{/download.html}download Maven}} and unzip it to your desired
installation directory, for example
C:\\maven in windows, or /usr/local/maven in Linux. After this,
add the system variable M2_HOME
as well as the $M2_HOME/bin directory to your system path. Type the
following in a terminal or command prompt:
@@ -27,7 +27,7 @@
--
Depending upon your network setup, you may require extra configuration.
Check out the
- {{{guides/mini/guide-configuring-maven.html}Guide to Configuring Maven}} if
necessary.
+ {{{../mini/guide-configuring-maven.html}Guide to Configuring Maven}} if
necessary.
* Creating a Project
@@ -50,7 +50,7 @@
---
Under this directory you will notice the following
-
{{{guides/introduction/introduction-to-the-standard-directory-layout.html}standard
project structure}}.
+
{{{../introduction/introduction-to-the-standard-directory-layout.html}standard
project structure}}.
---
my-app
@@ -106,7 +106,7 @@
** What did I just do?
You executed the Maven goal archetype:create, and passed in various
parameters to that goal.
- The prefix archetype is the {{{plugin}plugins/index.html}} that contains
the goal. If you are familiar with
+ The prefix archetype is the {{{/plugins/index.html}plugin}} that contains
the goal. If you are familiar with
{{{http://ant.apache.org}Ant}}, you
may concieve of this as similar to a task. This goal created a simple
project based upon an archetype.
Suffice it to say for now that a plugin is a collection
@@ -134,7 +134,7 @@
Unlike the first command executed (archetype:create) you may notice the
second is simply
a single word - package. Rather than a goal, this is a phase. A phase is
a step in the
- {{{introduction/introduction-to-the-lifecycle.html}build lifecycle}}, which
is an ordered
+ {{{../introduction/introduction-to-the-lifecycle.html}build lifecycle}},
which is an ordered
sequence of phases. When a phase is given, Maven will execute every phase in
the sequence
up to and including the one defined. For example, if we execute the
compile phase, the
phases that actually get executed are:
@@ -225,5 +225,5 @@
We hope this quick overview has piqued your interest in the versitility of
Maven. Note that this is a very
truncated quick-start guide. Now you are ready for more comprehensive
details concerning
- the actions you have just performed. Check out the
{{{guides/getting-started/index.html}Maven Getting Started Guide}}.
+ the actions you have just performed. Check out the {{{index.html}Maven
Getting Started Guide}}.
svn commit: r506731 - in /maven/release/trunk/maven-release-plugin/src/site/apt: examples/generate-release-poms.apt examples/lock-files.apt examples/perform-release.apt examples/prepare-release.apt ex
Author: dennisl Date: Mon Feb 12 14:50:07 2007 New Revision: 506731 URL: http://svn.apache.org/viewvc?view=revrev=506731 Log: o Roll back code formatting changes made in r492059. They messed up the apt format, resulting in badly rendered pages. Modified: maven/release/trunk/maven-release-plugin/src/site/apt/examples/generate-release-poms.apt maven/release/trunk/maven-release-plugin/src/site/apt/examples/lock-files.apt maven/release/trunk/maven-release-plugin/src/site/apt/examples/perform-release.apt maven/release/trunk/maven-release-plugin/src/site/apt/examples/prepare-release.apt maven/release/trunk/maven-release-plugin/src/site/apt/examples/run-goals-before-commit.apt maven/release/trunk/maven-release-plugin/src/site/apt/usage.apt Modified: maven/release/trunk/maven-release-plugin/src/site/apt/examples/generate-release-poms.apt URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-plugin/src/site/apt/examples/generate-release-poms.apt?view=diffrev=506731r1=506730r2=506731 == --- maven/release/trunk/maven-release-plugin/src/site/apt/examples/generate-release-poms.apt (original) +++ maven/release/trunk/maven-release-plugin/src/site/apt/examples/generate-release-poms.apt Mon Feb 12 14:50:07 2007 @@ -1,11 +1,11 @@ --- -Generate Release POMs --- -Carlos Sanchez [EMAIL PROTECTED] -Brett Porter [EMAIL PROTECTED] -John Tolentino [EMAIL PROTECTED] --- -September 18, 2006 + -- + Generate Release POMs + -- + Carlos Sanchez [EMAIL PROTECTED] + Brett Porter [EMAIL PROTECTED] + John Tolentino [EMAIL PROTECTED] + -- + September 18, 2006 ~~ Licensed to the Apache Software Foundation (ASF) under one ~~ or more contributor license agreements. See the NOTICE file Modified: maven/release/trunk/maven-release-plugin/src/site/apt/examples/lock-files.apt URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-plugin/src/site/apt/examples/lock-files.apt?view=diffrev=506731r1=506730r2=506731 == --- maven/release/trunk/maven-release-plugin/src/site/apt/examples/lock-files.apt (original) +++ maven/release/trunk/maven-release-plugin/src/site/apt/examples/lock-files.apt Mon Feb 12 14:50:07 2007 @@ -1,11 +1,11 @@ --- -Lock Files During Release --- -Carlos Sanchez [EMAIL PROTECTED] -Brett Porter [EMAIL PROTECTED] -John Tolentino [EMAIL PROTECTED] --- -September 18, 2006 + -- + Lock Files During Release + -- + Carlos Sanchez [EMAIL PROTECTED] + Brett Porter [EMAIL PROTECTED] + John Tolentino [EMAIL PROTECTED] + -- + September 18, 2006 ~~ Licensed to the Apache Software Foundation (ASF) under one ~~ or more contributor license agreements. See the NOTICE file Modified: maven/release/trunk/maven-release-plugin/src/site/apt/examples/perform-release.apt URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-plugin/src/site/apt/examples/perform-release.apt?view=diffrev=506731r1=506730r2=506731 == --- maven/release/trunk/maven-release-plugin/src/site/apt/examples/perform-release.apt (original) +++ maven/release/trunk/maven-release-plugin/src/site/apt/examples/perform-release.apt Mon Feb 12 14:50:07 2007 @@ -1,11 +1,11 @@ --- -Perform a release --- -Carlos Sanchez [EMAIL PROTECTED] -Brett Porter [EMAIL PROTECTED] -John Tolentino [EMAIL PROTECTED] --- -September 18, 2006 + -- + Perform a release + -- + Carlos Sanchez [EMAIL PROTECTED] + Brett Porter [EMAIL PROTECTED] + John Tolentino [EMAIL PROTECTED] + -- + September 18, 2006 ~~ Licensed to the Apache Software Foundation (ASF) under one ~~ or more contributor license agreements. See the NOTICE file Modified: maven/release/trunk/maven-release-plugin/src/site/apt/examples/prepare-release.apt URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-plugin/src/site/apt/examples/prepare-release.apt?view=diffrev=506731r1=506730r2=506731 == --- maven/release/trunk/maven-release-plugin/src/site/apt/examples/prepare-release.apt (original) +++ maven/release/trunk/maven-release-plugin/src/site/apt/examples/prepare-release.apt Mon Feb 12 14:50:07 2007 @@ -1,11 +1,11 @@ --- -Prepare a release --- -Carlos Sanchez [EMAIL PROTECTED] -Brett Porter [EMAIL PROTECTED] -John Tolentino [EMAIL PROTECTED] --- -September 18, 2006 + -- + Prepare a release + -- + Carlos Sanchez [EMAIL PROTECTED] + Brett Porter [EMAIL PROTECTED] + John Tolentino [EMAIL PROTECTED] + -- + September 18, 2006 ~~ Licensed to the Apache Software Foundation (ASF) under one ~~ or more contributor license agreements. See the NOTICE file Modified: maven/release/trunk/maven-release-plugin/src
svn commit: r506736 - /maven/release/trunk/maven-release-plugin/src/site/site.xml
Author: dennisl
Date: Mon Feb 12 15:03:07 2007
New Revision: 506736
URL: http://svn.apache.org/viewvc?view=revrev=506736
Log:
o Copy site appearance from maven plugins. It was lost when this project
changed its parent.
Modified:
maven/release/trunk/maven-release-plugin/src/site/site.xml
Modified: maven/release/trunk/maven-release-plugin/src/site/site.xml
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-plugin/src/site/site.xml?view=diffrev=506736r1=506735r2=506736
==
--- maven/release/trunk/maven-release-plugin/src/site/site.xml (original)
+++ maven/release/trunk/maven-release-plugin/src/site/site.xml Mon Feb 12
15:03:07 2007
@@ -19,7 +19,43 @@
--
project
+ !-- TODO: banners, skin, publish date, version should be inherited from
Maven itself --
+ bannerLeft
+name${project.name}/name
+srchttp://maven.apache.org/images/apache-maven-project-2.png/src
+hrefhttp://maven.apache.org//href
+ /bannerLeft
+ bannerRight
+srchttp://maven.apache.org/images/maven-logo-2.gif/src
+ /bannerRight
+ skin
+groupIdorg.apache.maven.skins/groupId
+artifactIdmaven-stylus-skin/artifactId
+ /skin
+ publishDate format=dd MMM position=left /
+ version position=left /
body
+!-- TODO: Link, head, reports should be inherited --
+!-- TODO: use breadcrumbs more structure, links for links, and inherit
subprojects as a menu or not at all --
+links
+ item name=Apache href=http://www.apache.org//
+ item name=Maven 1.x href=http://maven.apache.org/maven-1.x/
+ item name=Maven 2.x href=http://maven.apache.org//
+ item name=Maven 2.x Plugins href=http://maven.apache.org/plugins//
+ item name=Continuum href=http://maven.apache.org/continuum/
+ item name=SCM href=http://maven.apache.org/scm/
+ item name=Wagon href=http://maven.apache.org/wagon/
+ item name=JXR href=http://maven.apache.org/jxr/
+ item name=Doxia href=http://maven.apache.org/doxia/
+/links
+head
+ script src=http://www.google-analytics.com/urchin.js;
type=text/javascript
+ /script
+ script type=text/javascript
+_uacct = UA-140879-1;
+urchinTracker();
+ /script
+/head
menu name=Overview
item name=Introduction href=index.html/
item name=Goals href=plugin-info.html/
@@ -33,5 +69,6 @@
item name=Lock Files During Release href=examples/lock-files.html/
item name=Run Additional Goals Before Commit
href=examples/run-goals-before-commit.html/
/menu
+menu ref=reports inherit=bottom /
/body
/project
svn commit: r508585 - /maven/plugins/trunk/maven-changelog-plugin/pom.xml
Author: dennisl Date: Fri Feb 16 13:23:39 2007 New Revision: 508585 URL: http://svn.apache.org/viewvc?view=revrev=508585 Log: o Update to a released version of the parent. Modified: maven/plugins/trunk/maven-changelog-plugin/pom.xml Modified: maven/plugins/trunk/maven-changelog-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changelog-plugin/pom.xml?view=diffrev=508585r1=508584r2=508585 == --- maven/plugins/trunk/maven-changelog-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-changelog-plugin/pom.xml Fri Feb 16 13:23:39 2007 @@ -21,7 +21,7 @@ parent artifactIdmaven-plugins/artifactId groupIdorg.apache.maven.plugins/groupId -version8-SNAPSHOT/version +version8/version /parent modelVersion4.0.0/modelVersion artifactIdmaven-changelog-plugin/artifactId
svn commit: r508586 - /maven/plugins/trunk/maven-changelog-plugin/src/site/apt/usage.apt
Author: dennisl Date: Fri Feb 16 13:24:36 2007 New Revision: 508586 URL: http://svn.apache.org/viewvc?view=revrev=508586 Log: o Add the server to the developerConnection of the scm example. Modified: maven/plugins/trunk/maven-changelog-plugin/src/site/apt/usage.apt Modified: maven/plugins/trunk/maven-changelog-plugin/src/site/apt/usage.apt URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changelog-plugin/src/site/apt/usage.apt?view=diffrev=508586r1=508585r2=508586 == --- maven/plugins/trunk/maven-changelog-plugin/src/site/apt/usage.apt (original) +++ maven/plugins/trunk/maven-changelog-plugin/src/site/apt/usage.apt Fri Feb 16 13:24:36 2007 @@ -62,7 +62,7 @@ ... scm connectionscm:svn:http://server/path/to/project/trunk/connection - developerConnectionscm:svn:https://path/to/project/trunk/developerConnection + developerConnectionscm:svn:https://server/path/to/project/trunk/developerConnection urlscm:svn:http://server/path/to/view/trunk/url /scm ...
svn commit: r508618 - /maven/plugins/trunk/maven-changelog-plugin/pom.xml
Author: dennisl Date: Fri Feb 16 14:18:38 2007 New Revision: 508618 URL: http://svn.apache.org/viewvc?view=revrev=508618 Log: [maven-release-plugin] prepare release maven-changelog-plugin-2.0 Modified: maven/plugins/trunk/maven-changelog-plugin/pom.xml Modified: maven/plugins/trunk/maven-changelog-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changelog-plugin/pom.xml?view=diffrev=508618r1=508617r2=508618 == --- maven/plugins/trunk/maven-changelog-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-changelog-plugin/pom.xml Fri Feb 16 14:18:38 2007 @@ -17,7 +17,7 @@ under the License. -- -project +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-plugins/artifactId groupIdorg.apache.maven.plugins/groupId @@ -27,7 +27,7 @@ artifactIdmaven-changelog-plugin/artifactId packagingmaven-plugin/packaging nameMaven Changelog Plug-in/name - version2.0-SNAPSHOT/version + version2.0/version descriptionProduce SCM changelog reports./description prerequisites maven2.0/maven @@ -93,7 +93,7 @@ idkaz/id namePete Kazmier/name email[EMAIL PROTECTED]/email - organization/ + organization / roles roleDocumentation/role roleJava Developer/role @@ -103,7 +103,7 @@ idepugh/id nameEric Pugh/name email[EMAIL PROTECTED]/email - organization/ + organization / roles roleJava Developer/role /roles @@ -112,7 +112,7 @@ idevenisse/id nameEmmanuel Venisse/name email[EMAIL PROTECTED]/email - organization/ + organization / roles roleJava Developer/role /roles @@ -251,5 +251,11 @@ properties maven-scm.version1.0-beta-4/maven-scm.version /properties + + scm + connectionscm:svn:https://svn.apache.org/repos/asf/maven/plugins/tags/maven-changelog-plugin-2.0/connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/plugins/tags/maven-changelog-plugin-2.0/developerConnection + urlhttps://svn.apache.org/repos/asf/maven/plugins/tags/maven-changelog-plugin-2.0/url + /scm /project
svn commit: r508619 - in /maven/plugins/tags/maven-changelog-plugin-2.0: ./ pom.xml src/site/apt/usage.apt
Author: dennisl Date: Fri Feb 16 14:18:47 2007 New Revision: 508619 URL: http://svn.apache.org/viewvc?view=revrev=508619 Log: [maven-scm] copy for tag maven-changelog-plugin-2.0 Added: maven/plugins/tags/maven-changelog-plugin-2.0/ - copied from r508580, maven/plugins/trunk/maven-changelog-plugin/ maven/plugins/tags/maven-changelog-plugin-2.0/pom.xml - copied unchanged from r508618, maven/plugins/trunk/maven-changelog-plugin/pom.xml maven/plugins/tags/maven-changelog-plugin-2.0/src/site/apt/usage.apt - copied unchanged from r508586, maven/plugins/trunk/maven-changelog-plugin/src/site/apt/usage.apt
svn commit: r508620 - /maven/plugins/trunk/maven-changelog-plugin/pom.xml
Author: dennisl Date: Fri Feb 16 14:18:53 2007 New Revision: 508620 URL: http://svn.apache.org/viewvc?view=revrev=508620 Log: [maven-release-plugin] prepare for next development iteration Modified: maven/plugins/trunk/maven-changelog-plugin/pom.xml Modified: maven/plugins/trunk/maven-changelog-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changelog-plugin/pom.xml?view=diffrev=508620r1=508619r2=508620 == --- maven/plugins/trunk/maven-changelog-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-changelog-plugin/pom.xml Fri Feb 16 14:18:53 2007 @@ -27,7 +27,7 @@ artifactIdmaven-changelog-plugin/artifactId packagingmaven-plugin/packaging nameMaven Changelog Plug-in/name - version2.0/version + version2.1-SNAPSHOT/version descriptionProduce SCM changelog reports./description prerequisites maven2.0/maven @@ -251,11 +251,5 @@ properties maven-scm.version1.0-beta-4/maven-scm.version /properties - - scm - connectionscm:svn:https://svn.apache.org/repos/asf/maven/plugins/tags/maven-changelog-plugin-2.0/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/plugins/tags/maven-changelog-plugin-2.0/developerConnection - urlhttps://svn.apache.org/repos/asf/maven/plugins/tags/maven-changelog-plugin-2.0/url - /scm /project
svn commit: r508746 - in /maven/plugins/trunk/maven-jxr-plugin/src: main/resources/stylesheet.css site/apt/examples/aggregate.apt site/apt/examples/linkjavadoc.apt site/apt/index.apt site/apt/usage.ap
Author: dennisl
Date: Sat Feb 17 01:30:25 2007
New Revision: 508746
URL: http://svn.apache.org/viewvc?view=revrev=508746
Log:
o Set EOL style to native.
Modified:
maven/plugins/trunk/maven-jxr-plugin/src/main/resources/stylesheet.css
(contents, props changed)
maven/plugins/trunk/maven-jxr-plugin/src/site/apt/examples/aggregate.apt
(props changed)
maven/plugins/trunk/maven-jxr-plugin/src/site/apt/examples/linkjavadoc.apt
(props changed)
maven/plugins/trunk/maven-jxr-plugin/src/site/apt/index.apt (props
changed)
maven/plugins/trunk/maven-jxr-plugin/src/site/apt/usage.apt (props
changed)
maven/plugins/trunk/maven-jxr-plugin/src/site/resources/example/xref/stylesheet.css
(contents, props changed)
Modified: maven/plugins/trunk/maven-jxr-plugin/src/main/resources/stylesheet.css
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-jxr-plugin/src/main/resources/stylesheet.css?view=diffrev=508746r1=508745r2=508746
==
--- maven/plugins/trunk/maven-jxr-plugin/src/main/resources/stylesheet.css
(original)
+++ maven/plugins/trunk/maven-jxr-plugin/src/main/resources/stylesheet.css Sat
Feb 17 01:30:25 2007
@@ -1,116 +1,116 @@
-/* Javadoc style sheet */
-/* Define colors, fonts and other style attributes here to override the
defaults */
-body {
-background-color: #fff;
-font-family: Arial, Helvetica, sans-serif;
-}
-
-a:link {
-color: #00f;
-}
-a:visited {
-color: #00a;
-}
-
-a:active, a:hover {
-color: #f30 !important;
-}
-
-ul, li {
-list-style-type:none;
-margin:0;
-padding:0;
-}
-
-table td {
-padding: 3px;
-border: 1px solid #000;
-}
-table {
-width:100%;
-border: 1px solid #000;
-border-collapse: collapse;
-}
-
-div.overview {
-background-color:#ddd;
-padding: 4px 4px 4px 0;
-}
-div.overview li, div.framenoframe li {
-display: inline;
-}
-div.framenoframe {
-text-align: center;
-font-size: x-small;
-}
-div.framenoframe li {
-margin: 0 3px 0 3px;
-}
-div.overview li {
-margin:3px 3px 0 3px;
-padding: 4px;
-}
-li.selected {
-background-color:#888;
-color: #fff;
-font-weight: bold;
-}
-
-table.summary {
-margin-bottom: 20px;
-}
-table.summary td, table.summary th {
-font-weight: bold;
-text-align: left;
-padding: 3px;
-}
-table.summary th {
-background-color:#036;
-color: #fff;
-}
-table.summary td {
-background-color:#eee;
-border: 1px solid black;
-}
-
-em {
-color: #A00;
-}
-em.comment {
-color: #390;
-}
-.string {
-color: #009;
-}
-div#footer {
-text-align:center;
-}
-#overview {
-padding:2px;
-}
-
-hr {
-height: 1px;
-color: #000;
-}
-
-/* JXR style sheet */
-#jxr_comment
-{
-color: #390;
-}
-
-#jxr_javadoccomment
-{
-color: #A00;
-}
-
-#jxr_string
-{
-color: #009;
-}
-
-#jxr_keyword
-{
-color: #000;
-}
+/* Javadoc style sheet */
+/* Define colors, fonts and other style attributes here to override the
defaults */
+body {
+background-color: #fff;
+font-family: Arial, Helvetica, sans-serif;
+}
+
+a:link {
+color: #00f;
+}
+a:visited {
+color: #00a;
+}
+
+a:active, a:hover {
+color: #f30 !important;
+}
+
+ul, li {
+list-style-type:none;
+margin:0;
+padding:0;
+}
+
+table td {
+padding: 3px;
+border: 1px solid #000;
+}
+table {
+width:100%;
+border: 1px solid #000;
+border-collapse: collapse;
+}
+
+div.overview {
+background-color:#ddd;
+padding: 4px 4px 4px 0;
+}
+div.overview li, div.framenoframe li {
+display: inline;
+}
+div.framenoframe {
+text-align: center;
+font-size: x-small;
+}
+div.framenoframe li {
+margin: 0 3px 0 3px;
+}
+div.overview li {
+margin:3px 3px 0 3px;
+padding: 4px;
+}
+li.selected {
+background-color:#888;
+color: #fff;
+font-weight: bold;
+}
+
+table.summary {
+margin-bottom: 20px;
+}
+table.summary td, table.summary th {
+font-weight: bold;
+text-align: left;
+padding: 3px;
+}
+table.summary th {
+background-color:#036;
+color: #fff;
+}
+table.summary td {
+background-color:#eee;
+border: 1px solid black;
+}
+
+em {
+color: #A00;
+}
+em.comment {
+color: #390;
+}
+.string {
+color: #009;
+}
+div#footer {
+text-align:center;
+}
+#overview {
+padding:2px;
+}
+
+hr {
+height: 1px;
+color: #000;
+}
+
+/* JXR style sheet */
+#jxr_comment
+{
+color: #390;
+}
+
+#jxr_javadoccomment
+{
+color: #A00;
+}
+
+#jxr_string
+{
+color: #009;
+}
+
+#jxr_keyword
+{
+color: #000;
+}
Propchange:
maven/plugins/trunk/maven-jxr-plugin/src/main/resources/stylesheet.css
--
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-jxr-plugin/src/site/apt/examples/aggregate.apt
svn commit: r508753 - /maven/jxr/trunk/src/main/java/org/apache/maven/jxr/pacman/FileManager.java
Author: dennisl
Date: Sat Feb 17 03:58:14 2007
New Revision: 508753
URL: http://svn.apache.org/viewvc?view=revrev=508753
Log:
o Fix JavaDoc error.
Modified:
maven/jxr/trunk/src/main/java/org/apache/maven/jxr/pacman/FileManager.java
Modified:
maven/jxr/trunk/src/main/java/org/apache/maven/jxr/pacman/FileManager.java
URL:
http://svn.apache.org/viewvc/maven/jxr/trunk/src/main/java/org/apache/maven/jxr/pacman/FileManager.java?view=diffrev=508753r1=508752r2=508753
==
--- maven/jxr/trunk/src/main/java/org/apache/maven/jxr/pacman/FileManager.java
(original)
+++ maven/jxr/trunk/src/main/java/org/apache/maven/jxr/pacman/FileManager.java
Sat Feb 17 03:58:14 2007
@@ -93,7 +93,7 @@
/**
* see setEncoding(String)
*
- * @see setEncoding(String)
+ * @see #setEncoding(String)
*/
public String getEncoding()
{
svn commit: r508754 - /maven/jxr/trunk/src/main/java/org/apache/maven/jxr/JXR.java
Author: dennisl
Date: Sat Feb 17 04:00:37 2007
New Revision: 508754
URL: http://svn.apache.org/viewvc?view=revrev=508754
Log:
o Fix spelling an JavaDoc compliance.
Modified:
maven/jxr/trunk/src/main/java/org/apache/maven/jxr/JXR.java
Modified: maven/jxr/trunk/src/main/java/org/apache/maven/jxr/JXR.java
URL:
http://svn.apache.org/viewvc/maven/jxr/trunk/src/main/java/org/apache/maven/jxr/JXR.java?view=diffrev=508754r1=508753r2=508754
==
--- maven/jxr/trunk/src/main/java/org/apache/maven/jxr/JXR.java (original)
+++ maven/jxr/trunk/src/main/java/org/apache/maven/jxr/JXR.java Sat Feb 17
04:00:37 2007
@@ -41,18 +41,18 @@
public class JXR
{
/**
- * The Log
+ * The Log.
*/
private Log log;
/**
- * Description of the Notice
+ * Description of the Notice.
*/
public static final String NOTICE = This page was automatically generated
by +
a href=\http://maven.apache.org/\;Maven/a;
/**
- * Path to destination
+ * Path to destination.
*/
private String dest = ;
@@ -63,7 +63,7 @@
private String outputEncoding;
/**
- * Relative path to javadocs, suitable for hyperlinking
+ * Relative path to javadocs, suitable for hyperlinking.
*/
private String javadocLinkDir;
@@ -79,7 +79,7 @@
private String revision;
/**
- * Now that we have instantiated everythign. Process this JXR task.
+ * Now that we have instantiated everything. Process this JXR task.
*
* @param packageManager
* @param source
@@ -124,7 +124,7 @@
}
/**
- * Check to see if the file is a Java source file
+ * Check to see if the file is a Java source file.
*
* @param filename The name of the file to check
* @return codetrue/true if the file is a Java file
@@ -136,10 +136,10 @@
}
/**
- * Check to see if the file is a HTML file
+ * Check to see if the file is an HTML file.
*
* @param filename The name of the file to check
- * @return codetrue/true if the file is a HTML file
+ * @return codetrue/true if the file is an HTML file
*/
public static boolean isHtmlFile( String filename )
{
@@ -147,7 +147,7 @@
}
/**
- * Get the path to the destination files
+ * Get the path to the destination files.
*
* @return The path to the destination files
*/
svn commit: r508755 - in /maven/jxr/trunk/src: main/resources/templates/ site/apt/ site/apt/examples/ site/fml/
Author: dennisl Date: Sat Feb 17 04:09:33 2007 New Revision: 508755 URL: http://svn.apache.org/viewvc?view=revrev=508755 Log: o Update to the new ASF license headers. Modified: maven/jxr/trunk/src/main/resources/templates/allclasses-frame.vm maven/jxr/trunk/src/main/resources/templates/index.vm maven/jxr/trunk/src/main/resources/templates/overview-frame.vm maven/jxr/trunk/src/main/resources/templates/overview-summary.vm maven/jxr/trunk/src/main/resources/templates/package-frame.vm maven/jxr/trunk/src/main/resources/templates/package-summary.vm maven/jxr/trunk/src/site/apt/examples/java.apt maven/jxr/trunk/src/site/apt/index.apt maven/jxr/trunk/src/site/apt/links.apt maven/jxr/trunk/src/site/fml/faq.fml Modified: maven/jxr/trunk/src/main/resources/templates/allclasses-frame.vm URL: http://svn.apache.org/viewvc/maven/jxr/trunk/src/main/resources/templates/allclasses-frame.vm?view=diffrev=508755r1=508754r2=508755 == --- maven/jxr/trunk/src/main/resources/templates/allclasses-frame.vm (original) +++ maven/jxr/trunk/src/main/resources/templates/allclasses-frame.vm Sat Feb 17 04:09:33 2007 @@ -1,18 +1,21 @@ #* - Copyright 2001-2004 The Apache Software Foundation. +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 - 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 - 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. +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. *# !DOCTYPE html PUBLIC -//W3C//DTD XHTML 1.0 Transitional//EN DTD/xhtml1-transitional.dtd Modified: maven/jxr/trunk/src/main/resources/templates/index.vm URL: http://svn.apache.org/viewvc/maven/jxr/trunk/src/main/resources/templates/index.vm?view=diffrev=508755r1=508754r2=508755 == --- maven/jxr/trunk/src/main/resources/templates/index.vm (original) +++ maven/jxr/trunk/src/main/resources/templates/index.vm Sat Feb 17 04:09:33 2007 @@ -1,18 +1,21 @@ #* - Copyright 2001-2004 The Apache Software Foundation. +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 - 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 - 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. +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. *# !DOCTYPE html PUBLIC -//W3C//DTD XHTML 1.0 Transitional//EN DTD/xhtml1-transitional.dtd Modified: maven/jxr/trunk/src/main/resources/templates/overview-frame.vm URL: http://svn.apache.org/viewvc/maven/jxr/trunk/src/main/resources/templates/overview-frame.vm?view=diffrev=508755r1=508754r2=508755 == --- maven/jxr/trunk/src/main/resources/templates/overview-frame.vm (original) +++ maven/jxr/trunk/src
svn commit: r508756 - in /maven/jxr/trunk/src/site: apt/examples/java.apt apt/index.apt fml/faq.fml
Author: dennisl
Date: Sat Feb 17 04:19:07 2007
New Revision: 508756
URL: http://svn.apache.org/viewvc?view=revrev=508756
Log:
o Correct spelling and update links.
Modified:
maven/jxr/trunk/src/site/apt/examples/java.apt
maven/jxr/trunk/src/site/apt/index.apt
maven/jxr/trunk/src/site/fml/faq.fml
Modified: maven/jxr/trunk/src/site/apt/examples/java.apt
URL:
http://svn.apache.org/viewvc/maven/jxr/trunk/src/site/apt/examples/java.apt?view=diffrev=508756r1=508755r2=508756
==
--- maven/jxr/trunk/src/site/apt/examples/java.apt (original)
+++ maven/jxr/trunk/src/site/apt/examples/java.apt Sat Feb 17 04:19:07 2007
@@ -29,7 +29,7 @@
Using Maven JXR in Java
- The cross-referencing API is pretty basic. You could generate xref for a
given Java package or single Java source
+ The cross-referencing API is pretty basic. You can generate xref for a given
Java package or single Java source
class. The whole generated file is xref'd by line number.
* Transforming Java Packages
@@ -46,7 +46,7 @@
WindowsTitle, DocTitle, Bottom );
+--+
- Note: the templateDir is a directory with several
{{{http://jakarta.apache.org/velocity/}Velocity}} templates.
+ Note: the templateDir is a directory with several
{{{http://velocity.apache.org/}Velocity}} templates.
Maven JXR uses its own
{{{https://svn.apache.org/repos/asf/maven/jxr/trunk/src/main/resources/templates}templates}}.
The generated JXR structure should be like the following:
@@ -60,9 +60,9 @@
...
+--+
-* Transforming Single Java Source File
+* Transforming a Single Java Source File
- You could transform a single Java source file with the following:
+ You can transform a single Java source file with the following:
+--+
File sourceFile = new File( /src/main/java/Test.java );
Modified: maven/jxr/trunk/src/site/apt/index.apt
URL:
http://svn.apache.org/viewvc/maven/jxr/trunk/src/site/apt/index.apt?view=diffrev=508756r1=508755r2=508756
==
--- maven/jxr/trunk/src/site/apt/index.apt (original)
+++ maven/jxr/trunk/src/site/apt/index.apt Sat Feb 17 04:19:07 2007
@@ -30,17 +30,17 @@
Maven JXR
- JXR is a source cross reference generator. It analyzes a set of Java source
files and produce HTML files
+ JXR is a source cross reference generator. It analyzes a set of Java source
files and produces HTML files
that shows annotated source code.
- Take a look at the {{{xref/index.html}JXR report}} to see a result.
+ Take a look at the {{{xref/index.html}JXR report}} to see the results.
- The orignal JXR code was merged in 2004 with the Javasrc project from
+ The orignal JXR code was merged in 2004 with the Javasrc project from the
{{{http://jakarta.apache.org/alexandria}Jakarta Alexandria}} project.
* Examples
- The following example show how to use Maven JXR in more advanced usecases:
+ The following example shows how to use Maven JXR in more advanced usecases:
* {{{examples/java.html}Using Maven JXR in Java}}
Modified: maven/jxr/trunk/src/site/fml/faq.fml
URL:
http://svn.apache.org/viewvc/maven/jxr/trunk/src/site/fml/faq.fml?view=diffrev=508756r1=508755r2=508756
==
--- maven/jxr/trunk/src/site/fml/faq.fml (original)
+++ maven/jxr/trunk/src/site/fml/faq.fml Sat Feb 17 04:19:07 2007
@@ -21,8 +21,8 @@
faqs id=FAQ title=Frequently Asked Questions
part id=General
-faq id=Is it possible to convert other source files that Java to HTML
- questionIs it possible to convert other source files that Java to
HTML?/question
+faq id=Is it possible to convert other source files than Java to HTML
+ questionIs it possible to convert other source files than Java to
HTML?/question
answer
p
Not yet but it is on the roadmap.
svn commit: r512465 - in /maven/jxr/trunk/src: main/java/org/apache/maven/jxr/ main/java/org/apache/maven/jxr/pacman/ test/java/org/apache/maven/jxr/ test/resources/exclude/ test/resources/include/
Author: dennisl
Date: Tue Feb 27 14:42:08 2007
New Revision: 512465
URL: http://svn.apache.org/viewvc?view=revrev=512465
Log:
[JXR-17] JXR has no option to include / exclude source files
Added:
maven/jxr/trunk/src/test/java/org/apache/maven/jxr/IncludeExcludeTest.java
(with props)
maven/jxr/trunk/src/test/resources/exclude/
maven/jxr/trunk/src/test/resources/exclude/ExcludedClass.java (with props)
maven/jxr/trunk/src/test/resources/include/
maven/jxr/trunk/src/test/resources/include/IncludedClass.java (with props)
maven/jxr/trunk/src/test/resources/include/NotIncludedClass.java (with
props)
Modified:
maven/jxr/trunk/src/main/java/org/apache/maven/jxr/JXR.java
maven/jxr/trunk/src/main/java/org/apache/maven/jxr/pacman/PackageManager.java
Modified: maven/jxr/trunk/src/main/java/org/apache/maven/jxr/JXR.java
URL:
http://svn.apache.org/viewvc/maven/jxr/trunk/src/main/java/org/apache/maven/jxr/JXR.java?view=diffrev=512465r1=512464r2=512465
==
--- maven/jxr/trunk/src/main/java/org/apache/maven/jxr/JXR.java (original)
+++ maven/jxr/trunk/src/main/java/org/apache/maven/jxr/JXR.java Tue Feb 27
14:42:08 2007
@@ -52,6 +52,11 @@
a href=\http://maven.apache.org/\;Maven/a;
/**
+ * The default list of include patterns to use.
+ */
+private static final String[] DEFAULT_INCLUDES = {**/*.java};
+
+/**
* Path to destination.
*/
private String dest = ;
@@ -79,6 +84,16 @@
private String revision;
/**
+ * The list of exclude patterns to use.
+ */
+private String[] excludes = null;
+
+/**
+ * The list of include patterns to use.
+ */
+private String[] includes = DEFAULT_INCLUDES;
+
+/**
* Now that we have instantiated everything. Process this JXR task.
*
* @param packageManager
@@ -91,6 +106,10 @@
this.transformer = new JavaCodeTransform( packageManager );
DirectoryScanner ds = new DirectoryScanner();
+// I'm not sure why we don't use the directoryScanner in
packageManager,
+// but since we don't we need to set includes/excludes here as well
+ds.setExcludes( excludes );
+ds.setIncludes( includes );
ds.addDefaultExcludes();
File dir = new File( source );
@@ -238,6 +257,8 @@
fileManager.setEncoding( inputEncoding );
PackageManager pkgmgr = new PackageManager( log, fileManager );
+pkgmgr.setExcludes( excludes );
+pkgmgr.setIncludes( includes );
// go through each source directory and xref the java files
for ( Iterator i = sourceDirs.iterator(); i.hasNext(); )
@@ -382,5 +403,24 @@
}
return fromLink.append( toLink.toString() ).toString();
+}
+
+public void setExcludes( String[] excludes )
+{
+this.excludes = excludes;
+}
+
+
+public void setIncludes( String[] includes )
+{
+if ( includes == null )
+{
+// We should not include non-java files, so we use a sensible
default pattern
+this.includes = DEFAULT_INCLUDES;
+}
+else
+{
+this.includes = includes;
+}
}
}
Modified:
maven/jxr/trunk/src/main/java/org/apache/maven/jxr/pacman/PackageManager.java
URL:
http://svn.apache.org/viewvc/maven/jxr/trunk/src/main/java/org/apache/maven/jxr/pacman/PackageManager.java?view=diffrev=512465r1=512464r2=512465
==
---
maven/jxr/trunk/src/main/java/org/apache/maven/jxr/pacman/PackageManager.java
(original)
+++
maven/jxr/trunk/src/main/java/org/apache/maven/jxr/pacman/PackageManager.java
Tue Feb 27 14:42:08 2007
@@ -50,6 +50,16 @@
private FileManager fileManager;
+/**
+ * The list of exclude patterns to use.
+ */
+private String[] excludes = null;
+
+/**
+ * The list of include patterns to use.
+ */
+private String[] includes = {**/*.java};
+
public PackageManager( Log log, FileManager fileManager )
{
this.log = log;
@@ -99,7 +109,7 @@
DirectoryScanner directoryScanner = new DirectoryScanner();
File baseDir = new File( directory );
directoryScanner.setBasedir( baseDir );
-String[] includes = {**/*.java};
+directoryScanner.setExcludes( excludes );
directoryScanner.setIncludes( includes );
directoryScanner.scan();
String[] files = directoryScanner.getIncludedFiles();
@@ -200,6 +210,17 @@
public FileManager getFileManager()
{
return fileManager;
+}
+
+public void setExcludes( String[] excludes )
+{
+this.excludes = excludes;
+}
+
+
+public void setIncludes( String[] includes )
+{
+this.includes = includes;
}
}
Added:
maven/jxr/trunk/src/test/java/org/apache/maven/jxr
svn commit: r512991 - /maven/plugins/trunk/maven-war-plugin/src/site/apt/examples/war-manifest-guide.apt
Author: dennisl Date: Wed Feb 28 13:37:36 2007 New Revision: 512991 URL: http://svn.apache.org/viewvc?view=revrev=512991 Log: [MWAR-92] Bad xml in sample documentation on website o Also added missing manifestEntries tags. Modified: maven/plugins/trunk/maven-war-plugin/src/site/apt/examples/war-manifest-guide.apt Modified: maven/plugins/trunk/maven-war-plugin/src/site/apt/examples/war-manifest-guide.apt URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/site/apt/examples/war-manifest-guide.apt?view=diffrev=512991r1=512990r2=512991 == --- maven/plugins/trunk/maven-war-plugin/src/site/apt/examples/war-manifest-guide.apt (original) +++ maven/plugins/trunk/maven-war-plugin/src/site/apt/examples/war-manifest-guide.apt Wed Feb 28 13:37:36 2007 @@ -36,9 +36,11 @@ artifactIdmaven-war-plugin/artifactId version2.0/version configuration - archiver -manifest_entryvalue/manifest_entry - archiver + archive +manifestEntries + manifest_entryvalue/manifest_entry +/manifestEntries + /archive /configuration /plugin [...]
svn commit: r513473 - in /maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin: changes/ChangesReportGenerator.java jira/JiraReportGenerator.java
Author: dennisl Date: Thu Mar 1 12:07:33 2007 New Revision: 513473 URL: http://svn.apache.org/viewvc?view=revrev=513473 Log: [MCHANGES-64] The changes plugin should not push an external link image into the output renderer. Submitted by Henning Schmiedehausen o I also make sure that the links to issues in the JIRA report are closed properly. Modified: maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ChangesReportGenerator.java maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/JiraReportGenerator.java Modified: maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ChangesReportGenerator.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ChangesReportGenerator.java?view=diffrev=513473r1=513472r2=513473 == --- maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ChangesReportGenerator.java (original) +++ maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ChangesReportGenerator.java Thu Mar 1 12:07:33 2007 @@ -128,8 +128,6 @@ sink.text( action.getIssue() ); -sinkFigure( images/external.png, sink ); - sink.link_(); } Modified: maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/JiraReportGenerator.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/JiraReportGenerator.java?view=diffrev=513473r1=513472r2=513473 == --- maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/JiraReportGenerator.java (original) +++ maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/JiraReportGenerator.java Thu Mar 1 12:07:33 2007 @@ -105,7 +105,7 @@ sink.text( issue.getKey() ); -sinkFigure( sink, images/external.png ); +sink.link_(); sink.tableCell_();
svn commit: r513481 - /maven/plugins/trunk/maven-war-plugin/src/site/apt/examples/adding-filtering-webresources.apt
Author: dennisl Date: Thu Mar 1 12:18:37 2007 New Revision: 513481 URL: http://svn.apache.org/viewvc?view=revrev=513481 Log: [MWAR-88] typos in documentation Submitted by: Tomasz Pik Modified: maven/plugins/trunk/maven-war-plugin/src/site/apt/examples/adding-filtering-webresources.apt Modified: maven/plugins/trunk/maven-war-plugin/src/site/apt/examples/adding-filtering-webresources.apt URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/site/apt/examples/adding-filtering-webresources.apt?view=diffrev=513481r1=513480r2=513481 == --- maven/plugins/trunk/maven-war-plugin/src/site/apt/examples/adding-filtering-webresources.apt (original) +++ maven/plugins/trunk/maven-war-plugin/src/site/apt/examples/adding-filtering-webresources.apt Thu Mar 1 12:18:37 2007 @@ -160,7 +160,7 @@ directoryresource2/directory !-- there's no default value for this -- excludes - exclude**/image2/exlude + exclude**/image2/exclude /excludes /resource /webResources @@ -186,7 +186,7 @@ includes !-- there's no default value for this -- excludes - exclude**/*.jpg/exlude + exclude**/*.jpg/exclude /excludes /resource /webResources @@ -207,7 +207,7 @@ excludes exclude*pattern3/pattern3/exclude excludepattern4/pattern4/exclude -/exludes +/excludes [...] +--+ @@ -267,7 +267,7 @@ !-- enable filtering -- filteringtrue/filtering excludes - exclude**/propertiesexclude + exclude**/properties/exclude /excludes /resource /webResources @@ -344,7 +344,7 @@ !-- enable filtering -- filteringtrue/filtering excludes - exclude**/propertiesexclude + exclude**/properties/exclude /excludes /resource /resource
svn commit: r513486 - /maven/plugins/trunk/maven-assembly-plugin/pom.xml
Author: dennisl Date: Thu Mar 1 12:32:12 2007 New Revision: 513486 URL: http://svn.apache.org/viewvc?view=revrev=513486 Log: o Update the dependency on modello so that MASSEMBLY-169 can make use of the new features in there. Modified: maven/plugins/trunk/maven-assembly-plugin/pom.xml Modified: maven/plugins/trunk/maven-assembly-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/pom.xml?view=diffrev=513486r1=513485r2=513486 == --- maven/plugins/trunk/maven-assembly-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-assembly-plugin/pom.xml Thu Mar 1 12:32:12 2007 @@ -132,7 +132,7 @@ plugin groupIdorg.codehaus.modello/groupId artifactIdmodello-maven-plugin/artifactId -version1.0-alpha-8/version +version1.0-alpha-14/version executions execution iddescriptor/id @@ -361,6 +361,6 @@ version1.0-FCS/version scopetest/scope /dependency - /dependencies + /dependencies /project
svn commit: r513503 - in /maven/plugins/trunk/maven-help-plugin/src: main/java/org/apache/maven/plugins/help/ site/apt/ site/apt/examples/ site/fml/
Author: dennisl
Date: Thu Mar 1 13:18:56 2007
New Revision: 513503
URL: http://svn.apache.org/viewvc?view=revrev=513503
Log:
o Set EOL style to native.
Modified:
maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/ActiveProfilesMojo.java
(props changed)
maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/EffectivePomMojo.java
(props changed)
maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/EffectiveSettingsMojo.java
(props changed)
maven/plugins/trunk/maven-help-plugin/src/site/apt/examples/describe-configuration.apt
(props changed)
maven/plugins/trunk/maven-help-plugin/src/site/apt/index.apt (contents,
props changed)
maven/plugins/trunk/maven-help-plugin/src/site/apt/usage.apt (contents,
props changed)
maven/plugins/trunk/maven-help-plugin/src/site/fml/faq.fml (props changed)
Propchange:
maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/ActiveProfilesMojo.java
--
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/EffectivePomMojo.java
--
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/EffectiveSettingsMojo.java
--
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-help-plugin/src/site/apt/examples/describe-configuration.apt
--
svn:eol-style = native
Modified: maven/plugins/trunk/maven-help-plugin/src/site/apt/index.apt
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-help-plugin/src/site/apt/index.apt?view=diffrev=513503r1=513502r2=513503
==
--- maven/plugins/trunk/maven-help-plugin/src/site/apt/index.apt (original)
+++ maven/plugins/trunk/maven-help-plugin/src/site/apt/index.apt Thu Mar 1
13:18:56 2007
@@ -1,44 +1,44 @@
- --
- Introduction
- --
- Maria Odea Ching
- --
- 7 July 2006
- --
-
-
-Maven 2 Help Plugin
-
- The Maven 2 Help Plugin is used to get relative information about a project.
It can be used to get a description
- of a particular plugin, including the plugin's mojos with their parameters
and component requirements, the effective pom
- and effective settings of the current build, and the profiles applied to the
current project being built.
-
-* Goals Overview
-
- The Help plugin has the following goals:
-
- * {{{active-profiles-mojo.html}help:active-profiles}} lists the profiles
which are currently active for the build.
-
- * {{{dependencies-mojo.html}help:dependencies}} prints out the dependency
tree for the project.
-
- * {{{describe-mojo.html}help:describe}} describes the attirbutes of a plugin
and/or plugin mojo. For its execution, it requires
-the groupId and artifactId or the plugin prefix of the plugin to be
specified.
-
- * {{{effective-pom-mojo.html}help:effective-pom}} displays the effective POM
for the current build, with the active
-profiles factored in.
-
- * {{{effective-settings-mojo.html}help:effective-settings}} prints out the
calculated settings for the project, given any
-profile enhancement and the inheritance of the global settings into the
user-level settings.
-
-* Usage
-
- Instructions on how to use the Help Plugin can be found
{{{usage.html}here}}.
-
-* Examples
-
- To provide you with better understanding on some usages of the Help plugin,
you can take a look into the
- following example(s):
-
- * {{{examples/describe-configuration.html}Configuring Describe Mojo}}
-
-
+ --
+ Introduction
+ --
+ Maria Odea Ching
+ --
+ 7 July 2006
+ --
+
+
+Maven 2 Help Plugin
+
+ The Maven 2 Help Plugin is used to get relative information about a project.
It can be used to get a description
+ of a particular plugin, including the plugin's mojos with their parameters
and component requirements, the effective pom
+ and effective settings of the current build, and the profiles applied to the
current project being built.
+
+* Goals Overview
+
+ The Help plugin has the following goals:
+
+ * {{{active-profiles-mojo.html}help:active-profiles}} lists the profiles
which are currently active for the build.
+
+ * {{{dependencies-mojo.html}help:dependencies}} prints out the dependency
tree for the project.
+
+ * {{{describe-mojo.html}help:describe}} describes the attirbutes of a plugin
and/or plugin mojo. For its execution, it requires
+the groupId and artifactId or the plugin prefix of the plugin to be
specified.
+
+ * {{{effective-pom-mojo.html}help:effective-pom}} displays
svn commit: r513511 - /maven/plugins/trunk/maven-help-plugin/src/site/apt/usage.apt
Author: dennisl Date: Thu Mar 1 13:29:32 2007 New Revision: 513511 URL: http://svn.apache.org/viewvc?view=revrev=513511 Log: o Fix typos. o Add some formating. Modified: maven/plugins/trunk/maven-help-plugin/src/site/apt/usage.apt Modified: maven/plugins/trunk/maven-help-plugin/src/site/apt/usage.apt URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-help-plugin/src/site/apt/usage.apt?view=diffrev=513511r1=513510r2=513511 == --- maven/plugins/trunk/maven-help-plugin/src/site/apt/usage.apt (original) +++ maven/plugins/trunk/maven-help-plugin/src/site/apt/usage.apt Thu Mar 1 13:29:32 2007 @@ -9,7 +9,7 @@ Usage - Below are the different goals and configuration of the Help plugin. + Below are the different goals and configurations of the Help plugin. * The help:active-profiles Mojo @@ -17,7 +17,7 @@ For each project in the build session, it will output a list of profiles which have been applied to that project, along with the source of the profile (POM, settings.xml, or profiles.xml). - Optionally, the output parameter can be specified to divert this output to a file. + Optionally, the output parameter can be specified to divert this output to a file. You can execute this mojo using the following command: @@ -30,7 +30,7 @@ The dependencies mojo is used to view the dependency hierarchy of the project currently being built. It will output the resolved tree of dependencies that the Maven build process actually uses. - Optionally, the output parameter can be specified to divert this output to a file. + Optionally, the output parameter can be specified to divert this output to a file. You can execute this mojo using the following command: @@ -42,11 +42,11 @@ The describe mojo is used to discover information about Maven plugins. Given a plugin prefix or groupId, artifactId, and optionally version, the mojo will lookup that plugin and output details about it. If the user also specifies - which mojo to describe, the describe mojo will limit output to the details of that mojo, including parameters. + which mojo to describe, the describe mojo will limit output to the details of that mojo, including parameters. - Optionally, the output parameter can be specified to divert this output to a file. + Optionally, the output parameter can be specified to divert this output to a file. - This mojo requires either the groupId and artifactId parameters or the plugin parameter to be specified: + This mojo requires either the groupId and artifactId parameters or the plugin parameter to be specified: +-+ mvn help:describe -DgroupId=org.somewhere @@ -56,10 +56,10 @@ or +-+ -mvn help:active-profiles -Dplugin=org.somewhere:some-plugin:0.0.0 +mvn help:describe -Dplugin=org.somewhere:some-plugin:0.0.0 +-+ - (NOTE: version is always optional here.) + NOTE: version is always optional here. * The help:effective-pom Mojo @@ -67,12 +67,12 @@ and active profiles. It provides a useful way of removing the guesswork about just what ends up in the POM that Maven uses to build your project. It will iterate over all projects in the current build session, printing the effective POM for each. - Optionally, the output parameter can be specified to divert this output to a file. + Optionally, the output parameter can be specified to divert this output to a file. - The mojo can be executedd using the following command: + The mojo can be executed using the following command: +-+ -mvn help:effective-profiles -Doutput=/path/to/file +mvn help:effective-pom -Doutput=/path/to/file +-+ * The help:effective-settings Mojo @@ -80,9 +80,9 @@ The effective-settings mojo is used to view the Settings that Maven actually uses to run the build. This Settings instance is a result of merging the global file with the user's file, with the user's file taking precedence. - Optionally, the output parameter can be specified to divert this output to a file. + Optionally, the output parameter can be specified to divert this output to a file. - The mojo can be executedd using the following command: + The mojo can be executed using the following command: +-+ mvn help:effective-settings -Doutput=/path/to/file
svn commit: r513989 - /maven/site/trunk/src/site/apt/plugins/index.apt
Author: dennisl
Date: Fri Mar 2 14:12:38 2007
New Revision: 513989
URL: http://svn.apache.org/viewvc?view=revrev=513989
Log:
o Update version numbers for various plugins.
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?view=diffrev=513989r1=513988r2=513989
==
--- maven/site/trunk/src/site/apt/plugins/index.apt (original)
+++ maven/site/trunk/src/site/apt/plugins/index.apt Fri Mar 2 14:12:38 2007
@@ -25,7 +25,7 @@
*---++--+
| {{{maven-clean-plugin/} clean}} | 2.1.1 | Clean
up after the build.
*---++--+
-| {{{maven-compiler-plugin/} compiler}} | 2.0.1 |
Compiles Java sources.
+| {{{maven-compiler-plugin/} compiler}} | 2.0.2 |
Compiles Java sources.
*---++--+
| {{{maven-deploy-plugin/} deploy}} | 2.3| Deploy
the built artifact to the remote repository.
*---++--+
@@ -35,7 +35,7 @@
*---++--+
| {{{maven-site-plugin/} site}} | 2.0-beta-5 |
Generate a site for the current project.
*---++--+
-| {{{maven-surefire-plugin/} surefire}} | 2.2| Run the
Junit tests in an isolated classloader.
+| {{{maven-surefire-plugin/} surefire}} | 2.3| Run the
Junit tests in an isolated classloader.
*---++--+
| {{{maven-verifier-plugin/} verifier}} | 1.0-beta-1 |
Useful for integration tests - verifies the existence of certain conditions.
*---*+--+
@@ -43,7 +43,7 @@
*---++--+
| {{{maven-ear-plugin/} ear}} | 2.3|
Generate an EAR from the current project.
*---++--+
-| {{{maven-ejb-plugin/} ejb}} | 2.0| Build
an EJB (and optional client) from the current project.
+| {{{maven-ejb-plugin/} ejb}} | 2.1| Build
an EJB (and optional client) from the current project.
*---++--+
| {{{maven-jar-plugin/} jar}} | 2.1| Build a
JAR from the current project.
*---++--+
@@ -53,7 +53,7 @@
*---*+--+
| reporting | | Plugins which generate reports, are configured as reports
in the POM and run under the site generation lifecycle.
*---+---+--+
-| {{{maven-changelog-plugin/} changelog}} ||
Generate a list of recent changes from your SCM.
+| {{{maven-changelog-plugin/} changelog}} | 2.0|
Generate a list of recent changes from your SCM.
*---+---+--+
| {{{maven-changes-plugin/} changes}} | 2.0-beta-2 |
Generate a report from issue tracking or a change document.
*---++--+
@@ -61,11 +61,11 @@
*---++--+
| {{{maven-clover-plugin/} clover}} | 2.3|
Generate a Clover report.
*---++--+
-| {{{maven-doap-plugin/} doap}} ||
Generate a Description of a Project (DOAP) file from a POM.
+| {{{maven-doap-plugin/} doap
svn commit: r513992 - /maven/plugins/trunk/maven-jxr-plugin/src/main/java/org/apache/maven/plugin/jxr/AbstractJxrReport.java
Author: dennisl
Date: Fri Mar 2 14:22:34 2007
New Revision: 513992
URL: http://svn.apache.org/viewvc?view=revrev=513992
Log:
[MJXR-23] If inceptionYear is not set in the pom then {inceptionYear}- is
printed in the footer
Modified:
maven/plugins/trunk/maven-jxr-plugin/src/main/java/org/apache/maven/plugin/jxr/AbstractJxrReport.java
Modified:
maven/plugins/trunk/maven-jxr-plugin/src/main/java/org/apache/maven/plugin/jxr/AbstractJxrReport.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-jxr-plugin/src/main/java/org/apache/maven/plugin/jxr/AbstractJxrReport.java?view=diffrev=513992r1=513991r2=513992
==
---
maven/plugins/trunk/maven-jxr-plugin/src/main/java/org/apache/maven/plugin/jxr/AbstractJxrReport.java
(original)
+++
maven/plugins/trunk/maven-jxr-plugin/src/main/java/org/apache/maven/plugin/jxr/AbstractJxrReport.java
Fri Mar 2 14:22:34 2007
@@ -242,7 +242,7 @@
* Get the bottom text to be displayed at the lower part of the generated
JXR reports.
*
* @param inceptionYear the year when the project was started
- * @return a String that contains the bottom text to be displayed in the
lower part of the generrated JXR reports
+ * @return a String that contains the bottom text to be displayed in the
lower part of the generated JXR reports
*/
private String getBottomText( String inceptionYear )
{
@@ -251,7 +251,11 @@
String bottom = StringUtils.replace( this.bottom, {currentYear},
year );
-if ( inceptionYear != null )
+if ( inceptionYear == null )
+{
+bottom = StringUtils.replace( bottom, {inceptionYear}-, );
+}
+else
{
if ( inceptionYear.equals( year ) )
{
svn commit: r514001 - in /maven/plugins/trunk/maven-jxr-plugin/src: main/java/org/apache/maven/plugin/jxr/AbstractJxrReport.java site/apt/examples/include-exclude.apt site/site.xml
Author: dennisl
Date: Fri Mar 2 14:53:02 2007
New Revision: 514001
URL: http://svn.apache.org/viewvc?view=revrev=514001
Log:
[MJXR-24] Add the ability to include/exclude source files
Added:
maven/plugins/trunk/maven-jxr-plugin/src/site/apt/examples/include-exclude.apt
(with props)
Modified:
maven/plugins/trunk/maven-jxr-plugin/src/main/java/org/apache/maven/plugin/jxr/AbstractJxrReport.java
maven/plugins/trunk/maven-jxr-plugin/src/site/site.xml
Modified:
maven/plugins/trunk/maven-jxr-plugin/src/main/java/org/apache/maven/plugin/jxr/AbstractJxrReport.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-jxr-plugin/src/main/java/org/apache/maven/plugin/jxr/AbstractJxrReport.java?view=diffrev=514001r1=514000r2=514001
==
---
maven/plugins/trunk/maven-jxr-plugin/src/main/java/org/apache/maven/plugin/jxr/AbstractJxrReport.java
(original)
+++
maven/plugins/trunk/maven-jxr-plugin/src/main/java/org/apache/maven/plugin/jxr/AbstractJxrReport.java
Fri Mar 2 14:53:02 2007
@@ -122,6 +122,22 @@
private String stylesheet;
/**
+ * A list of exclude patterns to use. By default no files are excluded.
+ *
+ * @parameter expression=${excludes}
+ * @since 2.1
+ */
+private ArrayList excludes;
+
+/**
+ * A list of include patterns to use. By default all .java files are
included.
+ *
+ * @parameter expression=${includes}
+ * @since 2.1
+ */
+private ArrayList includes;
+
+/**
* The projects in the reactor for aggregation report.
*
* @parameter expression=${reactorProjects}
@@ -231,6 +247,15 @@
jxr.setOutputEncoding( outputEncoding );
jxr.setRevision( HEAD );
jxr.setJavadocLinkDir( getJavadocLocation() );
+// Set include/exclude patterns on the jxr instance
+if ( excludes != null !excludes.isEmpty() )
+{
+jxr.setExcludes( (String[]) excludes.toArray( new String[0] ) );
+}
+if ( includes != null !includes.isEmpty() )
+{
+jxr.setIncludes( (String[]) includes.toArray( new String[0] ) );
+}
jxr.xref( sourceDirs, templateDir, windowTitle, docTitle,
getBottomText( project.getInceptionYear() ) );
Added:
maven/plugins/trunk/maven-jxr-plugin/src/site/apt/examples/include-exclude.apt
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-jxr-plugin/src/site/apt/examples/include-exclude.apt?view=autorev=514001
==
---
maven/plugins/trunk/maven-jxr-plugin/src/site/apt/examples/include-exclude.apt
(added)
+++
maven/plugins/trunk/maven-jxr-plugin/src/site/apt/examples/include-exclude.apt
Fri Mar 2 14:53:02 2007
@@ -0,0 +1,73 @@
+ --
+ Including/Excluding Source Files
+ --
+ Dennis Lundberg
+ --
+ 2 March 2007
+ --
+
+Including/Excluding Source Files
+
+ To include or exclude files from the generated JXR files, you need to
+ configure the JXR plugin in your pom.xml. This is done using patterns
+ similar to those used in Ant.
+
+*Including files
+
+ The default is to include all java files. The pattern **/*.java is used
+ to achieve this. If you want to use a different pattern you just configure it
+ in your pom.xml like this:
+
++-+
+project
+ ...
+ reporting
+plugins
+ ...
+ plugin
+groupIdorg.apache.maven.plugins/groupId
+artifactIdmaven-jxr-plugin/artifactId
+configuration
+ ...
+ includes
+include**/include/*.java/include
+ includes
+ ...
+/configuration
+ /plugin
+/plugins
+ ...
+ /reporting
+ ...
+/project
++-+
+
+*Excluding files
+
+ By default no files are excluded. You can exclude files by configuring your
+ pom.xml. If you want to exclude all your abstract classes a configuration
+ like this might be useful:
+
++-+
+project
+ ...
+ reporting
+plugins
+ ...
+ plugin
+groupIdorg.apache.maven.plugins/groupId
+artifactIdmaven-jxr-plugin/artifactId
+configuration
+ ...
+ excludes
+exclude**/Abstract*.java/exclude
+ /excludes
+ ...
+/configuration
+ /plugin
+/plugins
+ ...
+ /reporting
+ ...
+/project
++-+
Propchange:
maven/plugins/trunk/maven-jxr-plugin/src/site/apt/examples/include-exclude.apt
--
svn:eol-style = native
Modified: maven/plugins/trunk/maven-jxr-plugin/src/site/site.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-jxr-plugin/src/site/site.xml?view=diffrev=514001r1=514000r2=514001
==
--- maven/plugins/trunk/maven-jxr-plugin/src/site/site.xml (original)
+++ maven/plugins/trunk/maven-jxr-plugin/src/site
svn commit: r514015 - in /maven/plugins/trunk/maven-jxr-plugin/src/test: java/org/apache/maven/plugin/jxr/ java/org/apache/maven/plugin/jxr/stubs/ resources/unit/exclude-configuration/ resources/unit/
Author: dennisl
Date: Fri Mar 2 15:36:49 2007
New Revision: 514015
URL: http://svn.apache.org/viewvc?view=revrev=514015
Log:
[MJXR-24] Add the ability to include/exclude source files
o Add tests.
Added:
maven/plugins/trunk/maven-jxr-plugin/src/test/java/org/apache/maven/plugin/jxr/stubs/ExcludeConfigurationMavenProjectStub.java
(with props)
maven/plugins/trunk/maven-jxr-plugin/src/test/java/org/apache/maven/plugin/jxr/stubs/IncludeConfigurationMavenProjectStub.java
(with props)
maven/plugins/trunk/maven-jxr-plugin/src/test/resources/unit/exclude-configuration/
maven/plugins/trunk/maven-jxr-plugin/src/test/resources/unit/exclude-configuration/exclude/
maven/plugins/trunk/maven-jxr-plugin/src/test/resources/unit/exclude-configuration/exclude-configuration-plugin-config.xml
(with props)
maven/plugins/trunk/maven-jxr-plugin/src/test/resources/unit/exclude-configuration/exclude/configuration/
maven/plugins/trunk/maven-jxr-plugin/src/test/resources/unit/exclude-configuration/exclude/configuration/App.java
(with props)
maven/plugins/trunk/maven-jxr-plugin/src/test/resources/unit/exclude-configuration/exclude/configuration/AppSample.java
(with props)
maven/plugins/trunk/maven-jxr-plugin/src/test/resources/unit/include-configuration/
maven/plugins/trunk/maven-jxr-plugin/src/test/resources/unit/include-configuration/include/
maven/plugins/trunk/maven-jxr-plugin/src/test/resources/unit/include-configuration/include-configuration-plugin-config.xml
(with props)
maven/plugins/trunk/maven-jxr-plugin/src/test/resources/unit/include-configuration/include/configuration/
maven/plugins/trunk/maven-jxr-plugin/src/test/resources/unit/include-configuration/include/configuration/App.java
(with props)
maven/plugins/trunk/maven-jxr-plugin/src/test/resources/unit/include-configuration/include/configuration/AppSample.java
(with props)
Modified:
maven/plugins/trunk/maven-jxr-plugin/src/test/java/org/apache/maven/plugin/jxr/JxrReportTest.java
Modified:
maven/plugins/trunk/maven-jxr-plugin/src/test/java/org/apache/maven/plugin/jxr/JxrReportTest.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-jxr-plugin/src/test/java/org/apache/maven/plugin/jxr/JxrReportTest.java?view=diffrev=514015r1=514014r2=514015
==
---
maven/plugins/trunk/maven-jxr-plugin/src/test/java/org/apache/maven/plugin/jxr/JxrReportTest.java
(original)
+++
maven/plugins/trunk/maven-jxr-plugin/src/test/java/org/apache/maven/plugin/jxr/JxrReportTest.java
Fri Mar 2 15:36:49 2007
@@ -1,318 +1,367 @@
-package org.apache.maven.plugin.jxr;
-
-/*
- * 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.testing.AbstractMojoTestCase;
-import org.codehaus.plexus.util.FileUtils;
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileReader;
-import java.io.IOException;
-
-/**
- * @author a href=mailto:[EMAIL PROTECTED]Maria Odea Ching/a
- */
-public class JxrReportTest
-extends AbstractMojoTestCase
-{
-
-protected void setUp()
-throws Exception
-{
-super.setUp();
-}
-
-/**
- * Test the plugin with default configuration
- *
- * @throws Exception
- */
-public void testDefaultConfiguration()
-throws Exception
-{
-copyFilesFromDirectory( new File( getBasedir(),
src/test/resources/unit/default-configuration/javadoc-files ),
-new File( getBasedir(),
target/test/unit/default-configuration/target/site ) );
-
-File testPom = new File( getBasedir(),
-
src/test/resources/unit/default-configuration/default-configuration-plugin-config.xml
);
-JxrReport mojo = (JxrReport) lookupMojo( jxr, testPom );
-mojo.execute();
-
-//check if xref files were generated
-File generatedFile =
-new File( getBasedir(),
target/test/unit/default-configuration/target/site/xref/allclasses-frame.html
);
-assertTrue( FileUtils.fileExists( generatedFile.getAbsolutePath() ) );
-
-generatedFile = new File( getBasedir
svn commit: r514018 - in /maven/plugins/trunk/maven-jxr-plugin/src/test: java/org/apache/maven/plugin/jxr/ java/org/apache/maven/plugin/jxr/stubs/ resources/unit/aggregate-test/ resources/unit/aggrega
Author: dennisl Date: Fri Mar 2 15:40:21 2007 New Revision: 514018 URL: http://svn.apache.org/viewvc?view=revrev=514018 Log: o Set EOL style to native. Modified: maven/plugins/trunk/maven-jxr-plugin/src/test/java/org/apache/maven/plugin/jxr/JxrReportTest.java (contents, props changed) maven/plugins/trunk/maven-jxr-plugin/src/test/java/org/apache/maven/plugin/jxr/JxrTestReportTest.java (props changed) maven/plugins/trunk/maven-jxr-plugin/src/test/java/org/apache/maven/plugin/jxr/stubs/AggregateSubmodule1MavenProjectStub.java (props changed) maven/plugins/trunk/maven-jxr-plugin/src/test/java/org/apache/maven/plugin/jxr/stubs/AggregateSubmodule2MavenProjectStub.java (props changed) maven/plugins/trunk/maven-jxr-plugin/src/test/java/org/apache/maven/plugin/jxr/stubs/AggregateTestMavenProjectStub.java (props changed) maven/plugins/trunk/maven-jxr-plugin/src/test/java/org/apache/maven/plugin/jxr/stubs/DefaultArtifactHandlerStub.java (props changed) maven/plugins/trunk/maven-jxr-plugin/src/test/java/org/apache/maven/plugin/jxr/stubs/DefaultConfigurationMavenProjectStub.java (props changed) maven/plugins/trunk/maven-jxr-plugin/src/test/java/org/apache/maven/plugin/jxr/stubs/JxrPluginArtifactStub.java (props changed) maven/plugins/trunk/maven-jxr-plugin/src/test/java/org/apache/maven/plugin/jxr/stubs/NoJavadocDirMavenProjectStub.java (props changed) maven/plugins/trunk/maven-jxr-plugin/src/test/java/org/apache/maven/plugin/jxr/stubs/NoJavadocLinkConfigurationMavenProjectStub.java (props changed) maven/plugins/trunk/maven-jxr-plugin/src/test/java/org/apache/maven/plugin/jxr/stubs/TestSourceDirMavenProjectStub.java (props changed) maven/plugins/trunk/maven-jxr-plugin/src/test/resources/unit/aggregate-test/aggregate-test-plugin-config.xml (props changed) maven/plugins/trunk/maven-jxr-plugin/src/test/resources/unit/aggregate-test/submodule1/aggregate-test-plugin-config.xml (props changed) maven/plugins/trunk/maven-jxr-plugin/src/test/resources/unit/aggregate-test/submodule1/aggregate/test/submodule1/Submodule1App.java (props changed) maven/plugins/trunk/maven-jxr-plugin/src/test/resources/unit/aggregate-test/submodule1/aggregate/test/submodule1/Submodule1AppSample.java (props changed) maven/plugins/trunk/maven-jxr-plugin/src/test/resources/unit/aggregate-test/submodule2/aggregate-test-plugin-config.xml (props changed) maven/plugins/trunk/maven-jxr-plugin/src/test/resources/unit/aggregate-test/submodule2/aggregate/test/submodule2/Submodule2App.java (props changed) maven/plugins/trunk/maven-jxr-plugin/src/test/resources/unit/aggregate-test/submodule2/aggregate/test/submodule2/Submodule2AppSample.java (props changed) maven/plugins/trunk/maven-jxr-plugin/src/test/resources/unit/default-configuration/def/configuration/App.java (props changed) maven/plugins/trunk/maven-jxr-plugin/src/test/resources/unit/default-configuration/def/configuration/AppSample.java (props changed) maven/plugins/trunk/maven-jxr-plugin/src/test/resources/unit/default-configuration/default-configuration-plugin-config.xml (props changed) maven/plugins/trunk/maven-jxr-plugin/src/test/resources/unit/default-configuration/exception-test-plugin-config.xml (props changed) maven/plugins/trunk/maven-jxr-plugin/src/test/resources/unit/nojavadocdir-test/nojavadocdir-test-plugin-config.xml (props changed) maven/plugins/trunk/maven-jxr-plugin/src/test/resources/unit/nojavadocdir-test/nojavadocdir/test/App.java (props changed) maven/plugins/trunk/maven-jxr-plugin/src/test/resources/unit/nojavadocdir-test/nojavadocdir/test/AppSample.java (props changed) maven/plugins/trunk/maven-jxr-plugin/src/test/resources/unit/nojavadoclink-configuration/nojavadoclink-configuration-plugin-config.xml (props changed) maven/plugins/trunk/maven-jxr-plugin/src/test/resources/unit/nojavadoclink-configuration/nojavadoclink/configuration/App.java (props changed) maven/plugins/trunk/maven-jxr-plugin/src/test/resources/unit/nojavadoclink-configuration/nojavadoclink/configuration/AppSample.java (props changed) maven/plugins/trunk/maven-jxr-plugin/src/test/resources/unit/nojavadoclink-configuration/nojavadoclink/configuration/sample/Sample.java (props changed) maven/plugins/trunk/maven-jxr-plugin/src/test/resources/unit/testsourcedir-test/src/main/java/testsourcedir/test/App.java (props changed) maven/plugins/trunk/maven-jxr-plugin/src/test/resources/unit/testsourcedir-test/src/main/java/testsourcedir/test/AppSample.java (props changed) maven/plugins/trunk/maven-jxr-plugin/src/test/resources/unit/testsourcedir-test/src/test/java/testsourcedir/test/AppSampleTest.java (props changed) maven/plugins/trunk/maven-jxr-plugin/src/test/resources/unit/testsourcedir-test/src/test/java/testsourcedir/test/AppTest.java (props changed
svn commit: r514144 - /maven/archetype/trunk/maven-archetype/maven-archetype-plugin/src/site/apt/examples/archetype.apt
Author: dennisl Date: Sat Mar 3 04:42:42 2007 New Revision: 514144 URL: http://svn.apache.org/viewvc?view=revrev=514144 Log: [ARCHETYPE-60] Archetype Documentation Incorrect Modified: maven/archetype/trunk/maven-archetype/maven-archetype-plugin/src/site/apt/examples/archetype.apt Modified: maven/archetype/trunk/maven-archetype/maven-archetype-plugin/src/site/apt/examples/archetype.apt URL: http://svn.apache.org/viewvc/maven/archetype/trunk/maven-archetype/maven-archetype-plugin/src/site/apt/examples/archetype.apt?view=diffrev=514144r1=514143r2=514144 == --- maven/archetype/trunk/maven-archetype/maven-archetype-plugin/src/site/apt/examples/archetype.apt (original) +++ maven/archetype/trunk/maven-archetype/maven-archetype-plugin/src/site/apt/examples/archetype.apt Sat Mar 3 04:42:42 2007 @@ -92,25 +92,25 @@ An optional \allowPartial\true\/allowPartial\ tag makes it possible to run the archetype:create even on existing projects. - The \sources\, \resources\, \test-resources\ and - \site-resources\ tags represent the different sections of the project: + The \sources\, \resources\, \testResources\ and + \siteResources\ tags represent the different sections of the project: * \sources\ = src/main/java * \resources\ = src/main/resources - * \test-sources\ = src/test/java + * \testSources\ = src/test/java - * \test-resources\ = src/test/resources + * \testResources\ = src/test/resources - * \site-resources\ = src/site + * \siteResources\ = src/site [] - \sources\ and \test-sources\ can contain \source\ + \sources\ and \testSources\ can contain \source\ elements that specify a source file. - \test-resources\ and \site-resources\ can contain + \testResources\ and \siteResources\ can contain \resource\ elements that specify a resource file. Place other resources such as the ones in the src/main/webapp directory
svn commit: r514148 - /maven/site/trunk/src/site/apt/guides/mini/guide-creating-archetypes.apt
Author: dennisl Date: Sat Mar 3 04:52:50 2007 New Revision: 514148 URL: http://svn.apache.org/viewvc?view=revrev=514148 Log: [ARCHETYPE-60] Archetype Documentation Incorrect o Sync this page with the one in the archetype-plugin. This page should be removed and replaced with a redirect. Modified: maven/site/trunk/src/site/apt/guides/mini/guide-creating-archetypes.apt Modified: maven/site/trunk/src/site/apt/guides/mini/guide-creating-archetypes.apt URL: http://svn.apache.org/viewvc/maven/site/trunk/src/site/apt/guides/mini/guide-creating-archetypes.apt?view=diffrev=514148r1=514147r2=514148 == --- maven/site/trunk/src/site/apt/guides/mini/guide-creating-archetypes.apt (original) +++ maven/site/trunk/src/site/apt/guides/mini/guide-creating-archetypes.apt Sat Mar 3 04:52:50 2007 @@ -1,25 +1,29 @@ -- Guide to Creating Archetypes -- - Jason van Zyl, Alexander Hars + Jason van Zyl, Alexander Hars, Franz Allan Valencia See -- - 26 October 2005 + 25 July 2006 -- Guide to Creating Archetypes - Creating an archetype is a pretty straight forward process. An archetype is a very simple plugin, that - contains the project prototype you wish to create. An archetype is made up of: + Creating an archetype is a pretty straight forward process. An archetype is a + very simple plugin, that contains the project prototype you wish to create. + An archetype is made up of: - * an archetype descriptor (archetype.xml in directory: src/main/resources/META-INF/). It lists all the files - that will be contained in the archetype and categorizes them so they can be processed correctly by the - archetype generation mechanism. + * an archetype descriptor (archetype.xml in directory: + src/main/resources/META-INF/). It lists all the files that will be + contained in the archetype and categorizes them so they can be processed + correctly by the archetype generation mechanism. - * the prototype files that are copied by the archetype (directory: src/main/resources/archetype-resources/) + * the prototype files that are copied by the archetype (directory: + src/main/resources/archetype-resources/) - * the prototpye pom (pom.xml in: src/main/resources/archetype-resources) + * the prototpye pom (pom.xml in: + src/main/resources/archetype-resources) - * a pom for the archetype (pom.xml in the archetype's root directory). + * a pom for the archetype (pom.xml in the archetype's root directory). [] @@ -27,7 +31,7 @@ * 1. Create a new project and pom.xml for the archetype plugin - An example pom.xml for an archetype plugin looks as follows: + An example pom.xml for an archetype plugin looks as follows: ++ @@ -41,13 +45,15 @@ ++ - All you need to specify is a groupId, artifactId and version. These three parameters will be needed later for - invoking the archetype via archetype:create from the commandline. + All you need to specify is a groupId, artifactId and + version. These three parameters will be needed later for invoking the + archetype via archetype:create from the commandline. * 2. Create the archetype descriptor - The archetype descriptor is a file called archetype.xml which must be located in src/main/resources/META-INF/ - An example for an archetype descriptor can be found in the quickstart archetype: + The archetype descriptor is a file called archetype.xml which must be + located in src/main/resources/META-INF/ An example for an archetype + descriptor can be found in the quickstart archetype: ++ @@ -63,33 +69,41 @@ ++ - The \id\ tag should be the same as the artifactId in the archetype pom.xml. + The \id\ tag should be the same as the artifactId in the + archetype pom.xml. - An optional \allowPartial\true\/allowPartial\ tag makes it possible to run the archetype:create even on existing projects. + An optional \allowPartial\true\/allowPartial\ tag makes it possible + to run the archetype:create even on existing projects. - The \sources\, \resources\, \test-resources\ and \site-resources\ tags represent the different sections of the project: + The \sources\, \resources\, \testResources\ and + \siteResources\ tags represent the different sections of the project: - * \sources\ = src/main/java + * \sources\ = src/main/java - * \resources\ = src/main/resources + * \resources\ = src/main/resources - * \test-sources\ = src/test/java + * \testSources\ = src/test/java - * \test-resources\ = src/test/resources + * \testResources\ = src/test/resources - * \site-resources\ = src/site + * \siteResources\ = src/site [] - \sources\ and \test-sources\ can contain \source\ elements that specify a source file. + \sources\ and \testSources\ can contain \source\ + elements that specify a source file. - \test-resources\ and \site-resources\ can contain \resource\ elements that specify
svn commit: r514152 - /maven/archetype/trunk/maven-archetype/maven-archetype-plugin/src/site/site.xml
Author: dennisl Date: Sat Mar 3 05:07:05 2007 New Revision: 514152 URL: http://svn.apache.org/viewvc?view=revrev=514152 Log: o Update the site to look like the other plugins. Modified: maven/archetype/trunk/maven-archetype/maven-archetype-plugin/src/site/site.xml Modified: maven/archetype/trunk/maven-archetype/maven-archetype-plugin/src/site/site.xml URL: http://svn.apache.org/viewvc/maven/archetype/trunk/maven-archetype/maven-archetype-plugin/src/site/site.xml?view=diffrev=514152r1=514151r2=514152 == --- maven/archetype/trunk/maven-archetype/maven-archetype-plugin/src/site/site.xml (original) +++ maven/archetype/trunk/maven-archetype/maven-archetype-plugin/src/site/site.xml Sat Mar 3 05:07:05 2007 @@ -19,15 +19,29 @@ project name=Maven Archetype Plugin bannerLeft nameMaven Archetype Plugin/name -srchttp://maven.apache.org/images/apache-maven-project.png/src +srchttp://maven.apache.org/images/apache-maven-project-2.png/src hrefhttp://maven.apache.org//href /bannerLeft bannerRight -srchttp://maven.apache.org/images/maven-small.gif/src +srchttp://maven.apache.org/images/maven-logo-2.gif/src /bannerRight + skin +groupIdorg.apache.maven.skins/groupId +artifactIdmaven-stylus-skin/artifactId + /skin + publishDate format=dd MMM position=left / + version position=left / body links - item name=Maven 2 href=http://maven.apache.org/maven2// + item name=Apache href=http://www.apache.org// + item name=Maven 1.x href=http://maven.apache.org/maven-1.x/ + item name=Maven 2.x href=http://maven.apache.org// + item name=Maven 2.x Plugins href=http://maven.apache.org/plugins// + item name=Continuum href=http://maven.apache.org/continuum/ + item name=SCM href=http://maven.apache.org/scm/ + item name=Wagon href=http://maven.apache.org/wagon/ + item name=JXR href=http://maven.apache.org/jxr/ + item name=Doxia href=http://maven.apache.org/doxia/ /links menu name=Overview
svn commit: r514154 - /maven/site/trunk/src/site/apt/developers/release/releasing.apt
Author: dennisl Date: Sat Mar 3 05:09:19 2007 New Revision: 514154 URL: http://svn.apache.org/viewvc?view=revrev=514154 Log: o Fix deploy.altRepository for direct releases. Modified: maven/site/trunk/src/site/apt/developers/release/releasing.apt Modified: maven/site/trunk/src/site/apt/developers/release/releasing.apt URL: http://svn.apache.org/viewvc/maven/site/trunk/src/site/apt/developers/release/releasing.apt?view=diffrev=514154r1=514153r2=514154 == --- maven/site/trunk/src/site/apt/developers/release/releasing.apt (original) +++ maven/site/trunk/src/site/apt/developers/release/releasing.apt Sat Mar 3 05:09:19 2007 @@ -86,7 +86,7 @@ idrelease/id properties gpg.passphrasesecretPhrase/gpg.passphrase - deploy.altRepositoryusername::default::scp://people.apache.org/www/people.apache.org/repo/m2-ibiblio-rsync-repository/deploy.altRepository + deploy.altRepositoryapache.releases::default::scp://people.apache.org/www/people.apache.org/repo/m2-ibiblio-rsync-repository/deploy.altRepository /properties /profile /profiles
svn commit: r514192 - /maven/archetype/trunk/maven-archetype/maven-archetype-plugin/pom.xml
Author: dennisl Date: Sat Mar 3 08:55:28 2007 New Revision: 514192 URL: http://svn.apache.org/viewvc?view=revrev=514192 Log: o Add a distributionManagement section so that the site ends up in the correct place. Modified: maven/archetype/trunk/maven-archetype/maven-archetype-plugin/pom.xml Modified: maven/archetype/trunk/maven-archetype/maven-archetype-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/archetype/trunk/maven-archetype/maven-archetype-plugin/pom.xml?view=diffrev=514192r1=514191r2=514192 == --- maven/archetype/trunk/maven-archetype/maven-archetype-plugin/pom.xml (original) +++ maven/archetype/trunk/maven-archetype/maven-archetype-plugin/pom.xml Sat Mar 3 08:55:28 2007 @@ -116,4 +116,10 @@ /build /profile /profiles + distributionManagement +site + idapache.website/id + urlscp://people.apache.org/www/maven.apache.org/plugins/maven-archetype-plugin/url +/site + /distributionManagement /project
svn commit: r514203 - /maven/shared/trunk/maven-plugin-tools/pom.xml
Author: dennisl Date: Sat Mar 3 09:40:53 2007 New Revision: 514203 URL: http://svn.apache.org/viewvc?view=revrev=514203 Log: o Use the released version of maven-plugin-descriptor. Modified: maven/shared/trunk/maven-plugin-tools/pom.xml Modified: maven/shared/trunk/maven-plugin-tools/pom.xml URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-plugin-tools/pom.xml?view=diffrev=514203r1=514202r2=514203 == --- maven/shared/trunk/maven-plugin-tools/pom.xml (original) +++ maven/shared/trunk/maven-plugin-tools/pom.xml Sat Mar 3 09:40:53 2007 @@ -59,7 +59,7 @@ dependency groupIdorg.apache.maven/groupId artifactIdmaven-plugin-descriptor/artifactId -version2.0.5-SNAPSHOT/version +version2.0.5/version /dependency dependency groupIdorg.codehaus.plexus/groupId
svn commit: r514217 - /maven/shared/trunk/maven-model-converter/pom.xml
Author: dennisl Date: Sat Mar 3 11:06:13 2007 New Revision: 514217 URL: http://svn.apache.org/viewvc?view=revrev=514217 Log: o Bump version number to reflect the amount of changes that has been added since the last release. Modified: maven/shared/trunk/maven-model-converter/pom.xml Modified: maven/shared/trunk/maven-model-converter/pom.xml URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-model-converter/pom.xml?view=diffrev=514217r1=514216r2=514217 == --- maven/shared/trunk/maven-model-converter/pom.xml (original) +++ maven/shared/trunk/maven-model-converter/pom.xml Sat Mar 3 11:06:13 2007 @@ -26,7 +26,7 @@ version6/version /parent artifactIdmaven-model-converter/artifactId - version2.0.5-SNAPSHOT/version + version2.1-SNAPSHOT/version nameMaven Model Converter/name descriptionConverts between version 3.0.0 and version 4.0.0 models./description dependencies
svn commit: r514219 - /maven/plugins/trunk/maven-one-plugin/pom.xml
Author: dennisl Date: Sat Mar 3 11:08:21 2007 New Revision: 514219 URL: http://svn.apache.org/viewvc?view=revrev=514219 Log: o Use a released parent. o Use the latest version of maven-model-converter. Modified: maven/plugins/trunk/maven-one-plugin/pom.xml Modified: maven/plugins/trunk/maven-one-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-one-plugin/pom.xml?view=diffrev=514219r1=514218r2=514219 == --- maven/plugins/trunk/maven-one-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-one-plugin/pom.xml Sat Mar 3 11:08:21 2007 @@ -21,7 +21,7 @@ parent artifactIdmaven-plugins/artifactId groupIdorg.apache.maven.plugins/groupId -version8-SNAPSHOT/version +version8/version /parent modelVersion4.0.0/modelVersion artifactIdmaven-one-plugin/artifactId @@ -117,7 +117,7 @@ dependency groupIdorg.apache.maven.shared/groupId artifactIdmaven-model-converter/artifactId - version2.0.5-SNAPSHOT/version + version2.1-SNAPSHOT/version /dependency dependency groupIdorg.apache.maven/groupId
svn commit: r514240 - /maven/shared/trunk/maven-model-converter/
Author: dennisl Date: Sat Mar 3 12:59:08 2007 New Revision: 514240 URL: http://svn.apache.org/viewvc?view=revrev=514240 Log: o Ignore IDEA files. Modified: maven/shared/trunk/maven-model-converter/ (props changed) Propchange: maven/shared/trunk/maven-model-converter/ -- --- svn:ignore (original) +++ svn:ignore Sat Mar 3 12:59:08 2007 @@ -1,2 +1,4 @@ target *.iml +*.ipr +*.iws
svn commit: r514241 - /maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/RollbackReleaseMojo.java
Author: dennisl Date: Sat Mar 3 13:11:29 2007 New Revision: 514241 URL: http://svn.apache.org/viewvc?view=revrev=514241 Log: o Add since information. Modified: maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/RollbackReleaseMojo.java Modified: maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/RollbackReleaseMojo.java URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/RollbackReleaseMojo.java?view=diffrev=514241r1=514240r2=514241 == --- maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/RollbackReleaseMojo.java (original) +++ maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/RollbackReleaseMojo.java Sat Mar 3 13:11:29 2007 @@ -30,6 +30,7 @@ * * @aggregator * @goal rollback + * @since 2.0-beta-5 * * @author Edwin Punzalan */
svn commit: r514245 - /maven/plugins/trunk/maven-plugin-plugin/pom.xml
Author: dennisl Date: Sat Mar 3 13:24:26 2007 New Revision: 514245 URL: http://svn.apache.org/viewvc?view=revrev=514245 Log: o Use the latest version of maven-plugin-tools. This brings in support for @since tags in mojos. Modified: maven/plugins/trunk/maven-plugin-plugin/pom.xml Modified: maven/plugins/trunk/maven-plugin-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-plugin-plugin/pom.xml?view=diffrev=514245r1=514244r2=514245 == --- maven/plugins/trunk/maven-plugin-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-plugin-plugin/pom.xml Sat Mar 3 13:24:26 2007 @@ -118,12 +118,12 @@ dependency groupIdorg.apache.maven/groupId artifactIdmaven-plugin-tools-api/artifactId - version2.0.5/version + version2.1-SNAPSHOT/version /dependency dependency groupIdorg.apache.maven/groupId artifactIdmaven-plugin-tools-java/artifactId - version2.0.5/version + version2.1-SNAPSHOT/version scoperuntime/scope /dependency dependency @@ -134,7 +134,7 @@ dependency groupIdorg.apache.maven/groupId artifactIdmaven-plugin-tools-beanshell/artifactId - version2.0.5/version + version2.1-SNAPSHOT/version scoperuntime/scope /dependency dependency
svn commit: r514247 - /maven/release/trunk/maven-release-plugin/pom.xml
Author: dennisl Date: Sat Mar 3 13:30:24 2007 New Revision: 514247 URL: http://svn.apache.org/viewvc?view=revrev=514247 Log: [MRELEASE-197] Release plugin documentation on maven.apache.org has broken link to release:rollback o Actually no mojo pages have been uploaded to the website, because the maven-plugin-plugin report was not included. Modified: maven/release/trunk/maven-release-plugin/pom.xml Modified: maven/release/trunk/maven-release-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-plugin/pom.xml?view=diffrev=514247r1=514246r2=514247 == --- maven/release/trunk/maven-release-plugin/pom.xml (original) +++ maven/release/trunk/maven-release-plugin/pom.xml Sat Mar 3 13:30:24 2007 @@ -79,6 +79,15 @@ /plugin /plugins /build + reporting +plugins + plugin +groupIdorg.apache.maven.plugins/groupId +artifactIdmaven-plugin-plugin/artifactId +version2.3-SNAPSHOT/version + /plugin +/plugins + /reporting distributionManagement site idapache.website/id
