svn commit: r610851 - in /incubator/nmaven/trunk/plugins/maven-compiler-plugin: TestCompilerMojo.java src/main/java/org/apache/maven/dotnet/plugin/compiler/TestCompilerMojo.java

2008-01-10 Thread sisbell
Author: sisbell
Date: Thu Jan 10 09:49:32 2008
New Revision: 610851

URL: http://svn.apache.org/viewvc?rev=610851&view=rev
Log:
Missed file on commit

Added:

incubator/nmaven/trunk/plugins/maven-compiler-plugin/src/main/java/org/apache/maven/dotnet/plugin/compiler/TestCompilerMojo.java
   (with props)
Removed:
incubator/nmaven/trunk/plugins/maven-compiler-plugin/TestCompilerMojo.java

Added: 
incubator/nmaven/trunk/plugins/maven-compiler-plugin/src/main/java/org/apache/maven/dotnet/plugin/compiler/TestCompilerMojo.java
URL: 
http://svn.apache.org/viewvc/incubator/nmaven/trunk/plugins/maven-compiler-plugin/src/main/java/org/apache/maven/dotnet/plugin/compiler/TestCompilerMojo.java?rev=610851&view=auto
==
--- 
incubator/nmaven/trunk/plugins/maven-compiler-plugin/src/main/java/org/apache/maven/dotnet/plugin/compiler/TestCompilerMojo.java
 (added)
+++ 
incubator/nmaven/trunk/plugins/maven-compiler-plugin/src/main/java/org/apache/maven/dotnet/plugin/compiler/TestCompilerMojo.java
 Thu Jan 10 09:49:32 2008
@@ -0,0 +1,203 @@
+/*
+ * 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.
+ */
+package org.apache.maven.dotnet.plugin.compiler;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.util.List;
+
+import org.apache.maven.artifact.handler.ArtifactHandler;
+import org.apache.maven.artifact.handler.manager.ArtifactHandlerManager;
+import org.apache.maven.dotnet.ArtifactType;
+import org.apache.maven.dotnet.BuildDirectories;
+import org.apache.maven.dotnet.InitializationException;
+import org.apache.maven.dotnet.ProgrammingLanguage;
+import org.apache.maven.dotnet.Vendor;
+import org.apache.maven.dotnet.compiler.DotnetCompilerConfig;
+import org.apache.maven.dotnet.compiler.DotnetCompilerContext;
+import org.apache.maven.dotnet.compiler.DotnetCompilerPlatformVersion;
+import org.apache.maven.dotnet.compiler.InvalidArtifactException;
+import org.apache.maven.dotnet.compiler.KeyInfo;
+import org.apache.maven.plugin.AbstractMojo;
+import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugin.MojoFailureException;
+import org.apache.maven.project.MavenProject;
+
+/**
+ * Maven Mojo for compiling Class files to the .NET Intermediate Language.
+ *
+ * @goal test-compile
+ * @phase test-compile
+ * @requiresDependencyResolution test
+ * @description Maven Mojo for compiling class files to the .NET Intermediate 
Language
+ */
+public class TestCompilerMojo
+extends AbstractMojo
+{
+/**
+ * The maven project.
+ *
+ * @parameter expression="${project}"
+ * @required
+ */
+private MavenProject project;
+
+/**
+ * The location of the local Maven repository.
+ *
+ * @parameter expression="${settings.localRepository}"
+ */
+private File localRepository;
+
+/**
+ * Specify a strong name key file.
+ *
+ * @parameter expression = "${keyfile}"
+ */
+private File keyfile;
+
+/**
+ * Specifies a strong name key container. (not currently supported)
+ *
+ * @parameter expression = "${keycontainer}"
+ */
+private String keycontainer;
+
+/**
+ * The framework version to compile under: 1.1, 2.0, 3.0
+ *
+ * @parameter expression = "${frameworkVersion}" default-value="2.0.50727"
+ */
+private String frameworkVersion;
+
+/**
+ * .NET Language. The default value is C_SHARP. Not case or 
white-space sensitive.
+ *
+ * @parameter expression="${language}" default-value = "C_SHARP"
+ * @required
+ */
+private String language;
+
+/**
+ * The Vendor for the Compiler. Not case or white-space sensitive.
+ *
+ * @parameter expression="${vendor}"
+ */
+private String vendorName;
+
+/**
+ * @component
+ */
+private DotnetCompilerContext compilerContext;
+
+/**
+ * @component
+ */
+private List artifactHandlers;
+
+/**
+ * @component
+ */
+private ArtifactHandlerManager artifactHandlerManager;
+
+public void execute()
+throws MojoExecutionException, MojoFailureException
+{
+
+St

svn commit: r610850 - in /incubator/nmaven/trunk: core-integration-tests/src/test/resources/MavenITmng-0007-CSharpCompileTestLibrary/ plugins/maven-compiler-plugin/ plugins/maven-compiler-plugin/src/m

2008-01-10 Thread sisbell
Author: sisbell
Date: Thu Jan 10 09:45:06 2008
New Revision: 610850

URL: http://svn.apache.org/viewvc?rev=610850&view=rev
Log:
Reverted back the abstract compiler mojo.

Added:
incubator/nmaven/trunk/plugins/maven-compiler-plugin/TestCompilerMojo.java  
 (with props)
Removed:

incubator/nmaven/trunk/plugins/maven-compiler-plugin/src/main/java/org/apache/maven/dotnet/plugin/compiler/AbstractCompilerMojo.java

incubator/nmaven/trunk/plugins/maven-compiler-plugin/src/main/java/org/apache/maven/dotnet/plugin/compiler/TestCompilerMojo.java
Modified:

incubator/nmaven/trunk/core-integration-tests/src/test/resources/MavenITmng-0007-CSharpCompileTestLibrary/pom.xml

incubator/nmaven/trunk/plugins/maven-compiler-plugin/src/main/java/org/apache/maven/dotnet/plugin/compiler/CompilerMojo.java

Modified: 
incubator/nmaven/trunk/core-integration-tests/src/test/resources/MavenITmng-0007-CSharpCompileTestLibrary/pom.xml
URL: 
http://svn.apache.org/viewvc/incubator/nmaven/trunk/core-integration-tests/src/test/resources/MavenITmng-0007-CSharpCompileTestLibrary/pom.xml?rev=610850&r1=610849&r2=610850&view=diff
==
--- 
incubator/nmaven/trunk/core-integration-tests/src/test/resources/MavenITmng-0007-CSharpCompileTestLibrary/pom.xml
 (original)
+++ 
incubator/nmaven/trunk/core-integration-tests/src/test/resources/MavenITmng-0007-CSharpCompileTestLibrary/pom.xml
 Thu Jan 10 09:45:06 2008
@@ -33,7 +33,7 @@
 
   NUnit
   NUnit.Framework
-  2.4.3
+  2.4.6
   dotnet:library
   test
 

Added: 
incubator/nmaven/trunk/plugins/maven-compiler-plugin/TestCompilerMojo.java
URL: 
http://svn.apache.org/viewvc/incubator/nmaven/trunk/plugins/maven-compiler-plugin/TestCompilerMojo.java?rev=610850&view=auto
==
--- incubator/nmaven/trunk/plugins/maven-compiler-plugin/TestCompilerMojo.java 
(added)
+++ incubator/nmaven/trunk/plugins/maven-compiler-plugin/TestCompilerMojo.java 
Thu Jan 10 09:45:06 2008
@@ -0,0 +1,203 @@
+/*
+ * 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.
+ */
+package org.apache.maven.dotnet.plugin.compiler;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.util.List;
+
+import org.apache.maven.artifact.handler.ArtifactHandler;
+import org.apache.maven.artifact.handler.manager.ArtifactHandlerManager;
+import org.apache.maven.dotnet.ArtifactType;
+import org.apache.maven.dotnet.BuildDirectories;
+import org.apache.maven.dotnet.InitializationException;
+import org.apache.maven.dotnet.ProgrammingLanguage;
+import org.apache.maven.dotnet.Vendor;
+import org.apache.maven.dotnet.compiler.DotnetCompilerConfig;
+import org.apache.maven.dotnet.compiler.DotnetCompilerContext;
+import org.apache.maven.dotnet.compiler.DotnetCompilerPlatformVersion;
+import org.apache.maven.dotnet.compiler.InvalidArtifactException;
+import org.apache.maven.dotnet.compiler.KeyInfo;
+import org.apache.maven.plugin.AbstractMojo;
+import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugin.MojoFailureException;
+import org.apache.maven.project.MavenProject;
+
+/**
+ * Maven Mojo for compiling Class files to the .NET Intermediate Language.
+ *
+ * @goal test-compile
+ * @phase test-compile
+ * @requiresDependencyResolution test
+ * @description Maven Mojo for compiling class files to the .NET Intermediate 
Language
+ */
+public class TestCompilerMojo
+extends AbstractMojo
+{
+/**
+ * The maven project.
+ *
+ * @parameter expression="${project}"
+ * @required
+ */
+private MavenProject project;
+
+/**
+ * The location of the local Maven repository.
+ *
+ * @parameter expression="${settings.localRepository}"
+ */
+private File localRepository;
+
+/**
+ * Specify a strong name key file.
+ *
+ * @parameter expression = "${keyfile}"
+ */
+private File keyfile;
+
+/**
+ * Specifies a strong name key container. (not currently supported)
+ *
+ * @parameter expression = "${keycontainer}"
+ */
+private String keycontain

svn commit: r610854 - /incubator/nmaven/trunk/plugins/maven-compiler-plugin/src/main/java/org/apache/maven/dotnet/plugin/compiler/TestCompilerMojo.java

2008-01-10 Thread sisbell
Author: sisbell
Date: Thu Jan 10 10:00:53 2008
New Revision: 610854

URL: http://svn.apache.org/viewvc?rev=610854&view=rev
Log:
Cleaned up test compiler mojo. No need for signing. Artifact type should always 
be dll.

Modified:

incubator/nmaven/trunk/plugins/maven-compiler-plugin/src/main/java/org/apache/maven/dotnet/plugin/compiler/TestCompilerMojo.java

Modified: 
incubator/nmaven/trunk/plugins/maven-compiler-plugin/src/main/java/org/apache/maven/dotnet/plugin/compiler/TestCompilerMojo.java
URL: 
http://svn.apache.org/viewvc/incubator/nmaven/trunk/plugins/maven-compiler-plugin/src/main/java/org/apache/maven/dotnet/plugin/compiler/TestCompilerMojo.java?rev=610854&r1=610853&r2=610854&view=diff
==
--- 
incubator/nmaven/trunk/plugins/maven-compiler-plugin/src/main/java/org/apache/maven/dotnet/plugin/compiler/TestCompilerMojo.java
 (original)
+++ 
incubator/nmaven/trunk/plugins/maven-compiler-plugin/src/main/java/org/apache/maven/dotnet/plugin/compiler/TestCompilerMojo.java
 Thu Jan 10 10:00:53 2008
@@ -68,20 +68,6 @@
 private File localRepository;
 
 /**
- * Specify a strong name key file.
- *
- * @parameter expression = "${keyfile}"
- */
-private File keyfile;
-
-/**
- * Specifies a strong name key container. (not currently supported)
- *
- * @parameter expression = "${keycontainer}"
- */
-private String keycontainer;
-
-/**
  * The framework version to compile under: 1.1, 2.0, 3.0
  *
  * @parameter expression = "${frameworkVersion}" default-value="2.0.50727"
@@ -108,15 +94,6 @@
  */
 private DotnetCompilerContext compilerContext;
 
-/**
- * @component
- */
-private List artifactHandlers;
-
-/**
- * @component
- */
-private ArtifactHandlerManager artifactHandlerManager;
 
 public void execute()
 throws MojoExecutionException, MojoFailureException
@@ -130,14 +107,14 @@
 }
 
 File sourceDir =
-new File( project.getBuild().getDirectory(),
-  BuildDirectories.TEST_SOURCES.getBuildDirectoryName() );
+new File( project.getBuild().getDirectory(), 
BuildDirectories.TEST_SOURCES.getBuildDirectoryName() );
 
 // No test source to process
-if (!sourceDir.exists()) {
+if ( !sourceDir.exists() )
+{
 return;
 }
-this.getLog();
+
 Vendor vendor;
 if ( vendorName != null )
 {
@@ -150,25 +127,8 @@
 
 getLog().info( ".NET Vendor: " + vendor );
 DotnetCompilerConfig compilerConfig = 
DotnetCompilerConfig.Factory.createDefaultCompilerConfig();
-compilerConfig.setArtifactType(
-ArtifactType.valueOf( project.getPackaging().split( "[:]" 
)[1].toUpperCase() ) );
+compilerConfig.setArtifactType( ArtifactType.LIBRARY );
 compilerConfig.setCompilerPlatformVersion( 
DotnetCompilerPlatformVersion.valueFromVersion( frameworkVersion ) );
-
-KeyInfo keyInfo = KeyInfo.Factory.createDefaultKeyInfo();
-if ( keyfile != null )
-{
-try
-{
-keyInfo.setKeyFileUri( new URI( keyfile.getAbsolutePath() ) );
-}
-catch ( URISyntaxException e )
-{
-throw new MojoExecutionException( e.getMessage() );
-}
-}
-
-keyInfo.setKeyContainerName( keycontainer );
-compilerConfig.setKeyInfo( keyInfo );
 
 compilerConfig.setLocalRepository( localRepository );
 compilerConfig.setProgrammingLanguage( ProgrammingLanguage.C_SHARP );




svn commit: r610901 - in /incubator/nmaven/trunk: components/maven-dotnet-extensions/src/main/java/org/apache/maven/dotnet/extensions/compiler/ plugins/maven-compiler-plugin/src/main/java/org/apache/m

2008-01-10 Thread sisbell
Author: sisbell
Date: Thu Jan 10 11:51:37 2008
New Revision: 610901

URL: http://svn.apache.org/viewvc?rev=610901&view=rev
Log:
Fixed bug dealing with signing of assemblies. The AssemblyInfo was picking up 
the AssemblyKeyFile attribute causing the compile to fail.

Modified:

incubator/nmaven/trunk/components/maven-dotnet-extensions/src/main/java/org/apache/maven/dotnet/extensions/compiler/CSharpClassCompiler.java

incubator/nmaven/trunk/plugins/maven-compiler-plugin/src/main/java/org/apache/maven/dotnet/plugin/compiler/AssemblyInfoGeneratorMojo.java

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=610901&r1=610900&r2=610901&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
 Thu Jan 10 11:51:37 2008
@@ -37,9 +37,9 @@
 import org.apache.maven.dotnet.Vendor;
 import org.apache.maven.dotnet.ArtifactScope;
 
[EMAIL PROTECTED]( programmingLanguaqe = ProgrammingLanguage.C_SHARP, vendors = 
{ Vendor.MICROSOFT, Vendor.NOVELL,
-Vendor.ANY }, dotnetCompilerPlatformVersions = { 
DotnetCompilerPlatformVersion.VERSION_2_0_50727,
-DotnetCompilerPlatformVersion.VERSION_3_0 } )
[EMAIL PROTECTED](programmingLanguaqe = ProgrammingLanguage.C_SHARP,
+vendors = {Vendor.MICROSOFT, Vendor.NOVELL, Vendor.ANY},
+dotnetCompilerPlatformVersions = 
{DotnetCompilerPlatformVersion.VERSION_2_0_50727, 
DotnetCompilerPlatformVersion.VERSION_3_0})
 public final class CSharpClassCompiler
 implements org.apache.maven.dotnet.compiler.ClassCompiler
 {
@@ -126,9 +126,8 @@
 if ( config.getVendor().equals( Vendor.MICROSOFT ) &&
 config.getCompilerPlatformVersion().equals( 
DotnetCompilerPlatformVersion.VERSION_3_0 ) )
 {
-String wcfRef =
-"/reference:" + System.getenv( "SystemRoot" ) +
-"\\Microsoft.NET\\Framework\\v3.0\\Windows Communication 
Foundation\\";
+String wcfRef = "/reference:" + System.getenv( "SystemRoot" ) +
+"\\Microsoft.NET\\Framework\\v3.0\\Windows Communication 
Foundation\\";
 // TODO: This is a hard-coded path: Don't have a registry value 
either.
 commands.add( wcfRef + "System.ServiceModel.dll" );
 commands.add( wcfRef + "Microsoft.Transactions.Bridge.dll" );
@@ -138,15 +137,19 @@
 commands.add( wcfRef + "System.Runtime.Serialization.dll" );
 commands.add( wcfRef + "SMDiagnostics.dll" );
 }
-
-if ( config.getKeyInfo().getKeyFileUri() != null )
-{
-commands.add( "/keyfile:" + new 
File(config.getKeyInfo().getKeyFileUri()).getAbsolutePath() );
-}
-else if ( config.getKeyInfo().getKeyContainerName() != null )
+
+if ( config.getKeyInfo() != null )
 {
-commands.add( "/keycontainer:" + 
config.getKeyInfo().getKeyContainerName() );
+if ( config.getKeyInfo().getKeyFileUri() != null )
+{
+commands.add( "/keyfile:" + new File( 
config.getKeyInfo().getKeyFileUri() ).getAbsolutePath() );
+}
+else if ( config.getKeyInfo().getKeyContainerName() != null )
+{
+commands.add( "/keycontainer:" + 
config.getKeyInfo().getKeyContainerName() );
+}
 }
+
 /*
  * if ( config.getCommands() != null ) { commands.addAll( 
config.getCommands() ); }
  */
@@ -212,8 +215,7 @@
 throw new IllegalArgumentException( "compilerContext" );
 }
 this.compilerContext = (DotnetCompilerContext) compilerContext;
-compiledArtifact =
-new File( compilerContext.getCompilerConfig().getTargetDirectory(),
-  
compilerContext.getCompilerConfig().getArtifactFileName() );
+compiledArtifact = new File( 
compilerContext.getCompilerConfig().getTargetDirectory(),
+ 
compilerContext.getCompilerConfig().getArtifactFileName() );
 }
 }

Modified: 
incubator/nmaven/trunk/plugins/maven-compiler-plugin/src/main/java/org/apache/maven/dotnet/plugin/compiler/AssemblyInfoGeneratorMojo.java
URL: 
http://svn.apache.org/viewvc/incubator/nmaven/trunk/plugins/maven-compiler-plugin/src/main/java/org/apache/maven/dotnet/plugin/compiler/AssemblyInfoGeneratorMojo.java?rev=610901&r1=610900&r2=610901&view=diff
==

svn commit: r610926 - in /incubator/nmaven/trunk: ./ plugins/dotnet-test-plugin/ plugins/dotnet-test-plugin/src/main/java/org/apache/maven/dotnet/plugin/nunit/ plugins/maven-compiler-plugin/src/main/j

2008-01-10 Thread sisbell
Author: sisbell
Date: Thu Jan 10 12:47:38 2008
New Revision: 610926

URL: http://svn.apache.org/viewvc?rev=610926&view=rev
Log:
Fixed bug where plugin was passing wrong working directory to nunit-console. 
Added back in code for copying test assemblies.

Modified:
incubator/nmaven/trunk/maven-dotnet.iml
incubator/nmaven/trunk/plugins/dotnet-test-plugin/pom.xml

incubator/nmaven/trunk/plugins/dotnet-test-plugin/src/main/java/org/apache/maven/dotnet/plugin/nunit/DotnetTestMojo.java

incubator/nmaven/trunk/plugins/maven-compiler-plugin/src/main/java/org/apache/maven/dotnet/plugin/compiler/AssemblyInfoGeneratorMojo.java

incubator/nmaven/trunk/plugins/maven-compiler-plugin/src/main/java/org/apache/maven/dotnet/plugin/compiler/TestCompilerMojo.java

Modified: incubator/nmaven/trunk/maven-dotnet.iml
URL: 
http://svn.apache.org/viewvc/incubator/nmaven/trunk/maven-dotnet.iml?rev=610926&r1=610925&r2=610926&view=diff
==
--- incubator/nmaven/trunk/maven-dotnet.iml (original)
+++ incubator/nmaven/trunk/maven-dotnet.iml Thu Jan 10 12:47:38 2008
@@ -12,6 +12,7 @@
   
   
   
+  
   
 
 

Modified: incubator/nmaven/trunk/plugins/dotnet-test-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/incubator/nmaven/trunk/plugins/dotnet-test-plugin/pom.xml?rev=610926&r1=610925&r2=610926&view=diff
==
--- incubator/nmaven/trunk/plugins/dotnet-test-plugin/pom.xml (original)
+++ incubator/nmaven/trunk/plugins/dotnet-test-plugin/pom.xml Thu Jan 10 
12:47:38 2008
@@ -40,7 +40,16 @@
 
 
   org.apache.maven
-  maven-core
+  maven-project
+
+
+  org.apache.maven
+  maven-plugin-api
+
+
+  org.apache.maven.dotnet
+  maven-dotnet-core
+  ${pom.version}
 
   
  

Modified: 
incubator/nmaven/trunk/plugins/dotnet-test-plugin/src/main/java/org/apache/maven/dotnet/plugin/nunit/DotnetTestMojo.java
URL: 
http://svn.apache.org/viewvc/incubator/nmaven/trunk/plugins/dotnet-test-plugin/src/main/java/org/apache/maven/dotnet/plugin/nunit/DotnetTestMojo.java?rev=610926&r1=610925&r2=610926&view=diff
==
--- 
incubator/nmaven/trunk/plugins/dotnet-test-plugin/src/main/java/org/apache/maven/dotnet/plugin/nunit/DotnetTestMojo.java
 (original)
+++ 
incubator/nmaven/trunk/plugins/dotnet-test-plugin/src/main/java/org/apache/maven/dotnet/plugin/nunit/DotnetTestMojo.java
 Thu Jan 10 12:47:38 2008
@@ -27,6 +27,7 @@
 import org.apache.maven.plugin.MojoFailureException;
 import org.apache.maven.plugin.logging.Log;
 import org.apache.maven.project.MavenProject;
+import org.apache.maven.dotnet.BuildDirectories;
 import org.codehaus.plexus.util.cli.CommandLineException;
 import org.codehaus.plexus.util.cli.CommandLineUtils;
 import org.codehaus.plexus.util.cli.Commandline;
@@ -80,13 +81,14 @@
 }
 
 // The directory where the test artifact exists
-String outputDirectory = project.getBuild().getDirectory();
+File testAssemblies =
+new File( project.getBuild().getDirectory(), 
BuildDirectories.TEST_ASSEMBLIES.getBuildDirectoryName() );
 
 Commandline commandline = new Commandline();
 
-getLog().debug( "NMaven-test: workingDirectory(" + outputDirectory + 
")" );
+getLog().debug( "NMaven-test: workingDirectory(" + 
testAssemblies.getAbsolutePath() + ")" );
 
-commandline.setWorkingDirectory( outputDirectory );
+commandline.setWorkingDirectory( testAssemblies.getAbsolutePath() );
 commandline.setExecutable( NUNIT_EXECUTABLE );
 commandline.addArguments( getNUnitArguments() );
 

Modified: 
incubator/nmaven/trunk/plugins/maven-compiler-plugin/src/main/java/org/apache/maven/dotnet/plugin/compiler/AssemblyInfoGeneratorMojo.java
URL: 
http://svn.apache.org/viewvc/incubator/nmaven/trunk/plugins/maven-compiler-plugin/src/main/java/org/apache/maven/dotnet/plugin/compiler/AssemblyInfoGeneratorMojo.java?rev=610926&r1=610925&r2=610926&view=diff
==
--- 
incubator/nmaven/trunk/plugins/maven-compiler-plugin/src/main/java/org/apache/maven/dotnet/plugin/compiler/AssemblyInfoGeneratorMojo.java
 (original)
+++ 
incubator/nmaven/trunk/plugins/maven-compiler-plugin/src/main/java/org/apache/maven/dotnet/plugin/compiler/AssemblyInfoGeneratorMojo.java
 Thu Jan 10 12:47:38 2008
@@ -1,3 +1,21 @@
+/*
+ * 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 ob

svn commit: r610944 - in /incubator/nmaven/trunk: install-libraries.bat thirdparty/NUnit/NUnit.Framework-2.2.8.0.pom thirdparty/NUnit/NUnit.Framework-2.4.6.dll thirdparty/NUnit/NUnit.Framework-2.4.6.p

2008-01-10 Thread sisbell
Author: sisbell
Date: Thu Jan 10 13:52:17 2008
New Revision: 610944

URL: http://svn.apache.org/viewvc?rev=610944&view=rev
Log:
Adding in NUnit assembly with version in filename.

Added:
incubator/nmaven/trunk/install-libraries.bat   (with props)
incubator/nmaven/trunk/thirdparty/NUnit/NUnit.Framework-2.4.6.dll   (with 
props)
incubator/nmaven/trunk/thirdparty/NUnit/NUnit.Framework-2.4.6.pom   (with 
props)
Removed:
incubator/nmaven/trunk/thirdparty/NUnit/NUnit.Framework-2.2.8.0.pom
incubator/nmaven/trunk/thirdparty/NUnit/NUnit.Framework.dll

Added: incubator/nmaven/trunk/install-libraries.bat
URL: 
http://svn.apache.org/viewvc/incubator/nmaven/trunk/install-libraries.bat?rev=610944&view=auto
==
--- incubator/nmaven/trunk/install-libraries.bat (added)
+++ incubator/nmaven/trunk/install-libraries.bat Thu Jan 10 13:52:17 2008
@@ -0,0 +1 @@
+cmd /C mvn.bat install:install-file 
-Dfile=./thirdparty/NUnit/NUnit.Framework-2.4.6.dll 
-DpomFile=./thirdparty/NUnit/NUnit.Framework-2.4.6.pom -DgroupId=NUnit 
-DartifactId=NUnit.Framework -Dversion=2.4.6
\ No newline at end of file

Propchange: incubator/nmaven/trunk/install-libraries.bat
--
svn:eol-style = native

Added: incubator/nmaven/trunk/thirdparty/NUnit/NUnit.Framework-2.4.6.dll
URL: 
http://svn.apache.org/viewvc/incubator/nmaven/trunk/thirdparty/NUnit/NUnit.Framework-2.4.6.dll?rev=610944&view=auto
==
Binary file - no diff available.

Propchange: incubator/nmaven/trunk/thirdparty/NUnit/NUnit.Framework-2.4.6.dll
--
svn:mime-type = application/octet-stream

Added: incubator/nmaven/trunk/thirdparty/NUnit/NUnit.Framework-2.4.6.pom
URL: 
http://svn.apache.org/viewvc/incubator/nmaven/trunk/thirdparty/NUnit/NUnit.Framework-2.4.6.pom?rev=610944&view=auto
==
--- incubator/nmaven/trunk/thirdparty/NUnit/NUnit.Framework-2.4.6.pom (added)
+++ incubator/nmaven/trunk/thirdparty/NUnit/NUnit.Framework-2.4.6.pom Thu Jan 
10 13:52:17 2008
@@ -0,0 +1,7 @@
+
+  4.0.0
+  NUnit
+  NUnit.Framework
+  dotnet:library
+  2.4.6
+
\ No newline at end of file

Propchange: incubator/nmaven/trunk/thirdparty/NUnit/NUnit.Framework-2.4.6.pom
--
svn:eol-style = native