[GitHub] maven-plugins pull request #115: Upgrade to Plexus Archiver 3.5-SNAPSHOT
Github user snicoll closed the pull request at: https://github.com/apache/maven-plugins/pull/115 --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. --- - To unsubscribe, e-mail: dev-unsubscr...@maven.apache.org For additional commands, e-mail: dev-h...@maven.apache.org
[GitHub] maven-plugins pull request #117: Upgrade to Plexus IO 3.0.0
GitHub user snicoll opened a pull request: https://github.com/apache/maven-plugins/pull/117 Upgrade to Plexus IO 3.0.0 See MASSEMBLY-859 PR #116 should be merged first as plexus io 3.0.0 requires Java 7 You can merge this pull request into a Git repository by running: $ git pull https://github.com/snicoll/maven-plugins MASSEMBLY-859 Alternatively you can review and apply these changes as the patch at: https://github.com/apache/maven-plugins/pull/117.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #117 commit 32c7570a3e8c1aa99e0ebf8a792136bca729b7f1 Author: Stephane Nicoll <snic...@pivotal.io> Date: 2017-06-19T09:23:24Z [MASSEMBLY-859] Upgrade to Plexus IO 3.0.0 --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. --- - To unsubscribe, e-mail: dev-unsubscr...@maven.apache.org For additional commands, e-mail: dev-h...@maven.apache.org
[GitHub] maven-plugins pull request #116: Upgrade to Java 7
GitHub user snicoll opened a pull request: https://github.com/apache/maven-plugins/pull/116 Upgrade to Java 7 See MASSEMBLY-860 You can merge this pull request into a Git repository by running: $ git pull https://github.com/snicoll/maven-plugins MASSEMBLY-860 Alternatively you can review and apply these changes as the patch at: https://github.com/apache/maven-plugins/pull/116.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #116 commit 549b9d9ef49e0f663cc6b847fa457d47452d1938 Author: Stephane Nicoll <snic...@pivotal.io> Date: 2017-06-19T09:19:57Z [MASSEMBLY-860] Upgrade to Java 7 --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. --- - To unsubscribe, e-mail: dev-unsubscr...@maven.apache.org For additional commands, e-mail: dev-h...@maven.apache.org
[GitHub] maven-plugins pull request #115: Upgrade to Plexus Archiver 3.5-SNAPSHOT
GitHub user snicoll opened a pull request: https://github.com/apache/maven-plugins/pull/115 Upgrade to Plexus Archiver 3.5-SNAPSHOT See MASSEMBLY-854 Please note that this new release of plexus archiver requires Java7 You can merge this pull request into a Git repository by running: $ git pull https://github.com/snicoll/maven-plugins MASSEMBLY-854 Alternatively you can review and apply these changes as the patch at: https://github.com/apache/maven-plugins/pull/115.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #115 commit eecf761b2edca2f91e52bf601db51bb86fb679d6 Author: Stephane Nicoll <snic...@pivotal.io> Date: 2017-06-16T12:34:03Z Upgrade to Plexus Archiver 3.5-SNAPSHOT --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. --- - To unsubscribe, e-mail: dev-unsubscr...@maven.apache.org For additional commands, e-mail: dev-h...@maven.apache.org
[GitHub] maven-plugins pull request #114: Add support for "parameters" flag
GitHub user snicoll opened a pull request: https://github.com/apache/maven-plugins/pull/114 Add support for "parameters" flag This requires a change in plexus compiler first, see https://github.com/codehaus-plexus/plexus-compiler/pull/29 You can merge this pull request into a Git repository by running: $ git pull https://github.com/snicoll/maven-plugins MCOMPILER-298 Alternatively you can review and apply these changes as the patch at: https://github.com/apache/maven-plugins/pull/114.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #114 commit d23b5deaea5e745f5062c1c0a754e2b1481bf515 Author: Stephane Nicoll <snic...@pivotal.io> Date: 2017-05-29T10:55:46Z Add support for "parameters" flag --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. --- - To unsubscribe, e-mail: dev-unsubscr...@maven.apache.org For additional commands, e-mail: dev-h...@maven.apache.org
[ANN] Maven Javacc Plugin 1.2 released
The maven team is pleased to announce the Maven Javacc Plugin 1.2 release! http://maven.apache.org/maven-1.x/reference/plugins/javacc/ Changes in this version include: Fixed bugs: o Output directory for generated files can be configured Issue: MPJAVACC-3. Changes: o Update dependencies to match ones in maven 1.1 core and to unify them between plugins. The following dependencies are updated : plexus-utils v1.0-beta-1 -amp;gt; v1.0.3 Issue: MAVEN-1712. To automatically install the plugin, type the following on a single line: maven plugin:download -DgroupId=maven -DartifactId=maven-javacc-plugin -Dversion=1.2 For a manual installation, you can download the plugin here: http://www.apache.org/dyn/closer.cgi/java-repository/maven/plugins/maven-javacc-plugin-1.2.jar Have fun! -The maven team - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
[ANN] Maven RAR Plugin 1.1 released
The maven team is pleased to announce the Maven RAR Plugin 1.1 release! http://maven.apache.org/maven-1.x/reference/plugins/rar/ Rar Plugin for Maven Changes in this version include: New Features: o Added maven.rar.final.name property. Issue: MPRAR-2. o Add xdocs/changes.xml Fixed bugs: o Fixed handling of plugin properties: ra.xml file is now included wherever it is located. Issue: MPRAR-1. o Move versions element to correct location in POM o Make plugin.jelly ascii for CVS Changes: o Update dependencies to match ones in maven 1.1 core and to unify them between plugins. The following dependencies are updated : commons-jelly-tags-util v1.1 -amp;gt; v1.1.1 Issue: MAVEN-1712. o Deprecate rar:load hook goal To automatically install the plugin, type the following on a single line: maven plugin:download -DgroupId=maven -DartifactId=maven-rar-plugin -Dversion=1.1 For a manual installation, you can download the plugin here: http://www.apache.org/dyn/closer.cgi/java-repository/maven/plugins/maven-rar-plugin-1.1.jar Have fun! -The maven team - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r291386 - in /maven/components/trunk/maven-plugins/maven-ejb-plugin/src/site: ./ apt/ apt/howto.apt apt/introduction.apt site.xml
Author: snicoll
Date: Sun Sep 25 00:48:20 2005
New Revision: 291386
URL: http://svn.apache.org/viewcvs?rev=291386view=rev
Log:
MNG-852: Added web site doco for EJB plugin.
Added:
maven/components/trunk/maven-plugins/maven-ejb-plugin/src/site/
maven/components/trunk/maven-plugins/maven-ejb-plugin/src/site/apt/
maven/components/trunk/maven-plugins/maven-ejb-plugin/src/site/apt/howto.apt
maven/components/trunk/maven-plugins/maven-ejb-plugin/src/site/apt/introduction.apt
maven/components/trunk/maven-plugins/maven-ejb-plugin/src/site/site.xml
Added:
maven/components/trunk/maven-plugins/maven-ejb-plugin/src/site/apt/howto.apt
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-ejb-plugin/src/site/apt/howto.apt?rev=291386view=auto
==
---
maven/components/trunk/maven-plugins/maven-ejb-plugin/src/site/apt/howto.apt
(added)
+++
maven/components/trunk/maven-plugins/maven-ejb-plugin/src/site/apt/howto.apt
Sun Sep 25 00:48:20 2005
@@ -0,0 +1,28 @@
+ --
+ Maven 2 Ejb Plugin: configuration examples
+ --
+ Stephane Nicoll
+ [EMAIL PROTECTED]
+ --
+ September 25, 2005
+
+Introduction
+
+ The EJB plugin allows to package an EJB module. To generate the ejb-client
+ jar as well, you need to set the generateClient to true in the plugin's
+ configuration:
+
++
+ build
+plugins
+ plugin
+groupIdorg.apache.maven.plugins/groupId
+artifactIdmaven-ejb-plugin/artifactId
+configuration
+ generateClienttrue/generateClient
+/configuration
+ /plugin
+/plugins
+ /build
++-
+
Added:
maven/components/trunk/maven-plugins/maven-ejb-plugin/src/site/apt/introduction.apt
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-ejb-plugin/src/site/apt/introduction.apt?rev=291386view=auto
==
---
maven/components/trunk/maven-plugins/maven-ejb-plugin/src/site/apt/introduction.apt
(added)
+++
maven/components/trunk/maven-plugins/maven-ejb-plugin/src/site/apt/introduction.apt
Sun Sep 25 00:48:20 2005
@@ -0,0 +1,17 @@
+ --
+ Maven 2 Ejb Plugin
+ --
+ Stephane Nicoll
+ [EMAIL PROTECTED]
+ --
+ September 25, 2005
+
+Introduction
+
+ This plugin generates J2EE Enterprise Javabean (EJB) file as well as the
associated
+ client jar.
+
+ The full description of goals is available {{{index.html}here}}.
+
+
+
Added: maven/components/trunk/maven-plugins/maven-ejb-plugin/src/site/site.xml
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-ejb-plugin/src/site/site.xml?rev=291386view=auto
==
--- maven/components/trunk/maven-plugins/maven-ejb-plugin/src/site/site.xml
(added)
+++ maven/components/trunk/maven-plugins/maven-ejb-plugin/src/site/site.xml Sun
Sep 25 00:48:20 2005
@@ -0,0 +1,41 @@
+?xml version=1.0 encoding=ISO-8859-1?
+
+!--
+/*
+ * 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.
+ */
+--
+
+project name=Maven Ejb Plugin
+ bannerLeft
+nameMaven Ejb Plugin/name
+srchttp://maven.apache.org/images/apache-maven-project.png/src
+hrefhttp://maven.apache.org//href
+ /bannerLeft
+ bannerRight
+srchttp://maven.apache.org/images/maven-small.gif/src
+ /bannerRight
+ body
+links
+ item name=Maven 2 href=http://maven.apache.org/maven2//
+/links
+
+menu name=Overview
+ item name=Introduction href=introduction.html/
+ item name=How to Use href=howto.html/
+/menu
+${reports}
+ /body
+/project
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r291388 - /maven/components/trunk/maven-plugins/maven-war-plugin/src/site/apt/introduction.apt
Author: snicoll Date: Sun Sep 25 01:05:41 2005 New Revision: 291388 URL: http://svn.apache.org/viewcvs?rev=291388view=rev Log: copy/pasting is evil! Modified: maven/components/trunk/maven-plugins/maven-war-plugin/src/site/apt/introduction.apt Modified: maven/components/trunk/maven-plugins/maven-war-plugin/src/site/apt/introduction.apt URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-war-plugin/src/site/apt/introduction.apt?rev=291388r1=291387r2=291388view=diff == --- maven/components/trunk/maven-plugins/maven-war-plugin/src/site/apt/introduction.apt (original) +++ maven/components/trunk/maven-plugins/maven-war-plugin/src/site/apt/introduction.apt Sun Sep 25 01:05:41 2005 @@ -1,5 +1,5 @@ -- - Maven 2 Ear Plugin + Maven 2 War Plugin -- Stephane Nicoll [EMAIL PROTECTED] - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r291389 - /maven/components/trunk/maven-plugins/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/EarMojo.java
Author: snicoll
Date: Sun Sep 25 01:13:35 2005
New Revision: 291389
URL: http://svn.apache.org/viewcvs?rev=291389view=rev
Log:
info log now specifies that maven will generate a MANIFEST if the custom
manifest is not found.
Modified:
maven/components/trunk/maven-plugins/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/EarMojo.java
Modified:
maven/components/trunk/maven-plugins/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/EarMojo.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/EarMojo.java?rev=291389r1=291388r2=291389view=diff
==
---
maven/components/trunk/maven-plugins/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/EarMojo.java
(original)
+++
maven/components/trunk/maven-plugins/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/EarMojo.java
Sun Sep 25 01:13:35 2005
@@ -198,7 +198,7 @@
File customManifestFile = new File( manifestFile );
if ( !customManifestFile.exists() )
{
-getLog().info( Could not find manifest file: + manifestFile );
+getLog().info( Could not find manifest file: + manifestFile +
- Generating one);
}
else
{
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r291393 - /maven/components/trunk/maven-site/src/site/xdoc/plugins/index.xml
Author: snicoll Date: Sun Sep 25 01:35:57 2005 New Revision: 291393 URL: http://svn.apache.org/viewcvs?rev=291393view=rev Log: Added reference to maven-rar-plugin Modified: maven/components/trunk/maven-site/src/site/xdoc/plugins/index.xml Modified: maven/components/trunk/maven-site/src/site/xdoc/plugins/index.xml URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-site/src/site/xdoc/plugins/index.xml?rev=291393r1=291392r2=291393view=diff == --- maven/components/trunk/maven-site/src/site/xdoc/plugins/index.xml (original) +++ maven/components/trunk/maven-site/src/site/xdoc/plugins/index.xml Sun Sep 25 01:35:57 2005 @@ -240,6 +240,16 @@ /tr tr td +a href=maven-rar-plugin + coderar/code +/a + /td + td +Build a RAR from the current project. + /td +/tr +tr + td a href=maven-release-plugin coderelease/code /a - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r291395 - /maven/components/trunk/maven-plugins/maven-rar-plugin/src/main/java/org/apache/maven/plugin/rar/RarMojo.java
Author: snicoll
Date: Sun Sep 25 01:49:09 2005
New Revision: 291395
URL: http://svn.apache.org/viewcvs?rev=291395view=rev
Log:
rar source file compliant with src/main structure.
Modified:
maven/components/trunk/maven-plugins/maven-rar-plugin/src/main/java/org/apache/maven/plugin/rar/RarMojo.java
Modified:
maven/components/trunk/maven-plugins/maven-rar-plugin/src/main/java/org/apache/maven/plugin/rar/RarMojo.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-rar-plugin/src/main/java/org/apache/maven/plugin/rar/RarMojo.java?rev=291395r1=291394r2=291395view=diff
==
---
maven/components/trunk/maven-plugins/maven-rar-plugin/src/main/java/org/apache/maven/plugin/rar/RarMojo.java
(original)
+++
maven/components/trunk/maven-plugins/maven-rar-plugin/src/main/java/org/apache/maven/plugin/rar/RarMojo.java
Sun Sep 25 01:49:09 2005
@@ -48,7 +48,7 @@
/**
* Single directory for extra files to include in the RAR.
*
- * @parameter expression=${basedir}/src/rar
+ * @parameter expression=${basedir}/src/main/rar
* @required
*/
private String rarSourceDirectory;
@@ -56,7 +56,7 @@
/**
* The location of the ra.xml file to be used within the rar file.
*
- * @parameter expression=${basedir}/src/rar/META-INF/ra.xml
+ * @parameter expression=${basedir}/src/main/rar/META-INF/ra.xml
*/
private String raXmlFile;
@@ -71,7 +71,7 @@
/**
* The location of the manifest file to be used within the rar file.
*
- * @parameter expression=${basedir}/src/rar/META-INF/MANIFEST.MF
+ * @parameter expression=${basedir}/src/main/rar/META-INF/MANIFEST.MF
*/
private String manifestFile;
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r291397 - in /maven/components/trunk/maven-core-it: ./ it0070/ it0070/src/ it0070/src/main/ it0070/src/main/custom/ it0070/src/main/rar/
Author: snicoll Date: Sun Sep 25 02:18:03 2005 New Revision: 291397 URL: http://svn.apache.org/viewcvs?rev=291397view=rev Log: Added rar integration test. Added: maven/components/trunk/maven-core-it/it0070/ maven/components/trunk/maven-core-it/it0070/expected-results.txt maven/components/trunk/maven-core-it/it0070/goals.txt maven/components/trunk/maven-core-it/it0070/pom.xml maven/components/trunk/maven-core-it/it0070/src/ maven/components/trunk/maven-core-it/it0070/src/main/ maven/components/trunk/maven-core-it/it0070/src/main/custom/ maven/components/trunk/maven-core-it/it0070/src/main/custom/ra.xml maven/components/trunk/maven-core-it/it0070/src/main/rar/ maven/components/trunk/maven-core-it/it0070/src/main/rar/SomeResource.txt Modified: maven/components/trunk/maven-core-it/README.txt maven/components/trunk/maven-core-it/integration-tests.txt Modified: maven/components/trunk/maven-core-it/README.txt URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core-it/README.txt?rev=291397r1=291396r2=291397view=diff == --- maven/components/trunk/maven-core-it/README.txt (original) +++ maven/components/trunk/maven-core-it/README.txt Sun Sep 25 02:18:03 2005 @@ -188,6 +188,8 @@ it0067: Test activation of a profile from the command line. +it0070: Test a RAR generation. + --- - generated sources Modified: maven/components/trunk/maven-core-it/integration-tests.txt URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core-it/integration-tests.txt?rev=291397r1=291396r2=291397view=diff == --- maven/components/trunk/maven-core-it/integration-tests.txt (original) +++ maven/components/trunk/maven-core-it/integration-tests.txt Sun Sep 25 02:18:03 2005 @@ -1,3 +1,4 @@ +it0070 it0067 it0066 it0065 Added: maven/components/trunk/maven-core-it/it0070/expected-results.txt URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core-it/it0070/expected-results.txt?rev=291397view=auto == --- maven/components/trunk/maven-core-it/it0070/expected-results.txt (added) +++ maven/components/trunk/maven-core-it/it0070/expected-results.txt Sun Sep 25 02:18:03 2005 @@ -0,0 +1,3 @@ +target/maven-core-it0070-1.0.rar +target/maven-core-it0070-1.0.rar!/META-INF/ra.xml +target/maven-core-it0070-1.0.rar!/SomeResource.txt Added: maven/components/trunk/maven-core-it/it0070/goals.txt URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core-it/it0070/goals.txt?rev=291397view=auto == --- maven/components/trunk/maven-core-it/it0070/goals.txt (added) +++ maven/components/trunk/maven-core-it/it0070/goals.txt Sun Sep 25 02:18:03 2005 @@ -0,0 +1 @@ +package Added: maven/components/trunk/maven-core-it/it0070/pom.xml URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core-it/it0070/pom.xml?rev=291397view=auto == --- maven/components/trunk/maven-core-it/it0070/pom.xml (added) +++ maven/components/trunk/maven-core-it/it0070/pom.xml Sun Sep 25 02:18:03 2005 @@ -0,0 +1,20 @@ +model + modelVersion4.0.0/modelVersion + groupIdorg.apache.maven/groupId + artifactIdmaven-core-it0070/artifactId + packagingrar/packaging + version1.0/version + + build +plugins + plugin +groupIdorg.apache.maven.plugins/groupId +artifactIdmaven-rar-plugin/artifactId +configuration +includeJarfalse/includeJar +raXmlFilesrc/main/custom/ra.xml/raXmlFile +/configuration + /plugin +/plugins + /build +/model Added: maven/components/trunk/maven-core-it/it0070/src/main/custom/ra.xml URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core-it/it0070/src/main/custom/ra.xml?rev=291397view=auto == --- maven/components/trunk/maven-core-it/it0070/src/main/custom/ra.xml (added) +++ maven/components/trunk/maven-core-it/it0070/src/main/custom/ra.xml Sun Sep 25 02:18:03 2005 @@ -0,0 +1,4 @@ +?xml version=1.0 encoding=ISO-8859-1? +connector + fake-content/fake-content +/connector \ No newline at end of file Added: maven/components/trunk/maven-core-it/it0070/src/main/rar/SomeResource.txt URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core-it/it0070/src/main/rar/SomeResource.txt?rev=291397view=auto == (empty) - To unsubscribe, e-mail: [EMAIL PROTECTED
svn commit: r291288 - in /maven/components/trunk/maven-plugins/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear: AbstractEarMojo.java GenerateApplicationXmlMojo.java
Author: snicoll Date: Sat Sep 24 05:25:32 2005 New Revision: 291288 URL: http://svn.apache.org/viewcvs?rev=291288view=rev Log: missing : in id. Modified: maven/components/trunk/maven-plugins/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/AbstractEarMojo.java maven/components/trunk/maven-plugins/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/GenerateApplicationXmlMojo.java Modified: maven/components/trunk/maven-plugins/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/AbstractEarMojo.java URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/AbstractEarMojo.java?rev=291288r1=291287r2=291288view=diff == --- maven/components/trunk/maven-plugins/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/AbstractEarMojo.java (original) +++ maven/components/trunk/maven-plugins/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/AbstractEarMojo.java Sat Sep 24 05:25:32 2005 @@ -31,7 +31,7 @@ * A base class for EAR-processing related tasks. * * @author a href=[EMAIL PROTECTED]Stephane Nicoll/a - * @version $Id $ + * @version $Id: $ */ public abstract class AbstractEarMojo extends AbstractMojo Modified: maven/components/trunk/maven-plugins/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/GenerateApplicationXmlMojo.java URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/GenerateApplicationXmlMojo.java?rev=291288r1=291287r2=291288view=diff == --- maven/components/trunk/maven-plugins/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/GenerateApplicationXmlMojo.java (original) +++ maven/components/trunk/maven-plugins/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/GenerateApplicationXmlMojo.java Sat Sep 24 05:25:32 2005 @@ -26,7 +26,7 @@ * A Mojo used to build the application.xml file. * * @author a href=[EMAIL PROTECTED]Stephane Nicoll/a - * @version $Id $ + * @version $Id: $ * @goal generate-application-xml * @phase generate-resources * @requiresDependencyResolution test - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r291309 - in /maven/components/trunk/maven-plugins/maven-plugin-plugin: ./ src/main/java/org/apache/maven/plugin/plugin/ src/main/resources/
Author: snicoll
Date: Sat Sep 24 08:22:36 2005
New Revision: 291309
URL: http://svn.apache.org/viewcvs?rev=291309view=rev
Log:
MNG-706: Implemented plugin:xdoc as a report
Added:
maven/components/trunk/maven-plugins/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/PluginReport.java
maven/components/trunk/maven-plugins/maven-plugin-plugin/src/main/resources/
maven/components/trunk/maven-plugins/maven-plugin-plugin/src/main/resources/plugin-report_en.properties
maven/components/trunk/maven-plugins/maven-plugin-plugin/src/main/resources/plugin-report_fr.properties
Modified:
maven/components/trunk/maven-plugins/maven-plugin-plugin/pom.xml
Modified: maven/components/trunk/maven-plugins/maven-plugin-plugin/pom.xml
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-plugin-plugin/pom.xml?rev=291309r1=291308r2=291309view=diff
==
--- maven/components/trunk/maven-plugins/maven-plugin-plugin/pom.xml (original)
+++ maven/components/trunk/maven-plugins/maven-plugin-plugin/pom.xml Sat Sep 24
08:22:36 2005
@@ -21,6 +21,11 @@
version2.0-beta-2-SNAPSHOT/version
/dependency
dependency
+ groupIdorg.apache.maven.reporting/groupId
+ artifactIdmaven-reporting-impl/artifactId
+ version2.0-beta-1/version
+/dependency
+dependency
groupIdorg.apache.maven/groupId
artifactIdmaven-plugin-tools-java/artifactId
version2.0-beta-2-SNAPSHOT/version
Added:
maven/components/trunk/maven-plugins/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/PluginReport.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/PluginReport.java?rev=291309view=auto
==
---
maven/components/trunk/maven-plugins/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/PluginReport.java
(added)
+++
maven/components/trunk/maven-plugins/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/PluginReport.java
Sat Sep 24 08:22:36 2005
@@ -0,0 +1,235 @@
+package org.apache.maven.plugin.plugin;
+
+/*
+ * 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.
+ */
+
+import org.apache.maven.plugin.descriptor.InvalidPluginDescriptorException;
+import org.apache.maven.plugin.descriptor.MojoDescriptor;
+import org.apache.maven.plugin.descriptor.PluginDescriptor;
+import org.apache.maven.project.MavenProject;
+import org.apache.maven.reporting.AbstractMavenReport;
+import org.apache.maven.reporting.AbstractMavenReportRenderer;
+import org.apache.maven.reporting.MavenReportException;
+import org.apache.maven.tools.plugin.extractor.ExtractionException;
+import org.apache.maven.tools.plugin.generator.Generator;
+import org.apache.maven.tools.plugin.generator.PluginXdocGenerator;
+import org.apache.maven.tools.plugin.scanner.MojoScanner;
+import org.apache.maven.tools.plugin.util.PluginUtils;
+import org.codehaus.doxia.sink.Sink;
+import org.codehaus.doxia.site.renderer.SiteRenderer;
+import org.codehaus.plexus.util.StringUtils;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.Iterator;
+import java.util.Locale;
+import java.util.ResourceBundle;
+
+/**
+ * Generates the Plugin's documentation report.
+ *
+ * @author a href=[EMAIL PROTECTED]Stephane Nicoll/a
+ * @version $Id: EarMojo.java 267433 2005-09-03 07:34:07Z brett $
+ * @goal report
+ */
+public class PluginReport
+extends AbstractMavenReport
+{
+/**
+ * @parameter expression=${project.build.directory}/generated-site/xdoc
+ * @required
+ */
+private String outputDirectory;
+
+/**
+ * @parameter
expression=${component.org.codehaus.doxia.site.renderer.SiteRenderer}
+ * @required
+ * @readonly
+ */
+private SiteRenderer siteRenderer;
+
+/**
+ * @parameter expression=${project}
+ * @required
+ * @readonly
+ */
+private MavenProject project;
+
+/**
+ * @parameter
expression=${component.org.apache.maven.tools.plugin.scanner.MojoScanner}
+ * @required
+ */
+protected MojoScanner mojoScanner;
+
+protected SiteRenderer getSiteRenderer()
+{
+return siteRenderer;
+}
+
+protected String getOutputDirectory()
+{
+return
svn commit: r291315 - /maven/components/trunk/maven-plugins/maven-plugin-plugin/pom.xml
Author: snicoll Date: Sat Sep 24 08:32:57 2005 New Revision: 291315 URL: http://svn.apache.org/viewcvs?rev=291315view=rev Log: updated reporting-impl dependencies to beta-2-SNAPSHOT Modified: maven/components/trunk/maven-plugins/maven-plugin-plugin/pom.xml Modified: maven/components/trunk/maven-plugins/maven-plugin-plugin/pom.xml URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-plugin-plugin/pom.xml?rev=291315r1=291314r2=291315view=diff == --- maven/components/trunk/maven-plugins/maven-plugin-plugin/pom.xml (original) +++ maven/components/trunk/maven-plugins/maven-plugin-plugin/pom.xml Sat Sep 24 08:32:57 2005 @@ -23,7 +23,7 @@ dependency groupIdorg.apache.maven.reporting/groupId artifactIdmaven-reporting-impl/artifactId - version2.0-beta-1/version + version2.0-beta-2-SNAPSHOT/version /dependency dependency groupIdorg.apache.maven/groupId - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r291184 - in /maven/components/trunk/maven-plugins/maven-ear-plugin/src/site: apt/configuration-examples.apt apt/howto.apt apt/introduction.apt site.xml
Author: snicoll
Date: Fri Sep 23 11:23:33 2005
New Revision: 291184
URL: http://svn.apache.org/viewcvs?rev=291184view=rev
Log:
Updated web site documentation according to Johnny R. Ruiz III's work.
Added:
maven/components/trunk/maven-plugins/maven-ear-plugin/src/site/apt/howto.apt
(contents, props changed)
- copied, changed from r291180,
maven/components/trunk/maven-plugins/maven-ear-plugin/src/site/apt/configuration-examples.apt
maven/components/trunk/maven-plugins/maven-ear-plugin/src/site/apt/introduction.apt
maven/components/trunk/maven-plugins/maven-ear-plugin/src/site/site.xml
Removed:
maven/components/trunk/maven-plugins/maven-ear-plugin/src/site/apt/configuration-examples.apt
Copied:
maven/components/trunk/maven-plugins/maven-ear-plugin/src/site/apt/howto.apt
(from r291180,
maven/components/trunk/maven-plugins/maven-ear-plugin/src/site/apt/configuration-examples.apt)
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-ear-plugin/src/site/apt/howto.apt?p2=maven/components/trunk/maven-plugins/maven-ear-plugin/src/site/apt/howto.aptp1=maven/components/trunk/maven-plugins/maven-ear-plugin/src/site/apt/configuration-examples.aptr1=291180r2=291184rev=291184view=diff
==
---
maven/components/trunk/maven-plugins/maven-ear-plugin/src/site/apt/configuration-examples.apt
(original)
+++
maven/components/trunk/maven-plugins/maven-ear-plugin/src/site/apt/howto.apt
Fri Sep 23 11:23:33 2005
@@ -1,16 +1,16 @@
- ---
- Ear Plugin: configuration examples
- ---
- Stéphane Nicoll
- ---
- 07-Sep-2005
- ---
+ --
+ Maven 2 Ear Plugin: configuration examples
+ --
+ Stephane Nicoll
+ [EMAIL PROTECTED]
+ --
+ September 23, 2005
Introduction
The Ear plugin allows to generate automatically the descriptor deployment,
e.g.
- application.xml. This generation is already customized by basic configuration
- items, see TODO: ADD A LINK HERE.
+ application.xml. This generation is already customized by the goal's
parameters,
+ see {{{index.html}the goals description}}.
Ear modules might be further customized as follows:
Propchange:
maven/components/trunk/maven-plugins/maven-ear-plugin/src/site/apt/howto.apt
--
svn:eol-style = native
Propchange:
maven/components/trunk/maven-plugins/maven-ear-plugin/src/site/apt/howto.apt
--
svn:keywords = Author Date Id Revision
Added:
maven/components/trunk/maven-plugins/maven-ear-plugin/src/site/apt/introduction.apt
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-ear-plugin/src/site/apt/introduction.apt?rev=291184view=auto
==
---
maven/components/trunk/maven-plugins/maven-ear-plugin/src/site/apt/introduction.apt
(added)
+++
maven/components/trunk/maven-plugins/maven-ear-plugin/src/site/apt/introduction.apt
Fri Sep 23 11:23:33 2005
@@ -0,0 +1,17 @@
+ --
+ Maven 2 Ear Plugin
+ --
+ Stephane Nicoll
+ [EMAIL PROTECTED]
+ --
+ September 23, 2005
+
+Introduction
+
+ This plugin generates J2EE Enterprise Archive (EAR) file. It can also
generate the deployment
+ descriptor file (e.g. application.xml)
+
+ The full description of goals is available {{{index.html}here}}.
+
+
+
Added: maven/components/trunk/maven-plugins/maven-ear-plugin/src/site/site.xml
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-ear-plugin/src/site/site.xml?rev=291184view=auto
==
--- maven/components/trunk/maven-plugins/maven-ear-plugin/src/site/site.xml
(added)
+++ maven/components/trunk/maven-plugins/maven-ear-plugin/src/site/site.xml Fri
Sep 23 11:23:33 2005
@@ -0,0 +1,41 @@
+?xml version=1.0 encoding=ISO-8859-1?
+
+!--
+/*
+ * 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.
+ */
+--
+
+project name=Maven Ear Plugin
+ bannerLeft
+nameMaven Ear Plugin/name
+srchttp://maven.apache.org/images/apache-maven-project.png/src
+hrefhttp://maven.apache.org//href
+ /bannerLeft
+ bannerRight
+srchttp://maven.apache.org/images/maven-small.gif/src
+ /bannerRight
+ body
+links
+ item name=Maven
svn commit: r291188 - in /maven/components/trunk/maven-plugins/maven-war-plugin/src/site: ./ apt/ apt/howto.apt apt/introduction.apt site.xml
Author: snicoll
Date: Fri Sep 23 11:43:46 2005
New Revision: 291188
URL: http://svn.apache.org/viewcvs?rev=291188view=rev
Log:
MNG-853: added howto and web site doco for war plugin.
Added:
maven/components/trunk/maven-plugins/maven-war-plugin/src/site/
maven/components/trunk/maven-plugins/maven-war-plugin/src/site/apt/
maven/components/trunk/maven-plugins/maven-war-plugin/src/site/apt/howto.apt
maven/components/trunk/maven-plugins/maven-war-plugin/src/site/apt/introduction.apt
maven/components/trunk/maven-plugins/maven-war-plugin/src/site/site.xml
Added:
maven/components/trunk/maven-plugins/maven-war-plugin/src/site/apt/howto.apt
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-war-plugin/src/site/apt/howto.apt?rev=291188view=auto
==
---
maven/components/trunk/maven-plugins/maven-war-plugin/src/site/apt/howto.apt
(added)
+++
maven/components/trunk/maven-plugins/maven-war-plugin/src/site/apt/howto.apt
Fri Sep 23 11:43:46 2005
@@ -0,0 +1,35 @@
+ --
+ Maven 2 War Plugin: configuration examples
+ --
+ Stephane Nicoll
+ [EMAIL PROTECTED]
+ --
+ September 23, 2005
+
+Introduction
+
+ The War plugin allows to package the web application in different mode:
+
+ * war (default): generates the war artifact
+
+ * inplace: package the web application in the source tree
+
+ * exploded (deprecated): package an exploded web application
+
+ The packaging's mode is to be set in the plugin's configuration. For
instance,
+ to use the inplace mode configure your project as follows:
+
++
+ build
+plugins
+ plugin
+groupIdorg.apache.maven.plugins/groupId
+artifactIdmaven-war-plugin/artifactId
+configuration
+ modeinplace/mode
+/configuration
+ /plugin
+/plugins
+ /build
++-
+
Added:
maven/components/trunk/maven-plugins/maven-war-plugin/src/site/apt/introduction.apt
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-war-plugin/src/site/apt/introduction.apt?rev=291188view=auto
==
---
maven/components/trunk/maven-plugins/maven-war-plugin/src/site/apt/introduction.apt
(added)
+++
maven/components/trunk/maven-plugins/maven-war-plugin/src/site/apt/introduction.apt
Fri Sep 23 11:43:46 2005
@@ -0,0 +1,16 @@
+ --
+ Maven 2 Ear Plugin
+ --
+ Stephane Nicoll
+ [EMAIL PROTECTED]
+ --
+ September 23, 2005
+
+Introduction
+
+ This plugin generates Web application archive (WAR) file.
+
+ The full description of goals is available {{{index.html}here}}.
+
+
+
Added: maven/components/trunk/maven-plugins/maven-war-plugin/src/site/site.xml
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-war-plugin/src/site/site.xml?rev=291188view=auto
==
--- maven/components/trunk/maven-plugins/maven-war-plugin/src/site/site.xml
(added)
+++ maven/components/trunk/maven-plugins/maven-war-plugin/src/site/site.xml Fri
Sep 23 11:43:46 2005
@@ -0,0 +1,41 @@
+?xml version=1.0 encoding=ISO-8859-1?
+
+!--
+/*
+ * 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.
+ */
+--
+
+project name=Maven War Plugin
+ bannerLeft
+nameMaven War Plugin/name
+srchttp://maven.apache.org/images/apache-maven-project.png/src
+hrefhttp://maven.apache.org//href
+ /bannerLeft
+ bannerRight
+srchttp://maven.apache.org/images/maven-small.gif/src
+ /bannerRight
+ body
+links
+ item name=Maven 2 href=http://maven.apache.org/maven2//
+/links
+
+menu name=Overview
+ item name=Introduction href=introduction.html/
+ item name=How to Use href=howto.html/
+/menu
+${reports}
+ /body
+/project
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r290534 - in /maven/components/trunk/maven-plugins/maven-jar-plugin/src: main/java/org/apache/maven/plugin/jar/JarMojo.java site/ site/apt/ site/apt/howto.apt site/site.xml
Author: snicoll
Date: Tue Sep 20 12:22:03 2005
New Revision: 290534
URL: http://svn.apache.org/viewcvs?rev=290534view=rev
Log:
PR: MNG-858
Submitted by: Allan Ramirez
Reviewed by: Stephane Nicoll
Documentation of Jar plugin
Added:
maven/components/trunk/maven-plugins/maven-jar-plugin/src/site/
maven/components/trunk/maven-plugins/maven-jar-plugin/src/site/apt/
maven/components/trunk/maven-plugins/maven-jar-plugin/src/site/apt/howto.apt
maven/components/trunk/maven-plugins/maven-jar-plugin/src/site/site.xml
Modified:
maven/components/trunk/maven-plugins/maven-jar-plugin/src/main/java/org/apache/maven/plugin/jar/JarMojo.java
Modified:
maven/components/trunk/maven-plugins/maven-jar-plugin/src/main/java/org/apache/maven/plugin/jar/JarMojo.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-jar-plugin/src/main/java/org/apache/maven/plugin/jar/JarMojo.java?rev=290534r1=290533r2=290534view=diff
==
---
maven/components/trunk/maven-plugins/maven-jar-plugin/src/main/java/org/apache/maven/plugin/jar/JarMojo.java
(original)
+++
maven/components/trunk/maven-plugins/maven-jar-plugin/src/main/java/org/apache/maven/plugin/jar/JarMojo.java
Tue Sep 20 12:22:03 2005
@@ -25,6 +25,8 @@
import java.io.File;
/**
+ * Build a JAR from the current project.
+ *
* @author a href=[EMAIL PROTECTED]Emmanuel Venisse/a
* @version $Id$
* @goal jar
@@ -34,27 +36,33 @@
public class JarMojo
extends AbstractMojo
{
-
+
private static final String[] DEFAULT_EXCLUDES = new
String[]{**/package.html};
private static final String[] DEFAULT_INCLUDES = new String[]{**/**};
/**
- * @todo Change type to File
- *
+* Directory containing the generated JAR.
+ *
* @parameter expression=${project.build.directory}
* @required
* @readonly
+ *
+ * @todo Change type to File
*/
private String basedir;
/**
+* Name of the generated JAR.
+*
* @parameter alias=jarName expression=${project.build.finalName}
* @required
*/
private String finalName;
/**
+* Directory containing the classes.
+*
* @parameter expression=${project.build.outputDirectory}
* @required
* @readonly
@@ -62,6 +70,8 @@
private String outputDirectory;
/**
+* The maven project.
+*
* @parameter expression=${project}
* @required
* @readonly
@@ -69,11 +79,15 @@
private MavenProject project;
/**
+ * The maven archiver to use.
+ *
* @parameter
*/
private MavenArchiveConfiguration archive = new
MavenArchiveConfiguration();
/**
+* Generates the JAR.
+ *
* @todo Add license files in META-INF directory.
*/
public void execute()
@@ -107,5 +121,4 @@
throw new MojoExecutionException( Error assembling JAR, e );
}
}
-
}
Added:
maven/components/trunk/maven-plugins/maven-jar-plugin/src/site/apt/howto.apt
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-jar-plugin/src/site/apt/howto.apt?rev=290534view=auto
==
---
maven/components/trunk/maven-plugins/maven-jar-plugin/src/site/apt/howto.apt
(added)
+++
maven/components/trunk/maven-plugins/maven-jar-plugin/src/site/apt/howto.apt
Tue Sep 20 12:22:03 2005
@@ -0,0 +1,20 @@
+ --
+ Maven 2 JAR Plugin
+ --
+
+Maven 2 JAR Plugin
+
+ Builds your project into a jar
+
+*How to Use
+
+ If the packaging of your project is set to 'jar', this plugin is executed
+ whenever it passes the package phase. Have it executed
+ using the command below from your project:
+
+---
+ m2 package
+---
+
+ From your project's target directory you'll able to see the generated jar
file.
+
Added: maven/components/trunk/maven-plugins/maven-jar-plugin/src/site/site.xml
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-jar-plugin/src/site/site.xml?rev=290534view=auto
==
--- maven/components/trunk/maven-plugins/maven-jar-plugin/src/site/site.xml
(added)
+++ maven/components/trunk/maven-plugins/maven-jar-plugin/src/site/site.xml Tue
Sep 20 12:22:03 2005
@@ -0,0 +1,21 @@
+project name=Maven JAR plugin
+ bannerLeft
+nameMaven JAR plugin/name
+srchttp://maven.apache.org/images/apache-maven-project.png/src
+hrefhttp://maven.apache.org//href
+ /bannerLeft
+ bannerRight
+srchttp://maven.apache.org/images/maven-small.gif/src
+ /bannerRight
+ body
+links
+ item name=Maven 2 href=http://maven.apache.org/maven2//
+/links
+
+menu name=Maven JAR Quickstart
+ item name=Overview href=howto.html/
+/menu
+${reports
svn commit: r280096 - /maven/components/trunk/maven-plugins/maven-ejb-plugin/src/main/java/org/apache/maven/plugin/ejb/EjbMojo.java
Author: snicoll
Date: Sun Sep 11 01:43:37 2005
New Revision: 280096
URL: http://svn.apache.org/viewcvs?rev=280096view=rev
Log:
MNG-852: added Javadoc and parameter's documentation.
Modified:
maven/components/trunk/maven-plugins/maven-ejb-plugin/src/main/java/org/apache/maven/plugin/ejb/EjbMojo.java
Modified:
maven/components/trunk/maven-plugins/maven-ejb-plugin/src/main/java/org/apache/maven/plugin/ejb/EjbMojo.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-ejb-plugin/src/main/java/org/apache/maven/plugin/ejb/EjbMojo.java?rev=280096r1=280095r2=280096view=diff
==
---
maven/components/trunk/maven-plugins/maven-ejb-plugin/src/main/java/org/apache/maven/plugin/ejb/EjbMojo.java
(original)
+++
maven/components/trunk/maven-plugins/maven-ejb-plugin/src/main/java/org/apache/maven/plugin/ejb/EjbMojo.java
Sun Sep 11 01:43:37 2005
@@ -26,6 +26,8 @@
import java.io.File;
/**
+ * Build an EJB (and optional client) from the current project.
+ *
* @author a href=[EMAIL PROTECTED]Emmanuel Venisse/a
* @version $Id$
* @goal ejb
@@ -38,35 +40,48 @@
// TODO: will null work instead?
private static final String[] DEFAULT_INCLUDES = new String[]{**/**};
-private static final String[] DEFAULT_EXCLUDES = new
String[]{**/*Bean.class, **/*CMP.class, **/*Session.class,
**/package.html};
+private static final String[] DEFAULT_EXCLUDES = new
String[]{**/*Bean.class, **/*CMP.class,
+**/*Session.class, **/package.html};
/**
- * @todo File instead
+ * The directory for the generated EJB.
+ *
* @parameter expression=${project.build.directory}
* @required
* @readonly
+ * @todo use File instead
*/
private String basedir;
/**
+ * Directory that resources are copied to during the build.
+ *
* @parameter expression=${project.build.outputDirectory}
* @required
*/
private String outputDirectory;
/**
+ * The name of the EJB file to generate.
+ *
* @parameter expression=${project.build.finalName}
* @required
+ * @deprecated Please use the finalName element of build instead
*/
private String jarName;
/**
- * @todo boolean instead
+ * Whether the ejb client jar should be generated or not. Default
+ * is false.
+ *
* @parameter
+ * @todo boolean instead
*/
private String generateClient = Boolean.FALSE.toString();
/**
+ * The maven project.
+ *
* @parameter expression=${project}
* @required
* @readonly
@@ -74,6 +89,8 @@
private MavenProject project;
/**
+ * The maven project's helper.
+ *
* @parameter
expression=${component.org.apache.maven.project.MavenProjectHelper}
* @required
* @readonly
@@ -81,11 +98,15 @@
private MavenProjectHelper projectHelper;
/**
+ * The maven archiver to use.
+ *
* @parameter
*/
private MavenArchiveConfiguration archive = new
MavenArchiveConfiguration();
/**
+ * Generates an ejb jar and optionnaly an ejb-client jar.
+ *
* @todo Add license files in META-INF directory.
*/
public void execute()
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r279847 - /maven/components/trunk/maven-plugins/maven-idea-plugin/src/main/java/org/apache/maven/plugin/idea/IdeaMojo.java
Author: snicoll
Date: Fri Sep 9 12:19:39 2005
New Revision: 279847
URL: http://svn.apache.org/viewcvs?rev=279847view=rev
Log:
MNG-420: provides a default jdkName based on the java.version system property.
Modified:
maven/components/trunk/maven-plugins/maven-idea-plugin/src/main/java/org/apache/maven/plugin/idea/IdeaMojo.java
Modified:
maven/components/trunk/maven-plugins/maven-idea-plugin/src/main/java/org/apache/maven/plugin/idea/IdeaMojo.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-idea-plugin/src/main/java/org/apache/maven/plugin/idea/IdeaMojo.java?rev=279847r1=279846r2=279847view=diff
==
---
maven/components/trunk/maven-plugins/maven-idea-plugin/src/main/java/org/apache/maven/plugin/idea/IdeaMojo.java
(original)
+++
maven/components/trunk/maven-plugins/maven-idea-plugin/src/main/java/org/apache/maven/plugin/idea/IdeaMojo.java
Fri Sep 9 12:19:39 2005
@@ -136,11 +136,14 @@
// Set the jdk name if set
if ( jdkName != null )
{
-setJdkName( module );
+setJdkName( module, jdkName );
}
else
{
-getLog().warn( jdkName is not set, you will have to set the
JDK to use in IDEA. );
+String javaVersion = System.getProperty( java.version );
+String defaultJdkName = java version + javaVersion;
+getLog().info( jdkName is not set, using[ + defaultJdkName +
] as default. );
+setJdkName( module, defaultJdkName );
}
Xpp3Dom component = findComponent( module, ProjectModuleManager
);
@@ -365,7 +368,7 @@
element.setAttribute( url, getModuleFileUrl( warSrc ) );
}
-private void setJdkName( Xpp3Dom content )
+private void setJdkName( Xpp3Dom content, String jdkName )
{
Xpp3Dom component = findComponent( content, ProjectRootManager );
component.setAttribute( project-jdk-name, jdkName );
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r279376 - in /maven/components/trunk/maven-plugins/maven-ear-plugin/src: main/java/org/apache/maven/plugin/ear/JavaModule.java site/apt/configuration-examples.apt
Author: snicoll
Date: Wed Sep 7 09:37:45 2005
New Revision: 279376
URL: http://svn.apache.org/viewcvs?rev=279376view=rev
Log:
MNG-826:
- Jar dependencies are not included in the generated application.xml ; Hence
'library' is the default behavior and has been removed
- Added includeInApplicationXml property on JavaModule to allow it to be
included in the generated application.xml
Modified:
maven/components/trunk/maven-plugins/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/JavaModule.java
maven/components/trunk/maven-plugins/maven-ear-plugin/src/site/apt/configuration-examples.apt
Modified:
maven/components/trunk/maven-plugins/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/JavaModule.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/JavaModule.java?rev=279376r1=279375r2=279376view=diff
==
---
maven/components/trunk/maven-plugins/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/JavaModule.java
(original)
+++
maven/components/trunk/maven-plugins/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/JavaModule.java
Wed Sep 7 09:37:45 2005
@@ -30,7 +30,7 @@
{
protected static final String JAVA_MODULE = java;
-private Boolean library = Boolean.FALSE;
+private Boolean includeInApplicationXml = Boolean.FALSE;
public JavaModule()
{
@@ -43,9 +43,10 @@
public void appendModule( XMLWriter writer, String version )
{
-// Generates an entry in the application.xml only if this
-// module is not a library
-if (!isLibrary()) {
+// Generates an entry in the application.xml only if
+// includeInApplicationXml is set
+if ( includeInApplicationXml.booleanValue() )
+{
writer.startElement( MODULE_ELEMENT );
writer.startElement( JAVA_MODULE );
writer.writeText( getUri() );
@@ -57,18 +58,5 @@
protected String getType()
{
return jar;
-}
-
-/**
- * Specify whether this Java module is a third party library or not.
- * p/
- * If tttrue/tt, the module will not be included in the generated
- * ttapplication.xml/tt.
- *
- * @return true if the module is a third party library, false otherwise
- */
-public boolean isLibrary()
-{
-return library.booleanValue();
}
}
Modified:
maven/components/trunk/maven-plugins/maven-ear-plugin/src/site/apt/configuration-examples.apt
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-ear-plugin/src/site/apt/configuration-examples.apt?rev=279376r1=279375r2=279376view=diff
==
---
maven/components/trunk/maven-plugins/maven-ear-plugin/src/site/apt/configuration-examples.apt
(original)
+++
maven/components/trunk/maven-plugins/maven-ear-plugin/src/site/apt/configuration-examples.apt
Wed Sep 7 09:37:45 2005
@@ -3,7 +3,7 @@
---
Stéphane Nicoll
---
- 15-Aug-2005
+ 07-Sep-2005
---
Introduction
@@ -25,8 +25,10 @@
Also, a dependency might be excluded from the generated EAR file by
specifying the
excluded flag.
- Finally, third party libraries are handled by setting the library flag. If
this flag
- is set, the module is not included in the generated application.xml
+ Please note that third party libraries are not included in the generated
+ application.xml (only ejb-client should be included in a java entry).
However, a
+ jar dependency could be included in the generated application.xml by
specifying the
+ includeInApplicationXml flag.
Customizing the context root
@@ -157,11 +159,10 @@
/build
+-
-Declaring a module as a third party library
+Including a third party library in the generated application.xml
- If third party libraries need to be included in an EAR file, the 'library'
flag could be
- used. Note that no entry in the application.xml will be created for such
module. This
- flag works only for java modules.
+ If third party libraries need to be included in the generated
application.xml, the
+ 'includeInApplicationXml' flag could be used. This flag works only for java
modules.
+
build
@@ -175,7 +176,7 @@
javaModule
groupIdartifactGroupId/groupId
artifactIdartifactId/artifactId
- librarytrue/library
+ includeInApplicationXmltrue/includeInApplicationXml
/javaModule
/modules
/configuration
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r279403 - /maven/components/trunk/maven-plugins/pom.xml
Author: snicoll Date: Wed Sep 7 12:30:51 2005 New Revision: 279403 URL: http://svn.apache.org/viewcvs?rev=279403view=rev Log: updated developers section. Modified: maven/components/trunk/maven-plugins/pom.xml Modified: maven/components/trunk/maven-plugins/pom.xml URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/pom.xml?rev=279403r1=279402r2=279403view=diff == --- maven/components/trunk/maven-plugins/pom.xml (original) +++ maven/components/trunk/maven-plugins/pom.xml Wed Sep 7 12:30:51 2005 @@ -61,6 +61,16 @@ roleJava Developer/role /roles /developer +developer + idsnicoll/id + nameStephane Nicoll/name + email[EMAIL PROTECTED]/email + organizationASF/organization + roles +roleJava Developer/role + /roles + timezone+1/timezone +/developer /developers dependencies dependency - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r234462 - /maven/components/trunk/maven-plugins/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/EarMojo.java
Author: snicoll
Date: Mon Aug 22 03:08:55 2005
New Revision: 234462
URL: http://svn.apache.org/viewcvs?rev=234462view=rev
Log:
Now allowing custom manifest file to be set in the generated EAR file.
Modified:
maven/components/trunk/maven-plugins/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/EarMojo.java
Modified:
maven/components/trunk/maven-plugins/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/EarMojo.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/EarMojo.java?rev=234462r1=234461r2=234462view=diff
==
---
maven/components/trunk/maven-plugins/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/EarMojo.java
(original)
+++
maven/components/trunk/maven-plugins/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/EarMojo.java
Mon Aug 22 03:08:55 2005
@@ -50,7 +50,6 @@
* The location of the manifest file to be used within the ear file.
*
* @parameter
expression=${basedir}/src/main/application/META-INF/MANIFEST.MF
- * @TODO handle this field
*/
private String manifestLocation;
@@ -113,7 +112,7 @@
if ( !sourceFile.isFile() )
{
-throw new MojoExecutionException( Cannot copy a
directory: + sourceFile.getAbsolutePath() +
+throw new MojoExecutionException( Cannot copy a
directory: + sourceFile.getAbsolutePath() +
; Did you package/install +
module.getArtifact().getId() + ? );
}
@@ -154,6 +153,9 @@
MavenArchiver archiver = new MavenArchiver();
archiver.setOutputFile( earFile );
+// Include custom manifest if necessary
+includeCustomManifestFile();
+
archiver.getArchiver().addDirectory( getBuildDir() );
archiver.createArchive( getProject(), archive );
@@ -168,5 +170,19 @@
private static File buildDestinationFile( File buildDir, String uri )
{
return new File( buildDir, uri );
+}
+
+private void includeCustomManifestFile()
+{
+File customManifestFile = new File( manifestLocation );
+if ( !customManifestFile.exists() )
+{
+// Does not exist so will use default
+}
+else
+{
+getLog().info( Including custom manifest file[ +
customManifestFile + ] );
+archive.setManifestFile( customManifestFile );
+}
}
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
