incubator-nmaven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sisb...@apache.org
Subject svn commit: r610854 - /incubator/nmaven/trunk/plugins/maven-compiler-plugin/src/main/java/org/apache/maven/dotnet/plugin/compiler/TestCompilerMojo.java
Date Thu, 10 Jan 2008 18:00:55 GMT
Author: sisbell
Date: Thu Jan 10 10:00:53 2008
New Revision: 610854

URL: http://svn.apache.org/viewvc?rev=610854&view=rev
Log:
Cleaned up test compiler mojo. No need for signing. Artifact type should always be dll.

Modified:
    incubator/nmaven/trunk/plugins/maven-compiler-plugin/src/main/java/org/apache/maven/dotnet/plugin/compiler/TestCompilerMojo.java

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=610854&r1=610853&r2=610854&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
Thu Jan 10 10:00:53 2008
@@ -68,20 +68,6 @@
     private File localRepository;
 
     /**
-     * Specify a strong name key file.
-     *
-     * @parameter expression = "${keyfile}"
-     */
-    private File keyfile;
-
-    /**
-     * Specifies a strong name key container. (not currently supported)
-     *
-     * @parameter expression = "${keycontainer}"
-     */
-    private String keycontainer;
-
-    /**
      * The framework version to compile under: 1.1, 2.0, 3.0
      *
      * @parameter expression = "${frameworkVersion}" default-value="2.0.50727"
@@ -108,15 +94,6 @@
      */
     private DotnetCompilerContext compilerContext;
 
-    /**
-     * @component
-     */
-    private List<ArtifactHandler> artifactHandlers;
-
-    /**
-     * @component
-     */
-    private ArtifactHandlerManager artifactHandlerManager;
 
     public void execute()
         throws MojoExecutionException, MojoFailureException
@@ -130,14 +107,14 @@
         }
 
         File sourceDir =
-            new File( project.getBuild().getDirectory(),
-                      BuildDirectories.TEST_SOURCES.getBuildDirectoryName() );
+            new File( project.getBuild().getDirectory(), BuildDirectories.TEST_SOURCES.getBuildDirectoryName()
);
 
         // No test source to process
-        if (!sourceDir.exists()) {
+        if ( !sourceDir.exists() )
+        {
             return;
         }
-        this.getLog();
+
         Vendor vendor;
         if ( vendorName != null )
         {
@@ -150,25 +127,8 @@
 
         getLog().info( ".NET Vendor: " + vendor );
         DotnetCompilerConfig compilerConfig = DotnetCompilerConfig.Factory.createDefaultCompilerConfig();
-        compilerConfig.setArtifactType(
-            ArtifactType.valueOf( project.getPackaging().split( "[:]" )[1].toUpperCase()
) );
+        compilerConfig.setArtifactType( ArtifactType.LIBRARY );
         compilerConfig.setCompilerPlatformVersion( DotnetCompilerPlatformVersion.valueFromVersion(
frameworkVersion ) );
-
-        KeyInfo keyInfo = KeyInfo.Factory.createDefaultKeyInfo();
-        if ( keyfile != null )
-        {
-            try
-            {
-                keyInfo.setKeyFileUri( new URI( keyfile.getAbsolutePath() ) );
-            }
-            catch ( URISyntaxException e )
-            {
-                throw new MojoExecutionException( e.getMessage() );
-            }
-        }
-
-        keyInfo.setKeyContainerName( keycontainer );
-        compilerConfig.setKeyInfo( keyInfo );
 
         compilerConfig.setLocalRepository( localRepository );
         compilerConfig.setProgrammingLanguage( ProgrammingLanguage.C_SHARP );



Mime
View raw message