svn commit: r291492 - /maven/components/trunk/maven-site/pom.xml
Author: trygvis Date: Sun Sep 25 16:28:02 2005 New Revision: 291492 URL: http://svn.apache.org/viewcvs?rev=291492&view=rev Log: o Woops, this shouldn't have been removed in the first place. Modified: maven/components/trunk/maven-site/pom.xml Modified: maven/components/trunk/maven-site/pom.xml URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-site/pom.xml?rev=291492&r1=291491&r2=291492&view=diff == --- maven/components/trunk/maven-site/pom.xml (original) +++ maven/components/trunk/maven-site/pom.xml Sun Sep 25 16:28:02 2005 @@ -17,6 +17,7 @@ +true - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r291490 - in /maven/components/trunk/maven-site: ./ src/site/apt/guides/getting-started/ src/site/apt/guides/getting-started/background/
Author: trygvis
Date: Sun Sep 25 16:24:29 2005
New Revision: 291490
URL: http://svn.apache.org/viewcvs?rev=291490&view=rev
Log:
o Adding some notes.
Modified:
maven/components/trunk/maven-site/pom.xml
maven/components/trunk/maven-site/src/site/apt/guides/getting-started/background/philosophy-of-maven.apt
maven/components/trunk/maven-site/src/site/apt/guides/getting-started/index.apt
maven/components/trunk/maven-site/src/site/apt/guides/getting-started/introduction-to-the-lifecycle.apt
maven/components/trunk/maven-site/src/site/apt/guides/getting-started/releasing.apt
Modified: maven/components/trunk/maven-site/pom.xml
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-site/pom.xml?rev=291490&r1=291489&r2=291490&view=diff
==
--- maven/components/trunk/maven-site/pom.xml (original)
+++ maven/components/trunk/maven-site/pom.xml Sun Sep 25 16:24:29 2005
@@ -17,7 +17,6 @@
-true
Modified:
maven/components/trunk/maven-site/src/site/apt/guides/getting-started/background/philosophy-of-maven.apt
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-site/src/site/apt/guides/getting-started/background/philosophy-of-maven.apt?rev=291490&r1=291489&r2=291490&view=diff
==
---
maven/components/trunk/maven-site/src/site/apt/guides/getting-started/background/philosophy-of-maven.apt
(original)
+++
maven/components/trunk/maven-site/src/site/apt/guides/getting-started/background/philosophy-of-maven.apt
Sun Sep 25 16:24:29 2005
@@ -7,3 +7,5 @@
--
Philosophy of Maven
+
+~~I had a couple of slides on this in my javaZone presentation - trygve
Modified:
maven/components/trunk/maven-site/src/site/apt/guides/getting-started/index.apt
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-site/src/site/apt/guides/getting-started/index.apt?rev=291490&r1=291489&r2=291490&view=diff
==
---
maven/components/trunk/maven-site/src/site/apt/guides/getting-started/index.apt
(original)
+++
maven/components/trunk/maven-site/src/site/apt/guides/getting-started/index.apt
Sun Sep 25 16:24:29 2005
@@ -12,8 +12,8 @@
a cookbook with self-contained references and solutions for common usecases.
For the first time user it is suggested that
you step through the material in a sequential fashion, but for users more
familiar with Maven the guide endeavours
to provide a quick solution for the need at hand. It is assumed at this point
that you have downloaded Maven and
- installed Maven on your local machine. If you have not done so please refer
to the {{{../download.html}}Download and
- Installation} instructions.
+ installed Maven on your local machine. If you have not done so please refer
to the
+ {{{../download.html}}Download and Installation} instructions.
* What is Maven?
@@ -30,8 +30,6 @@
* Managing releases
- * Managing releases
-
If you want to know about the Maven itself you can check out
{{{../philosophy-of-maven.html}}The Philosophy of Maven} and
the {{{../history-of-maven.html}}The History of Maven}. Now we want to move
on to why you, the user, can benefit from
using Maven.
@@ -242,7 +240,7 @@
~~* How do I deploy my jar in my remote repository?
-~~* How do I deploy my jar in IBiblio?
+~~* How do I deploy my jar in Ibiblio?
~~* How do I create documentation?
~~ o Explain the different formats APT/xdoc/docbook/FAQML
@@ -313,11 +311,12 @@
System vars are accessed implicitly in m2...try:
++-+
+
-~ ${build.debug}
-~ ${build.jdk}
-~ ${build.jdk}
+ ${build.debug}
+ ${build.jdk}
+ ${build.jdk}
-
-+-+
\ No newline at end of file
++-+
Modified:
maven/components/trunk/maven-site/src/site/apt/guides/getting-started/introduction-to-the-lifecycle.apt
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-site/src/site/apt/guides/getting-started/introduction-to-the-lifecycle.apt?rev=291490&r1=291489&r2=291490&view=diff
==
---
maven/components/trunk/maven-site/src/site/apt/guides/getting-started/introduction-to-the-lifecycle.apt
(original)
+++
maven/components/trunk/maven-site/src/site/apt/guides/getting-started/introduction-to-the-lifecycle.apt
Sun Sep 25 16:24:29 2005
@@ -8,4 +8,6 @@
Introduction to the Lifecycle
-The content from the current lifecycle document will be incorporated here.
\ No newline at end of file
+The content from the current lifecycle document will be incorporated here.
+
+~~How do I make my own lifecycle
Modified:
maven/components/trunk/maven-site/src/site/apt/guides/getting-started/releasing.apt
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-site/src/site/ap
svn commit: r291037 - /maven/maven-1/core/trunk/xdocs/using/bestpractices.xml
Author: trygvis Date: Thu Sep 22 16:27:56 2005 New Revision: 291037 URL: http://svn.apache.org/viewcvs?rev=291037&view=rev Log: o Adding a 'getting ready to maven 2' section. Modified: maven/maven-1/core/trunk/xdocs/using/bestpractices.xml Modified: maven/maven-1/core/trunk/xdocs/using/bestpractices.xml URL: http://svn.apache.org/viewcvs/maven/maven-1/core/trunk/xdocs/using/bestpractices.xml?rev=291037&r1=291036&r2=291037&view=diff == --- maven/maven-1/core/trunk/xdocs/using/bestpractices.xml (original) +++ maven/maven-1/core/trunk/xdocs/using/bestpractices.xml Thu Sep 22 16:27:56 2005 @@ -225,6 +225,27 @@ artifact of its own, and depend on that from your other projects. + + + Dependency Scopes: Maven 2 has a concept of + scopes which are used to control + when and where the dependencies are used in terms of e.g. the compile, test and runtime class paths. Maven + 1 doesn't have this concept but it's still useful for include this information when adding dependencies to + your project. It will be useful when you (possibly) convert your project to Maven 2 and if your repository + is ever converted to a Maven 2 repository the Maven 2 POMs will include dependencies with the correct scope. + + + To set the scope on your dependency use the scope tag like this: + + + - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r290499 - /maven/components/trunk/pom.xml
Author: trygvis Date: Tue Sep 20 11:05:03 2005 New Revision: 290499 URL: http://svn.apache.org/viewcvs?rev=290499&view=rev Log: o Adding the Apache announce list. Modified: maven/components/trunk/pom.xml Modified: maven/components/trunk/pom.xml URL: http://svn.apache.org/viewcvs/maven/components/trunk/pom.xml?rev=290499&r1=290498&r2=290499&view=diff == --- maven/components/trunk/pom.xml (original) +++ maven/components/trunk/pom.xml Tue Sep 20 11:05:03 2005 @@ -36,6 +36,13 @@ dev@maven.apache.org http://mail-archives.apache.org/mod_mbox/maven-dev + + Apache Announce List + [EMAIL PROTECTED] + [EMAIL PROTECTED] + announce@apache.org + mail-archives.apache.org/mod_mbox/www-announce/ + @@ -214,4 +221,4 @@ scp://minotaur.apache.org/www/maven.apache.org/maven2/ - \ No newline at end of file + - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r290430 - /maven/components/trunk/maven-site/src/site/apt/site.apt
Author: trygvis Date: Tue Sep 20 05:13:06 2005 New Revision: 290430 URL: http://svn.apache.org/viewcvs?rev=290430&view=rev Log: Fixing MNG-931: "In site.html, extra images are said to be available via resources/images". o Patch by Yann Le Du. Modified: maven/components/trunk/maven-site/src/site/apt/site.apt Modified: maven/components/trunk/maven-site/src/site/apt/site.apt URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-site/src/site/apt/site.apt?rev=290430&r1=290429&r2=290430&view=diff == --- maven/components/trunk/maven-site/src/site/apt/site.apt (original) +++ maven/components/trunk/maven-site/src/site/apt/site.apt Tue Sep 20 05:13:06 2005 @@ -149,8 +149,7 @@ The file <<>> will be added to the default XHTML output, so can be used to adjust the default Maven stylesheets if desired. - The file <<>> will be available via a relative reference to the - <<>> directory from any page in your site. + The file <<>> will be available via a relative reference to the <<>> directory from any page in your site. * Configuring Reports - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r289629 - /maven/components/trunk/maven-site/src/site/xdoc/dependency-mechanism.xml
Author: trygvis Date: Fri Sep 16 11:41:35 2005 New Revision: 289629 URL: http://svn.apache.org/viewcvs?rev=289629&view=rev Log: (empty) Modified: maven/components/trunk/maven-site/src/site/xdoc/dependency-mechanism.xml Modified: maven/components/trunk/maven-site/src/site/xdoc/dependency-mechanism.xml URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-site/src/site/xdoc/dependency-mechanism.xml?rev=289629&r1=289628&r2=289629&view=diff == --- maven/components/trunk/maven-site/src/site/xdoc/dependency-mechanism.xml (original) +++ maven/components/trunk/maven-site/src/site/xdoc/dependency-mechanism.xml Fri Sep 16 11:41:35 2005 @@ -203,33 +203,35 @@ And then the two child poms would become much simpler: - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r289576 - /maven/components/trunk/maven-site/src/site/apt/developers/development-guide.apt
Author: trygvis Date: Fri Sep 16 08:20:14 2005 New Revision: 289576 URL: http://svn.apache.org/viewcvs?rev=289576&view=rev Log: o Fixing a couple of typos, thanks to Julien Kirch. Modified: maven/components/trunk/maven-site/src/site/apt/developers/development-guide.apt Modified: maven/components/trunk/maven-site/src/site/apt/developers/development-guide.apt URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-site/src/site/apt/developers/development-guide.apt?rev=289576&r1=289575&r2=289576&view=diff == --- maven/components/trunk/maven-site/src/site/apt/developers/development-guide.apt (original) +++ maven/components/trunk/maven-site/src/site/apt/developers/development-guide.apt Fri Sep 16 08:20:14 2005 @@ -53,7 +53,7 @@ * Creating and submitting a patch When you have either completed an issue or just want some feedback on the work you have done, create a patch - and attache the patch to the issue in question. We have a couple of guidelines when creating patches: + and attach the patch to the issue in question. We have a couple of guidelines when creating patches: * Always create the patch from the root of the maven project, i.e. where the pom.xml file is. @@ -132,7 +132,7 @@ * Plexus - Plexus is a full-fledged container supporting different cinds of component lifecycles. It's native lifecycle + Plexus is a full-fledged container supporting different kinds of component lifecycles. It's native lifecycle is like any other modern IoC container, using field injection of both requirements and configuration. All core Maven 2 functionality are Plexus components. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r279318 - in /maven/components/trunk/maven-plugins/maven-source-plugin/src: main/java/org/apache/maven/plugin/source/ test/java/org/apache/maven/plugin/source/
Author: trygvis
Date: Wed Sep 7 06:12:56 2005
New Revision: 279318
URL: http://svn.apache.org/viewcvs?rev=279318&view=rev
Log:
o Adding licenses.
Modified:
maven/components/trunk/maven-plugins/maven-source-plugin/src/main/java/org/apache/maven/plugin/source/JarSourceMojo.java
maven/components/trunk/maven-plugins/maven-source-plugin/src/main/java/org/apache/maven/plugin/source/SourceBundler.java
maven/components/trunk/maven-plugins/maven-source-plugin/src/test/java/org/apache/maven/plugin/source/SourceBundlerTest.java
Modified:
maven/components/trunk/maven-plugins/maven-source-plugin/src/main/java/org/apache/maven/plugin/source/JarSourceMojo.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-source-plugin/src/main/java/org/apache/maven/plugin/source/JarSourceMojo.java?rev=279318&r1=279317&r2=279318&view=diff
==
---
maven/components/trunk/maven-plugins/maven-source-plugin/src/main/java/org/apache/maven/plugin/source/JarSourceMojo.java
(original)
+++
maven/components/trunk/maven-plugins/maven-source-plugin/src/main/java/org/apache/maven/plugin/source/JarSourceMojo.java
Wed Sep 7 06:12:56 2005
@@ -1,7 +1,7 @@
package org.apache.maven.plugin.source;
/*
- * Copyright 2001-2004 The Apache Software Foundation.
+ * Copyright 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.
@@ -38,7 +38,6 @@
public class JarSourceMojo
extends AbstractMojo
{
-
/**
* @deprecated ICK! This needs to be generalized OUTSIDE of this mojo!
*/
@@ -52,7 +51,7 @@
BANNED_PACKAGINGS = banned;
}
-
+
/**
* @parameter expression="${project}"
* @readonly
Modified:
maven/components/trunk/maven-plugins/maven-source-plugin/src/main/java/org/apache/maven/plugin/source/SourceBundler.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-source-plugin/src/main/java/org/apache/maven/plugin/source/SourceBundler.java?rev=279318&r1=279317&r2=279318&view=diff
==
---
maven/components/trunk/maven-plugins/maven-source-plugin/src/main/java/org/apache/maven/plugin/source/SourceBundler.java
(original)
+++
maven/components/trunk/maven-plugins/maven-source-plugin/src/main/java/org/apache/maven/plugin/source/SourceBundler.java
Wed Sep 7 06:12:56 2005
@@ -1,5 +1,21 @@
package org.apache.maven.plugin.source;
+/*
+ * Copyright 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.codehaus.plexus.archiver.Archiver;
import java.io.File;
Modified:
maven/components/trunk/maven-plugins/maven-source-plugin/src/test/java/org/apache/maven/plugin/source/SourceBundlerTest.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-source-plugin/src/test/java/org/apache/maven/plugin/source/SourceBundlerTest.java?rev=279318&r1=279317&r2=279318&view=diff
==
---
maven/components/trunk/maven-plugins/maven-source-plugin/src/test/java/org/apache/maven/plugin/source/SourceBundlerTest.java
(original)
+++
maven/components/trunk/maven-plugins/maven-source-plugin/src/test/java/org/apache/maven/plugin/source/SourceBundlerTest.java
Wed Sep 7 06:12:56 2005
@@ -1,5 +1,21 @@
package org.apache.maven.plugin.source;
+/*
+ * Copyright 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.codehaus.plexus.PlexusTestCase;
import org.codehaus.plexus.archiver.Archiver;
---
svn commit: r279299 - /maven/components/trunk/maven-plugins/maven-source-plugin/
Author: trygvis Date: Wed Sep 7 04:24:27 2005 New Revision: 279299 URL: http://svn.apache.org/viewcvs?rev=279299&view=rev Log: o Setting svn:ignore. Modified: maven/components/trunk/maven-plugins/maven-source-plugin/ (props changed) Propchange: maven/components/trunk/maven-plugins/maven-source-plugin/ -- --- svn:ignore (original) +++ svn:ignore Wed Sep 7 04:24:27 2005 @@ -1,5 +1,8 @@ -*.iml -target target -.project +*~ +*.log .classpath +.project +*.ipr +*.iws +*.iml - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r278994 - /maven/components/trunk/maven-plugins/maven-ear-plugin/
Author: trygvis Date: Tue Sep 6 06:04:13 2005 New Revision: 278994 URL: http://svn.apache.org/viewcvs?rev=278994&view=rev Log: o Setting svn:ignore. Modified: maven/components/trunk/maven-plugins/maven-ear-plugin/ (props changed) Propchange: maven/components/trunk/maven-plugins/maven-ear-plugin/ -- --- svn:ignore (original) +++ svn:ignore Tue Sep 6 06:04:13 2005 @@ -1,5 +1,8 @@ target -*.iws +*~ +*.log +.classpath +.project *.ipr +*.iws *.iml -target - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r278793 - /maven/components/trunk/maven-site/src/site/fml/general.fml
Author: trygvis Date: Mon Sep 5 09:34:28 2005 New Revision: 278793 URL: http://svn.apache.org/viewcvs?rev=278793&view=rev Log: Fixing MNG-837: "faq entry for how to load a jar into your local repository". o Thanks to Matthew Pocock for the patch. Modified: maven/components/trunk/maven-site/src/site/fml/general.fml Modified: maven/components/trunk/maven-site/src/site/fml/general.fml URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-site/src/site/fml/general.fml?rev=278793&r1=278792&r2=278793&view=diff == --- maven/components/trunk/maven-site/src/site/fml/general.fml (original) +++ maven/components/trunk/maven-site/src/site/fml/general.fml Mon Sep 5 09:34:28 2005 @@ -122,5 +122,39 @@ + + + I have a jar that I want to put into my local repository. How can I copy it in? + + + If you understand the layout of the maven repository, you can copy the jar directly into where it + is meant to go. Maven will find this file next time it is run. + + + + If you are not confident about the layout of the maven repository, then you can + adapt the following command to load in your jar file, all on one line. + + + + + + This should load in the file into the maven repository, renaming it as needed. + + + - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r278605 - in /maven/components/trunk: maven-artifact/src/main/java/org/apache/maven/artifact/repository/layout/ maven-artifact/src/main/java/org/apache/maven/artifact/transform/ maven-plugins/maven-checkstyle-plugin/src/main/java/org/apache...
Author: trygvis Date: Sun Sep 4 08:56:52 2005 New Revision: 278605 URL: http://svn.apache.org/viewcvs?rev=278605&view=rev Log: o Adding newline at end of file. Modified: maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/repository/layout/ArtifactRepositoryLayout.java maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/repository/layout/DefaultRepositoryLayout.java maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/repository/layout/LegacyRepositoryLayout.java maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/transform/ArtifactTransformation.java maven/components/trunk/maven-plugins/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleReport.java maven/components/trunk/maven-repository-metadata/src/main/mdo/plugins.mdo Modified: maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/repository/layout/ArtifactRepositoryLayout.java URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/repository/layout/ArtifactRepositoryLayout.java?rev=278605&r1=278604&r2=278605&view=diff == --- maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/repository/layout/ArtifactRepositoryLayout.java (original) +++ maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/repository/layout/ArtifactRepositoryLayout.java Sun Sep 4 08:56:52 2005 @@ -32,4 +32,4 @@ String pathOfLocalRepositoryMetadata( ArtifactMetadata metadata, ArtifactRepository repository ); String pathOfRemoteRepositoryMetadata( ArtifactMetadata metadata ); -} \ No newline at end of file +} Modified: maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/repository/layout/DefaultRepositoryLayout.java URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/repository/layout/DefaultRepositoryLayout.java?rev=278605&r1=278604&r2=278605&view=diff == --- maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/repository/layout/DefaultRepositoryLayout.java (original) +++ maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/repository/layout/DefaultRepositoryLayout.java Sun Sep 4 08:56:52 2005 @@ -92,4 +92,4 @@ return directory.replace( GROUP_SEPARATOR, PATH_SEPARATOR ); } -} \ No newline at end of file +} Modified: maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/repository/layout/LegacyRepositoryLayout.java URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/repository/layout/LegacyRepositoryLayout.java?rev=278605&r1=278604&r2=278605&view=diff == --- maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/repository/layout/LegacyRepositoryLayout.java (original) +++ maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/repository/layout/LegacyRepositoryLayout.java Sun Sep 4 08:56:52 2005 @@ -73,4 +73,4 @@ return pathOfRepositoryMetadata( metadata, metadata.getRemoteFilename() ); } -} \ No newline at end of file +} Modified: maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/transform/ArtifactTransformation.java URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/transform/ArtifactTransformation.java?rev=278605&r1=278604&r2=278605&view=diff == --- maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/transform/ArtifactTransformation.java (original) +++ maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/transform/ArtifactTransformation.java Sun Sep 4 08:56:52 2005 @@ -62,4 +62,4 @@ void transformForDeployment( Artifact artifact, ArtifactRepository remoteRepository ) throws ArtifactMetadataRetrievalException; -} \ No newline at end of file +} Modified: maven/components/trunk/maven-plugins/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleReport.java URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleReport.java?rev=278605&r1=278604&r2=278605&view=diff == --- maven/components/trunk/maven-plugins/maven-ch
svn commit: r278602 - /maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
Author: trygvis
Date: Sun Sep 4 08:44:37 2005
New Revision: 278602
URL: http://svn.apache.org/viewcvs?rev=278602&view=rev
Log:
o Fixing a potential bug where the unresolved artifact List was passed in as
the remote repository List causing a ClassCastException.
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java?rev=278602&r1=278601&r2=278602&view=diff
==
---
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
(original)
+++
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
Sun Sep 4 08:44:37 2005
@@ -541,7 +541,7 @@
unresolved.removeAll( resolved );
-resolveCoreArtifacts( unresolved, localRepository );
+resolveCoreArtifacts( unresolved, localRepository,
resolutionGroup.getResolutionRepositories() );
List allResolved = new ArrayList( resolved.size() +
unresolved.size() );
@@ -565,7 +565,8 @@
}
}
-private void resolveCoreArtifacts( List unresolved, ArtifactRepository
localRepository )
+private void resolveCoreArtifacts( List unresolved, ArtifactRepository
localRepository,
+ List resolutionRepositories )
throws ArtifactResolutionException
{
for ( Iterator it = unresolved.iterator(); it.hasNext(); )
@@ -583,7 +584,7 @@
if ( resourceUrl == null )
{
-artifactResolver.resolve( artifact, unresolved,
localRepository );
+artifactResolver.resolve( artifact,
resolutionRepositories, localRepository );
artifactFile = artifact.getFile();
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r278601 - /maven/components/trunk/maven-script/maven-script-beanshell/
Author: trygvis Date: Sun Sep 4 08:42:51 2005 New Revision: 278601 URL: http://svn.apache.org/viewcvs?rev=278601&view=rev Log: o Setting ignores. Modified: maven/components/trunk/maven-script/maven-script-beanshell/ (props changed) Propchange: maven/components/trunk/maven-script/maven-script-beanshell/ -- --- svn:ignore (original) +++ svn:ignore Sun Sep 4 08:42:51 2005 @@ -1,4 +1,8 @@ -*.iml +target +*~ +*.log +.classpath +.project *.ipr *.iws -target +*.iml - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r267218 - /maven/components/trunk/maven-plugins/maven-clean-plugin/src/main/java/org/apache/maven/plugin/clean/CleanPlugin.java
Author: trygvis
Date: Fri Sep 2 07:56:22 2005
New Revision: 267218
URL: http://svn.apache.org/viewcvs?rev=267218&view=rev
Log:
Fixing MNG-825: "Clean plugin should fail if unable to delete target"
o Changed the default from complaining through the logger to throwing an
exception.
Modified:
maven/components/trunk/maven-plugins/maven-clean-plugin/src/main/java/org/apache/maven/plugin/clean/CleanPlugin.java
Modified:
maven/components/trunk/maven-plugins/maven-clean-plugin/src/main/java/org/apache/maven/plugin/clean/CleanPlugin.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-clean-plugin/src/main/java/org/apache/maven/plugin/clean/CleanPlugin.java?rev=267218&r1=267217&r2=267218&view=diff
==
---
maven/components/trunk/maven-plugins/maven-clean-plugin/src/main/java/org/apache/maven/plugin/clean/CleanPlugin.java
(original)
+++
maven/components/trunk/maven-plugins/maven-clean-plugin/src/main/java/org/apache/maven/plugin/clean/CleanPlugin.java
Fri Sep 2 07:56:22 2005
@@ -22,10 +22,10 @@
import java.io.File;
/**
- * @author mailto:[EMAIL PROTECTED]">Emmanuel Venisse
- * @version $Id$
* @goal clean
* @description Goal which cleans the build
+ * @author mailto:[EMAIL PROTECTED]">Emmanuel Venisse
+ * @version $Id$
*/
public class CleanPlugin
extends AbstractMojo
@@ -91,6 +91,7 @@
* @param d the directory to delete
*/
protected void removeDir( File d )
+throws MojoExecutionException
{
String[] list = d.list();
if ( list == null )
@@ -113,11 +114,11 @@
// TODO:...
//if ( failOnError )
//{
-//throw new Exception( message );
+throw new MojoExecutionException( message );
//}
//else
//{
-getLog().info( message );
+//getLog().info( message );
//}
}
}
@@ -129,13 +130,12 @@
// TODO:...
//if ( failOnError )
//{
-//throw new Exception( message );
+throw new MojoExecutionException( message );
//}
//else
//{
-getLog().info( message );
+//getLog().info( message );
//}
}
}
-
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r267216 - /maven/components/trunk/maven-mboot2/src/main/java/MBoot.java
Author: trygvis
Date: Fri Sep 2 07:52:30 2005
New Revision: 267216
URL: http://svn.apache.org/viewcvs?rev=267216&view=rev
Log:
o maven-repository-metadata has to be built before maven-artifact-manager.
Modified:
maven/components/trunk/maven-mboot2/src/main/java/MBoot.java
Modified: maven/components/trunk/maven-mboot2/src/main/java/MBoot.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-mboot2/src/main/java/MBoot.java?rev=267216&r1=267215&r2=267216&view=diff
==
--- maven/components/trunk/maven-mboot2/src/main/java/MBoot.java (original)
+++ maven/components/trunk/maven-mboot2/src/main/java/MBoot.java Fri Sep 2
07:52:30 2005
@@ -38,8 +38,8 @@
public class MBoot
{
String[] builds = new String[]{"maven-model", "maven-settings",
"maven-monitor", "maven-plugin-api",
-"maven-artifact", "maven-plugin-descriptor", "maven-artifact-manager",
"maven-artifact-test",
-"maven-repository-metadata", "maven-script/maven-script-beanshell",
"maven-script/maven-script-marmalade",
+"maven-artifact", "maven-plugin-descriptor",
"maven-repository-metadata", "maven-artifact-manager",
+"maven-artifact-test", "maven-script/maven-script-beanshell",
"maven-script/maven-script-marmalade",
"maven-profile", "maven-project", "maven-plugin-registry",
"maven-reporting/maven-reporting-api",
"maven-reporting/maven-reporting-impl", "maven-core", "maven-archiver",
"maven-plugin-tools/maven-plugin-tools-api",
"maven-plugin-tools/maven-plugin-tools-java",
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r267182 - in /maven/components/trunk: maven-artifact-ant/ maven-artifact-manager/ maven-artifact-test/ maven-plugin-api/ maven-plugin-descriptor/ maven-plugin-registry/ maven-plugin-tools/ maven-plugin-tools/maven-plugin-tools-beanshell/ ma...
Author: trygvis Date: Fri Sep 2 03:37:16 2005 New Revision: 267182 URL: http://svn.apache.org/viewcvs?rev=267182&view=rev Log: o Setting properties. Modified: maven/components/trunk/maven-artifact-ant/ (props changed) maven/components/trunk/maven-artifact-manager/ (props changed) maven/components/trunk/maven-artifact-test/ (props changed) maven/components/trunk/maven-plugin-api/ (props changed) maven/components/trunk/maven-plugin-descriptor/ (props changed) maven/components/trunk/maven-plugin-registry/ (props changed) maven/components/trunk/maven-plugin-tools/ (props changed) maven/components/trunk/maven-plugin-tools/maven-plugin-tools-beanshell/ (props changed) maven/components/trunk/maven-profile/ (props changed) maven/components/trunk/maven-project/ (props changed) maven/components/trunk/maven-reporting/maven-reporting-impl/ (props changed) maven/components/trunk/sandbox/csharp/maven-csharp-plugin/ (props changed) Propchange: maven/components/trunk/maven-artifact-ant/ -- --- svn:ignore (original) +++ svn:ignore Fri Sep 2 03:37:16 2005 @@ -1,4 +1,8 @@ target -*.iml +*~ +*.log +.classpath +.project *.ipr *.iws +*.iml Propchange: maven/components/trunk/maven-artifact-manager/ -- --- svn:ignore (original) +++ svn:ignore Fri Sep 2 03:37:16 2005 @@ -1,4 +1,8 @@ -*.iml -*.iws -*.ipr target +*~ +*.log +.classpath +.project +*.ipr +*.iws +*.iml Propchange: maven/components/trunk/maven-artifact-test/ -- --- svn:ignore (original) +++ svn:ignore Fri Sep 2 03:37:16 2005 @@ -1,5 +1,8 @@ target -*.iws +*~ +*.log +.classpath +.project *.ipr +*.iws *.iml - Propchange: maven/components/trunk/maven-plugin-api/ -- --- svn:ignore (original) +++ svn:ignore Fri Sep 2 03:37:16 2005 @@ -1,5 +1,8 @@ target -*.iws +*~ +*.log +.classpath +.project *.ipr +*.iws *.iml - Propchange: maven/components/trunk/maven-plugin-descriptor/ -- --- svn:ignore (original) +++ svn:ignore Fri Sep 2 03:37:16 2005 @@ -1,4 +1,8 @@ target -*.iws +*~ +*.log +.classpath +.project *.ipr +*.iws *.iml Propchange: maven/components/trunk/maven-plugin-registry/ -- --- svn:ignore (original) +++ svn:ignore Fri Sep 2 03:37:16 2005 @@ -1,2 +1,8 @@ target +*~ +*.log +.classpath +.project +*.ipr +*.iws *.iml Propchange: maven/components/trunk/maven-plugin-tools/ -- --- svn:ignore (original) +++ svn:ignore Fri Sep 2 03:37:16 2005 @@ -1,6 +1,8 @@ +target *~ *.log -target +.classpath +.project *.ipr *.iws *.iml Propchange: maven/components/trunk/maven-plugin-tools/maven-plugin-tools-beanshell/ -- --- svn:ignore (original) +++ svn:ignore Fri Sep 2 03:37:16 2005 @@ -1,4 +1,8 @@ -*.iml -*.iws -*.ipr target +*~ +*.log +.classpath +.project +*.ipr +*.iws +*.iml Propchange: maven/components/trunk/maven-profile/ -- --- svn:ignore (original) +++ svn:ignore Fri Sep 2 03:37:16 2005 @@ -1,4 +1,8 @@ target -*.iml +*~ +*.log +.classpath +.project *.ipr *.iws +*.iml Propchange: maven/components/trunk/maven-project/ -- --- svn:ignore (original) +++ svn:ignore Fri Sep 2 03:37:16 2005 @@ -1,5 +1,8 @@ target -*.iws +*~ +*.log +.classpath +.project *.ipr +*.iws *.iml - Propchange: maven/components/trunk/maven-reporting/maven-reporting-impl/ -- --- svn:ignore (original) +++ svn:ignore Fri Sep 2 03:37:16 2005 @@ -1,4 +1,8 @@ target -*.iml -*.iws +*~ +*.log +.classpath +.project *.ipr +*.iws +*.iml Propchange: maven/components/trunk/sandbox/csharp/maven-csharp-plugin/ -- --- svn:ignore (added) +++ svn:ignore Fri Sep 2 03:37:16 2005 @@ -0,0 +1,8 @@ +target +*~ +*.log +.classpath +.project +*.ipr +*.iws +*.iml - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r267176 - /maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/activation/AlwaysOnProfileActivator.java
Author: trygvis
Date: Fri Sep 2 03:29:02 2005
New Revision: 267176
URL: http://svn.apache.org/viewcvs?rev=267176&view=rev
Log:
o Organizing imports.
Modified:
maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/activation/AlwaysOnProfileActivator.java
Modified:
maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/activation/AlwaysOnProfileActivator.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/activation/AlwaysOnProfileActivator.java?rev=267176&r1=267175&r2=267176&view=diff
==
---
maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/activation/AlwaysOnProfileActivator.java
(original)
+++
maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/activation/AlwaysOnProfileActivator.java
Fri Sep 2 03:29:02 2005
@@ -1,8 +1,5 @@
package org.apache.maven.profiles.activation;
-import org.apache.maven.model.Profile;
-import org.apache.maven.profiles.AlwaysOnActivation;
-
/*
* Copyright 2001-2005 The Apache Software Foundation.
*
@@ -19,6 +16,9 @@
* limitations under the License.
*/
+import org.apache.maven.model.Profile;
+import org.apache.maven.profiles.AlwaysOnActivation;
+
public class AlwaysOnProfileActivator
implements ProfileActivator
{
@@ -31,5 +31,4 @@
{
return true;
}
-
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r265788 - in /maven/components/trunk/maven-site/src/site: apt/developers/development-guide.apt apt/plugin-overview.apt xdoc/getting-started.xml
Author: trygvis
Date: Thu Sep 1 14:54:52 2005
New Revision: 265788
URL: http://svn.apache.org/viewcvs?rev=265788&view=rev
Log:
o Adding some more notes on how to create patches.
Modified:
maven/components/trunk/maven-site/src/site/apt/developers/development-guide.apt
maven/components/trunk/maven-site/src/site/apt/plugin-overview.apt
maven/components/trunk/maven-site/src/site/xdoc/getting-started.xml
Modified:
maven/components/trunk/maven-site/src/site/apt/developers/development-guide.apt
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-site/src/site/apt/developers/development-guide.apt?rev=265788&r1=265787&r2=265788&view=diff
==
---
maven/components/trunk/maven-site/src/site/apt/developers/development-guide.apt
(original)
+++
maven/components/trunk/maven-site/src/site/apt/developers/development-guide.apt
Thu Sep 1 14:54:52 2005
@@ -59,6 +59,10 @@
* Name the file <<-.patch>>>.
+ * When adding the patch add a comment to the JIRA suggesting the commit
message. For information on what to include
+ in a commit message please take a look at the existing commit messages.
Currently the commit mails are sent to
+ {{{http://mail-archives.apache.org/mod_mbox/maven-dev/[EMAIL PROTECTED]
with the subject prefix "svn commit".
+
[]
An example on how to create a patch from the command line:
@@ -69,7 +73,7 @@
If you are picking up an issue with a existing patch attached to the issue
you can apply the patch to your working
directory directly from JIRA like this. The <<>> and <<>>
commands will only be available if you are
- on a UNIX platform or Cygwin on windows.
+ on a UNIX platform or using Cygwin on windows.
---
$ wget -O - -q | patch -p0
@@ -80,6 +84,14 @@
---
$ patch -p0 < MNG-123.patch
---
+
+ A couple of notes:
+
+ * If you are using another tool for creating patches, make sure that the
patch doesn't include absolute paths.
+ Including absolute paths in the patch will make the useless for us as we most
likely don't have the same directory
+ structure as you.
+
+ * Make sure that you follow our code style.
* Other useful Subversion commands while developing
Modified: maven/components/trunk/maven-site/src/site/apt/plugin-overview.apt
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-site/src/site/apt/plugin-overview.apt?rev=265788&r1=265787&r2=265788&view=diff
==
--- maven/components/trunk/maven-site/src/site/apt/plugin-overview.apt
(original)
+++ maven/components/trunk/maven-site/src/site/apt/plugin-overview.apt Thu Sep
1 14:54:52 2005
@@ -82,7 +82,7 @@
[[2]] {{{plugin-management.html}Managing plugin configuration in large
projects}}
-[[3]] {{{plugin-configuration.html}Configuring plugins}}
+[[3]] {{{getting-started.html#configuring_plugins}Configuring plugins}}
* Comparison to Maven 1.x Plugins
Modified: maven/components/trunk/maven-site/src/site/xdoc/getting-started.xml
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-site/src/site/xdoc/getting-started.xml?rev=265788&r1=265787&r2=265788&view=diff
==
--- maven/components/trunk/maven-site/src/site/xdoc/getting-started.xml
(original)
+++ maven/components/trunk/maven-site/src/site/xdoc/getting-started.xml Thu Sep
1 14:54:52 2005
@@ -136,6 +136,7 @@
been done.
+
What if you would like to customise whether a plugins is enabled, or
how a plugin operates?
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r265787 - /maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java
Author: trygvis
Date: Thu Sep 1 14:53:54 2005
New Revision: 265787
URL: http://svn.apache.org/viewcvs?rev=265787&view=rev
Log:
Fixing MNG-797: "fix checksum parsing"
Modified:
maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java
Modified:
maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java?rev=265787&r1=265786&r2=265787&view=diff
==
---
maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java
(original)
+++
maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java
Thu Sep 1 14:53:54 2005
@@ -483,6 +483,26 @@
wagon.get( remotePath + checksumFileExtension, checksumFile );
String expectedChecksum = FileUtils.fileRead( checksumFile );
+
+// remove whitespaces at the end
+expectedChecksum = expectedChecksum.trim();
+
+// check for 'MD5 (name) = CHECKSUM'
+if ( expectedChecksum.startsWith( "MD5" ) )
+{
+int lastSpacePos = expectedChecksum.lastIndexOf( ' ' );
+expectedChecksum = expectedChecksum.substring( lastSpacePos +
1 );
+}
+else
+{
+// remove everything after the first space (if available)
+int spacePos = expectedChecksum.indexOf( ' ' );
+
+if ( spacePos != -1 )
+{
+expectedChecksum = expectedChecksum.substring( 0, spacePos
);
+}
+}
if ( !expectedChecksum.equals( actualChecksum ) )
{
throw new ChecksumFailedException( "Checksum failed on
download: local = '" + actualChecksum +
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r265765 - in /maven/components/trunk/maven-plugins/maven-javadoc-plugin: pom.xml src/main/java/org/apache/maven/plugin/javadoc/JavadocJar.java src/main/java/org/apache/maven/plugin/javadoc/JavadocReport.java
Author: trygvis
Date: Thu Sep 1 12:11:49 2005
New Revision: 265765
URL: http://svn.apache.org/viewcvs?rev=265765&view=rev
Log:
Fixing MNG-810: "create a mojo goal named -> javadoc:jar"
Added:
maven/components/trunk/maven-plugins/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocJar.java
(with props)
Modified:
maven/components/trunk/maven-plugins/maven-javadoc-plugin/pom.xml
maven/components/trunk/maven-plugins/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocReport.java
Modified: maven/components/trunk/maven-plugins/maven-javadoc-plugin/pom.xml
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-javadoc-plugin/pom.xml?rev=265765&r1=265764&r2=265765&view=diff
==
--- maven/components/trunk/maven-plugins/maven-javadoc-plugin/pom.xml (original)
+++ maven/components/trunk/maven-plugins/maven-javadoc-plugin/pom.xml Thu Sep
1 12:11:49 2005
@@ -44,6 +44,16 @@
plexus
plexus-utils
+
+ plexus
+ plexus-archiver
+ 1.0-alpha-1
+
+
+ plexus
+ plexus-container-default
+ 1.0-alpha-1
+
Added:
maven/components/trunk/maven-plugins/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocJar.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocJar.java?rev=265765&view=auto
==
---
maven/components/trunk/maven-plugins/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocJar.java
(added)
+++
maven/components/trunk/maven-plugins/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocJar.java
Thu Sep 1 12:11:49 2005
@@ -0,0 +1,87 @@
+package org.apache.maven.plugin.javadoc;
+
+/*
+ * Copyright 2004-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.AbstractMojo;
+import org.apache.maven.plugin.MojoExecutionException;
+import org.codehaus.plexus.archiver.ArchiverException;
+import org.codehaus.plexus.archiver.jar.JarArchiver;
+
+import java.io.File;
+import java.io.IOException;
+
+/**
+ * @goal jar
+ * @phase package
+ * @execute phase="javadoc:javadoc"
+ */
+public class JavadocJar
+extends AbstractMojo
+{
+/**
+ * @parameter expression="${project.build.directory}"
+ */
+private String outputDirectory;
+
+/**
+ * @parameter expression="${project.build.finalName}"
+ */
+private String finalName;
+
+public void execute()
+throws MojoExecutionException
+{
+try
+{
+generateArchive( outputDirectory + "/javadoc", finalName +
"-javadoc.jar" );
+}
+catch ( ArchiverException e )
+{
+throw new MojoExecutionException( "Error while creating archive.",
e );
+}
+catch ( IOException e )
+{
+throw new MojoExecutionException( "Error while creating archive.",
e );
+}
+}
+
+private void generateArchive( String source, String target )
+throws MojoExecutionException, ArchiverException, IOException
+{
+File javadocFiles = new File( source );
+
+if ( !javadocFiles.exists() )
+{
+throw new MojoExecutionException( "javadoc files not found." );
+}
+
+File javadocJar = new File( outputDirectory, target );
+
+if ( javadocJar.exists() )
+{
+javadocJar.delete();
+}
+
+JarArchiver archiver = new JarArchiver();
+
+archiver.addDirectory( javadocFiles );
+
+archiver.setDestFile( javadocJar );
+
+archiver.createArchive();
+}
+}
Propchange:
maven/components/trunk/maven-plugins/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocJar.java
--
svn:eol-style = native
Propchange:
maven/components/trunk/maven-plugins/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocJar.java
svn commit: r265708 - /maven/components/trunk/pom.xml
Author: trygvis
Date: Thu Sep 1 05:29:06 2005
New Revision: 265708
URL: http://svn.apache.org/viewcvs?rev=265708&view=rev
Log:
o Adding myself as a developer.
Modified:
maven/components/trunk/pom.xml
Modified: maven/components/trunk/pom.xml
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/pom.xml?rev=265708&r1=265707&r2=265708&view=diff
==
--- maven/components/trunk/pom.xml (original)
+++ maven/components/trunk/pom.xml Thu Sep 1 05:29:06 2005
@@ -92,6 +92,17 @@
+1
+
+ trygvis
+ Trygve Laugstol
+ [EMAIL PROTECTED]
+ Apache
+
+Java Developer
+PMC Member
+
+ +1
+
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r239601 - /maven/components/trunk/maven-plugins/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocReport.java
Author: trygvis
Date: Wed Aug 24 04:12:26 2005
New Revision: 239601
URL: http://svn.apache.org/viewcvs?rev=239601&view=rev
Log:
o Cleaning up the code style a bit:
- removing usage of this. as a prefix for referencing local variables
- renaming public_, private_ and protected_ to showPublic, etc.
- removing usage of final.
Modified:
maven/components/trunk/maven-plugins/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocReport.java
Modified:
maven/components/trunk/maven-plugins/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocReport.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocReport.java?rev=239601&r1=239600&r2=239601&view=diff
==
---
maven/components/trunk/maven-plugins/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocReport.java
(original)
+++
maven/components/trunk/maven-plugins/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocReport.java
Wed Aug 24 04:12:26 2005
@@ -24,6 +24,8 @@
import java.util.Iterator;
import java.util.Locale;
import java.util.StringTokenizer;
+import java.util.List;
+import java.util.ArrayList;
import org.apache.commons.lang.ClassUtils;
import org.apache.commons.lang.SystemUtils;
@@ -85,6 +87,10 @@
private static final String PATH_SEPARATOR = System.getProperty(
"path.separator" );
+// --
+// Mojo Parameters
+// --
+
/**
* @parameter expression="${project.build.directory}/site"
* @required
@@ -211,25 +217,25 @@
* @parameter expression="${package}"
* default-value="true"
*/
-private boolean package_ = true;
+private boolean showPackage = true;
/**
- * Shows all classes and members.
- * See http://java.sun.com/j2se/1.4.2/docs/tooldocs/windows/javadoc.html#private";>private
- *
- * @parameter expression="${private}"
+ * Shows only protected and public classes and members.
+ * See http://java.sun.com/j2se/1.4.2/docs/tooldocs/windows/javadoc.html#protected";>protected.
+ *
+ * @parameter expression="${protected}"
* default-value="false"
*/
-private boolean private_ = false;
+private boolean showProtected = false;
/**
- * Shows only protected and public classes and members.
- * See http://java.sun.com/j2se/1.4.2/docs/tooldocs/windows/javadoc.html#protected";>protected.
+ * Shows all classes and members.
+ * See http://java.sun.com/j2se/1.4.2/docs/tooldocs/windows/javadoc.html#private";>private
*
- * @parameter expression="${protected}"
+ * @parameter expression="${private}"
* default-value="false"
*/
-private boolean protected_ = false;
+private boolean showPrivate = false;
/**
* Shows only public classes and members.
@@ -558,10 +564,9 @@
*/
private String windowtitle;
-// End JavaDoc parameters
-
-/** The command line built to execute Javadoc. */
-private Commandline cmd = new Commandline();
+// --
+//
+// --
/**
* @see org.apache.maven.reporting.MavenReport#getName(java.util.Locale)
@@ -679,168 +684,168 @@
// Copy default style sheet
copyDefaultStylesheet( javadocDirectory );
-this.cmd.setWorkingDirectory( javadocDirectory.getAbsolutePath() );
-this.cmd.setExecutable( getJavadocPath() );
+Commandline cmd = new Commandline();
+
+List arguments = new ArrayList();
+
+cmd.setWorkingDirectory( javadocDirectory.getAbsolutePath() );
+cmd.setExecutable( getJavadocPath() );
// General javadoc arguments
-addArgIf( this.breakiterator, "-breakiterator", 1.4f );
-if ( !StringUtils.isEmpty( this.doclet ) )
+addArgIf( arguments, breakiterator, "-breakiterator", 1.4f );
+if ( !StringUtils.isEmpty( doclet ) )
{
-addArgIfNotEmpty( "-doclet", this.doclet );
-addArgIfNotEmpty( "-docletPath", this.docletPath );
+addArgIfNotEmpty( arguments, "-doclet", doclet );
+addArgIfNotEmpty( arguments, "-docletPath", docletPath );
}
-addArgIfNotEmpty( "-encoding", this.encoding );
-addArgIfNotEmpty
svn commit: r239596 - /maven/components/trunk/maven-plugins/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/AbstractCompilerMojo.java
Author: trygvis
Date: Wed Aug 24 03:27:28 2005
New Revision: 239596
URL: http://svn.apache.org/viewcvs?rev=239596&view=rev
Log:
o Adding a missing part of Rod's last patch.
Modified:
maven/components/trunk/maven-plugins/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/AbstractCompilerMojo.java
Modified:
maven/components/trunk/maven-plugins/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/AbstractCompilerMojo.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/AbstractCompilerMojo.java?rev=239596&r1=239595&r2=239596&view=diff
==
---
maven/components/trunk/maven-plugins/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/AbstractCompilerMojo.java
(original)
+++
maven/components/trunk/maven-plugins/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/AbstractCompilerMojo.java
Wed Aug 24 03:27:28 2005
@@ -111,6 +111,13 @@
private String compilerId;
/**
+ * Version of the compiler to use, ex. "1.3", "1.5"
+ *
+ * @parameter
+ */
+private String compilerVersion;
+
+/**
* Runs the compiler in a separate process.
*
* If not set the compiler will default to a executable.
@@ -248,6 +255,8 @@
compilerConfiguration.setWorkingDirectory( basedir );
+compilerConfiguration.setCompilerVersion( compilerVersion );
+
compilerConfiguration.setBuildDirectory( buildDirectory );
compilerConfiguration.setOutputFileName( outputFileName );
@@ -265,7 +274,7 @@
canUpdateTarget = compiler.canUpdateTarget( compilerConfiguration
);
if ( compiler.getCompilerOutputStyle() ==
CompilerOutputStyle.ONE_OUTPUT_FILE_FOR_ALL_INPUT_FILES &&
-!canUpdateTarget )
+ !canUpdateTarget )
{
getLog().info( "RESCANNING!" );
// TODO: This second scan for source files is sub-optimal
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r234499 - /maven/components/trunk/maven-plugins/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/AbstractCompilerMojo.java
Author: trygvis Date: Mon Aug 22 07:43:26 2005 New Revision: 234499 URL: http://svn.apache.org/viewcvs?rev=234499&view=rev Log: Fixing MNG-710: "Add ability to fork the maven-compiler-plugin" Patch created by Rod Coffin. Modified: maven/components/trunk/maven-plugins/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/AbstractCompilerMojo.java Modified: maven/components/trunk/maven-plugins/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/AbstractCompilerMojo.java URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/AbstractCompilerMojo.java?rev=234499&r1=234498&r2=234499&view=diff == --- maven/components/trunk/maven-plugins/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/AbstractCompilerMojo.java (original) +++ maven/components/trunk/maven-plugins/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/AbstractCompilerMojo.java Mon Aug 22 07:43:26 2005 @@ -19,27 +19,26 @@ import org.codehaus.plexus.compiler.Compiler; import org.codehaus.plexus.compiler.CompilerConfiguration; import org.codehaus.plexus.compiler.CompilerError; -import org.codehaus.plexus.compiler.CompilerOutputStyle; import org.codehaus.plexus.compiler.CompilerException; +import org.codehaus.plexus.compiler.CompilerOutputStyle; import org.codehaus.plexus.compiler.manager.CompilerManager; import org.codehaus.plexus.compiler.manager.NoSuchCompilerException; import org.codehaus.plexus.compiler.util.scan.InclusionScanException; +import org.codehaus.plexus.compiler.util.scan.SimpleSourceInclusionScanner; import org.codehaus.plexus.compiler.util.scan.SourceInclusionScanner; import org.codehaus.plexus.compiler.util.scan.StaleSourceScanner; -import org.codehaus.plexus.compiler.util.scan.SimpleSourceInclusionScanner; -import org.codehaus.plexus.compiler.util.scan.mapping.SuffixMapping; -import org.codehaus.plexus.compiler.util.scan.mapping.SourceMapping; import org.codehaus.plexus.compiler.util.scan.mapping.SingleTargetSourceMapping; +import org.codehaus.plexus.compiler.util.scan.mapping.SourceMapping; +import org.codehaus.plexus.compiler.util.scan.mapping.SuffixMapping; import java.io.File; import java.util.ArrayList; +import java.util.Collections; import java.util.HashSet; import java.util.Iterator; +import java.util.LinkedHashMap; import java.util.List; import java.util.Set; -import java.util.Map; -import java.util.Collections; -import java.util.Collection; /** * TODO: At least one step could be optimized, currently the plugin will do two @@ -115,6 +114,13 @@ private String compilerId; /** + * Version of the compiler to use, ex. "1.3", "1.5" + * + * @parameter + */ +private String compilerVersion; + +/** * Runs the compiler in a separate process. * * If not set the compiler will default to a executable. @@ -138,7 +144,7 @@ * * @parameter */ -private Map compilerArguments; +private LinkedHashMap compilerArguments; /** * Used to control the name of the output file when compiling a set of - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r233318 - /maven/components/trunk/maven-plugins/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/AbstractCompilerMojo.java
Author: trygvis
Date: Thu Aug 18 06:36:54 2005
New Revision: 233318
URL: http://svn.apache.org/viewcvs?rev=233318&view=rev
Log:
o Adding support for using compilers that produce an single output file like
C#.
Modified:
maven/components/trunk/maven-plugins/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/AbstractCompilerMojo.java
Modified:
maven/components/trunk/maven-plugins/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/AbstractCompilerMojo.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/AbstractCompilerMojo.java?rev=233318&r1=233317&r2=233318&view=diff
==
---
maven/components/trunk/maven-plugins/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/AbstractCompilerMojo.java
(original)
+++
maven/components/trunk/maven-plugins/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/AbstractCompilerMojo.java
Thu Aug 18 06:36:54 2005
@@ -26,6 +26,7 @@
import org.codehaus.plexus.compiler.util.scan.InclusionScanException;
import org.codehaus.plexus.compiler.util.scan.SourceInclusionScanner;
import org.codehaus.plexus.compiler.util.scan.StaleSourceScanner;
+import org.codehaus.plexus.compiler.util.scan.SimpleSourceInclusionScanner;
import org.codehaus.plexus.compiler.util.scan.mapping.SuffixMapping;
import org.codehaus.plexus.compiler.util.scan.mapping.SourceMapping;
import
org.codehaus.plexus.compiler.util.scan.mapping.SingleTargetSourceMapping;
@@ -37,8 +38,15 @@
import java.util.List;
import java.util.Set;
import java.util.Map;
+import java.util.Collections;
+import java.util.Collection;
/**
+ * TODO: At least one step could be optimized, currently the plugin will do two
+ * scans of all the source code if the compiler has to have the entire set of
+ * sources. This is currently the case for at least the C# compiler and most
+ * likely all the other .NET compilers too.
+ *
* @author others
* @author mailto:[EMAIL PROTECTED]">Trygve Laugstøl
* @version $Id: StaleSourceScannerTest.java 2393 2005-08-08 22:32:59Z kenney $
@@ -46,6 +54,10 @@
public abstract class AbstractCompilerMojo
extends AbstractMojo
{
+// --
+// Configurables
+// --
+
/**
* Whether to include debugging information in the compiled class files.
* The default value is true.
@@ -104,7 +116,7 @@
/**
* Runs the compiler in a separate process.
- *
+ *
* If not set the compiler will default to a executable.
*
* @parameter default-value="false"
@@ -120,7 +132,7 @@
/**
* Arguements to be passed to the compiler if fork is set to true.
- *
+ *
* This is because the list of valid arguements passed to a Java compiler
* varies based on the compiler version.
*
@@ -129,6 +141,18 @@
private Map compilerArguments;
/**
+ * Used to control the name of the output file when compiling a set of
+ * sources to a single file.
+ *
+ * @parameter expression="${project.build.finalName}"
+ */
+private String outputFileName;
+
+// --
+// Read-only parameters
+// --
+
+/**
* The directory to run the compiler from if fork is true.
*
* @parameter expression="${basedir}"
@@ -138,6 +162,15 @@
private File basedir;
/**
+ * The directory to run the compiler from if fork is true.
+ *
+ * @parameter expression="${project.build.directory}"
+ * @required
+ * @readonly
+ */
+private File buildDirectory;
+
+/**
* @parameter
expression="${component.org.codehaus.plexus.compiler.manager.CompilerManager}"
* @required
* @readonly
@@ -161,6 +194,8 @@
Compiler compiler;
+getLog().debug( "Using compiler '" + compilerId + "'." );
+
try
{
compiler = compilerManager.getCompiler( compilerId );
@@ -215,12 +250,42 @@
compilerConfiguration.setWorkingDirectory( basedir );
+compilerConfiguration.setBuildDirectory( buildDirectory );
+
+compilerConfiguration.setOutputFileName( outputFileName );
+
// TODO: have an option to always compile (without need to clean)
Set staleSources;
+boolean canUpdateTarget;
+
try
{
-staleSources = computeStaleSources( compilerConfiguration,
compiler );
+staleSources = computeStaleSources( compilerConfiguration,
+
svn commit: r233315 - /maven/components/trunk/maven-plugins/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocReport.java
Author: trygvis
Date: Thu Aug 18 05:49:31 2005
New Revision: 233315
URL: http://svn.apache.org/viewcvs?rev=233315&view=rev
Log:
o Replacing hardcoded path separator ';' value with ${path.separator}.
Modified:
maven/components/trunk/maven-plugins/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocReport.java
Modified:
maven/components/trunk/maven-plugins/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocReport.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocReport.java?rev=233315&r1=233314&r2=233315&view=diff
==
---
maven/components/trunk/maven-plugins/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocReport.java
(original)
+++
maven/components/trunk/maven-plugins/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocReport.java
Thu Aug 18 05:49:31 2005
@@ -83,6 +83,8 @@
/** Default window title */
private static final String DEFAULT_WINDOW_TITLE = "${project.name}
${project.version} API";
+private static final String PATH_SEPARATOR = System.getProperty(
"path.separator" );
+
/**
* @parameter expression="${project.build.directory}/site"
* @required
@@ -644,7 +646,7 @@
classpath.append( (String) i.next() );
if ( i.hasNext() )
{
-classpath.append( ";" );
+classpath.append( PATH_SEPARATOR );
}
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r233310 - /maven/components/trunk/maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/doxia/ScpSiteDeployMojo.java
Author: trygvis
Date: Thu Aug 18 05:13:47 2005
New Revision: 233310
URL: http://svn.apache.org/viewcvs?rev=233310&view=rev
Log:
o Throwing an exception if the procotol isn't 'scp' as that's the only protocol
this provider currently supports.
Modified:
maven/components/trunk/maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/doxia/ScpSiteDeployMojo.java
Modified:
maven/components/trunk/maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/doxia/ScpSiteDeployMojo.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/doxia/ScpSiteDeployMojo.java?rev=233310&r1=233309&r2=233310&view=diff
==
---
maven/components/trunk/maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/doxia/ScpSiteDeployMojo.java
(original)
+++
maven/components/trunk/maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/doxia/ScpSiteDeployMojo.java
Thu Aug 18 05:13:47 2005
@@ -5,6 +5,7 @@
import org.apache.maven.artifact.manager.WagonManager;
import org.apache.maven.model.DistributionManagement;
+import org.apache.maven.model.Site;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.project.MavenProject;
@@ -72,7 +73,7 @@
{
File baseDir = new File( inputDirectory );
-File zipFile = null;
+File zipFile;
try
{
@@ -90,32 +91,31 @@
if ( distributionManagement == null )
{
-String msg = "distributionManagement element is missing in the
POM: " + project.getId();
-
-throw new MojoExecutionException( msg );
+throw new MojoExecutionException( "Missing distribution
management information in the project" );
}
-if ( distributionManagement.getSite() == null )
-{
-String msg = "distributionManagement/site element is missing
in the POM: " + project.getId();
-
-throw new MojoExecutionException( msg );
+Site site = distributionManagement.getSite();
+if ( site == null )
+{
+throw new MojoExecutionException( "Missing site information in
the distribution management element in the project.." );
}
-String url = distributionManagement.getSite().getUrl();
+String url = site.getUrl();
-String id = distributionManagement.getSite().getId();
+String id = site.getId();
if ( url == null )
{
-String msg = "distributionManagement/site/url element is
missing in the POM: " + project.getId();
-
-throw new MojoExecutionException( msg );
-
+throw new MojoExecutionException( "The URL to the site is
missing in the project descriptor." );
}
Repository repository = new Repository( id, url );
+
+if ( !"scp".equals( repository.getProtocol() ) )
+{
+throw new MojoExecutionException( "The deploy mojo currently
only supports site deployment using the 'scp' protocol." );
+}
commandExecutor = (SshCommandExecutor) wagonManager.getWagon(
"scp" );
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r233048 - /maven/components/trunk/maven-plugins/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/WarMojo.java
Author: trygvis
Date: Tue Aug 16 12:54:30 2005
New Revision: 233048
URL: http://svn.apache.org/viewcvs?rev=233048&view=rev
Log:
Fixing MNG-478: "war:war warSourceExcludes parameter not used when set in the
POM".
Patch created by Greg Case, thanks for your work!
Modified:
maven/components/trunk/maven-plugins/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/WarMojo.java
Modified:
maven/components/trunk/maven-plugins/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/WarMojo.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/WarMojo.java?rev=233048&r1=233047&r2=233048&view=diff
==
---
maven/components/trunk/maven-plugins/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/WarMojo.java
(original)
+++
maven/components/trunk/maven-plugins/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/WarMojo.java
Tue Aug 16 12:54:30 2005
@@ -26,6 +26,7 @@
import org.codehaus.plexus.archiver.ArchiverException;
import org.codehaus.plexus.archiver.jar.ManifestException;
import org.codehaus.plexus.archiver.war.WarArchiver;
+import org.codehaus.plexus.util.DirectoryScanner;
import org.codehaus.plexus.util.FileUtils;
import java.io.File;
@@ -62,12 +63,11 @@
private MavenProject project;
/**
- * @todo Convert to File
* @parameter expression="${project.build.outputDirectory}"
* @required
* @readonly
*/
-private String classesDirectory;
+private File classesDirectory;
/**
* @parameter expression="${project.build.directory}"
@@ -76,18 +76,16 @@
private String outputDirectory;
/**
- * @todo Convert to File
* @parameter
expression="${project.build.directory}/${project.build.finalName}"
* @required
*/
-private String webappDirectory;
+private File webappDirectory;
/**
- * @todo Convert to File
* @parameter expression="${basedir}/src/main/webapp"
* @required
*/
-private String warSourceDirectory;
+private File warSourceDirectory;
/**
* @parameter alias="includes"
@@ -118,23 +116,27 @@
private static final String[] EMPTY_STRING_ARRAY = {};
-public void copyResources( File sourceDirectory, File webappDirectory,
String includes, String excludes,
- String webXml )
+public void copyResources( File sourceDirectory, File webappDirectory,
String webXml )
throws IOException
{
if ( !sourceDirectory.equals( webappDirectory ) )
{
getLog().info( "Copy webapp resources to " +
webappDirectory.getAbsolutePath() );
-if ( new File( warSourceDirectory ).exists() )
+if ( warSourceDirectory.exists() )
{
-//TODO : Use includes and excludes
-FileUtils.copyDirectoryStructure( sourceDirectory,
webappDirectory );
+String[] fileNames = getWarFiles( sourceDirectory );
+for (int i = 0; i < fileNames.length; i++)
+{
+FileUtils.copyFile(new File( sourceDirectory, fileNames[i]
), new File( webappDirectory, fileNames[i] ) );
+}
}
if ( webXml != null && !"".equals( webXml ) )
{
-FileUtils.copyFileToDirectory( new File( webXml ), new File(
webappDirectory, WEB_INF ) );
+//rename to web.xml
+File webinfDir = new File( webappDirectory, WEB_INF );
+FileUtils.copyFile( new File( webXml ), new File( webinfDir,
"/web.xml" ) );
}
}
}
@@ -150,7 +152,6 @@
File webappClassesDirectory = new File( webappDirectory, WEB_INF +
"/classes" );
-File classesDirectory = new File( this.classesDirectory );
if ( classesDirectory.exists() )
{
FileUtils.copyDirectoryStructure( classesDirectory,
webappClassesDirectory );
@@ -189,14 +190,13 @@
public void generateExplodedWebapp()
throws IOException
{
-File webappDirectory = new File( this.webappDirectory );
webappDirectory.mkdirs();
File webinfDir = new File( webappDirectory, WEB_INF );
webinfDir.mkdirs();
-copyResources( new File( warSourceDirectory ), webappDirectory,
warSourceIncludes, warSourceExcludes, webXml );
+copyResources( warSourceDirectory, webappDirectory, webXml );
buildWebapp( project );
}
@@ -249,8 +249,7 @@
archiver.setOutputFile( warFile );
-String[] excludes = (String[]) getDefaultExcludes().toArray(
EMPTY_STRING_ARRAY );
-warArchiver.addDir
svn commit: r232887 - in /maven/components/trunk/maven-plugins/maven-project-info-reports-plugin/src/main: java/org/apache/maven/report/projectinfo/ resources/
Author: trygvis
Date: Mon Aug 15 14:38:11 2005
New Revision: 232887
URL: http://svn.apache.org/viewcvs?rev=232887&view=rev
Log:
o Removing comment about no contributors.
o Changing the promt from "$>" to "$ ".
Modified:
maven/components/trunk/maven-plugins/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/CimReport.java
maven/components/trunk/maven-plugins/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ScmReport.java
maven/components/trunk/maven-plugins/maven-project-info-reports-plugin/src/main/resources/project-info-report_en.properties
Modified:
maven/components/trunk/maven-plugins/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/CimReport.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/CimReport.java?rev=232887&r1=232886&r2=232887&view=diff
==
---
maven/components/trunk/maven-plugins/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/CimReport.java
(original)
+++
maven/components/trunk/maven-plugins/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/CimReport.java
Mon Aug 15 14:38:11 2005
@@ -23,11 +23,11 @@
import org.apache.maven.reporting.AbstractMavenReport;
import org.apache.maven.reporting.AbstractMavenReportRenderer;
import org.apache.maven.reporting.MavenReportException;
+
import org.codehaus.doxia.sink.Sink;
import org.codehaus.doxia.site.renderer.SiteRenderer;
import org.codehaus.plexus.util.StringUtils;
-import java.io.IOException;
import java.util.Iterator;
import java.util.List;
import java.util.Locale;
@@ -44,6 +44,10 @@
public class CimReport
extends AbstractMavenReport
{
+// --
+// Parameters
+// --
+
/**
* @parameter expression="${project.build.directory}/site"
* @required
@@ -64,57 +68,40 @@
*/
private MavenProject project;
-/**
- * @see org.apache.maven.reporting.MavenReport#getName(java.util.Locale)
- */
+// --
+// MavenReport Implementation
+// --
+
public String getName( Locale locale )
{
return getBundle( locale ).getString( "report.cim.name" );
}
-/**
- * @see org.apache.maven.reporting.MavenReport#getCategoryName()
- */
public String getCategoryName()
{
return CATEGORY_PROJECT_INFORMATION;
}
-/**
- * @see
org.apache.maven.reporting.MavenReport#getDescription(java.util.Locale)
- */
public String getDescription( Locale locale )
{
return getBundle( locale ).getString( "report.cim.description" );
}
-/**
- * @see org.apache.maven.reporting.AbstractMavenReport#getOutputDirectory()
- */
protected String getOutputDirectory()
{
return outputDirectory;
}
-/**
- * @see org.apache.maven.reporting.AbstractMavenReport#getProject()
- */
protected MavenProject getProject()
{
return project;
}
-/**
- * @see org.apache.maven.reporting.AbstractMavenReport#getSiteRenderer()
- */
protected SiteRenderer getSiteRenderer()
{
return siteRenderer;
}
-/**
- * @see
org.apache.maven.reporting.AbstractMavenReport#executeReport(java.util.Locale)
- */
public void executeReport( Locale locale )
throws MavenReportException
{
@@ -123,14 +110,15 @@
r.render();
}
-/**
- * @see org.apache.maven.reporting.MavenReport#getOutputName()
- */
public String getOutputName()
{
return "integration";
}
+// --
+//
+// --
+
static class CimRenderer
extends AbstractMavenReportRenderer
{
@@ -147,17 +135,11 @@
this.locale = locale;
}
-/**
- * @see org.apache.maven.reporting.MavenReportRenderer#getTitle()
- */
public String getTitle()
{
return getBundle( locale ).getString( "report.cim.title" );
}
-/**
- * @see
org.apache.maven.reporting.AbstractMavenReportRenderer#renderBody()
- */
public void renderBody()
{
CiManagement cim = model.getCiManagement();
@@ -276,4 +258,4 @@
{
return
svn commit: r232833 - in /maven/components/trunk/maven-plugins/maven-ear-plugin/src: main/java/org/apache/maven/plugin/ear/ site/apt/
Author: trygvis
Date: Mon Aug 15 09:46:12 2005
New Revision: 232833
URL: http://svn.apache.org/viewcvs?rev=232833&view=rev
Log:
Fixing MNG-623: "Improve the exclusion / inclusion of a dependency inside the
ear"
Committing on behalf of Stephane Nicoll.
Provides two new flags to customize ear modules:
* excluded ; if set the module is not bundle in the EAR file
* library ; if set the java module is considered as a 3rd party library and no
entry is generated in the application.xml
The patch also update the documentation.
Modified:
maven/components/trunk/maven-plugins/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/AbstractEarModule.java
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/EarModule.java
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/AbstractEarModule.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/AbstractEarModule.java?rev=232833&r1=232832&r2=232833&view=diff
==
---
maven/components/trunk/maven-plugins/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/AbstractEarModule.java
(original)
+++
maven/components/trunk/maven-plugins/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/AbstractEarModule.java
Mon Aug 15 09:46:12 2005
@@ -47,6 +47,8 @@
private String bundleFileName;
+private Boolean excluded = Boolean.FALSE;
+
/**
* Empty constructor to be used when the module
* is built based on the configuration.
@@ -177,6 +179,16 @@
bundleFileName = artifact.getFile().getName();
}
return bundleFileName;
+}
+
+/**
+ * Specify whether this module should be excluded or not.
+ *
+ * @return true if this module should be skipped, false otherwise
+ */
+public boolean isExcluded()
+{
+return excluded.booleanValue();
}
public String toString()
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=232833&r1=232832&r2=232833&view=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
Mon Aug 15 09:46:12 2005
@@ -23,7 +23,6 @@
import java.io.File;
import java.util.ArrayList;
-import java.util.Arrays;
import java.util.Iterator;
import java.util.List;
import java.util.Set;
@@ -66,6 +65,8 @@
private List earModules;
+private List allModules;
+
private File buildDir;
public void execute()
@@ -73,9 +74,10 @@
{
getLog().debug( "Resolving ear modules ..." );
+allModules = new ArrayList();
+
if ( modules != null && modules.length > 0 )
{
-
// Let's validate user-defined modules
EarModule module = null;
try
@@ -85,17 +87,13 @@
module = (EarModule) modules[i];
getLog().debug( "Resolving ear module[" + module + "]" );
module.resolveArtifact( project.getArtifacts() );
+allModules.add( module );
}
}
catch ( EarPluginException e )
{
throw new MojoExecutionException( "Failed to initialize ear
modules", e );
}
-earModules = new ArrayList( Arrays.asList( modules ) );
-}
-else
-{
-earModules = new ArrayList();
}
// Let's add other modules
@@ -106,12 +104,26 @@
// Artifact is not yet registered and it has neither test, nor a
// provided scope
-if ( !isArtifactRegistered( artifact, earModules ) &&
- !Artifact.SCOPE_TEST.equals( artifact.getScope() ) &&
- !Artifact.SCOPE_PROVIDED.equals( artifact.getScope() ) )
+if ( !isArtifactRegistered( artifact, allModules ) &&
svn commit: r232832 - /maven/components/trunk/maven-site/src/site/apt/site.apt
Author: trygvis Date: Mon Aug 15 09:39:20 2005 New Revision: 232832 URL: http://svn.apache.org/viewcvs?rev=232832&view=rev Log: Fixing MNG-737. o Correcting the groupId of the plugin. Modified: maven/components/trunk/maven-site/src/site/apt/site.apt Modified: maven/components/trunk/maven-site/src/site/apt/site.apt URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-site/src/site/apt/site.apt?rev=232832&r1=232831&r2=232832&view=diff == --- maven/components/trunk/maven-site/src/site/apt/site.apt (original) +++ maven/components/trunk/maven-site/src/site/apt/site.apt Mon Aug 15 09:39:20 2005 @@ -167,7 +167,7 @@ -org.apache.maven.reports +org.apache.maven.plugins maven-project-info-reports-plugin - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r232831 - /maven/components/trunk/maven-site/src/site/apt/developers/development-guide.apt
Author: trygvis
Date: Mon Aug 15 09:32:16 2005
New Revision: 232831
URL: http://svn.apache.org/viewcvs?rev=232831&view=rev
Log:
o Improving the 'related projects' section.
Modified:
maven/components/trunk/maven-site/src/site/apt/developers/development-guide.apt
Modified:
maven/components/trunk/maven-site/src/site/apt/developers/development-guide.apt
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-site/src/site/apt/developers/development-guide.apt?rev=232831&r1=232830&r2=232831&view=diff
==
---
maven/components/trunk/maven-site/src/site/apt/developers/development-guide.apt
(original)
+++
maven/components/trunk/maven-site/src/site/apt/developers/development-guide.apt
Mon Aug 15 09:32:16 2005
@@ -114,23 +114,82 @@
*.iml
---
-* Dependent Projects
+* Related Projects
- Maven 2 has a few dependencies on other projects. TODO: Write more details
here.
+ Maven 2 has a few dependencies on other projects.
+
+ * Plexus
+
+ Plexus is a full-fledged container supporting different cinds of component
lifecycles. It's native lifecycle
+ is like any other modern IoC container, using field injection of both
requirements and configuration. All
+ core Maven 2 functionality are Plexus components.
+
+ You can read more about Plexus {{{http://plexus.codehaus.org}here}}.
* Modello
+ Modello is a simple tool for representing an object model and generate code
and resources from the model. Maven is
+ using Modello to generate all Java objects, XML readers and writers, XML
Schema and HTML documentation.
+
+ You can read more about Modello {{{http://modello.codehaus.org}here}}.
+
* Surefire
- * Plexus
+ Surefire is a testing framework. It can run regular JUnit tests so you won't
have to change anything in your code to
+ use it. It support scriping tests in BeanShell and Jython and has special
"batteries" for writing acceptance and
+ functional tests for the web and for testing XML-RPC code.
+
+ You can read more about Surefire {{{http://surefire.codehaus.org}here}}.
* Doxia
+ Doxia is Maven's documentation engine. It has a sink and parser API that can
be used to plug in support for input
+ and output documents. Currently it has support for these document formats:
+
+*---++-*
+| Format| In | Out |
+*---++-*
+| APT - Almost Plain Text | Y | N |
+*---++-*
+| DocBook | Y | Y |
+*---++-*
+| FML - FAQ Markup Language | Y | N/A |
+*---++-*
+| LaTeX | N | Y |
+*---++-*
+| RTF | N | Y |
+*---++-*
+| XDoc | Y | Y |
+*---++-*
+| XHTML | Y | Y |
+*---++-*
+Available formats
+
+ You can read more about Doxia {{{http://doxia.codehaus.org}here}}.
+
* Mojo
+ "Mojo" is really two things when it comes to Maven. It is both Maven's
plug-in API but also a separate Codehaus
+ project hosting these plugins.
+
+ {{{http://mojo.codehaus.org}The Mojo Project}} is a plugin forge for all
non-core Maven plugins. As we try to keep
+ the Mojos as independent of Maven as possible to increase their reuse we try
to keep them a bit away from Maven
+ itself. There is also a lower bar for becoming a part of the project.
+
+* Sub Projects
+
+** Maven SCM
+
+ Maven SCM (Source Control Management) is an reusable API which is independent
of Maven itself and it is used by the
+ SCM related Maven Plugins. The core part of Maven itself doesn't depend on
Maven SCM.
+
+** Maven Wagon
+
+ Maven Wagon is also a standalone API that deals with transporting files and
directories. Maven Core uses the Wagon
+ API to download and upload artifacts and artifact metadata and the site
plug-in uses it to publish the site.
+
* Subversion Configuration
Before committing files in subversion repository, you need to read the
{{{http://www.apache.org/dev/version-control.html#https-svn}Committer
Subversion Access}}
- document and you must set your svn client
- with these properties file : {{svn-eol-style.txt}}
+ document and you must set your svn client with these properties file :
{{svn-eol-style.txt}}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r231478 - /maven/components/trunk/maven-plugins/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/AbstractCompilerMojo.java
Author: trygvis
Date: Thu Aug 11 09:14:18 2005
New Revision: 231478
URL: http://svn.apache.org/viewcvs?rev=231478&view=rev
Log:
o Updating to the latest Plexus compiler API.
Modified:
maven/components/trunk/maven-plugins/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/AbstractCompilerMojo.java
Modified:
maven/components/trunk/maven-plugins/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/AbstractCompilerMojo.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/AbstractCompilerMojo.java?rev=231478&r1=231477&r2=231478&view=diff
==
---
maven/components/trunk/maven-plugins/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/AbstractCompilerMojo.java
(original)
+++
maven/components/trunk/maven-plugins/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/AbstractCompilerMojo.java
Thu Aug 11 09:14:18 2005
@@ -19,12 +19,16 @@
import org.codehaus.plexus.compiler.Compiler;
import org.codehaus.plexus.compiler.CompilerConfiguration;
import org.codehaus.plexus.compiler.CompilerError;
+import org.codehaus.plexus.compiler.CompilerOutputStyle;
+import org.codehaus.plexus.compiler.CompilerException;
import org.codehaus.plexus.compiler.manager.CompilerManager;
import org.codehaus.plexus.compiler.manager.NoSuchCompilerException;
import org.codehaus.plexus.compiler.util.scan.InclusionScanException;
import org.codehaus.plexus.compiler.util.scan.SourceInclusionScanner;
import org.codehaus.plexus.compiler.util.scan.StaleSourceScanner;
import org.codehaus.plexus.compiler.util.scan.mapping.SuffixMapping;
+import org.codehaus.plexus.compiler.util.scan.mapping.SourceMapping;
+import
org.codehaus.plexus.compiler.util.scan.mapping.SingleTargetSourceMapping;
import java.io.File;
import java.util.ArrayList;
@@ -32,7 +36,13 @@
import java.util.Iterator;
import java.util.List;
import java.util.Set;
+import java.util.Map;
+/**
+ * @author others
+ * @author mailto:[EMAIL PROTECTED]">Trygve Laugstøl
+ * @version $Id: StaleSourceScannerTest.java 2393 2005-08-08 22:32:59Z kenney $
+ */
public abstract class AbstractCompilerMojo
extends AbstractMojo
{
@@ -116,7 +126,7 @@
*
* @parameter
*/
-private List compilerArguements;
+private Map compilerArguments;
/**
* The directory to run the compiler from if fork is true.
@@ -144,13 +154,32 @@
throws MojoExecutionException
{
//
--
+// Look up the compiler. This is done before other code than can
+// cause the mojo to return before the lookup is done possibly
resulting
+// in misconfigured POMs still building.
+//
--
+
+Compiler compiler;
+
+try
+{
+compiler = compilerManager.getCompiler( compilerId );
+}
+catch ( NoSuchCompilerException e )
+{
+throw new MojoExecutionException( "No such compiler '" +
e.getCompilerId() + "'." );
+}
+
+//
--
//
//
--
List compileSourceRoots = removeEmptyCompileSourceRoots(
getCompileSourceRoots() );
+
if ( compileSourceRoots.isEmpty() )
{
getLog().info( "No sources to compile" );
+
return;
}
@@ -166,20 +195,6 @@
compilerConfiguration.setSourceLocations( compileSourceRoots );
-// TODO: have an option to always compile (without need to clean)
-Set staleSources = computeStaleSources();
-
-if ( staleSources.isEmpty() )
-{
-getLog().info( "Nothing to compile - all classes are up to date" );
-
-return;
-}
-else
-{
-compilerConfiguration.setSourceFiles( staleSources );
-}
-
compilerConfiguration.setDebug( debug );
compilerConfiguration.setShowWarnings( showWarnings );
@@ -192,7 +207,7 @@
compilerConfiguration.setSourceEncoding( encoding );
-compilerConfiguration.setCustomCompilerArguments( compilerArguements );
+compilerConfiguration.setCustomCompilerArguments( compilerArguments );
compilerConfiguration.setFork( fork );
@@ -200,6 +215,29 @@
compilerConfiguration.setWorkingDirectory( basedir );
+// TODO: have an option to always compile (without need to clean)
+Set staleSources;
+
+try
+{
+staleSources = computeStaleSources( compilerConfiguration,
compiler );
+}
+catch ( CompilerException
svn commit: r231258 - in /maven/components/trunk/maven-site/src/site: apt/building.apt apt/developers/building.apt apt/developers/development-guide.apt fml/about.fml fml/general.fml site.xml xdoc/index.xml
Author: trygvis
Date: Wed Aug 10 08:06:03 2005
New Revision: 231258
URL: http://svn.apache.org/viewcvs?rev=231258&view=rev
Log:
o Adding a part on how to get into development of m2 itself.
Added:
maven/components/trunk/maven-site/src/site/apt/developers/building.apt
- copied, changed from r231057,
maven/components/trunk/maven-site/src/site/apt/building.apt
Removed:
maven/components/trunk/maven-site/src/site/apt/building.apt
Modified:
maven/components/trunk/maven-site/src/site/apt/developers/development-guide.apt
maven/components/trunk/maven-site/src/site/fml/about.fml
maven/components/trunk/maven-site/src/site/fml/general.fml
maven/components/trunk/maven-site/src/site/site.xml
maven/components/trunk/maven-site/src/site/xdoc/index.xml
Copied: maven/components/trunk/maven-site/src/site/apt/developers/building.apt
(from r231057, maven/components/trunk/maven-site/src/site/apt/building.apt)
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-site/src/site/apt/developers/building.apt?p2=maven/components/trunk/maven-site/src/site/apt/developers/building.apt&p1=maven/components/trunk/maven-site/src/site/apt/building.apt&r1=231057&r2=231258&rev=231258&view=diff
==
--- maven/components/trunk/maven-site/src/site/apt/building.apt (original)
+++ maven/components/trunk/maven-site/src/site/apt/developers/building.apt Wed
Aug 10 08:06:03 2005
@@ -53,7 +53,11 @@
export M2_HOME=/usr/local/maven-2.0-SNAPSHOT
PATH=$M2_HOME/bin:$PATH
+
+
or
+
+
set M2_HOME=c:\maven-2.0-SNAPSHOT
set PATH=%M2_HOME%\bin;%PATH%
@@ -62,7 +66,11 @@
sh m2-bootstrap-all.sh
+
+
or
+
+
m2-bootstrap-all.bat
@@ -77,7 +85,5 @@
* M2_HOME directory contains a valid installation of m2 (ie
$M2_HOME/bin/m2.conf or %M2_HOME%\bin\m2.conf exists).
- If you have any problems or get any failures during the run, please report
them to the
+ If you have any problems or get any failures during the run, please report
them to the
{{{/mail-lists.html} Maven Developers List}}.
-
-
Modified:
maven/components/trunk/maven-site/src/site/apt/developers/development-guide.apt
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-site/src/site/apt/developers/development-guide.apt?rev=231258&r1=231257&r2=231258&view=diff
==
---
maven/components/trunk/maven-site/src/site/apt/developers/development-guide.apt
(original)
+++
maven/components/trunk/maven-site/src/site/apt/developers/development-guide.apt
Wed Aug 10 08:06:03 2005
@@ -2,27 +2,135 @@
Development Guide
--
Emmanuel Venisse
+Trygve Laugstol
--
8 July 2005
--
-~~ Copyright 2001-2004 The Apache Software Foundation.
-~~
+~~ Copyright 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.
-Subversion configuration
+Developing Maven 2
-Before committing files in subversion repository, you need to read the
-{{{http://www.apache.org/dev/version-control.html#https-svn}Committer
Subversion Access}}
-document and you must set your svn client
-with these properties file : {{svn-eol-style.txt}}
+ This document describes how to get started into developing Maven 2 itself.
There is a separate page describing how
+ to {{{building.html}building Maven 2}}.
+
+* Finding some work to do
+
+ First of all you need something to work on! Unless you have found a
particular issue you would like to work on
+ the Maven team has categorized a few issues that we could use help to
solve them. The list is on our
+ {{{http://docs.codehaus.org/display/MAVEN/How+to+help}Conflucene wiki}} and
will be updated every 60 minutes.
+
+ JIRA also has RSS feeds available if you'd like to include those in your
favorite feed aggregator.
+
+ We categorize the issues in three different categories:
+
+ * <>: No previous exposure to the code needed.
+
<({{{http://jira.codehaus.org/secure/IssueNavigator.jspa?view=rss&pid=10500&resolutionIds=-1&customfield_10010=Novice&sorter/field=priority&sorter/order=ASC&sorter/field=issuekey&sorter/order=ASC&tempMax=25&reset=true&decorator=none}rss
feed}})>
+
+ * <>: Exposure to Maven pluins and/or internals requir
svn commit: r231065 - in /maven/components/trunk/maven-core-it: it0044/ it0045/ it0046/ it0046/subproject2/
Author: trygvis Date: Tue Aug 9 10:13:40 2005 New Revision: 231065 URL: http://svn.apache.org/viewcvs?rev=231065&view=rev Log: o Setting svn ignores. Modified: maven/components/trunk/maven-core-it/it0044/ (props changed) maven/components/trunk/maven-core-it/it0045/ (props changed) maven/components/trunk/maven-core-it/it0046/ (props changed) maven/components/trunk/maven-core-it/it0046/subproject2/ (props changed) Propchange: maven/components/trunk/maven-core-it/it0044/ -- --- svn:ignore (added) +++ svn:ignore Tue Aug 9 10:13:40 2005 @@ -0,0 +1,2 @@ +target +*.txt Propchange: maven/components/trunk/maven-core-it/it0045/ -- --- svn:ignore (added) +++ svn:ignore Tue Aug 9 10:13:40 2005 @@ -0,0 +1,2 @@ +target +*.txt Propchange: maven/components/trunk/maven-core-it/it0046/ -- --- svn:ignore (added) +++ svn:ignore Tue Aug 9 10:13:40 2005 @@ -0,0 +1,2 @@ +target +*.txt Propchange: maven/components/trunk/maven-core-it/it0046/subproject2/ -- --- svn:ignore (added) +++ svn:ignore Tue Aug 9 10:13:40 2005 @@ -0,0 +1,8 @@ +target +*~ +*.log +.classpath +.project +*.ipr +*.iws +*.iml - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r231064 - /maven/components/trunk/maven-plugins/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/AbstractCompilerMojo.java
Author: trygvis Date: Tue Aug 9 10:03:55 2005 New Revision: 231064 URL: http://svn.apache.org/viewcvs?rev=231064&view=rev Log: o Updating WRT the latest plexus-api. Modified: maven/components/trunk/maven-plugins/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/AbstractCompilerMojo.java Modified: maven/components/trunk/maven-plugins/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/AbstractCompilerMojo.java URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/AbstractCompilerMojo.java?rev=231064&r1=231063&r2=231064&view=diff == --- maven/components/trunk/maven-plugins/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/AbstractCompilerMojo.java (original) +++ maven/components/trunk/maven-plugins/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/AbstractCompilerMojo.java Tue Aug 9 10:03:55 2005 @@ -182,23 +182,23 @@ compilerConfiguration.setDebug( debug ); -compilerConfiguration.setShowDeprecation( showDeprecation ); - compilerConfiguration.setShowWarnings( showWarnings ); +compilerConfiguration.setShowDeprecation( showDeprecation ); + compilerConfiguration.setSourceVersion( source ); compilerConfiguration.setTargetVersion( target ); compilerConfiguration.setSourceEncoding( encoding ); +compilerConfiguration.setCustomCompilerArguments( compilerArguements ); + compilerConfiguration.setFork( fork ); compilerConfiguration.setExecutable( executable ); compilerConfiguration.setWorkingDirectory( basedir ); - -compilerConfiguration.setCompilerArguements( compilerArguements ); // -- // Dump configuration - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r230934 - /maven/components/trunk/maven-site/src/site/xdoc/dependency-mechanism.xml
Author: trygvis Date: Mon Aug 8 17:20:31 2005 New Revision: 230934 URL: http://svn.apache.org/viewcvs?rev=230934&view=rev Log: o Adding a piece about dependency management. Modified: maven/components/trunk/maven-site/src/site/xdoc/dependency-mechanism.xml Modified: maven/components/trunk/maven-site/src/site/xdoc/dependency-mechanism.xml URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-site/src/site/xdoc/dependency-mechanism.xml?rev=230934&r1=230933&r2=230934&view=diff == --- maven/components/trunk/maven-site/src/site/xdoc/dependency-mechanism.xml (original) +++ maven/components/trunk/maven-site/src/site/xdoc/dependency-mechanism.xml Mon Aug 8 17:20:31 2005 @@ -2,16 +2,29 @@ Dependency Mechanism Brett Porter +Trygve Laugstol There are many aspects to working with dependencies in Maven. While it is not the sole focus of Maven, it -does comprise a large and important part of the system. +does comprise a large and important part of the system. Learn more about: + + +Transitive Dependencies + + +Dependency Scope + + +Dependency Management + + -This document is currently in the process of being written, so not all facets are covered. +This document is currently in the process of being written, so not all facets are covered. + Transitive dependencies are a new feature in Maven 2.0. This allows you to avoid needing to discover and @@ -33,12 +46,14 @@ -Dependency mediation- this determines what version of a dependency will be used when multiple +Dependency mediation +- this determines what version of a dependency will be used when multiple different ones are encountered. Currently, Maven 2.0 only supports using the "nearest definition" - so you can always guarantee a version by declaring it explicitly in the project's POM. -Dependency scope- this allows you to only include dependencies appropriate for the current stage +Dependency scope +- this allows you to only include dependencies appropriate for the current stage of the build. This is described in more detail below. @@ -49,6 +64,7 @@ + Dependency scope is used to limit the transitivity of a depedency, and also to affect the classpath used for various build tasks. @@ -58,20 +74,24 @@ -compile- this is the default scope, used if none is specified. Compile dependencies are available +compile +- this is the default scope, used if none is specified. Compile dependencies are available in all classpaths. -provided- this is much like compile, but indicates you expect the JDK or a container to provide it. +provided +- this is much like compile, but indicates you expect the JDK or a container to provide it. It is only available on the compilation classpath, and is not transitive. -runtime- this scope indicates that the dependency is not required for compilation, but is for +runtime +- this scope indicates that the dependency is not required for compilation, but is for execution. It is in the runtime and test classpaths, but not the compile classpath. -test- this scope indicates that the dependency is not required for normal use of the application, and +test +- this scope indicates that the dependency is not required for normal use of the application, and is only available for the test compilation and execution phases. @@ -119,13 +139,140 @@ - (*) Note:it is intended that this should be runtime instead, so that all compile dependencies must + (*) Note: + it is intended that this should be runtime instead, so that all compile dependencies must be explicitly listed - however, there is the case where the library you depend on extends a class from another library, forcing you to have available at compile time. For this reason, compile time dependencies remain as compile scope even when they are transitive. + + + + The dependency management section is a mechanism for centralizing dependency information. When you have + a set of projects tha
svn commit: r230933 - /maven/components/trunk/maven-site/
Author: trygvis Date: Mon Aug 8 17:20:09 2005 New Revision: 230933 URL: http://svn.apache.org/viewcvs?rev=230933&view=rev Log: o Setting ignores. Modified: maven/components/trunk/maven-site/ (props changed) Propchange: maven/components/trunk/maven-site/ -- --- svn:ignore (original) +++ svn:ignore Mon Aug 8 17:20:09 2005 @@ -1,3 +1,8 @@ target -maven-site.iml -velocity.log* +*~ +*.log +.classpath +.project +*.ipr +*.iws +*.iml - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r230869 - /maven/components/trunk/maven-plugins/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/AbstractCompilerMojo.java
Author: trygvis
Date: Mon Aug 8 12:58:32 2005
New Revision: 230869
URL: http://svn.apache.org/viewcvs?rev=230869&view=rev
Log:
Resolving http://jira.codehaus.org/browse/MNG-710: "Add ability to fork the
maven-compiler-plugin".
o Applying Rod Coffin's patch. Removed the basedir as a configurable argument.
Modified:
maven/components/trunk/maven-plugins/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/AbstractCompilerMojo.java
Modified:
maven/components/trunk/maven-plugins/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/AbstractCompilerMojo.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/AbstractCompilerMojo.java?rev=230869&r1=230868&r2=230869&view=diff
==
---
maven/components/trunk/maven-plugins/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/AbstractCompilerMojo.java
(original)
+++
maven/components/trunk/maven-plugins/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/AbstractCompilerMojo.java
Mon Aug 8 12:58:32 2005
@@ -93,6 +93,41 @@
private String compilerId;
/**
+ * Runs the compiler in a separate process.
+ *
+ * If not set the compiler will default to a executable.
+ *
+ * @parameter default-value="false"
+ */
+private boolean fork;
+
+/**
+ * The executable of the compiler to use.
+ *
+ * @parameter
+ */
+private String executable;
+
+/**
+ * Arguements to be passed to the compiler if fork is set to true.
+ *
+ * This is because the list of valid arguements passed to a Java compiler
+ * varies based on the compiler version.
+ *
+ * @parameter
+ */
+private List compilerArguements;
+
+/**
+ * The directory to run the compiler from if fork is true.
+ *
+ * @parameter expression="${basedir}"
+ * @required
+ * @readonly
+ */
+private File basedir;
+
+/**
* @parameter
expression="${component.org.codehaus.plexus.compiler.manager.CompilerManager}"
* @required
* @readonly
@@ -137,6 +172,7 @@
if ( staleSources.isEmpty() )
{
getLog().info( "Nothing to compile - all classes are up to date" );
+
return;
}
else
@@ -156,6 +192,14 @@
compilerConfiguration.setSourceEncoding( encoding );
+compilerConfiguration.setFork( fork );
+
+compilerConfiguration.setExecutable( executable );
+
+compilerConfiguration.setWorkingDirectory( basedir );
+
+compilerConfiguration.setCompilerArguements( compilerArguements );
+
//
--
// Dump configuration
//
--
@@ -256,8 +300,8 @@
}
catch ( InclusionScanException e )
{
-throw new MojoExecutionException( "Error scanning source root:
\'" + sourceRoot
-+ "\' for stale files to recompile.", e );
+throw new MojoExecutionException( "Error scanning source root:
\'" + sourceRoot + "\' " +
+ "for stale files to
recompile.", e );
}
}
@@ -285,5 +329,4 @@
}
return newCompileSourceRootsList;
}
-
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r230547 - /maven/components/trunk/maven-plugins/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/AbstractCompilerMojo.java
Author: trygvis
Date: Sat Aug 6 05:36:48 2005
New Revision: 230547
URL: http://svn.apache.org/viewcvs?rev=230547&view=rev
Log:
o Adding parameters:
- Show deprecation
- Show warnings
o Using the setters on the configuration object instead of passing them in
their raw format (eg -target 1.1).
Modified:
maven/components/trunk/maven-plugins/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/AbstractCompilerMojo.java
Modified:
maven/components/trunk/maven-plugins/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/AbstractCompilerMojo.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/AbstractCompilerMojo.java?rev=230547&r1=230546&r2=230547&view=diff
==
---
maven/components/trunk/maven-plugins/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/AbstractCompilerMojo.java
(original)
+++
maven/components/trunk/maven-plugins/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/AbstractCompilerMojo.java
Sat Aug 6 05:36:48 2005
@@ -45,6 +45,20 @@
private boolean debug;
/**
+ * Output source locations where deprecated APIs are used
+ *
+ * @parameter
+ */
+private boolean showDeprecation;
+
+/**
+ * Output warnings
+ *
+ * @parameter
+ */
+private boolean showWarnings;
+
+/**
* The -source argument for the Java compiler
*
* @parameter
@@ -130,22 +144,17 @@
compilerConfiguration.setSourceFiles( staleSources );
}
-if ( source != null )
-{
-compilerConfiguration.addCompilerOption( "-source", source );
-}
+compilerConfiguration.setDebug( debug );
-if ( target != null )
-{
-compilerConfiguration.addCompilerOption( "-target", target );
-}
+compilerConfiguration.setShowDeprecation( showDeprecation );
-if ( encoding != null )
-{
-compilerConfiguration.addCompilerOption( "-encoding" , encoding );
-}
+compilerConfiguration.setShowWarnings( showWarnings );
-compilerConfiguration.setDebug( debug );
+compilerConfiguration.setSourceVersion( source );
+
+compilerConfiguration.setTargetVersion( target );
+
+compilerConfiguration.setSourceEncoding( encoding );
//
--
// Dump configuration
@@ -189,7 +198,7 @@
throw new MojoExecutionException( "No such compiler '" +
e.getCompilerId() + "'." );
}
-getLog().info( "Using compiler '" + compilerId + "'." );
+getLog().debug( "Using compiler '" + compilerId + "'." );
try
{
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r227494 - in /maven/components/trunk/maven-plugins/maven-compiler-plugin: ./ src/main/java/org/apache/maven/plugin/
Author: trygvis
Date: Thu Aug 4 14:23:32 2005
New Revision: 227494
URL: http://svn.apache.org/viewcvs?rev=227494&view=rev
Log:
o Adding support for selecting the Plexus compiler implementation. Configure
the compiler plugin with , both "javac" and "eclipse" will work.
The default value is still "javac" so this shouldn't break anything.
Modified:
maven/components/trunk/maven-plugins/maven-compiler-plugin/pom.xml
maven/components/trunk/maven-plugins/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/AbstractCompilerMojo.java
maven/components/trunk/maven-plugins/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/CompilationFailureException.java
maven/components/trunk/maven-plugins/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/CompilerMojo.java
maven/components/trunk/maven-plugins/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/TestCompilerMojo.java
Modified: maven/components/trunk/maven-plugins/maven-compiler-plugin/pom.xml
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-compiler-plugin/pom.xml?rev=227494&r1=227493&r2=227494&view=diff
==
--- maven/components/trunk/maven-plugins/maven-compiler-plugin/pom.xml
(original)
+++ maven/components/trunk/maven-plugins/maven-compiler-plugin/pom.xml Thu Aug
4 14:23:32 2005
@@ -19,8 +19,21 @@
plexus
+ plexus-compiler-manager
+ 1.5-SNAPSHOT
+
+
+ plexus
plexus-compiler-javac
1.5-SNAPSHOT
+ runtime
+ 1.5-SNAPSHOT
+
+
+ plexus
+ plexus-compiler-eclipse
+ 1.5-SNAPSHOT
+ runtime
org.apache.maven
Modified:
maven/components/trunk/maven-plugins/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/AbstractCompilerMojo.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/AbstractCompilerMojo.java?rev=227494&r1=227493&r2=227494&view=diff
==
---
maven/components/trunk/maven-plugins/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/AbstractCompilerMojo.java
(original)
+++
maven/components/trunk/maven-plugins/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/AbstractCompilerMojo.java
Thu Aug 4 14:23:32 2005
@@ -19,7 +19,8 @@
import org.codehaus.plexus.compiler.Compiler;
import org.codehaus.plexus.compiler.CompilerConfiguration;
import org.codehaus.plexus.compiler.CompilerError;
-import org.codehaus.plexus.compiler.javac.JavacCompiler;
+import org.codehaus.plexus.compiler.manager.CompilerManager;
+import org.codehaus.plexus.compiler.manager.NoSuchCompilerException;
import org.codehaus.plexus.compiler.util.scan.InclusionScanException;
import org.codehaus.plexus.compiler.util.scan.SourceInclusionScanner;
import org.codehaus.plexus.compiler.util.scan.StaleSourceScanner;
@@ -35,46 +36,55 @@
public abstract class AbstractCompilerMojo
extends AbstractMojo
{
-
-private Compiler compiler = new JavacCompiler();
-
/**
* Whether to include debugging information in the compiled class files.
* The default value is true.
- *
+ *
* @parameter expression="${maven.compiler.debug}" default-value="true"
*/
private boolean debug;
-
+
/**
* The -source argument for the Java compiler
- *
+ *
* @parameter
*/
private String source;
-
+
/**
* The -target argument for the Java compiler
- *
+ *
* @parameter
*/
private String target;
-
+
/**
* The -encoding argument for the Java compiler
*
* @parameter
*/
private String encoding;
-
+
/**
* The granularity in milliseconds of the last modification
* date for testing whether a source needs recompilation
- *
+ *
* @parameter expression="${lastModGranularityMs}" default-value="0"
*/
private int staleMillis;
-
+
+/**
+ * @parameter default-value="javac"
+ */
+private String compilerId;
+
+/**
+ * @parameter
expression="${component.org.codehaus.plexus.compiler.manager.CompilerManager}"
+ * @required
+ * @readonly
+ */
+private CompilerManager compilerManager;
+
protected abstract List getClasspathElements();
protected abstract List getCompileSourceRoots();
@@ -95,10 +105,16 @@
return;
}
+//
--
+// Create the compiler configuration
+//
--
+
CompilerConfiguration compilerConfiguratio
svn commit: r209427 - /maven/components/trunk/maven-plugins/maven-resources-plugin/src/main/java/org/apache/maven/plugin/resources/ReflectionProperties.java
Author: trygvis
Date: Wed Jul 6 01:01:51 2005
New Revision: 209427
URL: http://svn.apache.org/viewcvs?rev=209427&view=rev
Log:
o Adding missing file.
Added:
maven/components/trunk/maven-plugins/maven-resources-plugin/src/main/java/org/apache/maven/plugin/resources/ReflectionProperties.java
(with props)
Added:
maven/components/trunk/maven-plugins/maven-resources-plugin/src/main/java/org/apache/maven/plugin/resources/ReflectionProperties.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-resources-plugin/src/main/java/org/apache/maven/plugin/resources/ReflectionProperties.java?rev=209427&view=auto
==
---
maven/components/trunk/maven-plugins/maven-resources-plugin/src/main/java/org/apache/maven/plugin/resources/ReflectionProperties.java
(added)
+++
maven/components/trunk/maven-plugins/maven-resources-plugin/src/main/java/org/apache/maven/plugin/resources/ReflectionProperties.java
Wed Jul 6 01:01:51 2005
@@ -0,0 +1,54 @@
+package org.apache.maven.plugin.resources;
+
+/*
+ * 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.project.MavenProject;
+import org.codehaus.plexus.util.introspection.ReflectionValueExtractor;
+
+import java.util.Properties;
+
+
+/**
+ * @author Andreas Hoheneder (ahoh_at_inode.at)
+ * @version $Id$
+ */
+public class ReflectionProperties
+extends Properties
+{
+
+private MavenProject project;
+
+public ReflectionProperties( MavenProject aProject )
+{
+ super();
+ project = aProject;
+}
+
+public Object get( Object key )
+{
+Object value = null;
+try
+{
+value = ReflectionValueExtractor.evaluate( "" + key , project );
+}
+catch ( Exception e )
+{
+//TODO: remove the try-catch block when
ReflectionValueExtractor.evaluate() throws no more exceptions
+}
+return value;
+}
+}
Propchange:
maven/components/trunk/maven-plugins/maven-resources-plugin/src/main/java/org/apache/maven/plugin/resources/ReflectionProperties.java
--
svn:eol-style = native
Propchange:
maven/components/trunk/maven-plugins/maven-resources-plugin/src/main/java/org/apache/maven/plugin/resources/ReflectionProperties.java
--
svn:keywords = Id
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r208783 - /maven/components/trunk/m2-bootstrap-all.sh
Author: trygvis Date: Fri Jul 1 12:26:56 2005 New Revision: 208783 URL: http://svn.apache.org/viewcvs?rev=208783&view=rev Log: o M2_HOME has to be set. Modified: maven/components/trunk/m2-bootstrap-all.sh Modified: maven/components/trunk/m2-bootstrap-all.sh URL: http://svn.apache.org/viewcvs/maven/components/trunk/m2-bootstrap-all.sh?rev=208783&r1=208782&r2=208783&view=diff == --- maven/components/trunk/m2-bootstrap-all.sh (original) +++ maven/components/trunk/m2-bootstrap-all.sh Fri Jul 1 12:26:56 2005 @@ -18,9 +18,12 @@ [ -n "$M2_HOME" ] && M2_HOME=`cygpath -w "$M2_HOME"` fi -if [ ! -z "$M2_HOME" ]; then - HOME_ARGS="-Dmaven.home=$M2_HOME" +if [ -z "$M2_HOME" ]; then + echo "M2_HOME must be set." + exit 1 fi + +HOME_ARGS="-Dmaven.home=$M2_HOME" # Build and install mboot ( - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r208743 - in /maven/components/trunk: maven-artifact/src/main/resources/META-INF/plexus/components.xml maven-core/src/main/resources/META-INF/plexus/components.xml
Author: trygvis Date: Fri Jul 1 03:37:49 2005 New Revision: 208743 URL: http://svn.apache.org/viewcvs?rev=208743&view=rev Log: (empty) Modified: maven/components/trunk/maven-artifact/src/main/resources/META-INF/plexus/components.xml maven/components/trunk/maven-core/src/main/resources/META-INF/plexus/components.xml Modified: maven/components/trunk/maven-artifact/src/main/resources/META-INF/plexus/components.xml URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-artifact/src/main/resources/META-INF/plexus/components.xml?rev=208743&r1=208742&r2=208743&view=diff == --- maven/components/trunk/maven-artifact/src/main/resources/META-INF/plexus/components.xml (original) +++ maven/components/trunk/maven-artifact/src/main/resources/META-INF/plexus/components.xml Fri Jul 1 03:37:49 2005 @@ -98,6 +98,17 @@ org.apache.maven.artifact.handler.ArtifactHandler + plexus-application + org.apache.maven.artifact.handler.DefaultArtifactHandler + +plexus-application +jar +plexus-application + + + + + org.apache.maven.artifact.handler.ArtifactHandler ejb-client org.apache.maven.artifact.handler.DefaultArtifactHandler Modified: maven/components/trunk/maven-core/src/main/resources/META-INF/plexus/components.xml URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core/src/main/resources/META-INF/plexus/components.xml?rev=208743&r1=208742&r2=208743&view=diff == --- maven/components/trunk/maven-core/src/main/resources/META-INF/plexus/components.xml (original) +++ maven/components/trunk/maven-core/src/main/resources/META-INF/plexus/components.xml Fri Jul 1 03:37:49 2005 @@ -216,7 +216,7 @@ plexus:app - plexus:bundle-runtime + plexus:bundle-application install:install deploy:deploy - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r191587 - /maven/components/trunk/maven-artifact/src/main/resources/META-INF/plexus/components.xml
Author: trygvis Date: Mon Jun 20 16:31:42 2005 New Revision: 191587 URL: http://svn.apache.org/viewcvs?rev=191587&view=rev Log: o Adding a plexus-service artifact handler. Modified: maven/components/trunk/maven-artifact/src/main/resources/META-INF/plexus/components.xml Modified: maven/components/trunk/maven-artifact/src/main/resources/META-INF/plexus/components.xml URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-artifact/src/main/resources/META-INF/plexus/components.xml?rev=191587&r1=191586&r2=191587&view=diff == --- maven/components/trunk/maven-artifact/src/main/resources/META-INF/plexus/components.xml (original) +++ maven/components/trunk/maven-artifact/src/main/resources/META-INF/plexus/components.xml Mon Jun 20 16:31:42 2005 @@ -180,6 +180,17 @@ org.apache.maven.artifact.handler.ArtifactHandler + plexus-service + org.apache.maven.artifact.handler.DefaultArtifactHandler + +plexus-service +jar +plexus-service + + + + + org.apache.maven.artifact.handler.ArtifactHandler ejb-client org.apache.maven.artifact.handler.DefaultArtifactHandler - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r188848 - in /maven/components/trunk/maven-artifact/src/main: java/org/apache/maven/artifact/handler/PlexusApplicationHandler.java resources/META-INF/plexus/components.xml
Author: trygvis
Date: Tue Jun 7 12:14:34 2005
New Revision: 188848
URL: http://svn.apache.org/viewcvs?rev=188848&view=rev
Log:
o Adding handler for Plexus applications.
Added:
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/handler/PlexusApplicationHandler.java
(with props)
Modified:
maven/components/trunk/maven-artifact/src/main/resources/META-INF/plexus/components.xml
Added:
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/handler/PlexusApplicationHandler.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/handler/PlexusApplicationHandler.java?rev=188848&view=auto
==
---
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/handler/PlexusApplicationHandler.java
(added)
+++
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/handler/PlexusApplicationHandler.java
Tue Jun 7 12:14:34 2005
@@ -0,0 +1,30 @@
+package org.apache.maven.artifact.handler;
+
+/*
+ * 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.
+ */
+
+/**
+ * @author mailto:[EMAIL PROTECTED]">Jason van Zyl
+ * @version $Id$
+ */
+public class PlexusApplicationHandler
+extends JarHandler
+{
+public String packageGoal()
+{
+return "plexus:app";
+}
+}
Propchange:
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/handler/PlexusApplicationHandler.java
--
svn:eol-style = native
Propchange:
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/handler/PlexusApplicationHandler.java
--
svn:keywords = Id
Modified:
maven/components/trunk/maven-artifact/src/main/resources/META-INF/plexus/components.xml
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-artifact/src/main/resources/META-INF/plexus/components.xml?rev=188848&r1=188847&r2=188848&view=diff
==
---
maven/components/trunk/maven-artifact/src/main/resources/META-INF/plexus/components.xml
(original)
+++
maven/components/trunk/maven-artifact/src/main/resources/META-INF/plexus/components.xml
Tue Jun 7 12:14:34 2005
@@ -153,6 +153,12 @@
org.apache.maven.artifact.handler.ArtifactHandler
+ plexus-application
+
org.apache.maven.artifact.handler.PlexusApplicationHandler
+
+
+
+ org.apache.maven.artifact.handler.ArtifactHandler
plexus-service
org.apache.maven.artifact.handler.PlexusServiceHandler
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r180000 - /maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
Author: trygvis
Date: Sat Jun 4 09:10:13 2005
New Revision: 18
URL: http://svn.apache.org/viewcvs?rev=18&view=rev
Log:
o Fixing a small bug that would cause a NPE if a plugin doesn't contain any
mojos.
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java?rev=18&r1=17&r2=18&view=diff
==
---
maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
(original)
+++
maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
Sat Jun 4 09:10:13 2005
@@ -251,30 +251,33 @@
Map goalMap = plugin.getGoalsAsMap();
-for ( Iterator j = pluginDescriptor.getMojos().iterator();
j.hasNext(); )
+if ( pluginDescriptor.getMojos() != null )
{
-MojoDescriptor mojoDescriptor = (MojoDescriptor) j.next();
-
-// TODO: remove later
-if ( mojoDescriptor.getGoal() == null )
+for ( Iterator j = pluginDescriptor.getMojos().iterator();
j.hasNext(); )
{
-throw new LifecycleExecutionException(
-"The plugin " + artifactId + " was built with an older
version of Maven" );
-}
+MojoDescriptor mojoDescriptor = (MojoDescriptor) j.next();
+
+// TODO: remove later
+if ( mojoDescriptor.getGoal() == null )
+{
+throw new LifecycleExecutionException(
+"The plugin " + artifactId + " was built with an
older version of Maven" );
+}
-Goal goal = (Goal) goalMap.get( mojoDescriptor.getGoal() );
+Goal goal = (Goal) goalMap.get( mojoDescriptor.getGoal() );
-if( goalMap.isEmpty() )
-{
-configureMojoPhaseBinding( mojoDescriptor, phaseMap,
session.getSettings() );
-}
-else if ( goal != null )
-{
-// We have to check to see that the inheritance rules have
been applied before binding this mojo.
-if( goal.isInheritanceApplied() ||
mojoDescriptor.isInheritedByDefault() )
+if( goalMap.isEmpty() )
{
configureMojoPhaseBinding( mojoDescriptor, phaseMap,
session.getSettings() );
}
+else if ( goal != null )
+{
+// We have to check to see that the inheritance rules
have been applied before binding this mojo.
+if( goal.isInheritanceApplied() ||
mojoDescriptor.isInheritedByDefault() )
+{
+configureMojoPhaseBinding( mojoDescriptor,
phaseMap, session.getSettings() );
+}
+}
}
}
}
@@ -450,4 +453,4 @@
return phases;
}
-}
\ No newline at end of file
+}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r179987 - /maven/components/trunk/maven-plugin-tools/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/generator/PluginDescriptorGenerator.java
Author: trygvis
Date: Sat Jun 4 06:24:17 2005
New Revision: 179987
URL: http://svn.apache.org/viewcvs?rev=179987&view=rev
Log:
o Fixing a small bug that would cause a NPE if a plugin doesn't contain any
mojos.
Modified:
maven/components/trunk/maven-plugin-tools/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/generator/PluginDescriptorGenerator.java
Modified:
maven/components/trunk/maven-plugin-tools/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/generator/PluginDescriptorGenerator.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugin-tools/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/generator/PluginDescriptorGenerator.java?rev=179987&r1=179986&r2=179987&view=diff
==
---
maven/components/trunk/maven-plugin-tools/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/generator/PluginDescriptorGenerator.java
(original)
+++
maven/components/trunk/maven-plugin-tools/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/generator/PluginDescriptorGenerator.java
Sat Jun 4 06:24:17 2005
@@ -76,10 +76,13 @@
w.startElement( "mojos" );
-for ( Iterator it = pluginDescriptor.getMojos().iterator();
it.hasNext(); )
+if ( pluginDescriptor.getMojos() != null )
{
-MojoDescriptor descriptor = (MojoDescriptor) it.next();
-processMojoDescriptor( descriptor, w );
+for ( Iterator it = pluginDescriptor.getMojos().iterator();
it.hasNext(); )
+{
+MojoDescriptor descriptor = (MojoDescriptor) it.next();
+processMojoDescriptor( descriptor, w );
+}
}
w.endElement();
@@ -362,4 +365,4 @@
w.endElement();
}
-}
\ No newline at end of file
+}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r165295 - /maven/components/trunk/maven-plugins/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/AbstractCompilerMojo.java
Author: trygvis
Date: Fri Apr 29 04:30:03 2005
New Revision: 165295
URL: http://svn.apache.org/viewcvs?rev=165295&view=rev
Log:
o Making sure that non-existing source roots aren't scanned for sources.
Modified:
maven/components/trunk/maven-plugins/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/AbstractCompilerMojo.java
Modified:
maven/components/trunk/maven-plugins/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/AbstractCompilerMojo.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/AbstractCompilerMojo.java?rev=165295&r1=165294&r2=165295&view=diff
==
---
maven/components/trunk/maven-plugins/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/AbstractCompilerMojo.java
(original)
+++
maven/components/trunk/maven-plugins/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/AbstractCompilerMojo.java
Fri Apr 29 04:30:03 2005
@@ -189,6 +189,11 @@
File rootFile = new File( sourceRoot );
+if ( !rootFile.isDirectory() )
+{
+continue;
+}
+
try
{
staleSources.addAll( scanner.getIncludedSources( rootFile,
outDir ) );
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r161047 - maven/continuum/trunk/continuum-core/src/main/resources/org/apache/maven/continuum/notification/mail/templates/common.vm
Author: trygvis Date: Tue Apr 12 05:56:54 2005 New Revision: 161047 URL: http://svn.apache.org/viewcvs?view=rev&rev=161047 Log: o Adding some checks for content in stdout and stderr. Modified: maven/continuum/trunk/continuum-core/src/main/resources/org/apache/maven/continuum/notification/mail/templates/common.vm Modified: maven/continuum/trunk/continuum-core/src/main/resources/org/apache/maven/continuum/notification/mail/templates/common.vm URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/main/resources/org/apache/maven/continuum/notification/mail/templates/common.vm?view=diff&r1=161046&r2=161047 == --- maven/continuum/trunk/continuum-core/src/main/resources/org/apache/maven/continuum/notification/mail/templates/common.vm (original) +++ maven/continuum/trunk/continuum-core/src/main/resources/org/apache/maven/continuum/notification/mail/templates/common.vm Tue Apr 12 05:56:54 2005 @@ -28,7 +28,7 @@ Building machine hostname: $buildHost -#if ( $buildResult.standardOutput ) +#if ( $buildResult.standardOutput && $buildResult.standardOutput != "" ) Standard output: @@ -38,7 +38,7 @@ There was no content on standard output. #end -#if( $buildResult.standardError ) +#if( $buildResult.standardError && $buildResult.standardError != "" ) Standard error: - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r161046 - maven/continuum/trunk/continuum-core-it/README.txt
Author: trygvis Date: Tue Apr 12 05:49:31 2005 New Revision: 161046 URL: http://svn.apache.org/viewcvs?view=rev&rev=161046 Log: o Adding some docs. Added: maven/continuum/trunk/continuum-core-it/README.txt Added: maven/continuum/trunk/continuum-core-it/README.txt URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core-it/README.txt?view=auto&rev=161046 == --- maven/continuum/trunk/continuum-core-it/README.txt (added) +++ maven/continuum/trunk/continuum-core-it/README.txt Tue Apr 12 05:49:31 2005 @@ -0,0 +1,29 @@ +* Files + + [[add-*]]: These scripts will add the respective projects to Continuum. + + [[cli.py]] is a small library for making interactive command line +programs. It's used by continuum_cli.py + + [[continuum.py]] is a reusable library for interfacing with Continuum over + the XML-RPC interface. It's used by the integration tests. + + [[continuum_cli.py]] is a interactive command line interface to Continuum. + Start it with this command: + -- + $ python continuum_cli.py + -- + and write "help" at the command prompt to list all + available commands. + + [[it.py]] is the integration tests. Se the next section for more information. + +* Integration tests + +These integration tests are executed by the it.py program. It assumes that you +have Continuum running on localhost, with the XML-RPC interface running on port +8000. + +To run the tests execute the script like this: + +$ python it.py - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r161043 - in maven/continuum/trunk/continuum-core-it: ./ add-apache-ds.py add-continuum.py add-jakarta-commons.py add-maven-wagon.py add-plexus.py cli.py continuum.py continuum_cli.py it.py
Author: trygvis
Date: Tue Apr 12 04:37:25 2005
New Revision: 161043
URL: http://svn.apache.org/viewcvs?view=rev&rev=161043
Log:
o Adding the forgotten ITs.
o Changed the temp directory that the IT uses from 'test-ci' to 'target'.
Added:
maven/continuum/trunk/continuum-core-it/ (with props)
maven/continuum/trunk/continuum-core-it/add-apache-ds.py
maven/continuum/trunk/continuum-core-it/add-continuum.py
maven/continuum/trunk/continuum-core-it/add-jakarta-commons.py
maven/continuum/trunk/continuum-core-it/add-maven-wagon.py
maven/continuum/trunk/continuum-core-it/add-plexus.py
maven/continuum/trunk/continuum-core-it/cli.py
maven/continuum/trunk/continuum-core-it/continuum.py
maven/continuum/trunk/continuum-core-it/continuum_cli.py
maven/continuum/trunk/continuum-core-it/it.py
Propchange: maven/continuum/trunk/continuum-core-it/
--
--- svn:ignore (added)
+++ svn:ignore Tue Apr 12 04:37:25 2005
@@ -0,0 +1,8 @@
+target
+*~
+*.log
+.classpath
+.project
+*.ipr
+*.iws
+*.iml
Added: maven/continuum/trunk/continuum-core-it/add-apache-ds.py
URL:
http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core-it/add-apache-ds.py?view=auto&rev=161043
==
--- maven/continuum/trunk/continuum-core-it/add-apache-ds.py (added)
+++ maven/continuum/trunk/continuum-core-it/add-apache-ds.py Tue Apr 12
04:37:25 2005
@@ -0,0 +1,25 @@
+import continuum
+import sys
+
+baseurl = "scm:svn:http://svn.apache.org/repos/asf/directory";
+configuration = {}
+
+continuum.addProjectFromScm( baseurl + "/apacheds/trunk", "maven-1", "",
"[EMAIL PROTECTED]", "1.0", configuration )
+
+sys.exit()
+
+continuum.addProjectFromScm( baseurl + "/apacheds/trunk/core", "maven-1", "",
"[EMAIL PROTECTED]", "1.0", configuration )
+continuum.addProjectFromScm( baseurl + "/apacheds/trunk/main", "maven-1", "",
"[EMAIL PROTECTED]", "1.0", configuration )
+continuum.addProjectFromScm( baseurl + "/apacheds/trunk/plugin", "maven-1",
"", "[EMAIL PROTECTED]", "1.0", configuration )
+continuum.addProjectFromScm( baseurl + "/apacheds/trunk/shared", "maven-1",
"", "[EMAIL PROTECTED]", "1.0", configuration )
+
+continuum.addProjectFromScm( baseurl + "/asn1/trunk/ber", "maven-1", "",
"[EMAIL PROTECTED]", "1.0", configuration )
+continuum.addProjectFromScm( baseurl + "/asn1/trunk/codec", "maven-1", "",
"[EMAIL PROTECTED]", "1.0", configuration )
+continuum.addProjectFromScm( baseurl + "/asn1/trunk/der", "maven-1", "",
"[EMAIL PROTECTED]", "1.0", configuration )
+continuum.addProjectFromScm( baseurl + "/asn1/trunk/stub-compiler", "maven-1",
"", "[EMAIL PROTECTED]", "1.0", configuration )
+
+continuum.addProjectFromScm( baseurl + "/authx/trunk/core", "maven-1", "",
"[EMAIL PROTECTED]", "1.0", configuration )
+continuum.addProjectFromScm( baseurl + "/authx/trunk/example", "maven-1", "",
"[EMAIL PROTECTED]", "1.0", configuration )
+continuum.addProjectFromScm( baseurl + "/authx/trunk/jdbc", "maven-1", "",
"[EMAIL PROTECTED]", "1.0", configuration )
+continuum.addProjectFromScm( baseurl + "/authx/trunk/script", "maven-1", "",
"[EMAIL PROTECTED]", "1.0", configuration )
+
Added: maven/continuum/trunk/continuum-core-it/add-continuum.py
URL:
http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core-it/add-continuum.py?view=auto&rev=161043
==
--- maven/continuum/trunk/continuum-core-it/add-continuum.py (added)
+++ maven/continuum/trunk/continuum-core-it/add-continuum.py Tue Apr 12
04:37:25 2005
@@ -0,0 +1,10 @@
+import continuum
+import sys
+
+baseurl = "http://cvs.continuum.codehaus.org/*checkout*/continuum-apache/";
+
+continuumId = continuum.addProjectFromUrl( baseurl + "pom.xml", "maven2" )
+continuumModelId = continuum.addProjectFromUrl( baseurl +
"continuum-model/pom.xml", "maven2" )
+continuumCoreId = continuum.addProjectFromUrl( baseurl +
"continuum-core/pom.xml", "maven2" )
+continuumXmlRpcId = continuum.addProjectFromUrl( baseurl +
"continuum-xmlrpc/pom.xml", "maven2" )
+continuumWebId = continuum.addP
svn commit: r161038 - maven/continuum/trunk/continuum-core/src/main/resources/org/apache/maven/continuum/notification/mail/templates/common.vm
Author: trygvis Date: Tue Apr 12 03:05:55 2005 New Revision: 161038 URL: http://svn.apache.org/viewcvs?view=rev&rev=161038 Log: o Adding some checks for content in stdout and stderr. Modified: maven/continuum/trunk/continuum-core/src/main/resources/org/apache/maven/continuum/notification/mail/templates/common.vm Modified: maven/continuum/trunk/continuum-core/src/main/resources/org/apache/maven/continuum/notification/mail/templates/common.vm URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/main/resources/org/apache/maven/continuum/notification/mail/templates/common.vm?view=diff&r1=161037&r2=161038 == --- maven/continuum/trunk/continuum-core/src/main/resources/org/apache/maven/continuum/notification/mail/templates/common.vm (original) +++ maven/continuum/trunk/continuum-core/src/main/resources/org/apache/maven/continuum/notification/mail/templates/common.vm Tue Apr 12 03:05:55 2005 @@ -28,14 +28,23 @@ Building machine hostname: $buildHost +#if ( $buildResult.standardOutput ) Standard output: $buildResult.standardOutput +#else +There was no content on standard output. +#end +#if( $buildResult.standardError ) Standard error: $buildResult.standardError -#end \ No newline at end of file + +#else +There was no content on standard output. +#end +#end \ No newline at end of file - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r161037 - in maven/continuum/trunk: ./ continuum-core/ continuum-model/ continuum-plexus-application/ continuum-site/ continuum-web/ continuum-xmlrpc/
Author: trygvis Date: Tue Apr 12 03:05:14 2005 New Revision: 161037 URL: http://svn.apache.org/viewcvs?view=rev&rev=161037 Log: o Removing IDEA files o Setting ignores. Removed: maven/continuum/trunk/continuum-core/continuum-core.iml maven/continuum/trunk/continuum-core/continuum-core.ipr maven/continuum/trunk/continuum-core/continuum-core.iws maven/continuum/trunk/continuum-web/continuum-web.iml maven/continuum/trunk/continuum-web/continuum-web.ipr maven/continuum/trunk/continuum-web/continuum-web.iws Modified: maven/continuum/trunk/ (props changed) maven/continuum/trunk/continuum-core/ (props changed) maven/continuum/trunk/continuum-model/ (props changed) maven/continuum/trunk/continuum-plexus-application/ (props changed) maven/continuum/trunk/continuum-site/ (props changed) maven/continuum/trunk/continuum-web/ (props changed) maven/continuum/trunk/continuum-xmlrpc/ (props changed) Propchange: maven/continuum/trunk/ -- --- svn:ignore (added) +++ svn:ignore Tue Apr 12 03:05:14 2005 @@ -0,0 +1,8 @@ +target +*~ +*.log +.classpath +.project +*.ipr +*.iws +*.iml Propchange: maven/continuum/trunk/continuum-core/ -- --- svn:ignore (added) +++ svn:ignore Tue Apr 12 03:05:14 2005 @@ -0,0 +1,8 @@ +target +*~ +*.log +.classpath +.project +*.ipr +*.iws +*.iml Propchange: maven/continuum/trunk/continuum-model/ -- --- svn:ignore (added) +++ svn:ignore Tue Apr 12 03:05:14 2005 @@ -0,0 +1,8 @@ +target +*~ +*.log +.classpath +.project +*.ipr +*.iws +*.iml Propchange: maven/continuum/trunk/continuum-plexus-application/ -- --- svn:ignore (added) +++ svn:ignore Tue Apr 12 03:05:14 2005 @@ -0,0 +1,8 @@ +target +*~ +*.log +.classpath +.project +*.ipr +*.iws +*.iml Propchange: maven/continuum/trunk/continuum-site/ -- --- svn:ignore (added) +++ svn:ignore Tue Apr 12 03:05:14 2005 @@ -0,0 +1,8 @@ +target +*~ +*.log +.classpath +.project +*.ipr +*.iws +*.iml Propchange: maven/continuum/trunk/continuum-web/ -- --- svn:ignore (added) +++ svn:ignore Tue Apr 12 03:05:14 2005 @@ -0,0 +1,8 @@ +target +*~ +*.log +.classpath +.project +*.ipr +*.iws +*.iml Propchange: maven/continuum/trunk/continuum-xmlrpc/ -- --- svn:ignore (added) +++ svn:ignore Tue Apr 12 03:05:14 2005 @@ -0,0 +1,8 @@ +target +*~ +*.log +.classpath +.project +*.ipr +*.iws +*.iml - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r160888 - maven/continuum/trunk/pom.xml
Author: trygvis Date: Mon Apr 11 07:33:43 2005 New Revision: 160888 URL: http://svn.apache.org/viewcvs?view=rev&rev=160888 Log: o Adding -web back to the modules set. Modified: maven/continuum/trunk/pom.xml Modified: maven/continuum/trunk/pom.xml URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/pom.xml?view=diff&r1=160887&r2=160888 == --- maven/continuum/trunk/pom.xml (original) +++ maven/continuum/trunk/pom.xml Mon Apr 11 07:33:43 2005 @@ -86,6 +86,7 @@ continuum-core continuum-model continuum-plexus-application +continuum-web continuum-xmlrpc - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r160203 - maven/maven-1/plugins-sandbox/trunk/modello/plugin.jelly maven/maven-1/plugins-sandbox/trunk/modello/plugin.properties maven/maven-1/plugins-sandbox/trunk/modello/project.xml
Author: trygvis
Date: Tue Apr 5 10:33:47 2005
New Revision: 160203
URL: http://svn.apache.org/viewcvs?view=rev&rev=160203
Log:
o Adding project properties to configure the version, package with version and
model file parameters.
o Adding jpox goals.
Added:
maven/maven-1/plugins-sandbox/trunk/modello/plugin.properties
Modified:
maven/maven-1/plugins-sandbox/trunk/modello/plugin.jelly
maven/maven-1/plugins-sandbox/trunk/modello/project.xml
Modified: maven/maven-1/plugins-sandbox/trunk/modello/plugin.jelly
URL:
http://svn.apache.org/viewcvs/maven/maven-1/plugins-sandbox/trunk/modello/plugin.jelly?view=diff&r1=160202&r2=160203
==
--- maven/maven-1/plugins-sandbox/trunk/modello/plugin.jelly (original)
+++ maven/maven-1/plugins-sandbox/trunk/modello/plugin.jelly Tue Apr 5
10:33:47 2005
@@ -1,4 +1,5 @@
+
-
+
@@ -25,17 +28,68 @@
-
+
${systemScope.setProperty('package', 'org.apache.maven.project')}
-
+
+
+
+
+
+
+${systemScope.setProperty('package', 'org.apache.maven.project')}
+
+
+
+
+${systemScope.setProperty('package', 'org.apache.maven.project')}
+
+
+
+
+${systemScope.setProperty('package', 'org.apache.maven.project')}
+
+
+
+
+${systemScope.setProperty('package', 'org.apache.maven.project')}
+
-
+
${systemScope.setProperty('package', 'org.apache.maven.project')}
-
-
+
Added: maven/maven-1/plugins-sandbox/trunk/modello/plugin.properties
URL:
http://svn.apache.org/viewcvs/maven/maven-1/plugins-sandbox/trunk/modello/plugin.properties?view=auto&rev=160203
==
--- maven/maven-1/plugins-sandbox/trunk/modello/plugin.properties (added)
+++ maven/maven-1/plugins-sandbox/trunk/modello/plugin.properties Tue Apr 5
10:33:47 2005
@@ -0,0 +1,2 @@
+maven.modello.model=src/main/resources/model.mdo
+maven.modello.targetDirectory=${maven.build.dir}/generated-sources/modello
Modified: maven/maven-1/plugins-sandbox/trunk/modello/project.xml
URL:
http://svn.apache.org/viewcvs/maven/maven-1/plugins-sandbox/trunk/modello/project.xml?view=diff&r1=160202&r2=160203
==
--- maven/maven-1/plugins-sandbox/trunk/modello/project.xml (original)
+++ maven/maven-1/plugins-sandbox/trunk/modello/project.xml Tue Apr 5 10:33:47
2005
@@ -1,4 +1,5 @@
+
-
../plugin-parent/project.xml
maven-modello-plugin
Modello Plugin for Maven 1.0
- 0.9-SNAPSHOT
+ 1.0-alpha-1-SNAPSHOT
2004
maven.apache.org
/www/maven.apache.org/plugins-sandbox/modello/
@@ -44,35 +44,58 @@
+
- plexus
- plexus-container-default
- 1.0-alpha-1-SNAPSHOT
+ org.codehaus.modello
+ modello-core
+ 1.0-alpha-2-SNAPSHOT
- plexus
- plexus-utils
- 1.0-alpha-1-SNAPSHOT
+ org.codehaus.modello
+ modello-plugin-xml
+ 1.0-alpha-2-SNAPSHOT
- modello
- modello-core
- 1.0-SNAPSHOT
+ org.codehaus.modello
+ modello-plugin-xpp3
+ 1.0-alpha-2-SNAPSHOT
+
+
+ org.codehaus.modello
+ modello-plugin-xdoc
+ 1.0-alpha-2-SNAPSHOT
+
+
+ org.codehaus.modello
+ modello-plugin-jpox
+ 1.0-alpha-2-SNAPSHOT
+
- modello
- modello-xml-plugin
- 1.0-SNAPSHOT
+ plexus
+ plexus-container-default
+ 1.0-alpha-2
- modello
- modello-xpp3-plugin
- 1.0-SNAPSHOT
+ plexus
+ plexus-utils
+ 1.0-alpha-2
classworlds
classworlds
1.1-alpha-1
+
+
+
+ plexus
+ plexus-velocity
+ 1.0
+
+
+ velocity
+ velocity
+ 1.4
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: maven-components/maven-model maven.mdo
trygvis 2005/03/21 06:38:59 Modified:maven-model maven.mdo Log: o Changing the default notifier type from 'email' to 'mail'. Revision ChangesPath 1.90 +1 -1 maven-components/maven-model/maven.mdo Index: maven.mdo === RCS file: /home/cvs/maven-components/maven-model/maven.mdo,v retrieving revision 1.89 retrieving revision 1.90 diff -u -r1.89 -r1.90 --- maven.mdo 17 Mar 2005 22:53:12 - 1.89 +++ maven.mdo 21 Mar 2005 14:38:59 - 1.90 @@ -911,7 +911,7 @@ type 4.0.0 - email + mail String The mechanism used to deliver notifications.
cvs commit: maven-components/maven-mboot/src/bash maven.functions
trygvis 2004/05/16 07:33:11 Modified:maven-mboot/src/bash maven.functions Log: o Removing the annoying error message: find: src/main/resources: No such file or directory Revision ChangesPath 1.36 +5 -0 maven-components/maven-mboot/src/bash/maven.functions Index: maven.functions === RCS file: /home/cvs/maven-components/maven-mboot/src/bash/maven.functions,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- maven.functions 16 Apr 2004 12:29:47 - 1.35 +++ maven.functions 16 May 2004 14:33:11 - 1.36 @@ -384,6 +384,11 @@ for include in $includes do + if [ ! -d "$directory" ] + then +continue + fi + files=`eval "find $directory -name $include"` for file in $files - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: maven-components/maven-core/src/main/java/org/apache/maven MavenCli.java
trygvis 2004/05/16 04:38:31
Modified:maven-core/src/main/java/org/apache/maven MavenCli.java
Log:
o Reorganized the CLI handling.
o Added --help option processing.
o Added --version option processing. Still needs to know it's own version somehow.
o Added -g option processing for listing all goals.
Needs better formatting and possibly more output.
Revision ChangesPath
1.5 +73 -29
maven-components/maven-core/src/main/java/org/apache/maven/MavenCli.java
Index: MavenCli.java
===
RCS file:
/home/cvs/maven-components/maven-core/src/main/java/org/apache/maven/MavenCli.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- MavenCli.java 9 May 2004 23:00:59 - 1.4
+++ MavenCli.java 16 May 2004 11:38:31 - 1.5
@@ -16,6 +16,10 @@
* limitations under the License.
*/
+import java.io.File;
+import java.util.Iterator;
+import java.util.TreeMap;
+
import org.apache.commons.cli.CommandLine;
import org.apache.commons.cli.CommandLineParser;
import org.apache.commons.cli.HelpFormatter;
@@ -23,10 +27,9 @@
import org.apache.commons.cli.Options;
import org.apache.commons.cli.ParseException;
import org.apache.commons.cli.PosixParser;
-import org.codehaus.classworlds.ClassWorld;
+import org.apache.maven.plugin.GoalDescriptor;
-import java.io.File;
-import java.util.Iterator;
+import org.codehaus.classworlds.ClassWorld;
/**
* @author mailto:[EMAIL PROTECTED]">Jason van Zyl
@@ -38,14 +41,6 @@
public static final String POM_VERSION_4_FILE_NAME = "project2.xml";
-private static final String WORK_OFFLINE = "o";
-
-private static final String REACTOR = "r";
-
-private static final String SET_SYSTEM_PROPERTY = "D";
-
-private static final String DEBUG = "X";
-
public static void main( String[] args, ClassWorld classWorld )
throws Exception
{
@@ -76,10 +71,44 @@
}
// --
+// Process particular command line options
+// --
+
+if ( commandLine.hasOption( CLIManager.HELP ) )
+{
+cliManager.displayHelp();
+
+return;
+}
+
+if ( commandLine.hasOption( CLIManager.VERSION ) )
+{
+// TODO: create some sane output.
+System.out.println( "Maven version: " );
+
+return;
+}
+
+if ( commandLine.hasOption( CLIManager.LIST_GOALS ) )
+{
+Iterator goals = new TreeMap( maven.getGoalDescriptors()
).values().iterator();
+
+System.out.println( "Goals: " );
+
+while ( goals.hasNext() )
+{
+GoalDescriptor goal = (GoalDescriptor)goals.next();
+System.out.println( "" + goal.getName() );
+}
+
+return;
+}
+
+// --
// Execute the goals
// --
-if ( commandLine.hasOption( REACTOR ) )
+if ( commandLine.hasOption( CLIManager.REACTOR ) )
{
for ( Iterator i = commandLine.getArgList().iterator(); i.hasNext(); )
{
@@ -101,7 +130,7 @@
// and therefore are set in the session properties. System properties
// are most dominant.
-if ( commandLine.hasOption( DEBUG ) )
+if ( commandLine.hasOption( CLIManager.DEBUG ) )
{
System.setProperty( MavenConstants.DEBUG_ON, "true" );
}
@@ -110,7 +139,7 @@
System.setProperty( MavenConstants.DEBUG_ON, "false" );
}
-if ( commandLine.hasOption( WORK_OFFLINE ) )
+if ( commandLine.hasOption( CLIManager.WORK_OFFLINE ) )
{
System.setProperty( "maven.mode.online", "false" );
}
@@ -119,9 +148,9 @@
System.setProperty( "maven.mode.online", "true" );
}
-if ( commandLine.hasOption( SET_SYSTEM_PROPERTY ) )
+if ( commandLine.hasOption( CLIManager.SET_SYSTEM_PROPERTY ) )
{
-String[] defStrs = commandLine.getOptionValues( SET_SYSTEM_PROPERTY );
+String[] defStrs = commandLine.getOptionValues(
CLIManager.SET_SYSTEM_PROPERTY );
for ( int i = 0; i < defStrs.length; ++i )
{
@@
cvs commit: maven-components/maven-project/src/main/java/org/apache/maven/project DefaultModelInheritanceAssembler.java
trygvis 2004/05/13 12:26:49 Modified:maven-project/src/main/java/org/apache/maven/project DefaultModelInheritanceAssembler.java Log: o Putting back dependency inheritance. Revision ChangesPath 1.5 +8 -2 maven-components/maven-project/src/main/java/org/apache/maven/project/DefaultModelInheritanceAssembler.java Index: DefaultModelInheritanceAssembler.java === RCS file: /home/cvs/maven-components/maven-project/src/main/java/org/apache/maven/project/DefaultModelInheritanceAssembler.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- DefaultModelInheritanceAssembler.java 17 Apr 2004 15:36:13 - 1.4 +++ DefaultModelInheritanceAssembler.java 13 May 2004 19:26:49 - 1.5 @@ -1,5 +1,8 @@ package org.apache.maven.project; +import java.util.List; + +import org.apache.maven.model.Dependency; import org.apache.maven.model.Model; /** @@ -146,6 +149,9 @@ } // Dependencies :: aggregate -//child.addParentDependencies( parent.getDependencies() ); +List dependencies = parent.getDependencies(); + +for ( int i = 0; i < dependencies.size(); i++ ) +child.addDependency( (Dependency)dependencies.get( i ) ); } } - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: maven-components/maven-project/src/main/java/org/apache/maven/project MavenProject.java
trygvis 2004/05/13 12:25:59 Modified:maven-project/src/main/java/org/apache/maven/project MavenProject.java Log: o Javadoc updates. Revision ChangesPath 1.7 +5 -5 maven-components/maven-project/src/main/java/org/apache/maven/project/MavenProject.java Index: MavenProject.java === RCS file: /home/cvs/maven-components/maven-project/src/main/java/org/apache/maven/project/MavenProject.java,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- MavenProject.java 10 May 2004 19:06:30 - 1.6 +++ MavenProject.java 13 May 2004 19:25:59 - 1.7 @@ -48,10 +48,10 @@ * requirements. * * We need to leave the model intact because we don't want the following: - * - * 1. We don't want interpolated values being written back into the model. - * 2. We don't want inherited values being written back into the model. - * + * + * We don't want interpolated values being written back into the model. + * We don't want inherited values being written back into the model. + * * @author mailto:[EMAIL PROTECTED]">Jason van Zyl * * @version $Id$ - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: maven-components/maven-project/src .cvsignore
trygvis 2004/05/11 14:20:12 Modified:..cvsignore maven-core .cvsignore maven-core/src .cvsignore maven-mboot .cvsignore maven-plugins/maven-clean-plugin .cvsignore maven-plugins/maven-compiler-plugin .cvsignore maven-plugins/maven-hello-plugin .cvsignore maven-plugins/maven-jar-plugin .cvsignore maven-plugins/maven-resources-plugin .cvsignore maven-plugins/maven-scm-plugin .cvsignore maven-plugins/maven-xdoc-plugin/src .cvsignore maven-project/src .cvsignore Log: o Adding eclipse excludes. Revision ChangesPath 1.2 +4 -1 maven-components/.cvsignore Index: .cvsignore === RCS file: /home/cvs/maven-components/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore14 Jan 2004 15:56:01 - 1.1 +++ .cvsignore11 May 2004 21:20:10 - 1.2 @@ -1 +1,4 @@ -maven.log \ No newline at end of file +maven.log +target +.classpath +.project 1.2 +4 -1 maven-components/maven-core/.cvsignore Index: .cvsignore === RCS file: /home/cvs/maven-components/maven-core/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore19 Mar 2004 04:13:15 - 1.1 +++ .cvsignore11 May 2004 21:20:11 - 1.2 @@ -3,4 +3,7 @@ target *.ipr *.iws -dist \ No newline at end of file +dist +target +.classpath +.project 1.2 +3 -0 maven-components/maven-core/src/.cvsignore Index: .cvsignore === RCS file: /home/cvs/maven-components/maven-core/src/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore19 Mar 2004 04:13:17 - 1.1 +++ .cvsignore11 May 2004 21:20:11 - 1.2 @@ -1 +1,4 @@ maven.log +target +.classpath +.project 1.2 +2 -0 maven-components/maven-mboot/.cvsignore Index: .cvsignore === RCS file: /home/cvs/maven-components/maven-mboot/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore3 Jan 2004 06:30:41 - 1.1 +++ .cvsignore11 May 2004 21:20:11 - 1.2 @@ -1,2 +1,4 @@ *~ target +.classpath +.project 1.2 +2 -0 maven-components/maven-plugins/maven-clean-plugin/.cvsignore Index: .cvsignore === RCS file: /home/cvs/maven-components/maven-plugins/maven-clean-plugin/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore20 Apr 2004 14:06:57 - 1.1 +++ .cvsignore11 May 2004 21:20:11 - 1.2 @@ -1,5 +1,7 @@ *~ *.log target +.classpath +.project *.ipr *.iws 1.2 +2 -0 maven-components/maven-plugins/maven-compiler-plugin/.cvsignore Index: .cvsignore === RCS file: /home/cvs/maven-components/maven-plugins/maven-compiler-plugin/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore15 Mar 2004 19:32:21 - 1.1 +++ .cvsignore11 May 2004 21:20:11 - 1.2 @@ -1,5 +1,7 @@ *~ *.log target +.classpath +.project *.ipr *.iws 1.2 +2 -0 maven-components/maven-plugins/maven-hello-plugin/.cvsignore Index: .cvsignore === RCS file: /home/cvs/maven-components/maven-plugins/maven-hello-plugin/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore15 Mar 2004 19:32:24 - 1.1 +++ .cvsignore11 May 2004 21:20:11 - 1.2 @@ -1,5 +1,7 @@ *~ *.log target +.classpath +.project *.ipr *.iws 1.2 +2 -0 maven-components/maven-plugins/maven-jar-plugin/.cvsignore Index: .cvsignore === RCS file: /home/cvs/maven-components/maven-plugins/maven-jar-plugin/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore15 Mar 2004 19:32:22 - 1.1 +++ .cvsignore11 May 2004 21:20:11 - 1.2 @@ -1,5 +1,7 @@ *~ *.log target +.classpath +.project *.ipr *.iws 1.2 +2 -0 maven-components
cvs commit: maven/src/man maven.1
trygvis 2004/05/05 05:25:58 Modified:src/man maven.1 Log: Updating the man page: o Adding new authors. o Adding the new command line options. o Some reformatting of the options to look more 'normal'. Revision ChangesPath 1.2 +28 -21maven/src/man/maven.1 Index: maven.1 === RCS file: /home/cvs/maven/src/man/maven.1,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- maven.1 26 Mar 2003 10:40:58 - 1.1 +++ maven.1 5 May 2004 12:25:57 - 1.2 @@ -1,11 +1,12 @@ .\" Process this file with .\" groff -man -Tascii foo.1 .\" -.TH MAVEN 1 "MARCH 2003" Linux "User Manuals" +.TH MAVEN 1 "MAY 2004" Linux "User Manuals" .SH NAME maven \- builds a project .SH SYNOPSIS -\fB maven\fR [\fIoptions\fR] \fIgoal\fR ... +\fB maven\fR [\fIoptions\fR] [\fIgoal\fR [\fIgoal2\fR [\fIgoal3\fR] ...]] + .SH DESCRIPTION .B Maven is a Java project management and project comprehension tool. Maven is @@ -27,47 +28,50 @@ .SH OPTIONS Options must be given before the list of goals to execute. .TP -\fB\-\-debug\fR (\fB\-X\fR) +\fB\-X\fR, \fB\-\-debug\fR Produce execution debug output .TP -\fB\-\-emacs\fR (\fB\-E\fR) -Produce logging information without adornments. -.TP -\fB\-\-define\fR arg (\fB-D\fRarg) +\fB\-D\fR, \fB\-\-define\fR \fIarg\fR Define a system property. arg must be in the form: .br -\fBmaven.property.name\fI=\fRvalue -.TP -\fB\-\-nobanner\fR (\fB\-b) -Suppress the logo banner. +maven.property.name=value .TP -\fB\-\-dir\fR (\fB\-d\fR) arg +\fB\-d\fR, \fB\-\-dir\fR \fIarg\fR Set the effective working directory. .TP -\fB\-\-exception\fR (\fB\-e\fR) +\fB\-E\fR, \fB\-\-emacs\fR +Produce logging information without adornments. +.TP +\fB\-e\fR, \fB\-\-exception\fR Produce exception stack traces. .TP -\fB\-\-find\fR (\fB-f\fR) arg +\fB\-f\fR, \fB\-\-find\fR \fIarg\fR Set the project file and effective working directory by finding the project. file. .TP -\fB\-\-goals\fR (\fB\-g\fR) +\fB\-g\fR, \fB\-\-goals\fR Display available goals. .TP -\fB\-\-help\fR (\fB\-h\fR) +\fB\-h\fR, \fB\-\-help\fR Display help information. .TP -\fB\-\-info\fR (\fB\-i\fR) +\fB\-i\fR, \fB\-\-info\fR Display system information. .TP -\fB\-\-offline\fR (\fB\-o\fR) +\fB\-b\fR, \fB\-\-nobanner\fR +Suppress the logo banner. +.TP +\fB\-o\fR, \fB\-\-offline\fR Build is happening offline. .TP -\fB\-\-pom\fR (\fB\-p\fR) arg +\fB\-p\fR, \fB\-\-pom\fR \fIarg\fR Set the project file. .TP -\fB\-\-version\fR (\fB\-v\fR) +\fB\-q\fR, \fB\-\-quitet\fR \fIarg\fR +Reduce execution output. +.TP +\fB\-v\fR, \fB\-\-version\fR Display the version of \fBmaven\fR we are using. .SH FILES .I ./build.properties @@ -135,3 +139,6 @@ Ben Walding <[EMAIL PROTECTED]> .SH CVS HEADER $Id$ +.SH AUTHOR +This man page was originally written Stephane Mor <[EMAIL PROTECTED]> +and updated by Trygve Laugstoel <[EMAIL PROTECTED]> - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: maven-components/maven-core/src/main/java/org/apache/maven MavenCli.java
trygvis 2004/04/23 16:01:40
Modified:maven-core/src/main/java/org/apache/maven MavenCli.java
Log:
o Using constants for command line options.
o Added handling of these options:
-h: Prints the help message from commons-cli.
-v: Just prints a stupid message. Needs to get the real
version numer somehow.
-g: Lists all the goals. Very simple and basic listing
for now.
Revision ChangesPath
1.2 +50 -11
maven-components/maven-core/src/main/java/org/apache/maven/MavenCli.java
Index: MavenCli.java
===
RCS file:
/home/cvs/maven-components/maven-core/src/main/java/org/apache/maven/MavenCli.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MavenCli.java 16 Apr 2004 13:56:09 - 1.1
+++ MavenCli.java 23 Apr 2004 23:01:40 - 1.2
@@ -16,6 +16,10 @@
* limitations under the License.
*/
+import java.io.File;
+import java.util.Iterator;
+import java.util.TreeMap;
+
import org.apache.commons.cli.CommandLine;
import org.apache.commons.cli.CommandLineParser;
import org.apache.commons.cli.HelpFormatter;
@@ -23,10 +27,9 @@
import org.apache.commons.cli.Options;
import org.apache.commons.cli.ParseException;
import org.apache.commons.cli.PosixParser;
-import org.codehaus.classworlds.ClassWorld;
+import org.apache.maven.plugin.descriptor.GoalDescriptor;
-import java.io.File;
-import java.util.Iterator;
+import org.codehaus.classworlds.ClassWorld;
/**
* @author mailto:[EMAIL PROTECTED]">Jason van Zyl
@@ -42,6 +45,12 @@
private static final String DEBUG = "X";
+private static final String HELP = "h";
+
+private static final String VERSION = "v";
+
+private static final String LIST_GOALS = "g";
+
public static void main( String[] args, ClassWorld classWorld )
throws Exception
{
@@ -55,6 +64,37 @@
File projectFile = new File( System.getProperty( "user.dir" ),
POM_FILE_NAME );
+if ( commandLine.hasOption( HELP ) )
+{
+cliManager.displayHelp();
+
+return;
+}
+
+if ( commandLine.hasOption( VERSION ) )
+{
+// TODO: create some sane output.
+System.out.println( "foo version" );
+
+return;
+}
+
+if ( commandLine.hasOption( LIST_GOALS ) )
+{
+Iterator goals = new TreeMap( maven.getGoalDescriptors()
).values().iterator();
+
+System.out.println( "Goals: " );
+
+while ( goals.hasNext() )
+{
+GoalDescriptor goal = (GoalDescriptor)goals.next();
+
+System.out.println( "" + goal.getName() );
+}
+
+return;
+}
+
for ( Iterator i = commandLine.getArgList().iterator(); i.hasNext(); )
{
maven.execute( projectFile, (String) i.next() );
@@ -137,7 +177,7 @@
.withLongOpt( "define" )
.hasArg()
.withDescription( "Define a system property" )
- .create( 'D' ) );
+ .create( SET_SYSTEM_PROPERTY ) );
options.addOption( OptionBuilder
.withLongOpt( "dir" )
@@ -153,27 +193,27 @@
options.addOption( OptionBuilder
.withLongOpt( "goalDescriptors" )
.withDescription( "Display available
goalDescriptors" )
- .create( 'g' ) );
+ .create( LIST_GOALS ) );
options.addOption( OptionBuilder
.withLongOpt( "help" )
.withDescription( "Display help information" )
- .create( 'h' ) );
+ .create( HELP ) );
options.addOption( OptionBuilder
.withLongOpt( "offline" )
.withDescription( "Build is happening offline" )
- .create( 'o' ) );
+ .create( WORK_OFFLINE ) );
options.addOption( OptionBuilder
.withLongOpt( "version" )
.withDescription( "Display version information" )
- .create( 'v' ) );
