You are viewing a plain text version of this content. The canonical link for it is here.
Posted to nmaven-commits@incubator.apache.org by si...@apache.org on 2007/04/11 08:56:22 UTC
svn commit: r527421 - in /incubator/nmaven/branches/SI_XPT/plugins: ./
maven-compile-plugin/
maven-compile-plugin/src/main/java/org/apache/maven/dotnet/plugin/compile/
maven-compile-plugin/src/main/resources/META-INF/plexus/
maven-install-plugin/ maven...
Author: sisbell
Date: Wed Apr 11 01:56:18 2007
New Revision: 527421
URL: http://svn.apache.org/viewvc?view=rev&rev=527421
Log:
Added some performance metrics to the plugins.
Modified:
incubator/nmaven/branches/SI_XPT/plugins/maven-compile-plugin/pom.xml
incubator/nmaven/branches/SI_XPT/plugins/maven-compile-plugin/src/main/java/org/apache/maven/dotnet/plugin/compile/AssemblyInfoGeneratorMojo.java
incubator/nmaven/branches/SI_XPT/plugins/maven-compile-plugin/src/main/java/org/apache/maven/dotnet/plugin/compile/CompilerMojo.java
incubator/nmaven/branches/SI_XPT/plugins/maven-compile-plugin/src/main/java/org/apache/maven/dotnet/plugin/compile/ComponentInitializerMojo.java
incubator/nmaven/branches/SI_XPT/plugins/maven-compile-plugin/src/main/java/org/apache/maven/dotnet/plugin/compile/SourceProcessorMojo.java
incubator/nmaven/branches/SI_XPT/plugins/maven-compile-plugin/src/main/java/org/apache/maven/dotnet/plugin/compile/TestCompilerMojo.java
incubator/nmaven/branches/SI_XPT/plugins/maven-compile-plugin/src/main/java/org/apache/maven/dotnet/plugin/compile/TestSourceProcessorMojo.java
incubator/nmaven/branches/SI_XPT/plugins/maven-compile-plugin/src/main/resources/META-INF/plexus/components.xml
incubator/nmaven/branches/SI_XPT/plugins/maven-install-plugin/pom.xml
incubator/nmaven/branches/SI_XPT/plugins/maven-install-plugin/src/main/java/org/apache/maven/dotnet/plugin/install/InstallerMojo.java
incubator/nmaven/branches/SI_XPT/plugins/maven-install-plugin/src/main/java/org/apache/maven/dotnet/plugin/install/TargetModuleInstallerMojo.java
incubator/nmaven/branches/SI_XPT/plugins/maven-link-plugin/pom.xml
incubator/nmaven/branches/SI_XPT/plugins/maven-resgen-plugin/src/main/java/org/apache/maven/dotnet/plugin/resgen/ResourceGeneratorMojo.java
incubator/nmaven/branches/SI_XPT/plugins/maven-resolver-plugin/pom.xml
incubator/nmaven/branches/SI_XPT/plugins/maven-resolver-plugin/src/main/java/org/apache/maven/dotnet/plugin/resolver/NetDependencyResolverMojo.java
incubator/nmaven/branches/SI_XPT/plugins/maven-settings-plugin/pom.xml
incubator/nmaven/branches/SI_XPT/plugins/maven-settings-plugin/src/main/java/org/apache/maven/dotnet/plugin/settings/SettingsGeneratorMojo.java
incubator/nmaven/branches/SI_XPT/plugins/maven-wsdl-plugin/pom.xml
incubator/nmaven/branches/SI_XPT/plugins/pom.xml
Modified: incubator/nmaven/branches/SI_XPT/plugins/maven-compile-plugin/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/plugins/maven-compile-plugin/pom.xml?view=diff&rev=527421&r1=527420&r2=527421
==============================================================================
--- incubator/nmaven/branches/SI_XPT/plugins/maven-compile-plugin/pom.xml (original)
+++ incubator/nmaven/branches/SI_XPT/plugins/maven-compile-plugin/pom.xml Wed Apr 11 01:56:18 2007
@@ -19,7 +19,7 @@
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-artifact</artifactId>
- <version>2.0.4</version>
+ <version>2.1-SNAPSHOT</version>
</dependency>
</dependencies>
<build>
Modified: incubator/nmaven/branches/SI_XPT/plugins/maven-compile-plugin/src/main/java/org/apache/maven/dotnet/plugin/compile/AssemblyInfoGeneratorMojo.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/plugins/maven-compile-plugin/src/main/java/org/apache/maven/dotnet/plugin/compile/AssemblyInfoGeneratorMojo.java?view=diff&rev=527421&r1=527420&r2=527421
==============================================================================
--- incubator/nmaven/branches/SI_XPT/plugins/maven-compile-plugin/src/main/java/org/apache/maven/dotnet/plugin/compile/AssemblyInfoGeneratorMojo.java (original)
+++ incubator/nmaven/branches/SI_XPT/plugins/maven-compile-plugin/src/main/java/org/apache/maven/dotnet/plugin/compile/AssemblyInfoGeneratorMojo.java Wed Apr 11 01:56:18 2007
@@ -119,7 +119,8 @@
public void execute()
throws MojoExecutionException
{
-
+ long startTime = System.currentTimeMillis();
+
if ( project.getArtifact().getType().equals( "module" ) )
{
return;
@@ -145,8 +146,6 @@
}
getLog().info( "NMAVEN-902-000: Generating Assembly Info: Language = " + language.trim() );
-
-
//TODO: Investigate the affect of not setting isDefault and profile. In the case of executables, this is
//managed by the framework. I intended to keep vendor info and state machine processor out of the
// Mojos. Unable to do so for this case. Look at new API.
@@ -195,5 +194,7 @@
throw new MojoExecutionException( "NMAVEN-902-005: Problem generating assembly info class", e );
}
+ long endTime = System.currentTimeMillis();
+ getLog().info( "Mojo Execution Time = " + (endTime - startTime));
}
}
Modified: incubator/nmaven/branches/SI_XPT/plugins/maven-compile-plugin/src/main/java/org/apache/maven/dotnet/plugin/compile/CompilerMojo.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/plugins/maven-compile-plugin/src/main/java/org/apache/maven/dotnet/plugin/compile/CompilerMojo.java?view=diff&rev=527421&r1=527420&r2=527421
==============================================================================
--- incubator/nmaven/branches/SI_XPT/plugins/maven-compile-plugin/src/main/java/org/apache/maven/dotnet/plugin/compile/CompilerMojo.java (original)
+++ incubator/nmaven/branches/SI_XPT/plugins/maven-compile-plugin/src/main/java/org/apache/maven/dotnet/plugin/compile/CompilerMojo.java Wed Apr 11 01:56:18 2007
@@ -20,6 +20,7 @@
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.AbstractMojo;
+import org.apache.maven.plugin.logging.Log;
import org.apache.maven.project.MavenProject;
import org.apache.maven.dotnet.PlatformUnsupportedException;
@@ -27,8 +28,6 @@
import org.apache.maven.dotnet.executable.ExecutionException;
import org.apache.maven.dotnet.vendor.VendorFactory;
import org.apache.maven.dotnet.executable.compiler.*;
-import org.apache.maven.model.Dependency;
-import org.apache.maven.artifact.Artifact;
import java.util.ArrayList;
import java.io.File;
@@ -49,14 +48,7 @@
public final class CompilerMojo
extends AbstractMojo
{
-
- /**
- * @parameter expression="${settings.localRepository}"
- * @required
- */
- private File localRepository;
-
- /**
+ /**
* The maven project.
*
* @parameter expression="${project}"
@@ -65,6 +57,11 @@
private MavenProject project;
/**
+ * @parameter expression="${settings.localRepository}"
+ */
+ private File localRepository;
+
+ /**
* Additional compiler commands
*
* @parameter expression = "${parameters}"
@@ -143,6 +140,7 @@
*/
private org.apache.maven.dotnet.executable.NetExecutableFactory netExecutableFactory;
+
/**
* Compiles the class files.
*
@@ -152,12 +150,19 @@
public void execute()
throws MojoExecutionException
{
+ long startTime = System.currentTimeMillis();
+
if ( profileAssemblyPath != null && !profileAssemblyPath.exists() )
{
throw new MojoExecutionException( "NMAVEN-900-007: Profile Assembly Path does not exist: Path = " +
profileAssemblyPath.getAbsolutePath() );
}
+ if(localRepository == null)
+ {
+ localRepository = new File(System.getProperty("user.home"), ".m2/repository");
+ }
+
//Requirement
CompilerRequirement compilerRequirement = CompilerRequirement.Factory.createDefaultCompilerRequirement();
compilerRequirement.setLanguage( language );
@@ -205,7 +210,11 @@
compilerConfig,
project,
profileAssemblyPath );
+ long startTimeCompile = System.currentTimeMillis();
compilerExecutable.execute();
+ long endTimeCompile = System.currentTimeMillis();
+
+ getLog().info( "NMAVEN-900-008: Compile Time = " + (endTimeCompile - startTimeCompile) + " ms");
project.getArtifact().setFile( compilerExecutable.getCompiledArtifact() );
}
catch ( PlatformUnsupportedException e )
@@ -219,5 +228,7 @@
", Vendor = " + vendor + ", ArtifactType = " + artifactTypeName + ", Source Directory = " +
project.getBuild().getSourceDirectory(), e );
}
+ long endTime = System.currentTimeMillis();
+ getLog().info( "Mojo Execution Time = " + (endTime - startTime));
}
}
Modified: incubator/nmaven/branches/SI_XPT/plugins/maven-compile-plugin/src/main/java/org/apache/maven/dotnet/plugin/compile/ComponentInitializerMojo.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/plugins/maven-compile-plugin/src/main/java/org/apache/maven/dotnet/plugin/compile/ComponentInitializerMojo.java?view=diff&rev=527421&r1=527420&r2=527421
==============================================================================
--- incubator/nmaven/branches/SI_XPT/plugins/maven-compile-plugin/src/main/java/org/apache/maven/dotnet/plugin/compile/ComponentInitializerMojo.java (original)
+++ incubator/nmaven/branches/SI_XPT/plugins/maven-compile-plugin/src/main/java/org/apache/maven/dotnet/plugin/compile/ComponentInitializerMojo.java Wed Apr 11 01:56:18 2007
@@ -51,7 +51,6 @@
/**
* @parameter expression="${settings.localRepository}"
- * @required
* @readonly
*/
private String localRepository;
@@ -83,9 +82,19 @@
*/
private AssemblerContext assemblerContext;
+ public static long sT;
+
public void execute()
throws MojoExecutionException
{
+ sT = System.currentTimeMillis();
+ long startTime = System.currentTimeMillis();
+
+ if(localRepository == null)
+ {
+ localRepository = new File(System.getProperty("user.home"), ".m2/repository").getAbsolutePath();
+ }
+
try
{
assemblyResolver.resolveTransitivelyFor( project, project.getArtifact(), project.getDependencies(), pomFile,
@@ -108,5 +117,8 @@
{
throw new MojoExecutionException( "NMAVEN-901-002: Failed to initialize the assembler context" );
}
+
+ long endTime = System.currentTimeMillis();
+ getLog().info( "Mojo Execution Time = " + (endTime - startTime));
}
}
Modified: incubator/nmaven/branches/SI_XPT/plugins/maven-compile-plugin/src/main/java/org/apache/maven/dotnet/plugin/compile/SourceProcessorMojo.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/plugins/maven-compile-plugin/src/main/java/org/apache/maven/dotnet/plugin/compile/SourceProcessorMojo.java?view=diff&rev=527421&r1=527420&r2=527421
==============================================================================
--- incubator/nmaven/branches/SI_XPT/plugins/maven-compile-plugin/src/main/java/org/apache/maven/dotnet/plugin/compile/SourceProcessorMojo.java (original)
+++ incubator/nmaven/branches/SI_XPT/plugins/maven-compile-plugin/src/main/java/org/apache/maven/dotnet/plugin/compile/SourceProcessorMojo.java Wed Apr 11 01:56:18 2007
@@ -54,7 +54,7 @@
/**
* Output directory
*
- * @parameter expression = "${outputDirectory}" default-value="${project.build.directory}${file.separator}build-sources"
+ * @parameter expression = "${outputDirectory}" default-value="${project.build.directory}/build-sources"
* @required
*/
private String outputDirectory;
@@ -85,6 +85,8 @@
public void execute()
throws MojoExecutionException
{
+ long startTime = System.currentTimeMillis();
+
if ( !new File( sourceDirectory ).exists() )
{
getLog().info( "NMAVEN-904-001: No source files to copy" );
Modified: incubator/nmaven/branches/SI_XPT/plugins/maven-compile-plugin/src/main/java/org/apache/maven/dotnet/plugin/compile/TestCompilerMojo.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/plugins/maven-compile-plugin/src/main/java/org/apache/maven/dotnet/plugin/compile/TestCompilerMojo.java?view=diff&rev=527421&r1=527420&r2=527421
==============================================================================
--- incubator/nmaven/branches/SI_XPT/plugins/maven-compile-plugin/src/main/java/org/apache/maven/dotnet/plugin/compile/TestCompilerMojo.java (original)
+++ incubator/nmaven/branches/SI_XPT/plugins/maven-compile-plugin/src/main/java/org/apache/maven/dotnet/plugin/compile/TestCompilerMojo.java Wed Apr 11 01:56:18 2007
@@ -45,7 +45,6 @@
/**
* @parameter expression="${settings.localRepository}"
- * @required
*/
private File localRepository;
@@ -131,6 +130,8 @@
public void execute()
throws MojoExecutionException
{
+ long startTime = System.currentTimeMillis();
+
String skipTests = System.getProperty( "maven.test.skip" );
if ( ( skipTests != null && skipTests.equalsIgnoreCase( "true" ) ) || skipTestCompile )
{
@@ -152,6 +153,11 @@
testFrameworkVersion = frameworkVersion;
}
+ if(localRepository == null)
+ {
+ localRepository = new File(System.getProperty("user.home"), ".m2/repository");
+ }
+
//Requirement
CompilerRequirement compilerRequirement = CompilerRequirement.Factory.createDefaultCompilerRequirement();
compilerRequirement.setLanguage( language );
@@ -196,5 +202,7 @@
throw new MojoExecutionException(
"NMAVEN-903-002: Unable to Compile: Language = " + language + ", Vendor = " + vendor, e );
}
+ long endTime = System.currentTimeMillis();
+ getLog().info( "Mojo Execution Time = " + (endTime - startTime));
}
}
Modified: incubator/nmaven/branches/SI_XPT/plugins/maven-compile-plugin/src/main/java/org/apache/maven/dotnet/plugin/compile/TestSourceProcessorMojo.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/plugins/maven-compile-plugin/src/main/java/org/apache/maven/dotnet/plugin/compile/TestSourceProcessorMojo.java?view=diff&rev=527421&r1=527420&r2=527421
==============================================================================
--- incubator/nmaven/branches/SI_XPT/plugins/maven-compile-plugin/src/main/java/org/apache/maven/dotnet/plugin/compile/TestSourceProcessorMojo.java (original)
+++ incubator/nmaven/branches/SI_XPT/plugins/maven-compile-plugin/src/main/java/org/apache/maven/dotnet/plugin/compile/TestSourceProcessorMojo.java Wed Apr 11 01:56:18 2007
@@ -50,7 +50,7 @@
/**
* Output directory
*
- * @parameter expression = "${outputDirectory}" default-value="${project.build.directory}${file.separator}build-test-sources"
+ * @parameter expression = "${outputDirectory}" default-value="${project.build.directory}/build-test-sources"
* @required
*/
private String outputDirectory;
@@ -58,6 +58,8 @@
public void execute()
throws MojoExecutionException
{
+ long startTime = System.currentTimeMillis();
+
if ( !new File( sourceDirectory ).exists() )
{
getLog().info( "NMAVEN-905-001: No test source files to copy" );
@@ -90,5 +92,7 @@
throw new MojoExecutionException( "NMAVEN-905-000: Unable to process test sources", e );
}
}
+ long endTime = System.currentTimeMillis();
+ getLog().info( "Mojo Execution Time = " + (endTime - startTime));
}
}
Modified: incubator/nmaven/branches/SI_XPT/plugins/maven-compile-plugin/src/main/resources/META-INF/plexus/components.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/plugins/maven-compile-plugin/src/main/resources/META-INF/plexus/components.xml?view=diff&rev=527421&r1=527420&r2=527421
==============================================================================
--- incubator/nmaven/branches/SI_XPT/plugins/maven-compile-plugin/src/main/resources/META-INF/plexus/components.xml (original)
+++ incubator/nmaven/branches/SI_XPT/plugins/maven-compile-plugin/src/main/resources/META-INF/plexus/components.xml Wed Apr 11 01:56:18 2007
@@ -47,7 +47,6 @@
<component>
<role>org.apache.maven.lifecycle.mapping.LifecycleMapping</role>
<role-hint>module</role-hint>
-
<implementation>
org.apache.maven.lifecycle.mapping.DefaultLifecycleMapping
</implementation>
@@ -202,6 +201,33 @@
<configuration>
<extension>dll</extension>
<type>gac</type>
+ </configuration>
+ </component>
+ <component>
+ <role>org.apache.maven.artifact.handler.ArtifactHandler</role>
+ <role-hint>gac_generic</role-hint>
+ <implementation>org.apache.maven.artifact.handler.DefaultArtifactHandler</implementation>
+ <configuration>
+ <extension>dll</extension>
+ <type>gac_generic</type>
+ </configuration>
+ </component>
+ <component>
+ <role>org.apache.maven.artifact.handler.ArtifactHandler</role>
+ <role-hint>gac_msil</role-hint>
+ <implementation>org.apache.maven.artifact.handler.DefaultArtifactHandler</implementation>
+ <configuration>
+ <extension>dll</extension>
+ <type>gac_msil</type>
+ </configuration>
+ </component>
+ <component>
+ <role>org.apache.maven.artifact.handler.ArtifactHandler</role>
+ <role-hint>gac_32</role-hint>
+ <implementation>org.apache.maven.artifact.handler.DefaultArtifactHandler</implementation>
+ <configuration>
+ <extension>dll</extension>
+ <type>gac_32</type>
</configuration>
</component>
<component>
Modified: incubator/nmaven/branches/SI_XPT/plugins/maven-install-plugin/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/plugins/maven-install-plugin/pom.xml?view=diff&rev=527421&r1=527420&r2=527421
==============================================================================
--- incubator/nmaven/branches/SI_XPT/plugins/maven-install-plugin/pom.xml (original)
+++ incubator/nmaven/branches/SI_XPT/plugins/maven-install-plugin/pom.xml Wed Apr 11 01:56:18 2007
@@ -14,6 +14,13 @@
<description>
Maven Plugin for .NET
</description>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.dotnet.plugins</groupId>
+ <artifactId>maven-compile-plugin</artifactId>
+ <version>0.14-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
<distributionManagement>
<site>
<id>nmaven-apache-site</id>
Modified: incubator/nmaven/branches/SI_XPT/plugins/maven-install-plugin/src/main/java/org/apache/maven/dotnet/plugin/install/InstallerMojo.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/plugins/maven-install-plugin/src/main/java/org/apache/maven/dotnet/plugin/install/InstallerMojo.java?view=diff&rev=527421&r1=527420&r2=527421
==============================================================================
--- incubator/nmaven/branches/SI_XPT/plugins/maven-install-plugin/src/main/java/org/apache/maven/dotnet/plugin/install/InstallerMojo.java (original)
+++ incubator/nmaven/branches/SI_XPT/plugins/maven-install-plugin/src/main/java/org/apache/maven/dotnet/plugin/install/InstallerMojo.java Wed Apr 11 01:56:18 2007
@@ -26,6 +26,7 @@
import org.apache.maven.artifact.Artifact;
import org.apache.maven.dotnet.artifact.ArtifactContext;
import org.apache.maven.dotnet.artifact.ArtifactType;
+import org.apache.maven.dotnet.plugin.compile.ComponentInitializerMojo;
import org.apache.maven.model.Dependency;
import java.io.File;
@@ -49,7 +50,6 @@
/**
* @parameter expression="${settings.localRepository}"
- * @required
*/
private File localRepository;
@@ -73,6 +73,13 @@
public void execute()
throws MojoExecutionException
{
+ long startTime = System.currentTimeMillis();
+
+ if(localRepository == null)
+ {
+ localRepository = new File(System.getProperty("user.home"), ".m2/repository");
+ }
+
Artifact artifact = project.getArtifact();
try
{
@@ -96,7 +103,9 @@
throw new MojoExecutionException( "NMAVEN-1001-002: Failed to install artifact file", e );
}
}
-
+ long endTime = System.currentTimeMillis();
+ getLog().info( "Mojo Execution Time = " + (endTime - startTime));
+ getLog().info( "Total Time = " + (endTime - ComponentInitializerMojo.sT));
//For the IDE: If we see a dll with same name as netmodule, copy dll to the local repo.
/*
File linkedFile =
Modified: incubator/nmaven/branches/SI_XPT/plugins/maven-install-plugin/src/main/java/org/apache/maven/dotnet/plugin/install/TargetModuleInstallerMojo.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/plugins/maven-install-plugin/src/main/java/org/apache/maven/dotnet/plugin/install/TargetModuleInstallerMojo.java?view=diff&rev=527421&r1=527420&r2=527421
==============================================================================
--- incubator/nmaven/branches/SI_XPT/plugins/maven-install-plugin/src/main/java/org/apache/maven/dotnet/plugin/install/TargetModuleInstallerMojo.java (original)
+++ incubator/nmaven/branches/SI_XPT/plugins/maven-install-plugin/src/main/java/org/apache/maven/dotnet/plugin/install/TargetModuleInstallerMojo.java Wed Apr 11 01:56:18 2007
@@ -46,7 +46,6 @@
/**
* @parameter expression="${settings.localRepository}"
- * @required
*/
private File localRepository;
@@ -67,6 +66,13 @@
public void execute()
throws MojoExecutionException
{
+ long startTime = System.currentTimeMillis();
+
+ if(localRepository == null)
+ {
+ localRepository = new File(System.getProperty("user.home"), ".m2/repository");
+ }
+
try
{
nmavenRegistry.createRepositoryRegistry();
@@ -86,5 +92,7 @@
{
throw new MojoExecutionException( "NMAVEN-1002-000: Failed to install artifacts into target directory", e );
}
+ long endTime = System.currentTimeMillis();
+ getLog().info( "Mojo Execution Time = " + (endTime - startTime));
}
}
Modified: incubator/nmaven/branches/SI_XPT/plugins/maven-link-plugin/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/plugins/maven-link-plugin/pom.xml?view=diff&rev=527421&r1=527420&r2=527421
==============================================================================
--- incubator/nmaven/branches/SI_XPT/plugins/maven-link-plugin/pom.xml (original)
+++ incubator/nmaven/branches/SI_XPT/plugins/maven-link-plugin/pom.xml Wed Apr 11 01:56:18 2007
@@ -14,7 +14,6 @@
<description>
Maven Plugin for .NET
</description>
-
<distributionManagement>
<site>
<id>nmaven-apache-site</id>
Modified: incubator/nmaven/branches/SI_XPT/plugins/maven-resgen-plugin/src/main/java/org/apache/maven/dotnet/plugin/resgen/ResourceGeneratorMojo.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/plugins/maven-resgen-plugin/src/main/java/org/apache/maven/dotnet/plugin/resgen/ResourceGeneratorMojo.java?view=diff&rev=527421&r1=527420&r2=527421
==============================================================================
--- incubator/nmaven/branches/SI_XPT/plugins/maven-resgen-plugin/src/main/java/org/apache/maven/dotnet/plugin/resgen/ResourceGeneratorMojo.java (original)
+++ incubator/nmaven/branches/SI_XPT/plugins/maven-resgen-plugin/src/main/java/org/apache/maven/dotnet/plugin/resgen/ResourceGeneratorMojo.java Wed Apr 11 01:56:18 2007
@@ -46,7 +46,6 @@
/**
* @parameter expression="${settings.localRepository}"
- * @required
*/
private String localRepository;
@@ -106,6 +105,11 @@
{
return;
}
+
+ if(localRepository == null)
+ {
+ localRepository = new File(System.getProperty("user.home"), ".m2/repository").getAbsolutePath();
+ }
/*
* We should do this check at a lower level (to keep consistent behavior with the nmaven-settings.xml)
Modified: incubator/nmaven/branches/SI_XPT/plugins/maven-resolver-plugin/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/plugins/maven-resolver-plugin/pom.xml?view=diff&rev=527421&r1=527420&r2=527421
==============================================================================
--- incubator/nmaven/branches/SI_XPT/plugins/maven-resolver-plugin/pom.xml (original)
+++ incubator/nmaven/branches/SI_XPT/plugins/maven-resolver-plugin/pom.xml Wed Apr 11 01:56:18 2007
@@ -1,18 +1,19 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <parent>
- <groupId>org.apache.maven.dotnet.plugins</groupId>
- <version>0.14-SNAPSHOT</version>
- <artifactId>maven-dotnet-plugins</artifactId>
- </parent>
- <modelVersion>4.0.0</modelVersion>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
<groupId>org.apache.maven.dotnet.plugins</groupId>
- <artifactId>maven-resolver-plugin</artifactId>
- <packaging>maven-plugin</packaging>
<version>0.14-SNAPSHOT</version>
- <name>maven-resolver-plugin</name>
- <description>
- Maven Plugin for .NET
- </description>
+ <artifactId>maven-dotnet-plugins</artifactId>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.maven.dotnet.plugins</groupId>
+ <artifactId>maven-resolver-plugin</artifactId>
+ <packaging>maven-plugin</packaging>
+ <version>0.14-SNAPSHOT</version>
+ <name>maven-resolver-plugin</name>
+ <description>
+ Maven Plugin for .NET
+ </description>
<distributionManagement>
<site>
<id>nmaven-apache-site</id>
Modified: incubator/nmaven/branches/SI_XPT/plugins/maven-resolver-plugin/src/main/java/org/apache/maven/dotnet/plugin/resolver/NetDependencyResolverMojo.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/plugins/maven-resolver-plugin/src/main/java/org/apache/maven/dotnet/plugin/resolver/NetDependencyResolverMojo.java?view=diff&rev=527421&r1=527420&r2=527421
==============================================================================
--- incubator/nmaven/branches/SI_XPT/plugins/maven-resolver-plugin/src/main/java/org/apache/maven/dotnet/plugin/resolver/NetDependencyResolverMojo.java (original)
+++ incubator/nmaven/branches/SI_XPT/plugins/maven-resolver-plugin/src/main/java/org/apache/maven/dotnet/plugin/resolver/NetDependencyResolverMojo.java Wed Apr 11 01:56:18 2007
@@ -56,8 +56,6 @@
/**
* @parameter expression="${settings.localRepository}"
- * @required
- * @readonly
*/
private String localRepository;
@@ -91,6 +89,8 @@
public void execute()
throws MojoExecutionException
{
+ long startTime = System.currentTimeMillis();
+
if ( System.getProperty( "bootstrap" ) != null )
{
return;
@@ -132,6 +132,11 @@
dependencies.addAll( repository.getDependenciesFor( matchPolicies ) );
getLog().info( "NMAVEN-1600-001: Found net dependencies: Number = " + dependencies.size() );
+ if(localRepository == null)
+ {
+ localRepository = new File(System.getProperty("user.home"), ".m2/repository").getAbsolutePath();
+ }
+
try
{
assemblyResolver.resolveTransitivelyFor( project, project.getArtifact(), dependencies, pomFile,
@@ -145,6 +150,8 @@
{
throw new MojoExecutionException( "NMAVEN-1600-003: Unable to resolve assemblies", e );
}
+ long endTime = System.currentTimeMillis();
+ getLog().info( "Mojo Execution Time = " + (endTime - startTime));
}
private class ProfileMatchPolicy
Modified: incubator/nmaven/branches/SI_XPT/plugins/maven-settings-plugin/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/plugins/maven-settings-plugin/pom.xml?view=diff&rev=527421&r1=527420&r2=527421
==============================================================================
--- incubator/nmaven/branches/SI_XPT/plugins/maven-settings-plugin/pom.xml (original)
+++ incubator/nmaven/branches/SI_XPT/plugins/maven-settings-plugin/pom.xml Wed Apr 11 01:56:18 2007
@@ -1,18 +1,19 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <parent>
- <groupId>org.apache.maven.dotnet.plugins</groupId>
- <version>0.14-SNAPSHOT</version>
- <artifactId>maven-dotnet-plugins</artifactId>
- </parent>
- <modelVersion>4.0.0</modelVersion>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
<groupId>org.apache.maven.dotnet.plugins</groupId>
- <artifactId>maven-settings-plugin</artifactId>
- <packaging>maven-plugin</packaging>
<version>0.14-SNAPSHOT</version>
- <name>maven-settings-plugin</name>
- <description>
- Maven Plugin for .NET
- </description>
+ <artifactId>maven-dotnet-plugins</artifactId>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.maven.dotnet.plugins</groupId>
+ <artifactId>maven-settings-plugin</artifactId>
+ <packaging>maven-plugin</packaging>
+ <version>0.14-SNAPSHOT</version>
+ <name>maven-settings-plugin</name>
+ <description>
+ Maven Plugin for .NET
+ </description>
<distributionManagement>
<site>
<id>nmaven-apache-site</id>
Modified: incubator/nmaven/branches/SI_XPT/plugins/maven-settings-plugin/src/main/java/org/apache/maven/dotnet/plugin/settings/SettingsGeneratorMojo.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/plugins/maven-settings-plugin/src/main/java/org/apache/maven/dotnet/plugin/settings/SettingsGeneratorMojo.java?view=diff&rev=527421&r1=527420&r2=527421
==============================================================================
--- incubator/nmaven/branches/SI_XPT/plugins/maven-settings-plugin/src/main/java/org/apache/maven/dotnet/plugin/settings/SettingsGeneratorMojo.java (original)
+++ incubator/nmaven/branches/SI_XPT/plugins/maven-settings-plugin/src/main/java/org/apache/maven/dotnet/plugin/settings/SettingsGeneratorMojo.java Wed Apr 11 01:56:18 2007
@@ -43,7 +43,6 @@
/**
* @parameter expression="${settings.localRepository}"
- * @required
*/
private String localRepository;
@@ -113,6 +112,11 @@
{
throw new MojoExecutionException(
"NMAVEN-aaa-003: Failed to create the repository registry for this plugin", e );
+ }
+
+ if(localRepository == null)
+ {
+ localRepository = new File(System.getProperty("user.home"), ".m2/repository").getAbsolutePath();
}
List<String> commands = new ArrayList<String>();
Modified: incubator/nmaven/branches/SI_XPT/plugins/maven-wsdl-plugin/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/plugins/maven-wsdl-plugin/pom.xml?view=diff&rev=527421&r1=527420&r2=527421
==============================================================================
--- incubator/nmaven/branches/SI_XPT/plugins/maven-wsdl-plugin/pom.xml (original)
+++ incubator/nmaven/branches/SI_XPT/plugins/maven-wsdl-plugin/pom.xml Wed Apr 11 01:56:18 2007
@@ -15,14 +15,6 @@
Maven Plugin for .NET
</description>
- <dependencies>
- <dependency>
- <groupId>org.apache.maven.shared</groupId>
- <artifactId>maven-plugin-testing-harness</artifactId>
- <version>1.0-beta-1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
<distributionManagement>
<site>
<id>nmaven-apache-site</id>
Modified: incubator/nmaven/branches/SI_XPT/plugins/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/plugins/pom.xml?view=diff&rev=527421&r1=527420&r2=527421
==============================================================================
--- incubator/nmaven/branches/SI_XPT/plugins/pom.xml (original)
+++ incubator/nmaven/branches/SI_XPT/plugins/pom.xml Wed Apr 11 01:56:18 2007
@@ -15,7 +15,6 @@
<module>maven-settings-plugin</module>
<module>maven-solution-plugin</module>
<module>maven-test-plugin</module>
- <module>maven-vstudio-plugin</module>
<module>maven-webapp-plugin</module>
<module>maven-xsd-plugin</module>
<module>maven-xsp-plugin</module>