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-0000-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-0000-CSharpCompile/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/nmaven/trunk/core-integration-tests/src/test/resources/MavenITmng-0000-CSharpCompile/pom.xml?rev=605086&r1=605085&r2=605086&view=diff
==============================================================================
---
incubator/nmaven/trunk/core-integration-tests/src/test/resources/MavenITmng-0000-CSharpCompile/pom.xml
(original)
+++
incubator/nmaven/trunk/core-integration-tests/src/test/resources/MavenITmng-0000-CSharpCompile/pom.xml
Mon Dec 17 20:56:59 2007
@@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>NMaven.Its</groupId>
<artifactId>NMaven.It.It0000</artifactId>
- <packaging>library</packaging>
+ <packaging>dotnet:library</packaging>
<version>1.0.0</version>
<name>NMaven.It.It0000</name>
<build>
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 @@
<modelVersion>4.0.0</modelVersion>
<groupId>NMaven.Its</groupId>
<artifactId>NMaven.It.It0001</artifactId>
- <packaging>exe</packaging>
+ <packaging>dotnet:exe</packaging>
<version>1.0.0</version>
<name>NMaven.It.It0001</name>
<build>
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 @@
<modelVersion>4.0.0</modelVersion>
<groupId>NMaven.Its</groupId>
<artifactId>NMaven.It.It0002</artifactId>
- <packaging>module</packaging>
+ <packaging>dotnet:module</packaging>
<version>1.0.0</version>
<name>NMaven.It.It0002</name>
<build>
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(
project.getBuild().getFinalName() + "." +
compilerConfig.getArtifactType().getExtension() );
- // DotnetCompilerContext compilerContext = new
DotnetCompilerContextImpl();
try
{
compilerContext.init( project, compilerConfig );
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=605086&r1=605085&r2=605086&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:56:59 2007
@@ -3,7 +3,7 @@
<!--liifecycle mappings-->
<component>
<role>org.apache.maven.lifecycle.mapping.LifecycleMapping</role>
- <role-hint>library</role-hint>
+ <role-hint>dotnet:library</role-hint>
<implementation>
org.apache.maven.lifecycle.mapping.DefaultLifecycleMapping
</implementation>
@@ -26,7 +26,7 @@
</component>
<component>
<role>org.apache.maven.lifecycle.mapping.LifecycleMapping</role>
- <role-hint>exe</role-hint>
+ <role-hint>dotnet:exe</role-hint>
<implementation>
org.apache.maven.lifecycle.mapping.DefaultLifecycleMapping
</implementation>
@@ -49,7 +49,7 @@
</component>
<component>
<role>org.apache.maven.lifecycle.mapping.LifecycleMapping</role>
- <role-hint>module</role-hint>
+ <role-hint>dotnet:module</role-hint>
<implementation>
org.apache.maven.lifecycle.mapping.DefaultLifecycleMapping
</implementation>
@@ -74,16 +74,16 @@
<!--artifact handlers-->
<component>
<role>org.apache.maven.artifact.handler.ArtifactHandler</role>
- <role-hint>module</role-hint>
+ <role-hint>dotnet:module</role-hint>
<implementation>org.apache.maven.artifact.handler.DefaultArtifactHandler</implementation>
<configuration>
<extension>netmodule</extension>
- <type>module</type>
+ <type>dotnet:module</type>
</configuration>
</component>
<component>
<role>org.apache.maven.artifact.handler.ArtifactHandler</role>
- <role-hint>library</role-hint>
+ <role-hint>dotnet:library</role-hint>
<implementation>org.apache.maven.artifact.handler.DefaultArtifactHandler</implementation>
<configuration>
<extension>dll</extension>
@@ -92,7 +92,7 @@
</component>
<component>
<role>org.apache.maven.artifact.handler.ArtifactHandler</role>
- <role-hint>exe</role-hint>
+ <role-hint>dotnet:exe</role-hint>
<implementation>org.apache.maven.artifact.handler.DefaultArtifactHandler</implementation>
<configuration>
<extension>exe</extension>
@@ -101,7 +101,7 @@
</component>
<component>
<role>org.apache.maven.artifact.handler.ArtifactHandler</role>
- <role-hint>winexe</role-hint>
+ <role-hint>dotnet:winexe</role-hint>
<implementation>org.apache.maven.artifact.handler.DefaultArtifactHandler</implementation>
<configuration>
<extension>exe</extension>
@@ -110,38 +110,38 @@
</component>
<component>
<role>org.apache.maven.artifact.handler.ArtifactHandler</role>
- <role-hint>gac</role-hint>
+ <role-hint>dotnet:gac</role-hint>
<implementation>org.apache.maven.artifact.handler.DefaultArtifactHandler</implementation>
<configuration>
<extension>dll</extension>
- <type>gac</type>
+ <type>dotnet:gac</type>
</configuration>
</component>
<component>
<role>org.apache.maven.artifact.handler.ArtifactHandler</role>
- <role-hint>gac_generic</role-hint>
+ <role-hint>dotnet:gac_generic</role-hint>
<implementation>org.apache.maven.artifact.handler.DefaultArtifactHandler</implementation>
<configuration>
<extension>dll</extension>
- <type>gac_generic</type>
+ <type>dotnet:gac_generic</type>
</configuration>
</component>
<component>
<role>org.apache.maven.artifact.handler.ArtifactHandler</role>
- <role-hint>gac_msil</role-hint>
+ <role-hint>dotnet:gac_msil</role-hint>
<implementation>org.apache.maven.artifact.handler.DefaultArtifactHandler</implementation>
<configuration>
<extension>dll</extension>
- <type>gac_msil</type>
+ <type>dotnet:gac_msil</type>
</configuration>
</component>
<component>
<role>org.apache.maven.artifact.handler.ArtifactHandler</role>
- <role-hint>gac_32</role-hint>
+ <role-hint>dotnet:gac_32</role-hint>
<implementation>org.apache.maven.artifact.handler.DefaultArtifactHandler</implementation>
<configuration>
<extension>dll</extension>
- <type>gac_32</type>
+ <type>dotnet:gac_32</type>
</configuration>
</component>
<component>
