svn commit: r607887 - in /incubator/nmaven/trunk/core-integration-tests/src/test: java/org/apache/maven/dotnet/integrationtests/ resources/MavenITmng-0014-ResolveLibraryDependency/
Author: sisbell
Date: Tue Jan 1 10:08:48 2008
New Revision: 607887
URL: http://svn.apache.org/viewvc?rev=607887&view=rev
Log:
IT for deploying of libraries.
Added:
incubator/nmaven/trunk/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0014ResolveLibraryDependency.java
(with props)
incubator/nmaven/trunk/core-integration-tests/src/test/resources/MavenITmng-0014-ResolveLibraryDependency/
incubator/nmaven/trunk/core-integration-tests/src/test/resources/MavenITmng-0014-ResolveLibraryDependency/It0014.cs
incubator/nmaven/trunk/core-integration-tests/src/test/resources/MavenITmng-0014-ResolveLibraryDependency/pom.xml
(with props)
Modified:
incubator/nmaven/trunk/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/IntegrationTestSuite.java
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=607887&r1=607886&r2=607887&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
Tue Jan 1 10:08:48 2008
@@ -38,10 +38,11 @@
suite.addTestSuite( MavenITmng0007CSharpCompileTestLibrary.class );
suite.addTestSuite(
MavenITmng0008CSharpCompileWithProvidedDependency.class );
//suite.addTestSuite(
MavenITmng0009CSharpCompileWithProvidedGacDependency.class );
-suite.addTestSuite( MavenITmng0010DeployLibrary.class );
+suite.addTestSuite( MavenITmng0010DeployLibrary.class );
suite.addTestSuite( MavenITmng0011DeployExe.class );
suite.addTestSuite( MavenITmng0012DeployModule.class );
suite.addTestSuite( MavenITmng0013DeployWinexe.class );
+suite.addTestSuite( MavenITmng0014ResolveLibraryDependency.class );
return suite;
}
}
Added:
incubator/nmaven/trunk/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0014ResolveLibraryDependency.java
URL:
http://svn.apache.org/viewvc/incubator/nmaven/trunk/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0014ResolveLibraryDependency.java?rev=607887&view=auto
==
---
incubator/nmaven/trunk/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0014ResolveLibraryDependency.java
(added)
+++
incubator/nmaven/trunk/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0014ResolveLibraryDependency.java
Tue Jan 1 10:08:48 2008
@@ -0,0 +1,27 @@
+package org.apache.maven.dotnet.integrationtests;
+
+import org.apache.maven.integrationtests.AbstractMavenIntegrationTestCase;
+import org.apache.maven.it.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.dotnet.BuildDirectories;
+
+import java.io.File;
+
+public class MavenITmng0014ResolveLibraryDependency
+extends AbstractMavenIntegrationTestCase
+{
+public void testit0014()
+throws Exception
+{
+File testDir =
+ResourceExtractor.simpleExtractResources( getClass(),
"/MavenITmng-0014-ResolveLibraryDependency" );
+Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+
+verifier.deleteArtifact( "NMaven.Its", "NMaven.It.It0010", "1.0.0",
"dll" );
+verifier.executeGoal( "install" );
+verifier.assertFilePresent( "target/" +
BuildDirectories.BUILD_SOURCES.getBuildDirectoryName() + "/It0014.cs" );
+verifier.assertFilePresent( "target/NMaven.It.It0014-1.0.0.dll" );
+verifier.verifyErrorFreeLog();
+verifier.resetStreams();
+}
+}
Propchange:
incubator/nmaven/trunk/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0014ResolveLibraryDependency.java
--
svn:eol-style = native
Added:
incubator/nmaven/trunk/core-integration-tests/src/test/resources/MavenITmng-0014-ResolveLibraryDependency/It0014.cs
URL:
http://svn.apache.org/viewvc/incubator/nmaven/trunk/core-integration-tests/src/test/resources/MavenITmng-0014-ResolveLibraryDependency/It0014.cs?rev=607887&view=auto
==
---
incubator/nmaven/trunk/core-integration-tests/src/test/resources/MavenITmng-0014-ResolveLibraryDependency/It0014.cs
(added)
+++
incubator/nmaven/trunk/core-integration-tests/src/test/resourc
svn commit: r607945 - in /incubator/nmaven/trunk/plugins: dotnet-test-plugin/src/main/java/org/apache/maven/dotnet/plugin/nunit/ maven-compiler-plugin/src/main/java/org/apache/maven/dotnet/plugin/comp
Author: eworley
Date: Tue Jan 1 15:29:32 2008
New Revision: 607945
URL: http://svn.apache.org/viewvc?rev=607945&view=rev
Log:
* Added support for maven.test.skip property
* Added support for dotnet-test-plugin configuration from the pom, see IT0007
for an example
Modified:
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/TestCompilerMojo.java
incubator/nmaven/trunk/plugins/maven-compiler-plugin/src/main/java/org/apache/maven/dotnet/plugin/compiler/TestSourceProcessorMojo.java
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=607945&r1=607944&r2=607945&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
Tue Jan 1 15:29:32 2008
@@ -19,6 +19,8 @@
package org.apache.maven.dotnet.plugin.nunit;
import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
@@ -53,10 +55,23 @@
* @required
*/
private MavenProject project;
+
+/**
+ * The arguments to pass to nunit
+ * @parameter
+ */
+private List arguments;
public void execute()
throws MojoExecutionException, MojoFailureException
{
+String skipTest = System.getProperty( "maven.test.skip" );
+if ( "TRUE".equalsIgnoreCase( skipTest ) )
+{
+getLog().info( "Skipping Test Execution" );
+return;
+}
+
// The directory where the test artifact exists
String outputDirectory = project.getBuild().getDirectory();
@@ -103,11 +118,14 @@
}
private String[] getNUnitArguments() {
-return new String[] {
-getTestAssemblyName(),
-"/labels",
-"/nologo"
-};
+List nunitArgs = new ArrayList();
+
+nunitArgs.add( getTestAssemblyName() );
+if (arguments != null) {
+nunitArgs.addAll( arguments );
+}
+
+return nunitArgs.toArray( new String[0] );
}
private static class NUnitStreamConsumer
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=607945&r1=607944&r2=607945&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
Tue Jan 1 15:29:32 2008
@@ -121,6 +121,14 @@
public void execute()
throws MojoExecutionException, MojoFailureException
{
+
+String skipTest = System.getProperty( "maven.test.skip" );
+if ( "TRUE".equalsIgnoreCase( skipTest ) )
+{
+getLog().info( "Skipping Test compilation" );
+return;
+}
+
File sourceDir =
new File( project.getBuild().getDirectory(),
BuildDirectories.TEST_SOURCES.getBuildDirectoryName() );
Modified:
incubator/nmaven/trunk/plugins/maven-compiler-plugin/src/main/java/org/apache/maven/dotnet/plugin/compiler/TestSourceProcessorMojo.java
URL:
http://svn.apache.org/viewvc/incubator/nmaven/trunk/plugins/maven-compiler-plugin/src/main/java/org/apache/maven/dotnet/plugin/compiler/TestSourceProcessorMojo.java?rev=607945&r1=607944&r2=607945&view=diff
==
---
incubator/nmaven/trunk/plugins/maven-compiler-plugin/src/main/java/org/apache/maven/dotnet/plugin/compiler/TestSourceProcessorMojo.java
(original)
+++
incubator/nmaven/trunk/plugins/maven-compiler-plugin/src/main/java/org/apache/maven/dotnet/plugin/compiler/TestSourceProcessorMojo.java
Tue Jan 1 15:29:32 2008
@@ -73,6 +73,13 @@
public void execute()
throws MojoExecutionException
{
+String skipTest = System.getProperty( "maven.test.skip" );
+if ( "TRUE".equalsIgnoreCase( ski
svn commit: r607948 - in /incubator/nmaven/trunk: ./ components/maven-dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/ components/maven-dotnet-assembler/src/main/java/org/apache/maven
Author: sisbell
Date: Tue Jan 1 16:04:16 2008
New Revision: 607948
URL: http://svn.apache.org/viewvc?rev=607948&view=rev
Log:
The compiler now outputs log results to console. Support for generating
assembly info files.
Added:
incubator/nmaven/trunk/components/maven-dotnet-assembler/src/main/resources/
incubator/nmaven/trunk/components/maven-dotnet-assembler/src/main/resources/META-INF/
incubator/nmaven/trunk/components/maven-dotnet-assembler/src/main/resources/META-INF/plexus/
incubator/nmaven/trunk/components/maven-dotnet-assembler/src/main/resources/META-INF/plexus/components.xml
(with props)
incubator/nmaven/trunk/plugins/maven-compiler-plugin/src/main/java/org/apache/maven/dotnet/plugin/compiler/AssemblyInfoGeneratorMojo.java
(with props)
Modified:
incubator/nmaven/trunk/components/maven-dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/AssemblerContext.java
incubator/nmaven/trunk/components/maven-dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/impl/AssemblerContextImpl.java
incubator/nmaven/trunk/components/maven-dotnet-compiler/src/main/java/org/apache/maven/dotnet/compiler/CommandExecutor.java
incubator/nmaven/trunk/components/maven-dotnet-compiler/src/main/java/org/apache/maven/dotnet/compiler/CompilerContext.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-extensions/src/main/java/org/apache/maven/dotnet/extensions/assembler/DefaultAssemblyInfoMarshaller.java
incubator/nmaven/trunk/plugins/maven-compiler-plugin/src/main/java/org/apache/maven/dotnet/plugin/compiler/CompilerMojo.java
incubator/nmaven/trunk/plugins/maven-compiler-plugin/src/main/java/org/apache/maven/dotnet/plugin/compiler/TestCompilerMojo.java
incubator/nmaven/trunk/plugins/maven-compiler-plugin/src/main/resources/META-INF/plexus/components.xml
incubator/nmaven/trunk/pom.xml
Modified:
incubator/nmaven/trunk/components/maven-dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/AssemblerContext.java
URL:
http://svn.apache.org/viewvc/incubator/nmaven/trunk/components/maven-dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/AssemblerContext.java?rev=607948&r1=607947&r2=607948&view=diff
==
---
incubator/nmaven/trunk/components/maven-dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/AssemblerContext.java
(original)
+++
incubator/nmaven/trunk/components/maven-dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/AssemblerContext.java
Tue Jan 1 16:04:16 2008
@@ -20,6 +20,9 @@
import org.apache.maven.project.MavenProject;
import org.apache.maven.dotnet.ProgrammingLanguage;
+import org.apache.maven.dotnet.InitializationException;
+
+import java.io.IOException;
/**
* Provides services for generating of AssemblyInfo.* file.
@@ -55,6 +58,6 @@
* @param mavenProject the maven project
*/
void init( MavenProject mavenProject )
-throws AssemblyInfoException;
+throws InitializationException, IOException;
}
Modified:
incubator/nmaven/trunk/components/maven-dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/impl/AssemblerContextImpl.java
URL:
http://svn.apache.org/viewvc/incubator/nmaven/trunk/components/maven-dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/impl/AssemblerContextImpl.java?rev=607948&r1=607947&r2=607948&view=diff
==
---
incubator/nmaven/trunk/components/maven-dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/impl/AssemblerContextImpl.java
(original)
+++
incubator/nmaven/trunk/components/maven-dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/impl/AssemblerContextImpl.java
Tue Jan 1 16:04:16 2008
@@ -25,6 +25,7 @@
import org.apache.maven.dotnet.assembler.AssemblyInfoMarshallerAnnotation;
import org.apache.maven.dotnet.ProgrammingLanguage;
import org.apache.maven.dotnet.BuildDirectories;
+import org.apache.maven.dotnet.InitializationException;
import org.apache.maven.project.MavenProject;
import org.apache.maven.model.Organization;
@@ -35,8 +36,8 @@
import java.io.*;
import java.util.Enumeration;
import java.util.List;
-import java.util.jar.JarFile;
-import java.util.jar.JarEntry;
+import java.util.ArrayList;
+import java.net.URL;
/**
* Provides an implementation of the AssemblerContext.
@@ -138,85 +139,67 @@
throws AssemblyInfoException
{
-for(AssemblyInfoMarshaller m : marshallers)
+for ( AssemblyInfoMarshaller m : marshallers )
{
-if(m.getProgrammingLanguageForMarshaller().equals(
programmingLanguage))
+if ( m.getProgrammingLanguageForMarshaller().equals(
programmingLanguage ) )
svn commit: r607949 - /incubator/nmaven/trunk/plugins/maven-compiler-plugin/src/main/resources/META-INF/plexus/components.xml
Author: sisbell Date: Tue Jan 1 16:09:27 2008 New Revision: 607949 URL: http://svn.apache.org/viewvc?rev=607949&view=rev Log: AssemblyInfo gen for exe and winexe types. Modified: incubator/nmaven/trunk/plugins/maven-compiler-plugin/src/main/resources/META-INF/plexus/components.xml Modified: incubator/nmaven/trunk/plugins/maven-compiler-plugin/src/main/resources/META-INF/plexus/components.xml URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/plugins/maven-compiler-plugin/src/main/resources/META-INF/plexus/components.xml?rev=607949&r1=607948&r2=607949&view=diff == --- incubator/nmaven/trunk/plugins/maven-compiler-plugin/src/main/resources/META-INF/plexus/components.xml (original) +++ incubator/nmaven/trunk/plugins/maven-compiler-plugin/src/main/resources/META-INF/plexus/components.xml Tue Jan 1 16:09:27 2008 @@ -44,6 +44,9 @@ + + org.apache.maven.dotnet.plugins:maven-compiler-plugin:generate-assembly-info + org.apache.maven.dotnet.plugins:maven-compiler-plugin:process-sources @@ -108,6 +111,9 @@ + + org.apache.maven.dotnet.plugins:maven-compiler-plugin:generate-assembly-info + org.apache.maven.dotnet.plugins:maven-compiler-plugin:process-sources
svn commit: r608017 - in /incubator/nmaven/trunk/core-integration-tests/src/test: java/org/apache/maven/dotnet/integrationtests/ resources/MavenITmng-0015-DeployLibraryAsSnapshot/
Author: sisbell
Date: Tue Jan 1 21:56:31 2008
New Revision: 608017
URL: http://svn.apache.org/viewvc?rev=608017&view=rev
Log:
IT for deploy of snapshot library.
Added:
incubator/nmaven/trunk/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0015DeployLibraryAsSnapshot.java
(with props)
incubator/nmaven/trunk/core-integration-tests/src/test/resources/MavenITmng-0015-DeployLibraryAsSnapshot/
incubator/nmaven/trunk/core-integration-tests/src/test/resources/MavenITmng-0015-DeployLibraryAsSnapshot/It0015.cs
incubator/nmaven/trunk/core-integration-tests/src/test/resources/MavenITmng-0015-DeployLibraryAsSnapshot/pom.xml
(with props)
Modified:
incubator/nmaven/trunk/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/IntegrationTestSuite.java
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=608017&r1=608016&r2=608017&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
Tue Jan 1 21:56:31 2008
@@ -43,6 +43,8 @@
suite.addTestSuite( MavenITmng0012DeployModule.class );
suite.addTestSuite( MavenITmng0013DeployWinexe.class );
suite.addTestSuite( MavenITmng0014ResolveLibraryDependency.class );
+
+suite.addTestSuite( MavenITmng0015DeployLibraryAsSnapshot.class );
return suite;
}
}
Added:
incubator/nmaven/trunk/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0015DeployLibraryAsSnapshot.java
URL:
http://svn.apache.org/viewvc/incubator/nmaven/trunk/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0015DeployLibraryAsSnapshot.java?rev=608017&view=auto
==
---
incubator/nmaven/trunk/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0015DeployLibraryAsSnapshot.java
(added)
+++
incubator/nmaven/trunk/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0015DeployLibraryAsSnapshot.java
Tue Jan 1 21:56:31 2008
@@ -0,0 +1,32 @@
+package org.apache.maven.dotnet.integrationtests;
+
+import org.apache.maven.integrationtests.AbstractMavenIntegrationTestCase;
+import org.apache.maven.it.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.dotnet.BuildDirectories;
+
+import java.io.File;
+
+public class MavenITmng0015DeployLibraryAsSnapshot
+extends AbstractMavenIntegrationTestCase
+{
+public void testit0015()
+throws Exception
+{
+String artifactId = "NMaven.It.It0015";
+String artifactName = artifactId + "-1.0.0-SNAPSHOT";
+String metadataDir = "target/test-repo/NMaven/Its/" + artifactId + "/";
+String artifactDir = metadataDir + "1.0.0-SNAPSHOT/";
+
+File testDir =
+ResourceExtractor.simpleExtractResources( getClass(),
"/MavenITmng-0015-DeployLibraryAsSnapshot" );
+Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+
+verifier.executeGoal( "deploy" );
+verifier.assertFilePresent( "target/" +
BuildDirectories.BUILD_SOURCES.getBuildDirectoryName() + "/It0015.cs" );
+verifier.assertFilePresent( "target/" + artifactName + ".dll" );
+verifier.assertFilePresent( artifactDir );
+verifier.assertFilePresent( metadataDir + "maven-metadata.xml" );
+verifier.resetStreams();
+}
+}
Propchange:
incubator/nmaven/trunk/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0015DeployLibraryAsSnapshot.java
--
svn:eol-style = native
Added:
incubator/nmaven/trunk/core-integration-tests/src/test/resources/MavenITmng-0015-DeployLibraryAsSnapshot/It0015.cs
URL:
http://svn.apache.org/viewvc/incubator/nmaven/trunk/core-integration-tests/src/test/resources/MavenITmng-0015-DeployLibraryAsSnapshot/It0015.cs?rev=608017&view=auto
==
---
incubator/nmaven/trunk/core-integration-tests/src/test/resources/MavenITmng-0015-DeployLibraryAsSnapshot/It0015.cs
(added)
+++
incubator/nmaven/trunk/core-integration-tests/src/test/resources/MavenITmng-0015-DeployLibraryAsSnapshot/It0015.cs
Tue Jan 1 21:56:31 2008
@@ -0,0 +1,8 @@
+namespace NMaven.IT {
+
+public class
