Author: brett
Date: Wed Oct 1 07:36:50 2008
New Revision: 700791
URL: http://svn.apache.org/viewvc?rev=700791&view=rev
Log:
[NMAVEN-8] correct multiple issues related to running NUnit tests. It is now
possible to use the original release binaries unmodified.
Add necessary tools for any plugin to be able to map artifacts to their final
name for reuse.
Merged from: r700374:700774 on branch NMAVEN-8-nunit
Added:
incubator/nmaven/trunk/components/maven-dotnet-compiler/src/main/java/org/apache/maven/dotnet/compiler/DotnetArtifactLocator.java
- copied unchanged from r700774,
incubator/nmaven/branches/NMAVEN-8-nunit/components/maven-dotnet-compiler/src/main/java/org/apache/maven/dotnet/compiler/DotnetArtifactLocator.java
incubator/nmaven/trunk/components/maven-dotnet-compiler/src/main/java/org/apache/maven/dotnet/compiler/impl/DotnetArtifactLocatorImpl.java
- copied unchanged from r700774,
incubator/nmaven/branches/NMAVEN-8-nunit/components/maven-dotnet-compiler/src/main/java/org/apache/maven/dotnet/compiler/impl/DotnetArtifactLocatorImpl.java
incubator/nmaven/trunk/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITNUnit24Features.java
- copied unchanged from r700774,
incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITNUnit24Features.java
incubator/nmaven/trunk/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITVersionedAssemblies.java
- copied unchanged from r700774,
incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITVersionedAssemblies.java
incubator/nmaven/trunk/core-integration-tests/src/test/resources/NUnit24Features/
- copied from r700774,
incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/resources/NUnit24Features/
incubator/nmaven/trunk/core-integration-tests/src/test/resources/NUnit24Features/NUnit22/
- copied from r700774,
incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/resources/NUnit24Features/NUnit22/
incubator/nmaven/trunk/core-integration-tests/src/test/resources/NUnit24Features/NUnit22/pom.xml
- copied unchanged from r700774,
incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/resources/NUnit24Features/NUnit22/pom.xml
incubator/nmaven/trunk/core-integration-tests/src/test/resources/NUnit24Features/NUnit22/src/
- copied from r700774,
incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/resources/NUnit24Features/NUnit22/src/
incubator/nmaven/trunk/core-integration-tests/src/test/resources/NUnit24Features/NUnit22/src/test/
- copied from r700774,
incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/resources/NUnit24Features/NUnit22/src/test/
incubator/nmaven/trunk/core-integration-tests/src/test/resources/NUnit24Features/NUnit22/src/test/dotnet/
- copied from r700774,
incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/resources/NUnit24Features/NUnit22/src/test/dotnet/
incubator/nmaven/trunk/core-integration-tests/src/test/resources/NUnit24Features/NUnit22/src/test/dotnet/AppTest.cs
- copied unchanged from r700774,
incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/resources/NUnit24Features/NUnit22/src/test/dotnet/AppTest.cs
incubator/nmaven/trunk/core-integration-tests/src/test/resources/NUnit24Features/NUnit24/
- copied from r700774,
incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/resources/NUnit24Features/NUnit24/
incubator/nmaven/trunk/core-integration-tests/src/test/resources/NUnit24Features/NUnit24/pom.xml
- copied unchanged from r700774,
incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/resources/NUnit24Features/NUnit24/pom.xml
incubator/nmaven/trunk/core-integration-tests/src/test/resources/NUnit24Features/NUnit24/src/
- copied from r700774,
incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/resources/NUnit24Features/NUnit24/src/
incubator/nmaven/trunk/core-integration-tests/src/test/resources/NUnit24Features/NUnit24/src/test/
- copied from r700774,
incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/resources/NUnit24Features/NUnit24/src/test/
incubator/nmaven/trunk/core-integration-tests/src/test/resources/NUnit24Features/NUnit24/src/test/dotnet/
- copied from r700774,
incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/resources/NUnit24Features/NUnit24/src/test/dotnet/
incubator/nmaven/trunk/core-integration-tests/src/test/resources/NUnit24Features/NUnit24/src/test/dotnet/AppTest.cs
- copied unchanged from r700774,
incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/resources/NUnit24Features/NUnit24/src/test/dotnet/AppTest.cs
incubator/nmaven/trunk/core-integration-tests/src/test/resources/VersionedAssemblies/
- copied from r700774,
incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/resources/VersionedAssemblies/
incubator/nmaven/trunk/core-integration-tests/src/test/resources/VersionedAssemblies/A-1.0/
- copied from r700774,
incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/resources/VersionedAssemblies/A-1.0/
incubator/nmaven/trunk/core-integration-tests/src/test/resources/VersionedAssemblies/A-1.0/pom.xml
- copied unchanged from r700774,
incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/resources/VersionedAssemblies/A-1.0/pom.xml
incubator/nmaven/trunk/core-integration-tests/src/test/resources/VersionedAssemblies/A-1.0/src/
- copied from r700774,
incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/resources/VersionedAssemblies/A-1.0/src/
incubator/nmaven/trunk/core-integration-tests/src/test/resources/VersionedAssemblies/A-1.0/src/main/
- copied from r700774,
incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/resources/VersionedAssemblies/A-1.0/src/main/
incubator/nmaven/trunk/core-integration-tests/src/test/resources/VersionedAssemblies/A-1.0/src/main/dotnet/
- copied from r700774,
incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/resources/VersionedAssemblies/A-1.0/src/main/dotnet/
incubator/nmaven/trunk/core-integration-tests/src/test/resources/VersionedAssemblies/A-1.0/src/main/dotnet/A.cs
- copied unchanged from r700774,
incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/resources/VersionedAssemblies/A-1.0/src/main/dotnet/A.cs
incubator/nmaven/trunk/core-integration-tests/src/test/resources/VersionedAssemblies/A-2.0/
- copied from r700774,
incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/resources/VersionedAssemblies/A-2.0/
incubator/nmaven/trunk/core-integration-tests/src/test/resources/VersionedAssemblies/A-2.0/pom.xml
- copied unchanged from r700774,
incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/resources/VersionedAssemblies/A-2.0/pom.xml
incubator/nmaven/trunk/core-integration-tests/src/test/resources/VersionedAssemblies/A-2.0/src/
- copied from r700774,
incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/resources/VersionedAssemblies/A-2.0/src/
incubator/nmaven/trunk/core-integration-tests/src/test/resources/VersionedAssemblies/A-2.0/src/main/
- copied from r700774,
incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/resources/VersionedAssemblies/A-2.0/src/main/
incubator/nmaven/trunk/core-integration-tests/src/test/resources/VersionedAssemblies/A-2.0/src/main/dotnet/
- copied from r700774,
incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/resources/VersionedAssemblies/A-2.0/src/main/dotnet/
incubator/nmaven/trunk/core-integration-tests/src/test/resources/VersionedAssemblies/A-2.0/src/main/dotnet/A.cs
- copied unchanged from r700774,
incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/resources/VersionedAssemblies/A-2.0/src/main/dotnet/A.cs
incubator/nmaven/trunk/core-integration-tests/src/test/resources/VersionedAssemblies/B/
- copied from r700774,
incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/resources/VersionedAssemblies/B/
incubator/nmaven/trunk/core-integration-tests/src/test/resources/VersionedAssemblies/B/pom.xml
- copied unchanged from r700774,
incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/resources/VersionedAssemblies/B/pom.xml
incubator/nmaven/trunk/core-integration-tests/src/test/resources/VersionedAssemblies/B/src/
- copied from r700774,
incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/resources/VersionedAssemblies/B/src/
incubator/nmaven/trunk/core-integration-tests/src/test/resources/VersionedAssemblies/B/src/main/
- copied from r700774,
incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/resources/VersionedAssemblies/B/src/main/
incubator/nmaven/trunk/core-integration-tests/src/test/resources/VersionedAssemblies/B/src/main/dotnet/
- copied from r700774,
incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/resources/VersionedAssemblies/B/src/main/dotnet/
incubator/nmaven/trunk/core-integration-tests/src/test/resources/VersionedAssemblies/B/src/main/dotnet/B.cs
- copied unchanged from r700774,
incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/resources/VersionedAssemblies/B/src/main/dotnet/B.cs
incubator/nmaven/trunk/core-integration-tests/src/test/resources/VersionedAssemblies/B/src/test/
- copied from r700774,
incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/resources/VersionedAssemblies/B/src/test/
incubator/nmaven/trunk/core-integration-tests/src/test/resources/VersionedAssemblies/B/src/test/dotnet/
- copied from r700774,
incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/resources/VersionedAssemblies/B/src/test/dotnet/
incubator/nmaven/trunk/core-integration-tests/src/test/resources/VersionedAssemblies/B/src/test/dotnet/BTest.cs
- copied unchanged from r700774,
incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/resources/VersionedAssemblies/B/src/test/dotnet/BTest.cs
incubator/nmaven/trunk/core-integration-tests/src/test/resources/VersionedAssemblies/C/
- copied from r700774,
incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/resources/VersionedAssemblies/C/
incubator/nmaven/trunk/core-integration-tests/src/test/resources/VersionedAssemblies/C/pom.xml
- copied unchanged from r700774,
incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/resources/VersionedAssemblies/C/pom.xml
incubator/nmaven/trunk/core-integration-tests/src/test/resources/VersionedAssemblies/C/src/
- copied from r700774,
incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/resources/VersionedAssemblies/C/src/
incubator/nmaven/trunk/core-integration-tests/src/test/resources/VersionedAssemblies/C/src/main/
- copied from r700774,
incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/resources/VersionedAssemblies/C/src/main/
incubator/nmaven/trunk/core-integration-tests/src/test/resources/VersionedAssemblies/C/src/main/dotnet/
- copied from r700774,
incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/resources/VersionedAssemblies/C/src/main/dotnet/
incubator/nmaven/trunk/core-integration-tests/src/test/resources/VersionedAssemblies/C/src/main/dotnet/C.cs
- copied unchanged from r700774,
incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/resources/VersionedAssemblies/C/src/main/dotnet/C.cs
incubator/nmaven/trunk/core-integration-tests/src/test/resources/VersionedAssemblies/C/src/test/
- copied from r700774,
incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/resources/VersionedAssemblies/C/src/test/
incubator/nmaven/trunk/core-integration-tests/src/test/resources/VersionedAssemblies/C/src/test/dotnet/
- copied from r700774,
incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/resources/VersionedAssemblies/C/src/test/dotnet/
incubator/nmaven/trunk/core-integration-tests/src/test/resources/VersionedAssemblies/C/src/test/dotnet/CTest.cs
- copied unchanged from r700774,
incubator/nmaven/branches/NMAVEN-8-nunit/core-integration-tests/src/test/resources/VersionedAssemblies/C/src/test/dotnet/CTest.cs
Removed:
incubator/nmaven/trunk/components/maven-dotnet-compiler/src/main/resource/
Modified:
incubator/nmaven/trunk/components/maven-dotnet-assembler/pom.xml
incubator/nmaven/trunk/components/maven-dotnet-compiler/src/main/java/org/apache/maven/dotnet/compiler/CompilerConfig.java
incubator/nmaven/trunk/components/maven-dotnet-compiler/src/main/java/org/apache/maven/dotnet/compiler/DotnetCompilerConfig.java
incubator/nmaven/trunk/components/maven-dotnet-compiler/src/main/java/org/apache/maven/dotnet/compiler/DotnetCompilerContext.java
incubator/nmaven/trunk/components/maven-dotnet-compiler/src/main/java/org/apache/maven/dotnet/compiler/impl/DotnetCompilerContextImpl.java
incubator/nmaven/trunk/components/maven-dotnet-compiler/src/test/java/org/apache/maven/dotnet/compiler/NetCompilerConfigTest.java
incubator/nmaven/trunk/components/maven-dotnet-compiler/src/test/java/org/apache/maven/dotnet/compiler/impl/DotnetCompilerContextImplTest.java
incubator/nmaven/trunk/components/maven-dotnet-core/src/main/java/org/apache/maven/dotnet/CommandExecutor.java
incubator/nmaven/trunk/components/maven-dotnet-extensions/src/main/java/org/apache/maven/dotnet/extensions/compiler/CSharpClassCompiler.java
incubator/nmaven/trunk/components/maven-dotnet-toolchain/pom.xml
incubator/nmaven/trunk/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/IntegrationTestSuite.java
incubator/nmaven/trunk/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0007CSharpCompileTestLibrary.java
incubator/nmaven/trunk/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0019BuildFailureOnNUnitFailure.java
incubator/nmaven/trunk/core-integration-tests/src/test/resources/MavenITmng-0007-CSharpCompileTestLibrary/src/test/dotnet/It0007.cs
incubator/nmaven/trunk/core-integration-tests/src/test/resources/MavenITmng-0020-ShareTestSource/A/pom.xml
incubator/nmaven/trunk/plugins/maven-dotnet-compiler-plugin/src/main/java/org/apache/maven/dotnet/plugin/compiler/CompilerMojo.java
incubator/nmaven/trunk/plugins/maven-dotnet-compiler-plugin/src/main/java/org/apache/maven/dotnet/plugin/compiler/TestCompilerMojo.java
incubator/nmaven/trunk/plugins/maven-dotnet-compiler-plugin/src/main/resources/META-INF/plexus/components.xml
incubator/nmaven/trunk/plugins/maven-dotnet-test-plugin/src/main/java/org/apache/maven/dotnet/plugin/nunit/DotnetTestMojo.java
incubator/nmaven/trunk/pom.xml
Modified: incubator/nmaven/trunk/components/maven-dotnet-assembler/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/nmaven/trunk/components/maven-dotnet-assembler/pom.xml?rev=700791&r1=700790&r2=700791&view=diff
==============================================================================
--- incubator/nmaven/trunk/components/maven-dotnet-assembler/pom.xml (original)
+++ incubator/nmaven/trunk/components/maven-dotnet-assembler/pom.xml Wed Oct 1
07:36:50 2008
@@ -45,10 +45,6 @@
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-component-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
</dependency>
</dependencies>
Modified:
incubator/nmaven/trunk/components/maven-dotnet-compiler/src/main/java/org/apache/maven/dotnet/compiler/CompilerConfig.java
URL:
http://svn.apache.org/viewvc/incubator/nmaven/trunk/components/maven-dotnet-compiler/src/main/java/org/apache/maven/dotnet/compiler/CompilerConfig.java?rev=700791&r1=700790&r2=700791&view=diff
==============================================================================
---
incubator/nmaven/trunk/components/maven-dotnet-compiler/src/main/java/org/apache/maven/dotnet/compiler/CompilerConfig.java
(original)
+++
incubator/nmaven/trunk/components/maven-dotnet-compiler/src/main/java/org/apache/maven/dotnet/compiler/CompilerConfig.java
Wed Oct 1 07:36:50 2008
@@ -18,6 +18,7 @@
*/
package org.apache.maven.dotnet.compiler;
+import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.dotnet.ProgrammingLanguage;
import org.apache.maven.dotnet.Vendor;
import org.apache.maven.dotnet.ArtifactType;
@@ -48,7 +49,7 @@
*
* @return local repository
*/
- File getLocalRepository();
+ ArtifactRepository getLocalRepository();
/**
* Sets the artifact type for the compiler plugin: library, module, exe,
winexe or nar
@@ -69,7 +70,7 @@
*
* @param localRepository
*/
- void setLocalRepository( File localRepository );
+ void setLocalRepository( ArtifactRepository localRepository );
void setCompilerSourceDirectory( File sourceDirectory );
Modified:
incubator/nmaven/trunk/components/maven-dotnet-compiler/src/main/java/org/apache/maven/dotnet/compiler/DotnetCompilerConfig.java
URL:
http://svn.apache.org/viewvc/incubator/nmaven/trunk/components/maven-dotnet-compiler/src/main/java/org/apache/maven/dotnet/compiler/DotnetCompilerConfig.java?rev=700791&r1=700790&r2=700791&view=diff
==============================================================================
---
incubator/nmaven/trunk/components/maven-dotnet-compiler/src/main/java/org/apache/maven/dotnet/compiler/DotnetCompilerConfig.java
(original)
+++
incubator/nmaven/trunk/components/maven-dotnet-compiler/src/main/java/org/apache/maven/dotnet/compiler/DotnetCompilerConfig.java
Wed Oct 1 07:36:50 2008
@@ -18,13 +18,14 @@
*/
package org.apache.maven.dotnet.compiler;
+import java.io.File;
+
+import org.apache.maven.artifact.repository.ArtifactRepository;
+import org.apache.maven.dotnet.ArtifactType;
import org.apache.maven.dotnet.ProgrammingLanguage;
import org.apache.maven.dotnet.Vendor;
-import org.apache.maven.dotnet.ArtifactType;
import org.apache.maven.toolchain.Toolchain;
-import java.io.File;
-
public interface DotnetCompilerConfig
extends CompilerConfig
{
@@ -73,7 +74,7 @@
private boolean isTestCompile;
- private File localRepository;
+ private ArtifactRepository localRepository;
private File compileSourceDirectory;
@@ -147,12 +148,12 @@
isTestCompile = testCompile;
}
- public File getLocalRepository()
+ public ArtifactRepository getLocalRepository()
{
return localRepository;
}
- public void setLocalRepository( File localRepository )
+ public void setLocalRepository( ArtifactRepository
localRepository )
{
this.localRepository = localRepository;
}
@@ -210,7 +211,7 @@
throw new IllegalArgumentException(
"compilerPlatformVersion" );
}
- if ( localRepository == null || !localRepository.exists() )
+ if ( localRepository == null || localRepository.getUrl()
== null )
{
throw new IllegalArgumentException( "localRepository"
);
}
Modified:
incubator/nmaven/trunk/components/maven-dotnet-compiler/src/main/java/org/apache/maven/dotnet/compiler/DotnetCompilerContext.java
URL:
http://svn.apache.org/viewvc/incubator/nmaven/trunk/components/maven-dotnet-compiler/src/main/java/org/apache/maven/dotnet/compiler/DotnetCompilerContext.java?rev=700791&r1=700790&r2=700791&view=diff
==============================================================================
---
incubator/nmaven/trunk/components/maven-dotnet-compiler/src/main/java/org/apache/maven/dotnet/compiler/DotnetCompilerContext.java
(original)
+++
incubator/nmaven/trunk/components/maven-dotnet-compiler/src/main/java/org/apache/maven/dotnet/compiler/DotnetCompilerContext.java
Wed Oct 1 07:36:50 2008
@@ -85,4 +85,10 @@
*/
Set<File> getWin32Resources();
+ /**
+ * The artifact locator, responsible for creating shadow copies of
artifacts if needed.
+ * @return artifact locator
+ */
+ DotnetArtifactLocator getArtifactLocator();
+
}
Modified:
incubator/nmaven/trunk/components/maven-dotnet-compiler/src/main/java/org/apache/maven/dotnet/compiler/impl/DotnetCompilerContextImpl.java
URL:
http://svn.apache.org/viewvc/incubator/nmaven/trunk/components/maven-dotnet-compiler/src/main/java/org/apache/maven/dotnet/compiler/impl/DotnetCompilerContextImpl.java?rev=700791&r1=700790&r2=700791&view=diff
==============================================================================
---
incubator/nmaven/trunk/components/maven-dotnet-compiler/src/main/java/org/apache/maven/dotnet/compiler/impl/DotnetCompilerContextImpl.java
(original)
+++
incubator/nmaven/trunk/components/maven-dotnet-compiler/src/main/java/org/apache/maven/dotnet/compiler/impl/DotnetCompilerContextImpl.java
Wed Oct 1 07:36:50 2008
@@ -34,6 +34,7 @@
import org.apache.maven.artifact.Artifact;
import org.apache.maven.dotnet.compiler.ClassCompiler;
import org.apache.maven.dotnet.compiler.CompilerConfig;
+import org.apache.maven.dotnet.compiler.DotnetArtifactLocator;
import org.apache.maven.dotnet.compiler.DotnetCompilerConfig;
import org.apache.maven.dotnet.compiler.DotnetCompilerContext;
import org.apache.maven.dotnet.InitializationException;
@@ -84,6 +85,8 @@
private Toolchain toolchain;
+ private DotnetArtifactLocator artifactLocator;
+
public Set<String> getCoreAssemblyNames()
{
return null;
@@ -413,4 +416,9 @@
{
return value.replaceAll( "[/\\\\]+", "\\" + File.separator );
}
+
+ public DotnetArtifactLocator getArtifactLocator()
+ {
+ return artifactLocator;
+ }
}
Modified:
incubator/nmaven/trunk/components/maven-dotnet-compiler/src/test/java/org/apache/maven/dotnet/compiler/NetCompilerConfigTest.java
URL:
http://svn.apache.org/viewvc/incubator/nmaven/trunk/components/maven-dotnet-compiler/src/test/java/org/apache/maven/dotnet/compiler/NetCompilerConfigTest.java?rev=700791&r1=700790&r2=700791&view=diff
==============================================================================
---
incubator/nmaven/trunk/components/maven-dotnet-compiler/src/test/java/org/apache/maven/dotnet/compiler/NetCompilerConfigTest.java
(original)
+++
incubator/nmaven/trunk/components/maven-dotnet-compiler/src/test/java/org/apache/maven/dotnet/compiler/NetCompilerConfigTest.java
Wed Oct 1 07:36:50 2008
@@ -18,12 +18,16 @@
*/
package org.apache.maven.dotnet.compiler;
+import org.junit.Assert;
import org.junit.Test;
+import org.apache.maven.artifact.repository.DefaultArtifactRepository;
+import org.apache.maven.artifact.repository.layout.DefaultRepositoryLayout;
import org.apache.maven.dotnet.ProgrammingLanguage;
import org.apache.maven.dotnet.Vendor;
import org.apache.maven.dotnet.ArtifactType;
import java.io.File;
+import java.net.MalformedURLException;
public class NetCompilerConfigTest
{
@@ -129,7 +133,15 @@
DotnetCompilerConfig config =
DotnetCompilerConfig.Factory.createDefaultCompilerConfig();
config.setArtifactType( ArtifactType.LIBRARY );
config.setCompilerPlatformVersion(
DotnetCompilerPlatformVersion.VERSION_2_0_50727 );
- config.setLocalRepository( new File( "." ) );
+ try
+ {
+ config.setLocalRepository( new DefaultArtifactRepository( "local",
new File( "." ).toURL().toExternalForm(),
+ new
DefaultRepositoryLayout() ) );
+ }
+ catch ( MalformedURLException e )
+ {
+ Assert.fail( e.getMessage() );
+ }
config.setProgrammingLanguage( ProgrammingLanguage.C_SHARP );
config.setCompilerSourceDirectory( new File( "." ) );
config.setTargetDirectory( new File( "." ) );
Modified:
incubator/nmaven/trunk/components/maven-dotnet-compiler/src/test/java/org/apache/maven/dotnet/compiler/impl/DotnetCompilerContextImplTest.java
URL:
http://svn.apache.org/viewvc/incubator/nmaven/trunk/components/maven-dotnet-compiler/src/test/java/org/apache/maven/dotnet/compiler/impl/DotnetCompilerContextImplTest.java?rev=700791&r1=700790&r2=700791&view=diff
==============================================================================
---
incubator/nmaven/trunk/components/maven-dotnet-compiler/src/test/java/org/apache/maven/dotnet/compiler/impl/DotnetCompilerContextImplTest.java
(original)
+++
incubator/nmaven/trunk/components/maven-dotnet-compiler/src/test/java/org/apache/maven/dotnet/compiler/impl/DotnetCompilerContextImplTest.java
Wed Oct 1 07:36:50 2008
@@ -18,32 +18,34 @@
*/
package org.apache.maven.dotnet.compiler.impl;
-import java.util.HashSet;
-import java.util.Set;
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.junit.Assert.assertThat;
+
import java.io.File;
import java.io.IOException;
+import java.net.MalformedURLException;
+import java.util.HashSet;
+import java.util.Set;
-import org.apache.maven.project.MavenProject;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.DefaultArtifact;
import org.apache.maven.artifact.handler.DefaultArtifactHandler;
+import org.apache.maven.artifact.repository.DefaultArtifactRepository;
+import org.apache.maven.artifact.repository.layout.DefaultRepositoryLayout;
import org.apache.maven.artifact.versioning.VersionRange;
-import org.apache.maven.model.Build;
-
-import org.apache.maven.dotnet.compiler.DotnetCompilerConfig;
+import org.apache.maven.dotnet.ArtifactScope;
import org.apache.maven.dotnet.ArtifactType;
-import org.apache.maven.dotnet.compiler.DotnetCompilerPlatformVersion;
+import org.apache.maven.dotnet.InitializationException;
import org.apache.maven.dotnet.ProgrammingLanguage;
import org.apache.maven.dotnet.Vendor;
-import org.apache.maven.dotnet.InitializationException;
-import org.apache.maven.dotnet.ArtifactScope;
import org.apache.maven.dotnet.compiler.ClassCompiler;
-
-import org.junit.Test;
-import static org.hamcrest.CoreMatchers.equalTo;
+import org.apache.maven.dotnet.compiler.DotnetCompilerConfig;
+import org.apache.maven.dotnet.compiler.DotnetCompilerPlatformVersion;
+import org.apache.maven.model.Build;
+import org.apache.maven.project.MavenProject;
import org.hamcrest.BaseMatcher;
import org.hamcrest.CoreMatchers;
-import static org.junit.Assert.*;
+import org.junit.Test;
public class DotnetCompilerContextImplTest
{
@@ -325,12 +327,13 @@
ClassCompiler compiler = ctx.getClassCompiler();
}
- private static DotnetCompilerConfig getDefaultDotnetCompilerConfig()
+ private static DotnetCompilerConfig getDefaultDotnetCompilerConfig()
throws MalformedURLException
{
DotnetCompilerConfig config =
DotnetCompilerConfig.Factory.createDefaultCompilerConfig();
config.setArtifactType( ArtifactType.LIBRARY );
config.setCompilerPlatformVersion(
DotnetCompilerPlatformVersion.VERSION_2_0_50727 );
- config.setLocalRepository( new File( "." ) );
+ config.setLocalRepository( new DefaultArtifactRepository( "local", new
File( "." ).toURL().toExternalForm(),
+ new
DefaultRepositoryLayout() ) );
config.setProgrammingLanguage( ProgrammingLanguage.C_SHARP );
config.setCompilerSourceDirectory( new File( "." ) );
config.setTargetDirectory( new File( "." ) );
Modified:
incubator/nmaven/trunk/components/maven-dotnet-core/src/main/java/org/apache/maven/dotnet/CommandExecutor.java
URL:
http://svn.apache.org/viewvc/incubator/nmaven/trunk/components/maven-dotnet-core/src/main/java/org/apache/maven/dotnet/CommandExecutor.java?rev=700791&r1=700790&r2=700791&view=diff
==============================================================================
---
incubator/nmaven/trunk/components/maven-dotnet-core/src/main/java/org/apache/maven/dotnet/CommandExecutor.java
(original)
+++
incubator/nmaven/trunk/components/maven-dotnet-core/src/main/java/org/apache/maven/dotnet/CommandExecutor.java
Wed Oct 1 07:36:50 2008
@@ -18,17 +18,17 @@
*/
package org.apache.maven.dotnet;
+import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.logging.Level;
+
import org.codehaus.plexus.logging.Logger;
-import org.codehaus.plexus.util.cli.StreamConsumer;
-import org.codehaus.plexus.util.cli.Commandline;
-import org.codehaus.plexus.util.cli.CommandLineUtils;
import org.codehaus.plexus.util.cli.CommandLineException;
+import org.codehaus.plexus.util.cli.CommandLineUtils;
+import org.codehaus.plexus.util.cli.Commandline;
import org.codehaus.plexus.util.cli.DefaultConsumer;
-
-import java.util.List;
-import java.util.ArrayList;
-import java.util.logging.Level;
-import java.io.File;
+import org.codehaus.plexus.util.cli.StreamConsumer;
/**
* Provides services for executing commands such as compilers or executables.
A <code>ClassCompiler</code> implementation can use the
Modified:
incubator/nmaven/trunk/components/maven-dotnet-extensions/src/main/java/org/apache/maven/dotnet/extensions/compiler/CSharpClassCompiler.java
URL:
http://svn.apache.org/viewvc/incubator/nmaven/trunk/components/maven-dotnet-extensions/src/main/java/org/apache/maven/dotnet/extensions/compiler/CSharpClassCompiler.java?rev=700791&r1=700790&r2=700791&view=diff
==============================================================================
---
incubator/nmaven/trunk/components/maven-dotnet-extensions/src/main/java/org/apache/maven/dotnet/extensions/compiler/CSharpClassCompiler.java
(original)
+++
incubator/nmaven/trunk/components/maven-dotnet-extensions/src/main/java/org/apache/maven/dotnet/extensions/compiler/CSharpClassCompiler.java
Wed Oct 1 07:36:50 2008
@@ -96,8 +96,10 @@
{
for ( Artifact artifact : references )
{
- String path = artifact.getFile().getAbsolutePath();
- commands.add( "/reference:" + path );
+ // It isn't necessary to rename the file for compilation, even
if it was compiled with a different one,
+ // so use it straight from the repository
+ File file = artifact.getFile();
+ commands.add( "/reference:" + file.getAbsolutePath() );
}
}
Modified: incubator/nmaven/trunk/components/maven-dotnet-toolchain/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/nmaven/trunk/components/maven-dotnet-toolchain/pom.xml?rev=700791&r1=700790&r2=700791&view=diff
==============================================================================
--- incubator/nmaven/trunk/components/maven-dotnet-toolchain/pom.xml (original)
+++ incubator/nmaven/trunk/components/maven-dotnet-toolchain/pom.xml Wed Oct 1
07:36:50 2008
@@ -51,10 +51,6 @@
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-component-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-container-default</artifactId>
</dependency>
</dependencies>
Modified:
incubator/nmaven/trunk/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/IntegrationTestSuite.java
URL:
http://svn.apache.org/viewvc/incubator/nmaven/trunk/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/IntegrationTestSuite.java?rev=700791&r1=700790&r2=700791&view=diff
==============================================================================
---
incubator/nmaven/trunk/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/IntegrationTestSuite.java
(original)
+++
incubator/nmaven/trunk/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/IntegrationTestSuite.java
Wed Oct 1 07:36:50 2008
@@ -29,27 +29,26 @@
{
TestSuite suite = new TestSuite();
- // NMAVEN-8
- //suite.addTestSuite( MavenITmng0007CSharpCompileTestLibrary.class );
- //suite.addTestSuite( MavenITmng0019BuildFailureOnNUnitFailure.class );
- //suite.addTestSuite( MavenITmng0020ShareTestSource.class );
-
// Fails occasionally with:
// error CS1548: Cryptographic failure while signing assembly ... The
process cannot access the file because it is being used by another process. '
// suite.addTestSuite( MavenITmng0017CSharpStrongNamedAssembly.class );
- // Neeed to be able to locate the GAC root, perhaps using the toolchain
+ // Need to be able to locate the GAC root, perhaps using the toolchain
// suite.addTestSuite(
MavenITmng0009CSharpCompileWithProvidedGacDependency.class );
// Currently requiring library in $M2_HOME/lib when extension should
be enough
// suite.addTestSuite( MavenITDotNetToolchain.class );
+ suite.addTestSuite( MavenITVersionedAssemblies.class );
+ suite.addTestSuite( MavenITNUnit24Features.class );
+
suite.addTestSuite( MavenITmng0000CSharpCompileLibrary.class );
suite.addTestSuite( MavenITmng0001CSharpCompileExe.class );
suite.addTestSuite( MavenITmng0002CSharpCompileModule.class );
suite.addTestSuite( MavenITmng0003CSharpCompileWinexe.class );
suite.addTestSuite( MavenITmng0004CSharpCompileWithDependency.class );
suite.addTestSuite(
MavenITmng0005CSharpCompileWithTransitiveDependency.class );
+ suite.addTestSuite( MavenITmng0007CSharpCompileTestLibrary.class );
suite.addTestSuite(
MavenITmng0008CSharpCompileWithProvidedDependency.class );
suite.addTestSuite( MavenITmng0010DeployLibrary.class );
suite.addTestSuite( MavenITmng0011DeployExe.class );
@@ -59,6 +58,11 @@
suite.addTestSuite( MavenITmng0015DeployLibraryAsSnapshot.class );
suite.addTestSuite( MavenITmng0016CSharpAssemblyInfoGeneration.class );
suite.addTestSuite(
MavenITmng0018CSharpSynchronizeTargetWithSource.class );
+ suite.addTestSuite( MavenITmng0019BuildFailureOnNUnitFailure.class );
+
+ // Looks to link to NMaven.Its.It0020B-1.0.0-test 0.0.0.0 instead of
the correct version
+ //suite.addTestSuite( MavenITmng0020ShareTestSource.class );
+
return suite;
}
}
Modified:
incubator/nmaven/trunk/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0007CSharpCompileTestLibrary.java
URL:
http://svn.apache.org/viewvc/incubator/nmaven/trunk/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0007CSharpCompileTestLibrary.java?rev=700791&r1=700790&r2=700791&view=diff
==============================================================================
---
incubator/nmaven/trunk/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0007CSharpCompileTestLibrary.java
(original)
+++
incubator/nmaven/trunk/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0007CSharpCompileTestLibrary.java
Wed Oct 1 07:36:50 2008
@@ -26,6 +26,12 @@
public class MavenITmng0007CSharpCompileTestLibrary
extends AbstractNMavenIntegrationTestCase
{
+ public MavenITmng0007CSharpCompileTestLibrary()
+ {
+ // 0.14 and 0.16+ only
+ super( "(,0.15-incubating),(0.15-incubating,)" );
+ }
+
public void testit0007()
throws Exception
{
Modified:
incubator/nmaven/trunk/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0019BuildFailureOnNUnitFailure.java
URL:
http://svn.apache.org/viewvc/incubator/nmaven/trunk/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0019BuildFailureOnNUnitFailure.java?rev=700791&r1=700790&r2=700791&view=diff
==============================================================================
---
incubator/nmaven/trunk/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0019BuildFailureOnNUnitFailure.java
(original)
+++
incubator/nmaven/trunk/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0019BuildFailureOnNUnitFailure.java
Wed Oct 1 07:36:50 2008
@@ -31,11 +31,10 @@
{
File testDir = extractAndTranslateResources(
"/MavenITmng-0019-BuildFailureOnNUnitFailure" );
Verifier verifier = getVerifier( testDir );
- verifier.executeGoal( "test" );
try
{
- verifier.verifyErrorFreeLog();
+ verifier.executeGoal( "test" );
fail( "Log has no errors, expected test failure" );
}
catch ( VerificationException e )
Modified:
incubator/nmaven/trunk/core-integration-tests/src/test/resources/MavenITmng-0007-CSharpCompileTestLibrary/src/test/dotnet/It0007.cs
URL:
http://svn.apache.org/viewvc/incubator/nmaven/trunk/core-integration-tests/src/test/resources/MavenITmng-0007-CSharpCompileTestLibrary/src/test/dotnet/It0007.cs?rev=700791&r1=700790&r2=700791&view=diff
==============================================================================
---
incubator/nmaven/trunk/core-integration-tests/src/test/resources/MavenITmng-0007-CSharpCompileTestLibrary/src/test/dotnet/It0007.cs
(original)
+++
incubator/nmaven/trunk/core-integration-tests/src/test/resources/MavenITmng-0007-CSharpCompileTestLibrary/src/test/dotnet/It0007.cs
Wed Oct 1 07:36:50 2008
@@ -27,18 +27,18 @@
public class It0007 {
[Test]
public void testSimple1() {
- Assertion.AssertEquals(1, 1);
+ Assert.AreEqual(1, 1);
}
[Test]
public void testSimple2() {
- Assertion.AssertEquals(2, 2);
+ Assert.AreEqual(2, 2);
}
[Test]
public void testTakesSomeTime() {
for (int i=0; i < 9999999; i++) {
- Assertion.AssertEquals(i+1, i+1);
+ Assert.AreEqual(i+1, i+1);
}
}
}
Modified:
incubator/nmaven/trunk/core-integration-tests/src/test/resources/MavenITmng-0020-ShareTestSource/A/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/nmaven/trunk/core-integration-tests/src/test/resources/MavenITmng-0020-ShareTestSource/A/pom.xml?rev=700791&r1=700790&r2=700791&view=diff
==============================================================================
---
incubator/nmaven/trunk/core-integration-tests/src/test/resources/MavenITmng-0020-ShareTestSource/A/pom.xml
(original)
+++
incubator/nmaven/trunk/core-integration-tests/src/test/resources/MavenITmng-0020-ShareTestSource/A/pom.xml
Wed Oct 1 07:36:50 2008
@@ -57,9 +57,9 @@
</build>
<dependencies>
<dependency>
- <groupId>org.apache.maven.dotnet</groupId>
+ <groupId>NUnit</groupId>
<artifactId>NUnit.Framework</artifactId>
- <version>2.4.8.0</version>
+ <version>2.2.8.0</version>
<type>dotnet:library</type>
<scope>test</scope>
</dependency>
@@ -68,6 +68,7 @@
<groupId>NMaven.Its</groupId>
<artifactId>NMaven.It.It0020B</artifactId>
<scope>test</scope>
+ <classifier>test</classifier>
<version>1.0.0</version>
<type>dotnet:library</type>
</dependency>
Modified:
incubator/nmaven/trunk/plugins/maven-dotnet-compiler-plugin/src/main/java/org/apache/maven/dotnet/plugin/compiler/CompilerMojo.java
URL:
http://svn.apache.org/viewvc/incubator/nmaven/trunk/plugins/maven-dotnet-compiler-plugin/src/main/java/org/apache/maven/dotnet/plugin/compiler/CompilerMojo.java?rev=700791&r1=700790&r2=700791&view=diff
==============================================================================
---
incubator/nmaven/trunk/plugins/maven-dotnet-compiler-plugin/src/main/java/org/apache/maven/dotnet/plugin/compiler/CompilerMojo.java
(original)
+++
incubator/nmaven/trunk/plugins/maven-dotnet-compiler-plugin/src/main/java/org/apache/maven/dotnet/plugin/compiler/CompilerMojo.java
Wed Oct 1 07:36:50 2008
@@ -21,6 +21,7 @@
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
+import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.dotnet.compiler.DotnetCompilerContext;
import org.apache.maven.dotnet.compiler.DotnetCompilerConfig;
import org.apache.maven.dotnet.compiler.DotnetCompilerPlatformVersion;
@@ -61,9 +62,10 @@
/**
* The location of the local Maven repository.
*
- * @parameter expression="${settings.localRepository}"
+ * @parameter expression="${localRepository}"
+ * @readonly
*/
- private File localRepository;
+ private ArtifactRepository localRepository;
/**
* Specify a strong name key file.
Modified:
incubator/nmaven/trunk/plugins/maven-dotnet-compiler-plugin/src/main/java/org/apache/maven/dotnet/plugin/compiler/TestCompilerMojo.java
URL:
http://svn.apache.org/viewvc/incubator/nmaven/trunk/plugins/maven-dotnet-compiler-plugin/src/main/java/org/apache/maven/dotnet/plugin/compiler/TestCompilerMojo.java?rev=700791&r1=700790&r2=700791&view=diff
==============================================================================
---
incubator/nmaven/trunk/plugins/maven-dotnet-compiler-plugin/src/main/java/org/apache/maven/dotnet/plugin/compiler/TestCompilerMojo.java
(original)
+++
incubator/nmaven/trunk/plugins/maven-dotnet-compiler-plugin/src/main/java/org/apache/maven/dotnet/plugin/compiler/TestCompilerMojo.java
Wed Oct 1 07:36:50 2008
@@ -28,6 +28,7 @@
import org.apache.maven.dotnet.ProgrammingLanguage;
import org.apache.maven.dotnet.Vendor;
import org.apache.maven.dotnet.ArtifactScope;
+import org.apache.maven.dotnet.compiler.DotnetArtifactLocator;
import org.apache.maven.dotnet.compiler.DotnetCompilerConfig;
import org.apache.maven.dotnet.compiler.DotnetCompilerContext;
import org.apache.maven.dotnet.compiler.DotnetCompilerPlatformVersion;
@@ -36,7 +37,10 @@
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
import org.apache.maven.project.MavenProject;
+import org.apache.maven.project.MavenProjectHelper;
import org.apache.maven.artifact.Artifact;
+import org.apache.maven.artifact.metadata.ArtifactMetadataSource;
+import org.apache.maven.artifact.repository.ArtifactRepository;
import org.codehaus.plexus.util.FileUtils;
/**
@@ -59,13 +63,6 @@
private MavenProject project;
/**
- * The location of the local Maven repository.
- *
- * @parameter expression="${settings.localRepository}"
- */
- private File localRepository;
-
- /**
* The framework version to compile under: 1.1, 2.0, 3.0
*
* @parameter expression = "${frameworkVersion}" default-value="2.0.50727"
@@ -92,6 +89,21 @@
*/
private DotnetCompilerContext compilerContext;
+ /**
+ * @component
+ */
+ private DotnetArtifactLocator artifactLocator;
+
+ /**
+ * @parameter expression="${localRepository}"
+ * @readonly
+ */
+ private ArtifactRepository localRepository;
+
+ /**
+ * @component
+ */
+ private MavenProjectHelper projectHelper;
public void execute()
throws MojoExecutionException, MojoFailureException
@@ -154,6 +166,7 @@
try
{
testAssembly = compilerContext.getClassCompiler().compile();
+ projectHelper.attachArtifact( project, "dotnet:library", "test",
testAssembly );
}
catch ( InvalidArtifactException e )
{
@@ -169,14 +182,15 @@
throw new MojoExecutionException( "Unable to create test
assemblies directory: " + testAssemblies );
}
- Set<Artifact> testDependencies =
compilerContext.getLibraryDependenciesFor( ArtifactScope.TEST );
+ Set<Artifact> testDependencies =
compilerContext.getLibraryDependenciesFor( ArtifactScope.TEST );
try
{
for ( Artifact testDependency : testDependencies )
{
File testDependencyFile = testDependency.getFile();
- File testAssembliesFile = new File( testAssemblies,
testDependencyFile.getName() );
+ File testAssembliesFile =
+ new File( testAssemblies,
artifactLocator.getAssemblyFileName( testDependency, localRepository ) );
FileUtils.copyFile( testDependencyFile, testAssembliesFile );
}
Modified:
incubator/nmaven/trunk/plugins/maven-dotnet-compiler-plugin/src/main/resources/META-INF/plexus/components.xml
URL:
http://svn.apache.org/viewvc/incubator/nmaven/trunk/plugins/maven-dotnet-compiler-plugin/src/main/resources/META-INF/plexus/components.xml?rev=700791&r1=700790&r2=700791&view=diff
==============================================================================
---
incubator/nmaven/trunk/plugins/maven-dotnet-compiler-plugin/src/main/resources/META-INF/plexus/components.xml
(original)
+++
incubator/nmaven/trunk/plugins/maven-dotnet-compiler-plugin/src/main/resources/META-INF/plexus/components.xml
Wed Oct 1 07:36:50 2008
@@ -288,6 +288,21 @@
<component>
<role>org.apache.maven.dotnet.compiler.DotnetCompilerContext</role>
<implementation>org.apache.maven.dotnet.compiler.impl.DotnetCompilerContextImpl</implementation>
+ <requirements>
+ <requirement>
+
<role>org.apache.maven.dotnet.compiler.DotnetArtifactLocator</role>
+ </requirement>
+ </requirements>
+ </component>
+ <component>
+ <role>org.apache.maven.dotnet.compiler.DotnetArtifactLocator</role>
+
<implementation>org.apache.maven.dotnet.compiler.impl.DotnetArtifactLocatorImpl</implementation>
+ <requirements>
+ <requirement>
+ <role>org.apache.maven.project.MavenProjectBuilder</role>
+ <fieldName>projectBuilder</fieldName>
+ </requirement>
+ </requirements>
</component>
<component>
<role>org.apache.maven.toolchain.ToolchainFactory</role>
Modified:
incubator/nmaven/trunk/plugins/maven-dotnet-test-plugin/src/main/java/org/apache/maven/dotnet/plugin/nunit/DotnetTestMojo.java
URL:
http://svn.apache.org/viewvc/incubator/nmaven/trunk/plugins/maven-dotnet-test-plugin/src/main/java/org/apache/maven/dotnet/plugin/nunit/DotnetTestMojo.java?rev=700791&r1=700790&r2=700791&view=diff
==============================================================================
---
incubator/nmaven/trunk/plugins/maven-dotnet-test-plugin/src/main/java/org/apache/maven/dotnet/plugin/nunit/DotnetTestMojo.java
(original)
+++
incubator/nmaven/trunk/plugins/maven-dotnet-test-plugin/src/main/java/org/apache/maven/dotnet/plugin/nunit/DotnetTestMojo.java
Wed Oct 1 07:36:50 2008
@@ -108,18 +108,7 @@
getLog().debug( "NMaven-test: workingDirectory(" +
testAssemblies.getAbsolutePath() + ")" );
commandline.setWorkingDirectory( testAssemblies.getAbsolutePath() );
- if ( vendor.equals( Vendor.MICROSOFT ) )
- {
- commandline.setExecutable( "nunit-console" );
- }
- else if ( vendor.equals( Vendor.NOVELL ) )
- {
- commandline.setExecutable( "nunit-console2" );
- }
- else
- {
- throw new MojoExecutionException("Vendor not found.");
- }
+ commandline.setExecutable( "nunit-console" );
commandline.addArguments( getNUnitArguments() );
NUnitStreamConsumer systemOut = new NUnitStreamConsumer( getLog() );
Modified: incubator/nmaven/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/nmaven/trunk/pom.xml?rev=700791&r1=700790&r2=700791&view=diff
==============================================================================
--- incubator/nmaven/trunk/pom.xml (original)
+++ incubator/nmaven/trunk/pom.xml Wed Oct 1 07:36:50 2008
@@ -195,6 +195,27 @@
</pluginManagement>
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <version>1.0-alpha-3</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ <configuration>
+ <rules>
+ <bannedDependencies>
+ <excludes>
+ <exclude>org.codehaus.plexus:plexus-component-api</exclude>
+ </excludes>
+ </bannedDependencies>
+ </rules>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.3</version>
</plugin>
@@ -277,13 +298,8 @@
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-component-api</artifactId>
- <version>1.0-alpha-32</version>
- </dependency>
- <dependency>
- <groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-container-default</artifactId>
- <version>1.0-alpha-32</version>
+ <version>1.0-alpha-9-stable-1</version>
</dependency>
</dependencies>
</dependencyManagement>
