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( MavenITmng0000CSharpCompile.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/viewvc/incubator/nmaven/trunk/core-integration-tests/src/test/resources/MavenITmng-0002-CSharpCompileModule/pom.xml?rev=605083&view=auto
==============================================================================
---
incubator/nmaven/trunk/core-integration-tests/src/test/resources/MavenITmng-0002-CSharpCompileModule/pom.xml
(added)
+++
incubator/nmaven/trunk/core-integration-tests/src/test/resources/MavenITmng-0002-CSharpCompileModule/pom.xml
Mon Dec 17 20:42:38 2007
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>NMaven.Its</groupId>
+ <artifactId>NMaven.It.It0002</artifactId>
+ <packaging>module</packaging>
+ <version>1.0.0</version>
+ <name>NMaven.It.It0002</name>
+ <build>
+ <sourceDirectory>.</sourceDirectory>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.dotnet.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <extensions>true</extensions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange:
incubator/nmaven/trunk/core-integration-tests/src/test/resources/MavenITmng-0002-CSharpCompileModule/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=605083&r1=605082&r2=605083&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
Mon Dec 17 20:42:38 2007
@@ -1,5 +1,6 @@
<component-set>
<components>
+ <!--liifecycle mappings-->
<component>
<role>org.apache.maven.lifecycle.mapping.LifecycleMapping</role>
<role-hint>library</role-hint>
@@ -47,6 +48,31 @@
</configuration>
</component>
<component>
+ <role>org.apache.maven.lifecycle.mapping.LifecycleMapping</role>
+ <role-hint>module</role-hint>
+ <implementation>
+ org.apache.maven.lifecycle.mapping.DefaultLifecycleMapping
+ </implementation>
+ <configuration>
+ <phases>
+ <process-sources>
+
org.apache.maven.dotnet.plugins:maven-compiler-plugin:process-sources
+ </process-sources>
+ <compile>
+ org.apache.maven.dotnet.plugins:maven-compiler-plugin:compile
+ </compile>
+ <install>
+ org.apache.maven.plugins:maven-install-plugin:install
+ </install>
+ <deploy>
+ org.apache.maven.plugins:maven-deploy-plugin:deploy
+ </deploy>
+ </phases>
+ </configuration>
+ </component>
+
+ <!--artifact handlers-->
+ <component>
<role>org.apache.maven.artifact.handler.ArtifactHandler</role>
<role-hint>module</role-hint>
<implementation>org.apache.maven.artifact.handler.DefaultArtifactHandler</implementation>
@@ -116,32 +142,6 @@
<configuration>
<extension>dll</extension>
<type>gac_32</type>
- </configuration>
- </component>
- <component>
- <role>org.apache.maven.artifact.handler.ArtifactHandler</role>
- <role-hint>nar</role-hint>
-
<implementation>org.apache.maven.artifact.handler.DefaultArtifactHandler</implementation>
- <configuration>
- <type>nar</type>
- </configuration>
- </component>
- <component>
- <role>org.apache.maven.artifact.handler.ArtifactHandler</role>
- <role-hint>netplugin</role-hint>
-
<implementation>org.apache.maven.artifact.handler.DefaultArtifactHandler</implementation>
- <configuration>
- <extension>dll</extension>
- <type>netplugin</type>
- </configuration>
- </component>
- <component>
- <role>org.apache.maven.artifact.handler.ArtifactHandler</role>
- <role-hint>visual-studio-addin</role-hint>
-
<implementation>org.apache.maven.artifact.handler.DefaultArtifactHandler</implementation>
- <configuration>
- <extension>dll</extension>
- <type>visual-studio-addin</type>
</configuration>
</component>
<component>
