From nmaven-commits-return-584-apmail-incubator-nmaven-commits-archive=incubator.apache.org@incubator.apache.org Wed Nov 28 08:53:22 2007 Return-Path: Delivered-To: apmail-incubator-nmaven-commits-archive@locus.apache.org Received: (qmail 84449 invoked from network); 28 Nov 2007 08:53:22 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 28 Nov 2007 08:53:22 -0000 Received: (qmail 72256 invoked by uid 500); 28 Nov 2007 08:53:10 -0000 Delivered-To: apmail-incubator-nmaven-commits-archive@incubator.apache.org Received: (qmail 72237 invoked by uid 500); 28 Nov 2007 08:53:10 -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 72228 invoked by uid 99); 28 Nov 2007 08:53:10 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 28 Nov 2007 00:53:10 -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; Wed, 28 Nov 2007 08:53:20 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 4B6541A9832; Wed, 28 Nov 2007 00:52:58 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r598915 - in /incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/compiler: ./ impl/ Date: Wed, 28 Nov 2007 08:52:57 -0000 To: nmaven-commits@incubator.apache.org From: eworley@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20071128085258.4B6541A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: eworley Date: Wed Nov 28 00:52:55 2007 New Revision: 598915 URL: http://svn.apache.org/viewvc?rev=598915&view=rev Log: Renaming "Net" classes to "Dotnet" to prevent confusion Added: incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/compiler/DotnetCompilerConfig.java - copied, changed from r598911, incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/compiler/NetCompilerConfig.java incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/compiler/DotnetCompilerContext.java - copied, changed from r598911, incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/compiler/NetCompilerContext.java incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/compiler/DotnetCompilerPlatformVersion.java - copied, changed from r598911, incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/compiler/NetCompilerPlatformVersion.java incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/compiler/impl/DotnetCompilerContextImpl.java - copied, changed from r598911, incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/compiler/impl/NetCompilerContextImpl.java Removed: incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/compiler/NetCompilerConfig.java incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/compiler/NetCompilerContext.java incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/compiler/NetCompilerPlatformVersion.java incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/compiler/impl/NetCompilerContextImpl.java Copied: incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/compiler/DotnetCompilerConfig.java (from r598911, incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/compiler/NetCompilerConfig.java) URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/compiler/DotnetCompilerConfig.java?p2=incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/compiler/DotnetCompilerConfig.java&p1=incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/compiler/NetCompilerConfig.java&r1=598911&r2=598915&rev=598915&view=diff ============================================================================== --- incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/compiler/NetCompilerConfig.java (original) +++ incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/compiler/DotnetCompilerConfig.java Wed Nov 28 00:52:55 2007 @@ -2,7 +2,7 @@ import java.io.File; -public interface NetCompilerConfig +public interface DotnetCompilerConfig extends CompilerConfig { @@ -20,9 +20,9 @@ */ void setKeyInfo( KeyInfo keyInfo ); - NetCompilerPlatformVersion getCompilerPlatformVersion(); + DotnetCompilerPlatformVersion getCompilerPlatformVersion(); - void setCompilerPlatformVersion( NetCompilerPlatformVersion compilerPlatformVersion ); + void setCompilerPlatformVersion( DotnetCompilerPlatformVersion compilerPlatformVersion ); public static class Factory { @@ -38,13 +38,13 @@ * * @return a default instance of the executable config */ - public static NetCompilerConfig createDefaultExecutableConfig() + public static DotnetCompilerConfig createDefaultExecutableConfig() { - return new NetCompilerConfig() + return new DotnetCompilerConfig() { private KeyInfo keyInfo; - private NetCompilerPlatformVersion compilerPlatformVersion; + private DotnetCompilerPlatformVersion compilerPlatformVersion; private ArtifactType artifactType; @@ -70,12 +70,12 @@ this.keyInfo = keyInfo; } - public NetCompilerPlatformVersion getCompilerPlatformVersion() + public DotnetCompilerPlatformVersion getCompilerPlatformVersion() { return compilerPlatformVersion; } - public void setCompilerPlatformVersion( NetCompilerPlatformVersion compilerPlatformVersion ) + public void setCompilerPlatformVersion( DotnetCompilerPlatformVersion compilerPlatformVersion ) { this.compilerPlatformVersion = compilerPlatformVersion; } @@ -205,7 +205,7 @@ return false; } - final NetCompilerConfig that = (NetCompilerConfig) o; + final DotnetCompilerConfig that = (DotnetCompilerConfig) o; if ( isTestCompile != that.isTestCompile() ) { Copied: incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/compiler/DotnetCompilerContext.java (from r598911, incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/compiler/NetCompilerContext.java) URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/compiler/DotnetCompilerContext.java?p2=incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/compiler/DotnetCompilerContext.java&p1=incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/compiler/NetCompilerContext.java&r1=598911&r2=598915&rev=598915&view=diff ============================================================================== --- incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/compiler/NetCompilerContext.java (original) +++ incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/compiler/DotnetCompilerContext.java Wed Nov 28 00:52:55 2007 @@ -5,7 +5,7 @@ import java.io.File; import java.util.Set; -public interface NetCompilerContext extends CompilerContext +public interface DotnetCompilerContext extends CompilerContext { /** Copied: incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/compiler/DotnetCompilerPlatformVersion.java (from r598911, incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/compiler/NetCompilerPlatformVersion.java) URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/compiler/DotnetCompilerPlatformVersion.java?p2=incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/compiler/DotnetCompilerPlatformVersion.java&p1=incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/compiler/NetCompilerPlatformVersion.java&r1=598911&r2=598915&rev=598915&view=diff ============================================================================== --- incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/compiler/NetCompilerPlatformVersion.java (original) +++ incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/compiler/DotnetCompilerPlatformVersion.java Wed Nov 28 00:52:55 2007 @@ -1,6 +1,6 @@ package org.apache.maven.dotnet.compiler; -public enum NetCompilerPlatformVersion +public enum DotnetCompilerPlatformVersion { VERSION_1_1_4322("1.1.4322"), VERSION_2_0_50727("2.0.50727"), @@ -9,7 +9,7 @@ private String version; - NetCompilerPlatformVersion(String version) + DotnetCompilerPlatformVersion(String version) { this.version = version; } Copied: incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/compiler/impl/DotnetCompilerContextImpl.java (from r598911, incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/compiler/impl/NetCompilerContextImpl.java) URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/compiler/impl/DotnetCompilerContextImpl.java?p2=incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/compiler/impl/DotnetCompilerContextImpl.java&p1=incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/compiler/impl/NetCompilerContextImpl.java&r1=598911&r2=598915&rev=598915&view=diff ============================================================================== --- incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/compiler/impl/NetCompilerContextImpl.java (original) +++ incubator/nmaven/branches/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/compiler/impl/DotnetCompilerContextImpl.java Wed Nov 28 00:52:55 2007 @@ -1,21 +1,23 @@ package org.apache.maven.dotnet.compiler.impl; -import org.apache.maven.dotnet.compiler.*; +import java.io.File; +import java.util.Arrays; +import java.util.HashSet; +import java.util.Set; + +import org.apache.maven.artifact.Artifact; import org.apache.maven.dotnet.compiler.Compiler; import org.apache.maven.dotnet.compiler.CompilerConfig; +import org.apache.maven.dotnet.compiler.DotnetCompilerConfig; +import org.apache.maven.dotnet.compiler.DotnetCompilerContext; +import org.apache.maven.dotnet.compiler.DotnetCompilerPlatformVersion; import org.apache.maven.dotnet.compiler.PlatformUnsupportedException; -import org.apache.maven.artifact.Artifact; +import org.apache.maven.dotnet.compiler.Vendor; import org.apache.maven.project.MavenProject; import org.codehaus.plexus.logging.Logger; -import java.util.Set; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.HashSet; -import java.io.File; - -public class NetCompilerContextImpl - implements NetCompilerContext +public class DotnetCompilerContextImpl + implements DotnetCompilerContext { @@ -24,7 +26,7 @@ */ private MavenProject project; - private NetCompilerConfig netCompilerConfig; + private DotnetCompilerConfig netCompilerConfig; private Set libraryDependencies; @@ -115,7 +117,7 @@ } this.project = project; - this.netCompilerConfig = (NetCompilerConfig) compilerConfig; + this.netCompilerConfig = (DotnetCompilerConfig) compilerConfig; netCompilerConfig.verifyCompilerConfig(); libraryDependencies = new HashSet(); @@ -140,12 +142,12 @@ String gacRoot = null; if ( netCompilerConfig.getVendor().equals( Vendor.MICROSOFT ) && ( netCompilerConfig.getCompilerPlatformVersion().compareTo( - NetCompilerPlatformVersion.VERSION_2_0_50727 ) >= 0 ) ) + DotnetCompilerPlatformVersion.VERSION_2_0_50727 ) >= 0 ) ) { gacRoot = System.getenv( "SystemRoot" ) + "\\assembly\\GAC_MSIL\\"; } else if ( netCompilerConfig.getVendor().equals( Vendor.MICROSOFT ) && - netCompilerConfig.equals( NetCompilerPlatformVersion.VERSION_1_1_4322 ) ) + netCompilerConfig.equals( DotnetCompilerPlatformVersion.VERSION_1_1_4322 ) ) { gacRoot = System.getenv( "SystemRoot" ) + "\\assembly\\GAC\\"; }