svn commit: r744645 - /maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/cli/MavenCli.java
Author: bentmann Date: Sun Feb 15 10:05:15 2009 New Revision: 744645 URL: http://svn.apache.org/viewvc?rev=744645view=rev Log: [MNG-4037] Include Java home in version information Modified: maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/cli/MavenCli.java Modified: maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/cli/MavenCli.java URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/cli/MavenCli.java?rev=744645r1=744644r2=744645view=diff == --- maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/cli/MavenCli.java (original) +++ maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/cli/MavenCli.java Sun Feb 15 10:05:15 2009 @@ -613,6 +613,8 @@ System.out.println( Java version: + System.getProperty( java.version, unknown java version ) ); +System.out.println( Java home: + System.getProperty( java.home, unknown java home ) ); + System.out.println( Default locale: + Locale.getDefault() + , platform encoding: + System.getProperty( file.encoding, unknown encoding ) );
svn commit: r744646 - in /maven/mercury/trunk/mercury-ant-tasks/src/site/apt: howto.apt intro.apt
Author: hboutemy
Date: Sun Feb 15 10:12:02 2009
New Revision: 744646
URL: http://svn.apache.org/viewvc?rev=744646view=rev
Log:
fixed typos in documentation
Modified:
maven/mercury/trunk/mercury-ant-tasks/src/site/apt/howto.apt
maven/mercury/trunk/mercury-ant-tasks/src/site/apt/intro.apt
Modified: maven/mercury/trunk/mercury-ant-tasks/src/site/apt/howto.apt
URL:
http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-ant-tasks/src/site/apt/howto.apt?rev=744646r1=744645r2=744646view=diff
==
--- maven/mercury/trunk/mercury-ant-tasks/src/site/apt/howto.apt (original)
+++ maven/mercury/trunk/mercury-ant-tasks/src/site/apt/howto.apt Sun Feb 15
10:12:02 2009
@@ -1,5 +1,5 @@
--
- Maven Ant tasks
+ Mercury Ant Tasks
--
Oleg Gusakov
--
@@ -8,82 +8,82 @@
Where to get mercury-ant-tasks?
- All the development releases will be deployed to
{{{http://people.apache.org/~ogusakov/repos/test/org/apache/maven/mercury/mercury-ant-tasks/1.0-alpha-1-SNAPSHOT}this
site}}
-
- There are several ways to start using mercury ant tasks. First - make the
necessary libraries available for ant:
-
+ All the development releases will be deployed to
{{{http://people.apache.org/~ogusakov/repos/test/org/apache/maven/mercury/mercury-ant-tasks/}this
site}}
+
+ There are several ways to start using Mercury Ant Tasks. First - make the
necessary libraries available for Ant:
+
* mercury-ant-tasks-VERSION-all.jar - an uber jar with almost (see
below) all the required dependencies
-
- * bcpg-jdk15-140.jar and bcprov-jdk15-140.jar from
+
+ * bcpg-jdk15-140.jar and bcprov-jdk15-140.jar from
{{{http://repo1.maven.org/maven2/bouncycastle}this central repository
location}} - this in case you plan to use PGP signatures
-
- One way to make them available is to drop or link them into ~/.ant/lib,
as a matter of fact, this is the easiest for the Bounce
- castle binaries as their version will change much less often, compared to
mercury.
-
+
+ One way to make them available is to drop or link them into ~/.ant/lib,
as a matter of fact, this is the easiest for the Bouncy
+ Castle binaries as their version will change much less often, compared to
Mercury.
+
Another way would be defining a classpath inside a taskdef tag, such as:
-++
+++
taskdef resource=org/apache/maven/mercury/ant/tasks/antlib.xml
classpath=/path/to/the/mercury-ant-tasks-VERSION-all.jar:/path/to/bouncycastle/bcpg-jdk15-140.jar:/path/to/bouncycastle/bcprov-jdk15-140.jar
/
-++
-
+++
+
Then there is a second choice to make:
-
- * use mercury-ant-tasks directly
-
+
+ * use mercury-ant-tasks directly
+
* use mercury-ant-tasks in a namespace
-
- Please check xmlns attribute for ant \project\ element or
uri attribute of the \taskdef\ in
+
+ Please check xmlns attribute for ant \project\ element or
uri attribute of the \taskdef\ in
{{{http://ant.apache.org/manual/index.html}Ant documentation}} if you'd
like
to use namespaces - all examples in this document use the
mercury-ant-tasks element directly.
-
+
Examples
You can check the test
{{{http://people.apache.org/~ogusakov/repos/test/org/apache/maven/mercury/mercury-ant-tasks/1.0-alpha-1-SNAPSHOT/build.xml}build.xml}}
if you'd like to see various existing options. But that file is really a
test script, it's too complex. It's much easier to check the following usage
examples.
-
+
* How to access dependencies from the central repository
Here the dependency asm:asm:3.0 is downloaded from the default central
repository and stored in the default local repository.
See {{{http://maven.apache.org}Maven site}} for more information on default
locations for central and local repositories.
- These defaults could be changed vis system properties - see the
{{{reference.html}reference docs}}
+ These defaults could be changed vis system properties - see the
{{{reference.html}reference docs}}
+---+
javac srcdir=src/main/java
destdir=target/classes
- classpath
+ classpath
deps
dependency name=asm:asm:3.0/
/deps
/classpath
/javac
+---+
-
+
* How to read dependencies from a POM file
-
+
Still defaults to central repo, dependencies section from the pom provides
the classpath
+---+
javac srcdir=src/main/java
destdir=target/classes
- classpath
+ classpath
deps
dependency name=t:t:1.0::pom pom=${basedir}/t-1.0.pom/
/deps
/classpath
/javac
+---+
-
+
* How to create and reference a named classpath
+---+
path id=my.path
-deps
- dependency name=asm:asm:3.0/
-/deps
+ deps
+dependency name=asm:asm:3.0/
+ /deps
/path
javac srcdir=src/main/java
@@ -91,20 +91,20 @@
classpathref=my.path
/
+---+
-
+
* How to create and reference several
svn commit: r744647 - /maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/cli/CLIReportingUtils.java
Author: bentmann
Date: Sun Feb 15 10:18:00 2009
New Revision: 744647
URL: http://svn.apache.org/viewvc?rev=744647view=rev
Log:
[MNG-4037] Include Java home in version information
o Merged from r744645
Modified:
maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/cli/CLIReportingUtils.java
Modified:
maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/cli/CLIReportingUtils.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/cli/CLIReportingUtils.java?rev=744647r1=744646r2=744647view=diff
==
---
maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/cli/CLIReportingUtils.java
(original)
+++
maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/cli/CLIReportingUtils.java
Sun Feb 15 10:18:00 2009
@@ -49,12 +49,20 @@
static void showVersion()
{
-ApplicationInformation ai = DefaultRuntimeInformation.getVersion(
MavenCli.class.getClassLoader(), org.apache.maven, maven-core );
+ApplicationInformation ai =
+DefaultRuntimeInformation.getVersion(
MavenCli.class.getClassLoader(), org.apache.maven, maven-core );
System.out.println( Maven version: + ai.getVersion() + built on
+ ai.getBuiltOn() );
+
System.out.println( Java version: + System.getProperty(
java.version, unknown java version ) );
-System.out.println( Default locale: + Locale.getDefault() + ,
platform encoding: + System.getProperty( file.encoding, unknown
encoding ) );
-System.out.println( OS name: \ + Os.OS_NAME + \ version: \ +
Os.OS_VERSION + \ arch: \ + Os.OS_ARCH + \ family: \ + Os.OS_FAMILY +
\ );
+
+System.out.println( Java home: + System.getProperty( java.home,
unknown java home ) );
+
+System.out.println( Default locale: + Locale.getDefault() + ,
platform encoding:
++ System.getProperty( file.encoding, unknown encoding ) );
+
+System.out.println( OS name: \ + Os.OS_NAME + \ version: \ +
Os.OS_VERSION + \ arch: \ + Os.OS_ARCH
++ \ family: \ + Os.OS_FAMILY + \ );
}
/**
svn commit: r744656 - in /maven/mercury/trunk/mercury-ant-tasks/src: main/java/org/apache/maven/mercury/ant/tasks/ test/java/org/apache/maven/mercury/ant/tasks/
Author: hboutemy
Date: Sun Feb 15 11:18:34 2009
New Revision: 744656
URL: http://svn.apache.org/viewvc?rev=744656view=rev
Log:
o coding style fixes
o added missing license headers
Modified:
maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/AbstractAntTask.java
maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/AbstractDataType.java
maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Auth.java
maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Config.java
maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Dep.java
maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Dependency.java
maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Repo.java
maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/ResolveTask.java
maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/WriteTask.java
maven/mercury/trunk/mercury-ant-tasks/src/test/java/org/apache/maven/mercury/ant/tasks/MercuryAntTest.java
maven/mercury/trunk/mercury-ant-tasks/src/test/java/org/apache/maven/mercury/ant/tasks/MercuryBootstrapTest.java
Modified:
maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/AbstractAntTask.java
URL:
http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/AbstractAntTask.java?rev=744656r1=744655r2=744656view=diff
==
---
maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/AbstractAntTask.java
(original)
+++
maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/AbstractAntTask.java
Sun Feb 15 11:18:34 2009
@@ -1,5 +1,24 @@
package org.apache.maven.mercury.ant.tasks;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * License); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.Project;
import org.apache.tools.ant.Task;
@@ -13,7 +32,7 @@
public class AbstractAntTask
extends Task
{
-private static final Language LANG = new DefaultLanguage(
ResolveTask.class );
+private static final Language LANG = new DefaultLanguage(
AbstractAntTask.class );
protected boolean _failOnError = true;
Modified:
maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/AbstractDataType.java
URL:
http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/AbstractDataType.java?rev=744656r1=744655r2=744656view=diff
==
---
maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/AbstractDataType.java
(original)
+++
maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/AbstractDataType.java
Sun Feb 15 11:18:34 2009
@@ -1,5 +1,24 @@
package org.apache.maven.mercury.ant.tasks;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * License); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
import org.apache.tools.ant.ProjectComponent;
/**
Modified:
svn commit: r744658 - in /maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks: AbstractAntTask.java Dep.java ResolveTask.java WriteTask.java
Author: hboutemy
Date: Sun Feb 15 12:07:51 2009
New Revision: 744658
URL: http://svn.apache.org/viewvc?rev=744658view=rev
Log:
improved exception handling
Modified:
maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/AbstractAntTask.java
maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Dep.java
maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/ResolveTask.java
maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/WriteTask.java
Modified:
maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/AbstractAntTask.java
URL:
http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/AbstractAntTask.java?rev=744658r1=744657r2=744658view=diff
==
---
maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/AbstractAntTask.java
(original)
+++
maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/AbstractAntTask.java
Sun Feb 15 12:07:51 2009
@@ -52,6 +52,15 @@
}
}
+protected void throwIfEnabled( Throwable t )
+throws BuildException
+{
+if ( _failOnError )
+{
+throw new BuildException( t );
+}
+}
+
//
public static final Config findConfig( Project project, String configId )
throws Exception
Modified:
maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Dep.java
URL:
http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Dep.java?rev=744658r1=744657r2=744658view=diff
==
---
maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Dep.java
(original)
+++
maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Dep.java
Sun Feb 15 12:07:51 2009
@@ -405,7 +405,7 @@
}
catch ( Exception e )
{
-LOG.error( e.getMessage() );
+LOG.error( unable to create dependencies iterator, e );
return null;
}
@@ -427,7 +427,7 @@
}
catch ( Exception e )
{
-LOG.error( e.getMessage() );
+LOG.error( unable to count dependencies, e );
return 0;
}
Modified:
maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/ResolveTask.java
URL:
http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/ResolveTask.java?rev=744658r1=744657r2=744658view=diff
==
---
maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/ResolveTask.java
(original)
+++
maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/ResolveTask.java
Sun Feb 15 12:07:51 2009
@@ -203,14 +203,7 @@
}
catch ( Exception e )
{
-if ( _failOnError )
-{
-throw new BuildException( e.getMessage() );
-}
-else
-{
-return;
-}
+throwIfEnabled( e );
}
}
Modified:
maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/WriteTask.java
URL:
http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/WriteTask.java?rev=744658r1=744657r2=744658view=diff
==
---
maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/WriteTask.java
(original)
+++
maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/WriteTask.java
Sun Feb 15 12:07:51 2009
@@ -200,7 +200,7 @@
}
catch ( Exception e )
{
-throwIfEnabled( e.getMessage() );
+throwIfEnabled( e );
}
}
svn commit: r744659 - /maven/shared/trunk/maven-dependency-analyzer/src/test/java/org/apache/maven/shared/dependency/analyzer/DefaultProjectDependencyAnalyzerTest.java
Author: bentmann
Date: Sun Feb 15 12:12:58 2009
New Revision: 744659
URL: http://svn.apache.org/viewvc?rev=744659view=rev
Log:
o Printed path to local repo
Modified:
maven/shared/trunk/maven-dependency-analyzer/src/test/java/org/apache/maven/shared/dependency/analyzer/DefaultProjectDependencyAnalyzerTest.java
Modified:
maven/shared/trunk/maven-dependency-analyzer/src/test/java/org/apache/maven/shared/dependency/analyzer/DefaultProjectDependencyAnalyzerTest.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-dependency-analyzer/src/test/java/org/apache/maven/shared/dependency/analyzer/DefaultProjectDependencyAnalyzerTest.java?rev=744659r1=744658r2=744659view=diff
==
---
maven/shared/trunk/maven-dependency-analyzer/src/test/java/org/apache/maven/shared/dependency/analyzer/DefaultProjectDependencyAnalyzerTest.java
(original)
+++
maven/shared/trunk/maven-dependency-analyzer/src/test/java/org/apache/maven/shared/dependency/analyzer/DefaultProjectDependencyAnalyzerTest.java
Sun Feb 15 12:12:58 2009
@@ -35,6 +35,7 @@
import org.apache.maven.shared.invoker.InvocationResult;
import org.apache.maven.shared.test.plugin.BuildTool;
import org.apache.maven.shared.test.plugin.ProjectTool;
+import org.apache.maven.shared.test.plugin.RepositoryTool;
import org.apache.maven.shared.test.plugin.TestToolsException;
import org.codehaus.plexus.PlexusTestCase;
@@ -56,6 +57,8 @@
private ProjectDependencyAnalyzer analyzer;
+private static File localRepo;
+
// TestCase methods ---
/*
@@ -70,6 +73,13 @@
projectTool = (ProjectTool) lookup( ProjectTool.ROLE );
+if ( localRepo == null )
+{
+RepositoryTool repositoryTool = (RepositoryTool) lookup(
RepositoryTool.ROLE );
+localRepo =
repositoryTool.findLocalRepositoryDirectory().getAbsoluteFile();
+System.out.println( Local repository: + localRepo );
+}
+
analyzer = (ProjectDependencyAnalyzer) lookup(
ProjectDependencyAnalyzer.ROLE );
}
svn commit: r744684 - in /maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/cli: CLIManager.java MavenCli.java
Author: bentmann
Date: Sun Feb 15 16:05:10 2009
New Revision: 744684
URL: http://svn.apache.org/viewvc?rev=744684view=rev
Log:
[MNG-3914] Add CLI option to control location of global settings from command
line
o Merged from r726563 to provide a smooth migration path to 3.x
This is not beautiful but effective until somebody wants to change the existing
API of the MavenSettingsBuilder
Modified:
maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/cli/CLIManager.java
maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/cli/MavenCli.java
Modified:
maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/cli/CLIManager.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/cli/CLIManager.java?rev=744684r1=744683r2=744684view=diff
==
---
maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/cli/CLIManager.java
(original)
+++
maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/cli/CLIManager.java
Sun Feb 15 16:05:10 2009
@@ -58,6 +58,8 @@
public static final char ALTERNATE_USER_SETTINGS = 's';
+public static final String ALTERNATE_GLOBAL_SETTINGS = gs;
+
public static final String FAIL_FAST = ff;
public static final String FAIL_AT_END = fae;
@@ -159,6 +161,11 @@
.hasArg()
.create( ALTERNATE_USER_SETTINGS ) );
+options.addOption( OptionBuilder.withLongOpt( global-settings )
+.withDescription( Alternate path for
the global settings file )
+.hasArg()
+.create( ALTERNATE_GLOBAL_SETTINGS ) );
+
options.addOption( OptionBuilder.withLongOpt( fail-fast )
.withDescription( Stop at first
failure in reactorized builds )
.create( FAIL_FAST ) );
Modified:
maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/cli/MavenCli.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/cli/MavenCli.java?rev=744684r1=744683r2=744684view=diff
==
---
maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/cli/MavenCli.java
(original)
+++
maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/cli/MavenCli.java
Sun Feb 15 16:05:10 2009
@@ -309,6 +309,12 @@
userSettingsPath = commandLine.getOptionValue(
CLIManager.ALTERNATE_USER_SETTINGS );
}
+if ( commandLine.hasOption( CLIManager.ALTERNATE_GLOBAL_SETTINGS ) )
+{
+String globalSettingsPath = commandLine.getOptionValue(
CLIManager.ALTERNATE_GLOBAL_SETTINGS );
+System.setProperty(
MavenSettingsBuilder.ALT_GLOBAL_SETTINGS_XML_LOCATION, globalSettingsPath );
+}
+
Settings settings = null;
MavenSettingsBuilder settingsBuilder = (MavenSettingsBuilder)
embedder.lookup( MavenSettingsBuilder.ROLE );
svn commit: r744685 - /maven/components/branches/maven-2.1.x/apache-maven/src/conf/settings.xml
Author: bentmann
Date: Sun Feb 15 16:16:42 2009
New Revision: 744685
URL: http://svn.apache.org/viewvc?rev=744685view=rev
Log:
[MNG-3914] Add CLI option to control location of global settings from command
line
o Updated documentation
Modified:
maven/components/branches/maven-2.1.x/apache-maven/src/conf/settings.xml
Modified:
maven/components/branches/maven-2.1.x/apache-maven/src/conf/settings.xml
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.x/apache-maven/src/conf/settings.xml?rev=744685r1=744684r2=744685view=diff
==
--- maven/components/branches/maven-2.1.x/apache-maven/src/conf/settings.xml
(original)
+++ maven/components/branches/maven-2.1.x/apache-maven/src/conf/settings.xml
Sun Feb 15 16:16:42 2009
@@ -23,20 +23,20 @@
| This is the configuration file for Maven. It can be specified at two levels:
|
| 1. User Level. This settings.xml file provides configuration for a single
user,
- | and is normally provided in $HOME/.m2/settings.xml.
+ | and is normally provided in ${user.home}/.m2/settings.xml.
|
- | NOTE: This location can be overridden with the system
property:
+ | NOTE: This location can be overridden with the CLI option:
|
- | -Dorg.apache.maven.user-settings=/path/to/user/settings.xml
+ | -s /path/to/user/settings.xml
|
- | 2. Global Level. This settings.xml file provides configuration for all
maven
- | users on a machine (assuming they're all using the same
maven
+ | 2. Global Level. This settings.xml file provides configuration for all
Maven
+ | users on a machine (assuming they're all using the same
Maven
| installation). It's normally provided in
| ${maven.home}/conf/settings.xml.
|
- | NOTE: This location can be overridden with the system
property:
+ | NOTE: This location can be overridden with the CLI option:
|
- |
-Dorg.apache.maven.global-settings=/path/to/global/settings.xml
+ | -gs /path/to/global/settings.xml
|
| The sections in this sample file are intended to give you a running start at
| getting the most out of your Maven installation. Where appropriate, the
default
svn commit: r744687 - /maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0294MergeGlobalAndUserSettingsTest.java
Author: bentmann
Date: Sun Feb 15 16:20:42 2009
New Revision: 744687
URL: http://svn.apache.org/viewvc?rev=744687view=rev
Log:
[MNG-3914] Add CLI option to control location of global settings from command
line
o Updated IT to check support for CLI option in 2.1.0-M2+
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0294MergeGlobalAndUserSettingsTest.java
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0294MergeGlobalAndUserSettingsTest.java
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0294MergeGlobalAndUserSettingsTest.java?rev=744687r1=744686r2=744687view=diff
==
---
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0294MergeGlobalAndUserSettingsTest.java
(original)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0294MergeGlobalAndUserSettingsTest.java
Sun Feb 15 16:20:42 2009
@@ -53,7 +53,7 @@
verifier.deleteDirectory( target );
verifier.getCliOptions().add( --settings );
verifier.getCliOptions().add( user-settings.xml );
-if ( matchesVersionRange( [3.0-alpha-1,) ) )
+if ( matchesVersionRange( [2.1.0-M2,) ) )
{
verifier.getCliOptions().add( --global-settings );
verifier.getCliOptions().add( global-settings.xml );
svn commit: r744688 - /maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0294MergeGlobalAndUserSettingsTest.java
Author: bentmann
Date: Sun Feb 15 16:24:24 2009
New Revision: 744688
URL: http://svn.apache.org/viewvc?rev=744688view=rev
Log:
[MNG-3914] Add CLI option to control location of global settings from command
line
o Added cross-ref to issue
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0294MergeGlobalAndUserSettingsTest.java
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0294MergeGlobalAndUserSettingsTest.java
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0294MergeGlobalAndUserSettingsTest.java?rev=744688r1=744687r2=744688view=diff
==
---
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0294MergeGlobalAndUserSettingsTest.java
(original)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0294MergeGlobalAndUserSettingsTest.java
Sun Feb 15 16:24:24 2009
@@ -55,6 +55,7 @@
verifier.getCliOptions().add( user-settings.xml );
if ( matchesVersionRange( [2.1.0-M2,) ) )
{
+// dedicated CLI option only available since MNG-3914
verifier.getCliOptions().add( --global-settings );
verifier.getCliOptions().add( global-settings.xml );
}
svn commit: r744696 - /maven/mercury/trunk/mercury-ant-tasks/mercury.xml
Author: ogusakov
Date: Sun Feb 15 17:08:04 2009
New Revision: 744696
URL: http://svn.apache.org/viewvc?rev=744696view=rev
Log:
url cal also be location
Modified:
maven/mercury/trunk/mercury-ant-tasks/mercury.xml
Modified: maven/mercury/trunk/mercury-ant-tasks/mercury.xml
URL:
http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-ant-tasks/mercury.xml?rev=744696r1=744695r2=744696view=diff
==
--- maven/mercury/trunk/mercury-ant-tasks/mercury.xml (original)
+++ maven/mercury/trunk/mercury-ant-tasks/mercury.xml Sun Feb 15 17:08:04 2009
@@ -65,7 +65,7 @@
!-- redefine local and central for testing --
mercury:local-repository location=${localRepo}/
-mercury:remote-repository url=${remoteRepo}/
+mercury:remote-repository location=${remoteRepo}/
mercury:resolve-dependencies
mercury:dependency id=g0:a0:v0/
@@ -79,7 +79,7 @@
!-- redefine local and central for testing --
mercury:local-repository location=${localRepo}/
-mercury:remote-repository url=${remoteRepo}/
+mercury:remote-repository location=${remoteRepo}/
!-- (2) --
!--
@@ -100,7 +100,7 @@
!-- redefine local and central for testing --
mercury:local-repository location=${localRepo}/
-mercury:remote-repository url=${remoteRepo}/
+mercury:remote-repository location=${remoteRepo}/
mercury:resolve-dependencies
transitive=false
svn commit: r744705 - in /maven/plugins/trunk/maven-war-plugin/src: main/java/org/apache/maven/plugin/war/WarMojo.java site/apt/examples/skinny-wars.apt
Author: dennisl
Date: Sun Feb 15 17:40:31 2009
New Revision: 744705
URL: http://svn.apache.org/viewvc?rev=744705view=rev
Log:
[MWAR-182] warSourceIncludes no longer works
o Add a new parameter packagingIncludes
Modified:
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/WarMojo.java
maven/plugins/trunk/maven-war-plugin/src/site/apt/examples/skinny-wars.apt
Modified:
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/WarMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/WarMojo.java?rev=744705r1=744704r2=744705view=diff
==
---
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/WarMojo.java
(original)
+++
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/WarMojo.java
Sun Feb 15 17:40:31 2009
@@ -82,6 +82,16 @@
private String packagingExcludes;
/**
+ * The comma separated list of tokens to include in the WAR before
+ * packaging. By default everything is included. This option may be used
+ * to implement the skinny war use case.
+ *
+ * @parameter alias=packagingIncludes
+ * @since 2.1-beta-1
+ */
+private String packagingIncludes;
+
+/**
* The War archiver.
*
* @component role=org.codehaus.plexus.archiver.Archiver roleHint=war
@@ -191,9 +201,11 @@
archiver.setOutputFile( warFile );
getLog().debug(
-Excluding + Arrays.asList( getPackagingExcludes() ) + for the
generated webapp archive. );
+Excluding + Arrays.asList( getPackagingExcludes() ) + from
the generated webapp archive. );
+getLog().debug(
+Including + Arrays.asList( getPackagingIncludes() ) + in the
generated webapp archive. );
-warArchiver.addDirectory( getWebappDirectory(), new String[]{**},
getPackagingExcludes() );
+warArchiver.addDirectory( getWebappDirectory(),
getPackagingIncludes(), getPackagingExcludes() );
final File webXmlFile = new File( getWebappDirectory(),
WEB-INF/web.xml );
if ( webXmlFile.exists() )
@@ -292,7 +304,6 @@
{
return StringUtils.split( packagingExcludes, , );
}
-
}
public void setPackagingExcludes( String packagingExcludes )
@@ -300,6 +311,23 @@
this.packagingExcludes = packagingExcludes;
}
+public String[] getPackagingIncludes()
+{
+if ( StringUtils.isEmpty( packagingIncludes ) )
+{
+return new String[]{**};
+}
+else
+{
+return StringUtils.split( packagingIncludes, , );
+}
+}
+
+public void setPackagingIncludes( String packagingIncludes )
+{
+this.packagingIncludes = packagingIncludes;
+}
+
public String getOutputDirectory()
{
return outputDirectory;
Modified:
maven/plugins/trunk/maven-war-plugin/src/site/apt/examples/skinny-wars.apt
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/site/apt/examples/skinny-wars.apt?rev=744705r1=744704r2=744705view=diff
==
--- maven/plugins/trunk/maven-war-plugin/src/site/apt/examples/skinny-wars.apt
(original)
+++ maven/plugins/trunk/maven-war-plugin/src/site/apt/examples/skinny-wars.apt
Sun Feb 15 17:40:31 2009
@@ -46,8 +46,9 @@
plugins
plugin
artifactIdmaven-war-plugin/artifactId
+version2.1-alpha-2/version
configuration
- !-- In version 2.x, this was incorrectly named warSourceExcludes --
+ !-- In version 2.1-alpha-1, this was incorrectly named
warSourceExcludes --
packagingExcludesWEB-INF/lib/*.jar/packagingExcludes
archive
manifest
@@ -63,6 +64,38 @@
/project
+-+
+ Here's another variant of the above example, but this time we use
+ \packagingIncludes\ to select a few JARs to be included in the WAR.
+ This is useful when there is a need to package a small, but non-empty, subset
+ of JARs into the WAR. When making an EAR of skinny WARs, one wants to package
+ all of the JARs into the EAR. Sometimes a list of JARs must be packaged into
+ the WAR though in order for it to work properly, like tag libraries.
+
++-+
+project
+ ...
+ build
+plugins
+ plugin
+artifactIdmaven-war-plugin/artifactId
+version2.1-beta-1/version
+configuration
+ !-- Use this to include a selection of jars that will be included
in the WAR --
+
packagingIncludesWEB-INF/lib/my-tag-library.jar,WEB-INF/web.xml/packagingIncludes
+ archive
+manifest
+ addClasspathtrue/addClasspath
+ classpathPrefixlib//classpathPrefix
+/manifest
+ /archive
svn commit: r744709 - /maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Dep.java
Author: ogusakov
Date: Sun Feb 15 18:10:03 2009
New Revision: 744709
URL: http://svn.apache.org/viewvc?rev=744709view=rev
Log:
syncing style updates
Modified:
maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Dep.java
Modified:
maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Dep.java
URL:
http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Dep.java?rev=744709r1=744708r2=744709view=diff
==
---
maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Dep.java
(original)
+++
maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Dep.java
Sun Feb 15 18:10:03 2009
@@ -1,24 +1,5 @@
package org.apache.maven.mercury.ant.tasks;
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * License); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
import java.io.File;
import java.util.ArrayList;
import java.util.Iterator;
@@ -80,32 +61,6 @@
private Dependency _sourceDependency;
-/**
- * @param vr
- * @throws MavenEmbedderException
- */
-// private MavenEmbedder createEmbedder( VirtualRepositoryReader vr )
-// throws MavenEmbedderException
-// {
-// Configuration configuration = new DefaultConfiguration()
-// .setUserSettingsFile( MavenEmbedder.DEFAULT_USER_SETTINGS_FILE )
-// .setGlobalSettingsFile( MavenEmbedder.DEFAULT_GLOBAL_SETTINGS_FILE )
-// .setClassLoader( Thread.currentThread().getContextClassLoader() )
-// ;
-//
-// ConfigurationValidationResult validationResult =
MavenEmbedder.validateConfiguration( configuration );
-//
-// if ( validationResult.isValid() )
-// {
-// // If the configuration is valid then do your thang ...
-// }
-//
-// MavenEmbedder embedder = new MavenEmbedder( configuration );
-//
-// PlexusContainer container = embedder.getPlexusContainer();
-//
-// return embedder;
-// }
private ListArtifactBasicMetadata getDependencies(
VirtualRepositoryReader vr )
throws RepositoryException
{
@@ -137,9 +92,7 @@
File pomFile = new File( d._pom );
if ( !pomFile.exists() )
-{
throw new RepositoryException( pom file + d._pom +
does not exist );
-}
try
{
@@ -191,31 +144,6 @@
}
//
-// protected ArtifactRepository getLocalRepository( String path )
-// throws Exception
-// {
-// ArtifactRepositoryLayout repoLayout = new DefaultRepositoryLayout();
-//
-// ArtifactRepository r = new DefaultArtifactRepository( local,
-// file:// + path,
-// repoLayout );
-//
-// return r;
-// }
-
-// protected MavenProject getProject( File pom, ArtifactRepository
localRepo )
-// throws Exception
-// {
-// Properties props = System.getProperties();
-// ProfileActivationContext ctx = new DefaultProfileActivationContext(
props, false );
-//
-// ProjectBuilderConfiguration pbc = new
DefaultProjectBuilderConfiguration();
-// pbc.setLocalRepository( localRepo );
-// pbc.setGlobalProfileManager( new DefaultProfileManager( getContainer(),
ctx ) );
-//
-// return projectBuilder.build( pom, pbc );
-// }
-//
protected ListArtifact resolve( Config config, ArtifactScopeEnum scope )
throws Exception
{
@@ -313,16 +241,12 @@
private ListArtifactMetadata toArtifactMetadataList(
ListArtifactBasicMetadata depList )
{
if ( Util.isEmpty( depList ) )
-{
return null;
-}
ListArtifactMetadata res = new ArrayListArtifactMetadata(
depList.size() );
for ( ArtifactBasicMetadata bmd : depList )
-{
res.add( new ArtifactMetadata( bmd ) );
-}
return res;
}
@@ -344,9 +268,7 @@
super.setId( id
svn commit: r744711 - /maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Dep.java
Author: ogusakov Date: Sun Feb 15 18:10:50 2009 New Revision: 744711 URL: http://svn.apache.org/viewvc?rev=744711view=rev Log: syncing style updates Modified: maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Dep.java Modified: maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Dep.java URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Dep.java?rev=744711r1=744710r2=744711view=diff == --- maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Dep.java (original) +++ maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Dep.java Sun Feb 15 18:10:50 2009 @@ -1,5 +1,24 @@ package org.apache.maven.mercury.ant.tasks; +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * License); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + import java.io.File; import java.util.ArrayList; import java.util.Iterator;
svn commit: r744715 - in /maven/plugins/trunk/maven-invoker-plugin/src: it/invoker-report/ it/invoker-report/src/it/beanshell/ it/invoker-report/src/it/failed-one/ it/invoker-report/src/it/failure-bui
Author: bentmann Date: Sun Feb 15 18:28:45 2009 New Revision: 744715 URL: http://svn.apache.org/viewvc?rev=744715view=rev Log: o Fixed rendering of build result Added: maven/plugins/trunk/maven-invoker-plugin/src/it/invoker-report/src/it/failure-build/ maven/plugins/trunk/maven-invoker-plugin/src/it/invoker-report/src/it/failure-build/pom.xml (with props) maven/plugins/trunk/maven-invoker-plugin/src/it/invoker-report/src/it/failure-post/ maven/plugins/trunk/maven-invoker-plugin/src/it/invoker-report/src/it/failure-post/invoker.properties (with props) maven/plugins/trunk/maven-invoker-plugin/src/it/invoker-report/src/it/failure-post/pom.xml (with props) maven/plugins/trunk/maven-invoker-plugin/src/it/invoker-report/src/it/failure-post/verify.bsh (with props) maven/plugins/trunk/maven-invoker-plugin/src/it/invoker-report/src/it/failure-pre/ maven/plugins/trunk/maven-invoker-plugin/src/it/invoker-report/src/it/failure-pre/invoker.properties (with props) maven/plugins/trunk/maven-invoker-plugin/src/it/invoker-report/src/it/failure-pre/pom.xml (with props) maven/plugins/trunk/maven-invoker-plugin/src/it/invoker-report/src/it/failure-pre/setup.bsh (with props) maven/plugins/trunk/maven-invoker-plugin/src/it/invoker-report/src/it/success/ maven/plugins/trunk/maven-invoker-plugin/src/it/invoker-report/src/it/success/invoker.properties (with props) maven/plugins/trunk/maven-invoker-plugin/src/it/invoker-report/src/it/success/pom.xml (with props) Removed: maven/plugins/trunk/maven-invoker-plugin/src/it/invoker-report/src/it/beanshell/ maven/plugins/trunk/maven-invoker-plugin/src/it/invoker-report/src/it/failed-one/ maven/plugins/trunk/maven-invoker-plugin/src/it/invoker-report/src/it/groovy/ Modified: maven/plugins/trunk/maven-invoker-plugin/src/it/invoker-report/pom.xml maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/InvokerMojo.java maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/InvokerReport.java Modified: maven/plugins/trunk/maven-invoker-plugin/src/it/invoker-report/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/src/it/invoker-report/pom.xml?rev=744715r1=744714r2=744715view=diff == --- maven/plugins/trunk/maven-invoker-plugin/src/it/invoker-report/pom.xml (original) +++ maven/plugins/trunk/maven-invoker-plugin/src/it/invoker-report/pom.xml Sun Feb 15 18:28:45 2009 @@ -35,9 +35,9 @@ project.build.sourceEncodingUTF-8/project.build.sourceEncoding /properties - !--build + build plugins - plugin + !--plugin groupIdorg.apache.maven.plugins/groupId artifactIdmaven-invoker-plugin/artifactId version@project.version@/version @@ -60,17 +60,43 @@ /goals /execution /executions + /plugin-- + plugin +groupIdorg.apache.maven.plugins/groupId +artifactIdmaven-site-plugin/artifactId +version2.0-beta-7/version /plugin /plugins - /build-- + /build reporting -excludeDefaultstrue/excludeDefaults plugins plugin groupIdorg.apache.maven.plugins/groupId +artifactIdmaven-project-info-reports-plugin/artifactId +version2.1/version +reportSets + reportSet +reports + reportindex/report +/reports + /reportSet +/reportSets + /plugin + plugin +groupIdorg.apache.maven.plugins/groupId artifactIdmaven-invoker-plugin/artifactId -version@project.version@/version +version@project.version@/version +configuration + pomIncludes +pomInclude*/pom.xml/pomInclude + /pomIncludes + preBuildHookScriptsetup/preBuildHookScript + postBuildHookScriptverify/postBuildHookScript + goals +goalvalidate/goal + /goals +/configuration /plugin /plugins /reporting Added: maven/plugins/trunk/maven-invoker-plugin/src/it/invoker-report/src/it/failure-build/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/src/it/invoker-report/src/it/failure-build/pom.xml?rev=744715view=auto == --- maven/plugins/trunk/maven-invoker-plugin/src/it/invoker-report/src/it/failure-build/pom.xml (added) +++ maven/plugins/trunk/maven-invoker-plugin/src/it/invoker-report/src/it/failure-build/pom.xml Sun Feb 15 18:28:45 2009 @@ -0,0 +1,39 @@ +?xml version=1.0 encoding=UTF-8? + +!-- +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding
svn commit: r744718 - in /maven/plugins/trunk/maven-invoker-plugin/src/main/resources: invoker-report.properties invoker-report_de.properties invoker-report_en.properties
Author: bentmann Date: Sun Feb 15 18:43:43 2009 New Revision: 744718 URL: http://svn.apache.org/viewvc?rev=744718view=rev Log: o Updated report bundle to refer to builds rather than tests o Added German bundle Added: maven/plugins/trunk/maven-invoker-plugin/src/main/resources/invoker-report_de.properties (with props) Modified: maven/plugins/trunk/maven-invoker-plugin/src/main/resources/invoker-report.properties maven/plugins/trunk/maven-invoker-plugin/src/main/resources/invoker-report_en.properties Modified: maven/plugins/trunk/maven-invoker-plugin/src/main/resources/invoker-report.properties URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/src/main/resources/invoker-report.properties?rev=744718r1=744717r2=744718view=diff == --- maven/plugins/trunk/maven-invoker-plugin/src/main/resources/invoker-report.properties (original) +++ maven/plugins/trunk/maven-invoker-plugin/src/main/resources/invoker-report.properties Sun Feb 15 18:43:43 2009 @@ -14,17 +14,18 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -report.invoker.result.description = Generate a report based on the results of it tests. -report.invoker.result.name = Invoker Tests Results + +report.invoker.result.description = The results of the Maven invocations. +report.invoker.result.name = Invoker Build Results report.invoker.result.title = Invoker Report report.invoker.summary.title= Summary -report.invoker.summary.number = Tests +report.invoker.summary.number = Builds report.invoker.summary.success = Success report.invoker.summary.failed = Failures report.invoker.summary.success.rate = Success Rate report.invoker.summary.time.total = Total Time report.invoker.summary.time.avg = Avg Time -report.invoker.detail.title = Tests Details +report.invoker.detail.title = Build Details report.invoker.detail.name = Name report.invoker.detail.result= Result report.invoker.detail.time = Time Added: maven/plugins/trunk/maven-invoker-plugin/src/main/resources/invoker-report_de.properties URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/src/main/resources/invoker-report_de.properties?rev=744718view=auto == --- maven/plugins/trunk/maven-invoker-plugin/src/main/resources/invoker-report_de.properties (added) +++ maven/plugins/trunk/maven-invoker-plugin/src/main/resources/invoker-report_de.properties Sun Feb 15 18:43:43 2009 @@ -0,0 +1,32 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# License); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + +report.invoker.result.description = Die Ergebnisse der Maven-Ausführungen. +report.invoker.result.name = Invoker-Build-Ergebnisse +report.invoker.result.title = Invoker-Bericht +report.invoker.summary.title= Zusammenfassungen +report.invoker.summary.number = Builds +report.invoker.summary.success = Erfolge +report.invoker.summary.failed = Fehlschläge +report.invoker.summary.success.rate = Erfolgsrate +report.invoker.summary.time.total = Gesamtzeit +report.invoker.summary.time.avg = Durchschnittszeit +report.invoker.detail.title = Build-Details +report.invoker.detail.name = Name +report.invoker.detail.result= Ergebnis +report.invoker.detail.time = Zeit +report.invoker.detail.message = Meldung Propchange: maven/plugins/trunk/maven-invoker-plugin/src/main/resources/invoker-report_de.properties -- svn:eol-style = native Propchange: maven/plugins/trunk/maven-invoker-plugin/src/main/resources/invoker-report_de.properties -- svn:keywords = Author Date Id Revision Modified: maven/plugins/trunk/maven-invoker-plugin/src/main/resources/invoker-report_en.properties URL:
svn commit: r744728 - in /maven/plugins/trunk/maven-invoker-plugin/src: it/invoker-report/pom.xml main/java/org/apache/maven/plugin/invoker/InvokerReport.java main/resources/invoker-report.properties
Author: bentmann
Date: Sun Feb 15 19:40:24 2009
New Revision: 744728
URL: http://svn.apache.org/viewvc?rev=744728view=rev
Log:
o Polished report and used localized number formats
Modified:
maven/plugins/trunk/maven-invoker-plugin/src/it/invoker-report/pom.xml
maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/InvokerReport.java
maven/plugins/trunk/maven-invoker-plugin/src/main/resources/invoker-report.properties
maven/plugins/trunk/maven-invoker-plugin/src/main/resources/invoker-report_de.properties
Modified: maven/plugins/trunk/maven-invoker-plugin/src/it/invoker-report/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/src/it/invoker-report/pom.xml?rev=744728r1=744727r2=744728view=diff
==
--- maven/plugins/trunk/maven-invoker-plugin/src/it/invoker-report/pom.xml
(original)
+++ maven/plugins/trunk/maven-invoker-plugin/src/it/invoker-report/pom.xml Sun
Feb 15 19:40:24 2009
@@ -23,12 +23,13 @@
modelVersion4.0.0/modelVersion
groupIdorg.apache.maven.plugins.invoker/groupId
- artifactIdscript-context/artifactId
+ artifactIdinvoker-report/artifactId
version1.0-SNAPSHOT/version
packagingpom/packaging
+ nameTest/name
description
-Test that the hook scripts can share information via a map in the global
variable context (MINVOKER-79).
+Test the generation of invoker reports (MINVOKER-77).
/description
properties
Modified:
maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/InvokerReport.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/InvokerReport.java?rev=744728r1=744727r2=744728view=diff
==
---
maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/InvokerReport.java
(original)
+++
maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/InvokerReport.java
Sun Feb 15 19:40:24 2009
@@ -1,24 +1,5 @@
package org.apache.maven.plugin.invoker;
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Locale;
-
-import org.apache.maven.doxia.sink.Sink;
-import org.apache.maven.doxia.siterenderer.Renderer;
-import org.apache.maven.plugin.invoker.model.BuildJob;
-import org.apache.maven.plugin.invoker.model.io.xpp3.BuildJobXpp3Reader;
-import org.apache.maven.project.MavenProject;
-import org.apache.maven.reporting.AbstractMavenReport;
-import org.apache.maven.reporting.MavenReportException;
-import org.codehaus.plexus.i18n.I18N;
-import org.codehaus.plexus.util.ReaderFactory;
-import org.codehaus.plexus.util.StringUtils;
-import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -38,6 +19,28 @@
* under the License.
*/
+import java.io.File;
+import java.io.IOException;
+import java.text.DecimalFormat;
+import java.text.DecimalFormatSymbols;
+import java.text.NumberFormat;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Locale;
+
+import org.apache.maven.doxia.sink.Sink;
+import org.apache.maven.doxia.siterenderer.Renderer;
+import org.apache.maven.plugin.invoker.model.BuildJob;
+import org.apache.maven.plugin.invoker.model.io.xpp3.BuildJobXpp3Reader;
+import org.apache.maven.project.MavenProject;
+import org.apache.maven.reporting.AbstractMavenReport;
+import org.apache.maven.reporting.MavenReportException;
+import org.codehaus.plexus.i18n.I18N;
+import org.codehaus.plexus.util.ReaderFactory;
+import org.codehaus.plexus.util.StringUtils;
+import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
+
/**
* Generate a report based on the results of it tests.
* Fork an invoker:run
@@ -90,15 +93,43 @@
*/
private File reportsDirectory;
+/**
+ * The number format used to print percent values in the report locale.
+ */
+private NumberFormat percentFormat;
+
+/**
+ * The number format used to print time values in the report locale.
+ */
+private NumberFormat secondsFormat;
+
protected void executeReport( Locale locale )
throws MavenReportException
{
+DecimalFormatSymbols symbols = new DecimalFormatSymbols( locale );
+percentFormat = new DecimalFormat( getText( locale,
report.invoker.format.percent ), symbols );
+secondsFormat = new DecimalFormat( getText( locale,
report.invoker.format.seconds ), symbols );
+
Sink sink = getSink();
+
+sink.head();
+
+sink.title();
+sink.text( getText( locale, report.invoker.result.title ) );
+sink.title_();
+
svn commit: r744746 - in /maven/mercury/trunk/mercury-ant-tasks: ./ src/main/java/org/apache/maven/mercury/ant/tasks/
Author: ogusakov
Date: Sun Feb 15 20:35:47 2009
New Revision: 744746
URL: http://svn.apache.org/viewvc?rev=744746view=rev
Log:
[MNG-3969] intermediate commit - multiple scopes are now available. Also
continue keeping Herve happy
Modified:
maven/mercury/trunk/mercury-ant-tasks/build.xml
maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Config.java
maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Repo.java
maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/ResolveTask.java
Modified: maven/mercury/trunk/mercury-ant-tasks/build.xml
URL:
http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-ant-tasks/build.xml?rev=744746r1=744745r2=744746view=diff
==
--- maven/mercury/trunk/mercury-ant-tasks/build.xml (original)
+++ maven/mercury/trunk/mercury-ant-tasks/build.xml Sun Feb 15 20:35:47 2009
@@ -328,7 +328,7 @@
javac srcdir=${basedir}/src/test/compile
destdir=${basedir}/target/compile-classes
-classpathref=mercury.path
+classpathref=mercury.classpath
source=1.5
target=1.5
/
Modified:
maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Config.java
URL:
http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Config.java?rev=744746r1=744745r2=744746view=diff
==
---
maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Config.java
(original)
+++
maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Config.java
Sun Feb 15 20:35:47 2009
@@ -45,11 +45,13 @@
public static final String DEFAULT_LOCAL_DIR_NAME = /.m2/repository;
+public static final String DEFAULT_PATH_ID = mercury.classpath;
+
+public static final String DEFAULT_FILESET_ID = mercury.fileset;
+
public static final String DEFAULT_CONFIG_ID =
System.getProperty( mercury.default.config.id,
mercury.default.config.id. + System.currentTimeMillis() );
-public static final String DEFAULT_PATH_ID = System.getProperty(
mercury.default.path.id, mercury.path );
-
CollectionRepo _repos;
CollectionAuth _auths;
Modified:
maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Repo.java
URL:
http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Repo.java?rev=744746r1=744745r2=744746view=diff
==
---
maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Repo.java
(original)
+++
maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/Repo.java
Sun Feb 15 20:35:47 2009
@@ -49,7 +49,7 @@
/**
* repository data type
- *
+ *
* @author Oleg Gusakov
* @version $Id$
*/
Modified:
maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/ResolveTask.java
URL:
http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/ResolveTask.java?rev=744746r1=744745r2=744746view=diff
==
---
maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/ResolveTask.java
(original)
+++
maven/mercury/trunk/mercury-ant-tasks/src/main/java/org/apache/maven/mercury/ant/tasks/ResolveTask.java
Sun Feb 15 20:35:47 2009
@@ -20,6 +20,7 @@
*/
import java.io.File;
+import java.io.IOException;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
@@ -29,7 +30,10 @@
import org.apache.maven.mercury.util.Util;
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.types.FileList;
+import org.apache.tools.ant.types.FileSet;
import org.apache.tools.ant.types.Path;
+import org.apache.tools.ant.types.FileList.FileName;
+import org.apache.tools.ant.types.selectors.FilenameSelector;
import org.codehaus.plexus.lang.DefaultLanguage;
import org.codehaus.plexus.lang.Language;
@@ -42,6 +46,9 @@
{
private static final Language LANG = new DefaultLanguage(
ResolveTask.class );
+ArtifactScopeEnum[] SCOPES =
+new ArtifactScopeEnum[] { ArtifactScopeEnum.compile,
ArtifactScopeEnum.test, ArtifactScopeEnum.runtime };
+
public static final String TASK_NAME = LANG.getMessage(
resolve.task.name );
public static final String TASK_DESC = LANG.getMessage(
resolve.task.desc );
@@ -60,7 +67,7 @@
private boolean _transitive = true;
-private ArtifactScopeEnum _scope = ArtifactScopeEnum.compile;
+private ArtifactScopeEnum
svn propchange: r744288 - svn:log
Author: brianf Revision: 744288 Modified property: svn:log Modified: svn:log at Sun Feb 15 22:47:21 2009 -- --- svn:log (original) +++ svn:log Sun Feb 15 22:47:21 2009 @@ -1 +1 @@ -use the new parent +Move the snapshot properties and repo definitions up to the asf pom for consistency across projects. Change urls to use repository.apache.org
svn propchange: r744331 - svn:log
Author: brianf Revision: 744331 Modified property: svn:log Modified: svn:log at Sun Feb 15 22:48:12 2009 -- --- svn:log (original) +++ svn:log Sun Feb 15 22:48:12 2009 @@ -0,0 +1 @@ +use shorter url
svn commit: r744843 - /maven/sandbox/branches/MDEP-145/
Author: pisong Date: Mon Feb 16 07:53:59 2009 New Revision: 744843 URL: http://svn.apache.org/viewvc?rev=744843view=rev Log: (empty) Added: maven/sandbox/branches/MDEP-145/
svn commit: r744844 - /maven/sandbox/branches/MDEP-145/
Author: pisong Date: Mon Feb 16 07:57:11 2009 New Revision: 744844 URL: http://svn.apache.org/viewvc?rev=744844view=rev Log: (empty) Removed: maven/sandbox/branches/MDEP-145/
