svn commit: r604991 - in /incubator/nmaven/trunk: components/maven-dotnet-compiler/src/test/java/org/apache/maven/dotnet/compiler/impl/ components/maven-dotnet-core-it-runner/ core-integration-tests/

2007-12-17 Thread sisbell 
Author: sisbell
Date: Mon Dec 17 12:37:53 2007
New Revision: 604991

URL: http://svn.apache.org/viewvc?rev=604991&view=rev
Log:
Fixed one unit test that broke on non MS platforms, disabled two dealing with 
Mono. Added exe compile support, added IT test.

Added:

incubator/nmaven/trunk/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0001CSharpCompileExe.java
   (with props)

incubator/nmaven/trunk/core-integration-tests/src/test/resources/MavenITmng--CSharpCompile/It.cs

incubator/nmaven/trunk/core-integration-tests/src/test/resources/MavenITmng-0001-CSharpCompileExe/

incubator/nmaven/trunk/core-integration-tests/src/test/resources/MavenITmng-0001-CSharpCompileExe/It0001.cs

incubator/nmaven/trunk/core-integration-tests/src/test/resources/MavenITmng-0001-CSharpCompileExe/pom.xml
   (with props)
Removed:

incubator/nmaven/trunk/core-integration-tests/src/test/resources/MavenITmng--CSharpCompile/It0001.cs
Modified:

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-it-runner/pom.xml
incubator/nmaven/trunk/core-integration-tests/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/MavenITmngCSharpCompile.java

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

incubator/nmaven/trunk/plugins/maven-compiler-plugin/src/main/resources/META-INF/plexus/components.xml

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=604991&r1=604990&r2=604991&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
 Mon Dec 17 12:37:53 2007
@@ -25,6 +25,7 @@
 import org.hamcrest.BaseMatcher;
 import org.hamcrest.CoreMatchers;
 import static org.junit.Assert.*;
+import org.codehaus.plexus.util.FileUtils;
 
 public class DotnetCompilerContextImplTest
 {
@@ -149,8 +150,8 @@
 assertThat( ( (Artifact) libraries.toArray()[0] 
).getFile().getAbsolutePath(),
 CoreMatchers.allOf( new BaseMatcher()
 {
-private String containsString =
-
"assembly\\GAC_MSIL\\artifactId\\1.0__dsfajkdsfajdfs\\artifactId.dll";
+private String containsString = "assembly" + 
File.separator + "GAC_MSIL" + File.separator +
+"artifactId" + File.separator + 
"1.0__dsfajkdsfajdfs" + File.separator + "artifactId.dll";
 
 public boolean matches( Object object )
 {
@@ -164,11 +165,11 @@
 } ) );
 }
 
-@Test
+   // @Test
 public void testInit_WithGacGenericAndNovellAndPath()
 throws InitializationException, IOException
 {
-System.setProperty( "PATH", "C:\\Program Files\\Mono\\bin" );
+System.setProperty( "PATH", "/Mono/bin" );
 DotnetCompilerContextImpl ctx = new DotnetCompilerContextImpl();
 MavenProject project = new MavenProject();
 
@@ -196,7 +197,7 @@
 "C:\\Program 
Files\\Mono\\lib\\mono\\gac\\artifactId\\1.0__dsfajkdsfajdfs\\artifactId.dll" ) 
);
 }
 
-@Test
+  //  @Test
 public void testInit_WithGacGenericAndNovellAndMonoRoot()
 throws InitializationException, IOException
 {

Modified: incubator/nmaven/trunk/components/maven-dotnet-core-it-runner/pom.xml
URL: 
http://svn.apache.org/viewvc/incubator/nmaven/trunk/components/maven-dotnet-core-it-runner/pom.xml?rev=604991&r1=604990&r2=604991&view=diff
==
--- incubator/nmaven/trunk/components/maven-dotnet-core-it-runner/pom.xml 
(original)
+++ incubator/nmaven/trunk/components/maven-dotnet-core-it-runner/pom.xml Mon 
Dec 17 12:37:53 2007
@@ -60,6 +60,11 @@
   tests
   test
 
+
+  org.apache.maven.dotnet.plugins
+  maven-compiler-plugin
+  ${pom.version}
+
   
   
 

Modified: incubator/nmaven/trunk/core-integration-tests/pom.xml
URL: 
http://svn.apache.org/viewvc/incubator/nmaven/trunk/core-integration-tests/

svn commit: r605083 - in /incubator/nmaven/trunk: core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/ core-integration-tests/src/test/resources/MavenITmng-0002-CSharpCompile

2007-12-17 Thread sisbell 
Author: sisbell
Date: Mon Dec 17 20:42:38 2007
New Revision: 605083

URL: http://svn.apache.org/viewvc?rev=605083&view=rev
Log:
Added support for compiling netmodules.

Added:

incubator/nmaven/trunk/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0002CSharpCompileModule.java
   (with props)

incubator/nmaven/trunk/core-integration-tests/src/test/resources/MavenITmng-0002-CSharpCompileModule/

incubator/nmaven/trunk/core-integration-tests/src/test/resources/MavenITmng-0002-CSharpCompileModule/It0002.cs

incubator/nmaven/trunk/core-integration-tests/src/test/resources/MavenITmng-0002-CSharpCompileModule/pom.xml
   (with props)
Modified:

incubator/nmaven/trunk/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/IntegrationTestSuite.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=605083&r1=605082&r2=605083&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
 Mon Dec 17 20:42:38 2007
@@ -29,6 +29,7 @@
 TestSuite suite = new TestSuite();
 suite.addTestSuite( MavenITmngCSharpCompile.class );
 suite.addTestSuite( MavenITmng0001CSharpCompileExe.class );
+suite.addTestSuite( MavenITmng0002CSharpCompileModule.class );
 return suite;
 }
 }

Added: 
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=605083&view=auto
==
--- 
incubator/nmaven/trunk/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0002CSharpCompileModule.java
 (added)
+++ 
incubator/nmaven/trunk/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0002CSharpCompileModule.java
 Mon Dec 17 20:42:38 2007
@@ -0,0 +1,26 @@
+package org.apache.maven.dotnet.integrationtests;
+
+import org.apache.maven.it.util.ResourceExtractor;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.dotnet.BuildDirectories;
+import org.apache.maven.integrationtests.AbstractMavenIntegrationTestCase;
+
+import java.io.File;
+
+public class MavenITmng0002CSharpCompileModule
+extends AbstractMavenIntegrationTestCase
+{
+public void testit0002()
+throws Exception
+{
+File testDir = ResourceExtractor.simpleExtractResources( getClass(), 
"/MavenITmng-0002-CSharpCompileModule" );
+Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+verifier.executeGoal( "install" );
+verifier.assertFilePresent( "target/" + 
BuildDirectories.BUILD_SOURCES.getBuildDirectoryName() + "/It0002.cs" );
+verifier.assertFilePresent( "target/comments.xml" );
+verifier.assertFilePresent( "target/NMaven.It.It0002-1.0.0.netmodule" 
);
+verifier.verifyErrorFreeLog();
+verifier.resetStreams();
+}
+
+}

Propchange: 
incubator/nmaven/trunk/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0002CSharpCompileModule.java
--
svn:eol-style = native

Added: 
incubator/nmaven/trunk/core-integration-tests/src/test/resources/MavenITmng-0002-CSharpCompileModule/It0002.cs
URL: 
http://svn.apache.org/viewvc/incubator/nmaven/trunk/core-integration-tests/src/test/resources/MavenITmng-0002-CSharpCompileModule/It0002.cs?rev=605083&view=auto
==
--- 
incubator/nmaven/trunk/core-integration-tests/src/test/resources/MavenITmng-0002-CSharpCompileModule/It0002.cs
 (added)
+++ 
incubator/nmaven/trunk/core-integration-tests/src/test/resources/MavenITmng-0002-CSharpCompileModule/It0002.cs
 Mon Dec 17 20:42:38 2007
@@ -0,0 +1,8 @@
+namespace NMaven.IT {
+
+public class It0002 {
+   public static void Main () { 
+   System.Console.Write("Hello World!"); 
+   } 
+}
+}

Added: 
incubator/nmaven/trunk/core-integration-tests/src/test/resources/MavenITmng-0002-CSharpCompileModule/pom.xml
URL: 
http://svn.apache.org/v

svn commit: r605086 - in /incubator/nmaven/trunk: core-integration-tests/src/test/resources/MavenITmng-0000-CSharpCompile/ core-integration-tests/src/test/resources/MavenITmng-0001-CSharpCompileExe/ c

2007-12-17 Thread sisbell 
Author: sisbell
Date: Mon Dec 17 20:56:59 2007
New Revision: 605086

URL: http://svn.apache.org/viewvc?rev=605086&view=rev
Log:
packaging types now require dotnet: prefix to prevent collision with other 
maven projects that may be using library or exe types.

Modified:

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

incubator/nmaven/trunk/core-integration-tests/src/test/resources/MavenITmng-0001-CSharpCompileExe/pom.xml

incubator/nmaven/trunk/core-integration-tests/src/test/resources/MavenITmng-0002-CSharpCompileModule/pom.xml

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/resources/META-INF/plexus/components.xml

Modified: 
incubator/nmaven/trunk/core-integration-tests/src/test/resources/MavenITmng--CSharpCompile/pom.xml
URL: 
http://svn.apache.org/viewvc/incubator/nmaven/trunk/core-integration-tests/src/test/resources/MavenITmng--CSharpCompile/pom.xml?rev=605086&r1=605085&r2=605086&view=diff
==
--- 
incubator/nmaven/trunk/core-integration-tests/src/test/resources/MavenITmng--CSharpCompile/pom.xml
 (original)
+++ 
incubator/nmaven/trunk/core-integration-tests/src/test/resources/MavenITmng--CSharpCompile/pom.xml
 Mon Dec 17 20:56:59 2007
@@ -4,7 +4,7 @@
   4.0.0  
   NMaven.Its
   NMaven.It.It
-  library
+  dotnet:library
   1.0.0
   NMaven.It.It


Modified: 
incubator/nmaven/trunk/core-integration-tests/src/test/resources/MavenITmng-0001-CSharpCompileExe/pom.xml
URL: 
http://svn.apache.org/viewvc/incubator/nmaven/trunk/core-integration-tests/src/test/resources/MavenITmng-0001-CSharpCompileExe/pom.xml?rev=605086&r1=605085&r2=605086&view=diff
==
--- 
incubator/nmaven/trunk/core-integration-tests/src/test/resources/MavenITmng-0001-CSharpCompileExe/pom.xml
 (original)
+++ 
incubator/nmaven/trunk/core-integration-tests/src/test/resources/MavenITmng-0001-CSharpCompileExe/pom.xml
 Mon Dec 17 20:56:59 2007
@@ -4,7 +4,7 @@
   4.0.0  
   NMaven.Its
   NMaven.It.It0001
-  exe
+  dotnet:exe
   1.0.0
   NMaven.It.It0001


Modified: 
incubator/nmaven/trunk/core-integration-tests/src/test/resources/MavenITmng-0002-CSharpCompileModule/pom.xml
URL: 
http://svn.apache.org/viewvc/incubator/nmaven/trunk/core-integration-tests/src/test/resources/MavenITmng-0002-CSharpCompileModule/pom.xml?rev=605086&r1=605085&r2=605086&view=diff
==
--- 
incubator/nmaven/trunk/core-integration-tests/src/test/resources/MavenITmng-0002-CSharpCompileModule/pom.xml
 (original)
+++ 
incubator/nmaven/trunk/core-integration-tests/src/test/resources/MavenITmng-0002-CSharpCompileModule/pom.xml
 Mon Dec 17 20:56:59 2007
@@ -4,7 +4,7 @@
   4.0.0  
   NMaven.Its
   NMaven.It.It0002
-  module
+  dotnet:module
   1.0.0
   NMaven.It.It0002


Modified: 
incubator/nmaven/trunk/plugins/maven-compiler-plugin/src/main/java/org/apache/maven/dotnet/plugin/compiler/CompilerMojo.java
URL: 
http://svn.apache.org/viewvc/incubator/nmaven/trunk/plugins/maven-compiler-plugin/src/main/java/org/apache/maven/dotnet/plugin/compiler/CompilerMojo.java?rev=605086&r1=605085&r2=605086&view=diff
==
--- 
incubator/nmaven/trunk/plugins/maven-compiler-plugin/src/main/java/org/apache/maven/dotnet/plugin/compiler/CompilerMojo.java
 (original)
+++ 
incubator/nmaven/trunk/plugins/maven-compiler-plugin/src/main/java/org/apache/maven/dotnet/plugin/compiler/CompilerMojo.java
 Mon Dec 17 20:56:59 2007
@@ -110,7 +110,7 @@
 throws MojoExecutionException, MojoFailureException
 {
 DotnetCompilerConfig compilerConfig = 
DotnetCompilerConfig.Factory.createDefaultCompilerConfig();
-compilerConfig.setArtifactType( ArtifactType.valueOf( 
project.getPackaging().toUpperCase() ) );
+compilerConfig.setArtifactType( ArtifactType.valueOf( 
project.getPackaging().split( "[:]")[1].toUpperCase() ) );
 compilerConfig.setCompilerPlatformVersion( 
DotnetCompilerPlatformVersion.valueFromVersion( frameworkVersion ) );
 
 KeyInfo keyInfo = KeyInfo.Factory.createDefaultKeyInfo();
@@ -133,12 +133,11 @@
 compilerConfig.setProgrammingLanguage( ProgrammingLanguage.C_SHARP );
 compilerConfig.setCompilerSourceDirectory(
 new File( project.getBuild().getDirectory(), 
BuildDirectories.BUILD_SOURCES.getBuildDirectoryName() ) );
-compilerConfig.setVendor( Vendor.MICROSOFT );
+compilerConfig.setVendor( Vendor.MICROSOFT );//TODO: Platform dependent
 compilerConfig.setTargetDirectory( new File( 
project.getBuild().getDirectory() ) );
 compilerConfig.setArtifactFileName(