From nmaven-commits-return-644-apmail-incubator-nmaven-commits-archive=incubator.apache.org@incubator.apache.org Tue Dec 18 17:32:07 2007 Return-Path: Delivered-To: apmail-incubator-nmaven-commits-archive@locus.apache.org Received: (qmail 70834 invoked from network); 18 Dec 2007 17:32:07 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 18 Dec 2007 17:32:07 -0000 Received: (qmail 12625 invoked by uid 500); 18 Dec 2007 17:31:56 -0000 Delivered-To: apmail-incubator-nmaven-commits-archive@incubator.apache.org Received: (qmail 12593 invoked by uid 500); 18 Dec 2007 17:31:56 -0000 Mailing-List: contact nmaven-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: nmaven-dev@incubator.apache.org Delivered-To: mailing list nmaven-commits@incubator.apache.org Received: (qmail 12584 invoked by uid 99); 18 Dec 2007 17:31:56 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 18 Dec 2007 09:31:56 -0800 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 18 Dec 2007 17:31:42 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 0C3EC1A9838; Tue, 18 Dec 2007 09:31:46 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r605266 - in /incubator/nmaven/trunk: core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/ core-integration-tests/src/test/resources/MavenITmng-0003-CSharpCompileWinexe/ plugins/maven-compiler-plugin/src/main/resou... Date: Tue, 18 Dec 2007 17:31:44 -0000 To: nmaven-commits@incubator.apache.org From: sisbell@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20071218173146.0C3EC1A9838@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: sisbell Date: Tue Dec 18 09:31:39 2007 New Revision: 605266 URL: http://svn.apache.org/viewvc?rev=605266&view=rev Log: Support for compiling target winexe with csharp. Added: incubator/nmaven/trunk/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0003CSharpCompileWinexe.java (with props) incubator/nmaven/trunk/core-integration-tests/src/test/resources/MavenITmng-0003-CSharpCompileWinexe/ incubator/nmaven/trunk/core-integration-tests/src/test/resources/MavenITmng-0003-CSharpCompileWinexe/It0003.cs incubator/nmaven/trunk/core-integration-tests/src/test/resources/MavenITmng-0003-CSharpCompileWinexe/pom.xml (with props) Modified: 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/MavenITmng0002CSharpCompileModule.java incubator/nmaven/trunk/plugins/maven-compiler-plugin/src/main/resources/META-INF/plexus/components.xml 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=605266&r1=605265&r2=605266&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 Dec 18 09:31:39 2007 @@ -30,6 +30,7 @@ suite.addTestSuite( MavenITmng0000CSharpCompile.class ); suite.addTestSuite( MavenITmng0001CSharpCompileExe.class ); suite.addTestSuite( MavenITmng0002CSharpCompileModule.class ); + suite.addTestSuite( MavenITmng0003CSharpCompileWinexe.class ); return suite; } } Modified: incubator/nmaven/trunk/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0002CSharpCompileModule.java URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0002CSharpCompileModule.java?rev=605266&r1=605265&r2=605266&view=diff ============================================================================== --- incubator/nmaven/trunk/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0002CSharpCompileModule.java (original) +++ incubator/nmaven/trunk/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0002CSharpCompileModule.java Tue Dec 18 09:31:39 2007 @@ -8,7 +8,7 @@ import java.io.File; public class MavenITmng0002CSharpCompileModule - extends AbstractMavenIntegrationTestCase + extends AbstractMavenIntegrationTestCase { public void testit0002() throws Exception Added: incubator/nmaven/trunk/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0003CSharpCompileWinexe.java URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0003CSharpCompileWinexe.java?rev=605266&view=auto ============================================================================== --- incubator/nmaven/trunk/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0003CSharpCompileWinexe.java (added) +++ incubator/nmaven/trunk/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0003CSharpCompileWinexe.java Tue Dec 18 09:31:39 2007 @@ -0,0 +1,25 @@ +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 MavenITmng0003CSharpCompileWinexe + extends AbstractMavenIntegrationTestCase +{ + public void testit0003() + throws Exception + { + File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/MavenITmng-0003-CSharpCompileWinexe" ); + Verifier verifier = new Verifier( testDir.getAbsolutePath() ); + verifier.executeGoal( "install" ); + verifier.assertFilePresent( "target/" + BuildDirectories.BUILD_SOURCES.getBuildDirectoryName() + "/It0003.cs" ); + verifier.assertFilePresent( "target/comments.xml" ); + verifier.assertFilePresent( "target/NMaven.It.It0003-1.0.0.exe" ); + verifier.verifyErrorFreeLog(); + verifier.resetStreams(); + } +} Propchange: incubator/nmaven/trunk/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0003CSharpCompileWinexe.java ------------------------------------------------------------------------------ svn:eol-style = native Added: incubator/nmaven/trunk/core-integration-tests/src/test/resources/MavenITmng-0003-CSharpCompileWinexe/It0003.cs URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/core-integration-tests/src/test/resources/MavenITmng-0003-CSharpCompileWinexe/It0003.cs?rev=605266&view=auto ============================================================================== --- incubator/nmaven/trunk/core-integration-tests/src/test/resources/MavenITmng-0003-CSharpCompileWinexe/It0003.cs (added) +++ incubator/nmaven/trunk/core-integration-tests/src/test/resources/MavenITmng-0003-CSharpCompileWinexe/It0003.cs Tue Dec 18 09:31:39 2007 @@ -0,0 +1,8 @@ +namespace NMaven.IT { + +public class It0003 { + public static void Main () { + System.Console.Write("Hello World!"); + } +} +} Added: incubator/nmaven/trunk/core-integration-tests/src/test/resources/MavenITmng-0003-CSharpCompileWinexe/pom.xml URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/core-integration-tests/src/test/resources/MavenITmng-0003-CSharpCompileWinexe/pom.xml?rev=605266&view=auto ============================================================================== --- incubator/nmaven/trunk/core-integration-tests/src/test/resources/MavenITmng-0003-CSharpCompileWinexe/pom.xml (added) +++ incubator/nmaven/trunk/core-integration-tests/src/test/resources/MavenITmng-0003-CSharpCompileWinexe/pom.xml Tue Dec 18 09:31:39 2007 @@ -0,0 +1,20 @@ + + + + 4.0.0 + NMaven.Its + NMaven.It.It0003 + dotnet:winexe + 1.0.0 + NMaven.It.It0003 + + . + + + org.apache.maven.dotnet.plugins + maven-compiler-plugin + true + + + + Propchange: incubator/nmaven/trunk/core-integration-tests/src/test/resources/MavenITmng-0003-CSharpCompileWinexe/pom.xml ------------------------------------------------------------------------------ svn:eol-style = native 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=605266&r1=605265&r2=605266&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 Dec 18 09:31:39 2007 @@ -70,17 +70,31 @@ - - - org.apache.maven.artifact.handler.ArtifactHandler - dotnet:module - org.apache.maven.artifact.handler.DefaultArtifactHandler + org.apache.maven.lifecycle.mapping.LifecycleMapping + dotnet:winexe + + org.apache.maven.lifecycle.mapping.DefaultLifecycleMapping + - netmodule - dotnet:module + + + org.apache.maven.dotnet.plugins:maven-compiler-plugin:process-sources + + + org.apache.maven.dotnet.plugins:maven-compiler-plugin:compile + + + org.apache.maven.plugins:maven-install-plugin:install + + + org.apache.maven.plugins:maven-deploy-plugin:deploy + + + + org.apache.maven.artifact.handler.ArtifactHandler dotnet:library @@ -97,6 +111,15 @@ exe exe + + + + org.apache.maven.artifact.handler.ArtifactHandler + dotnet:module + org.apache.maven.artifact.handler.DefaultArtifactHandler + + netmodule + dotnet:module