From nmaven-commits-return-576-apmail-incubator-nmaven-commits-archive=incubator.apache.org@incubator.apache.org Sun Nov 25 20:46:56 2007 Return-Path: Delivered-To: apmail-incubator-nmaven-commits-archive@locus.apache.org Received: (qmail 79466 invoked from network); 25 Nov 2007 20:46:56 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 25 Nov 2007 20:46:56 -0000 Received: (qmail 84426 invoked by uid 500); 25 Nov 2007 20:46:44 -0000 Delivered-To: apmail-incubator-nmaven-commits-archive@incubator.apache.org Received: (qmail 84409 invoked by uid 500); 25 Nov 2007 20:46:44 -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 84400 invoked by uid 99); 25 Nov 2007 20:46:44 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 25 Nov 2007 12:46:44 -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; Sun, 25 Nov 2007 20:46:52 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 2307E1A9832; Sun, 25 Nov 2007 12:46:30 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r598049 - in /incubator/nmaven/tags/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-executable/src/org/apache/maven/dotnet/compiler: ./ impl/ Date: Sun, 25 Nov 2007 20:46:29 -0000 To: nmaven-commits@incubator.apache.org From: sisbell@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20071125204630.2307E1A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: sisbell Date: Sun Nov 25 12:46:28 2007 New Revision: 598049 URL: http://svn.apache.org/viewvc?rev=598049&view=rev Log: Changed return types: should use set instead of list, since ordering is not important but duplication is. Stricter type-safeing on some other methods. Modified: incubator/nmaven/tags/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-executable/src/org/apache/maven/dotnet/compiler/Compiler.java incubator/nmaven/tags/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-executable/src/org/apache/maven/dotnet/compiler/CompilerAnnotation.java incubator/nmaven/tags/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-executable/src/org/apache/maven/dotnet/compiler/CompilerConfig.java incubator/nmaven/tags/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-executable/src/org/apache/maven/dotnet/compiler/KeyInfo.java incubator/nmaven/tags/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-executable/src/org/apache/maven/dotnet/compiler/NetCompilerContext.java incubator/nmaven/tags/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-executable/src/org/apache/maven/dotnet/compiler/impl/NetCompilerContextImpl.java Modified: incubator/nmaven/tags/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-executable/src/org/apache/maven/dotnet/compiler/Compiler.java URL: http://svn.apache.org/viewvc/incubator/nmaven/tags/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-executable/src/org/apache/maven/dotnet/compiler/Compiler.java?rev=598049&r1=598048&r2=598049&view=diff ============================================================================== --- incubator/nmaven/tags/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-executable/src/org/apache/maven/dotnet/compiler/Compiler.java (original) +++ incubator/nmaven/tags/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-executable/src/org/apache/maven/dotnet/compiler/Compiler.java Sun Nov 25 12:46:28 2007 @@ -1,7 +1,7 @@ package org.apache.maven.dotnet.compiler; import java.io.File; -import java.util.List; +import java.util.Set; public interface Compiler { @@ -22,32 +22,30 @@ boolean failOnErrorOutput(); /** - * Returns the commands that this compiler will use to compile the application. This list is unmodifiable. - * - * @return the commands that this compiler will use to compile the application - */ - List getCommands(); - - /** - * Resets the commands to be used by the executable. This should only be used if the executable is being reused with - * different commands from the one that it was initialized with. - * - * @param commands - */ - void resetCommands(List commands); - - /** - * Compiles class files. - * - */ - void compile(); - - /** - * Returns the executable file name that this compiler will use to compile the application. - * - * @return the executable file name that this compiler will use to compile the application - * - */ - String getCompilerFileName(); + * Returns the commands that this compiler will use to compile the application. This list is unmodifiable. + * + * @return the commands that this compiler will use to compile the application + */ + Set getCommands(); + + /** + * Resets the commands to be used by the executable. This should only be used if the executable is being reused with + * different commands from the one that it was initialized with. + * + * @param commands + */ + void resetCommands( Set commands ); + + /** + * Compiles class files. + */ + void compile(); + + /** + * Returns the executable file name that this compiler will use to compile the application. + * + * @return the executable file name that this compiler will use to compile the application + */ + String getCompilerFileName(); } Modified: incubator/nmaven/tags/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-executable/src/org/apache/maven/dotnet/compiler/CompilerAnnotation.java URL: http://svn.apache.org/viewvc/incubator/nmaven/tags/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-executable/src/org/apache/maven/dotnet/compiler/CompilerAnnotation.java?rev=598049&r1=598048&r2=598049&view=diff ============================================================================== --- incubator/nmaven/tags/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-executable/src/org/apache/maven/dotnet/compiler/CompilerAnnotation.java (original) +++ incubator/nmaven/tags/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-executable/src/org/apache/maven/dotnet/compiler/CompilerAnnotation.java Sun Nov 25 12:46:28 2007 @@ -2,11 +2,9 @@ public @interface CompilerAnnotation { - String getClassFileExtension(); + ProgrammingLanguage getProgrammingLanguaqe(); - String getLanguaqe(); + Vendor getVendor(); - String getVendor(); - - String getFrameworkVersion(); + String getLanguageVersion(); } Modified: incubator/nmaven/tags/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-executable/src/org/apache/maven/dotnet/compiler/CompilerConfig.java URL: http://svn.apache.org/viewvc/incubator/nmaven/tags/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-executable/src/org/apache/maven/dotnet/compiler/CompilerConfig.java?rev=598049&r1=598048&r2=598049&view=diff ============================================================================== --- incubator/nmaven/tags/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-executable/src/org/apache/maven/dotnet/compiler/CompilerConfig.java (original) +++ incubator/nmaven/tags/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-executable/src/org/apache/maven/dotnet/compiler/CompilerConfig.java Sun Nov 25 12:46:28 2007 @@ -67,8 +67,16 @@ */ File getTargetDirectory(); - String getProgramLanguage(); + ProgrammingLanguage getProgrammingLanguage(); - void setProgramLanguage( String programLanguage ); + void setProgrammingLanguage( ProgrammingLanguage programLanguage ); + + String getProgramLanguageVersion(); + + void setProgrammingLanguageVersion(String programLanguageVersion); + + void setVendor(String vendor); + + String getVendor(); } Modified: incubator/nmaven/tags/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-executable/src/org/apache/maven/dotnet/compiler/KeyInfo.java URL: http://svn.apache.org/viewvc/incubator/nmaven/tags/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-executable/src/org/apache/maven/dotnet/compiler/KeyInfo.java?rev=598049&r1=598048&r2=598049&view=diff ============================================================================== --- incubator/nmaven/tags/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-executable/src/org/apache/maven/dotnet/compiler/KeyInfo.java (original) +++ incubator/nmaven/tags/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-executable/src/org/apache/maven/dotnet/compiler/KeyInfo.java Sun Nov 25 12:46:28 2007 @@ -1,5 +1,7 @@ package org.apache.maven.dotnet.compiler; +import java.net.URI; + /** * Provides services for obtaining information about the key file. * @@ -11,14 +13,14 @@ * * @return the path of the key */ - String getKeyFileUri(); + URI getKeyFileUri(); /** * Sets the path of the key * * @param keyFileUri the path of the key */ - void setKeyFileUri(String keyFileUri); + void setKeyFileUri(URI keyFileUri); String getKeyContainerName(); @@ -42,15 +44,15 @@ { return new KeyInfo() { - private String keyFileUri; + private URI keyFileUri; private String keyContainerName; - public String getKeyFileUri() { + public URI getKeyFileUri() { return keyFileUri; } - public void setKeyFileUri(String keyFileUri) { + public void setKeyFileUri(URI keyFileUri) { this.keyFileUri = keyFileUri; } Modified: incubator/nmaven/tags/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-executable/src/org/apache/maven/dotnet/compiler/NetCompilerContext.java URL: http://svn.apache.org/viewvc/incubator/nmaven/tags/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-executable/src/org/apache/maven/dotnet/compiler/NetCompilerContext.java?rev=598049&r1=598048&r2=598049&view=diff ============================================================================== --- incubator/nmaven/tags/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-executable/src/org/apache/maven/dotnet/compiler/NetCompilerContext.java (original) +++ incubator/nmaven/tags/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-executable/src/org/apache/maven/dotnet/compiler/NetCompilerContext.java Sun Nov 25 12:46:28 2007 @@ -3,7 +3,7 @@ import org.apache.maven.artifact.Artifact; import java.io.File; -import java.util.List; +import java.util.Set; public interface NetCompilerContext extends CompilerContext { @@ -15,7 +15,7 @@ * * @return assembly names that should be referenced by the compiler. */ - List getCoreAssemblyNames(); + Set getCoreAssemblyNames(); /** * Returns a list of module (netmodule) dependencies that exist directly within the invoking projects pom @@ -23,28 +23,28 @@ * * @return a list of module (netmodule) dependencies of the class files. */ - List getDirectModuleDependencies(); + Set getDirectModuleDependencies(); /** * Returns a list of library (dll) dependencies of the class files. * * @return a list of library (dll) dependencies of the class files. */ - List getLibraryDependencies(); + Set getLibraryDependencies(); /** * Returns a list of module (netmodule) dependencies of the class files. * * @return a list of module (netmodule) dependencies of the class files. */ - List getModuleDependencies(); + Set getModuleDependencies(); /** * Returns a list of resources that the compiler should link to the compiled assembly * * @return a list of resources that the compiler should link to the compiled assembly */ - List getLinkedResources(); + Set getLinkedResources(); /** * Returns a list of resources that the compiler should embed in the compiled assembly. These may of any mime-type @@ -52,7 +52,7 @@ * * @return a list of resources that the compiler should embed in the compiled assembly. */ - List getEmbeddedResources(); + Set getEmbeddedResources(); /** * Returns the icon that the assembly should display when viewed. Should not be used in conjunction with win32res. @@ -66,5 +66,5 @@ * * @return a list of win32 resources. */ - List getWin32Resources(); + Set getWin32Resources(); } Modified: incubator/nmaven/tags/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-executable/src/org/apache/maven/dotnet/compiler/impl/NetCompilerContextImpl.java URL: http://svn.apache.org/viewvc/incubator/nmaven/tags/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-executable/src/org/apache/maven/dotnet/compiler/impl/NetCompilerContextImpl.java?rev=598049&r1=598048&r2=598049&view=diff ============================================================================== --- incubator/nmaven/tags/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-executable/src/org/apache/maven/dotnet/compiler/impl/NetCompilerContextImpl.java (original) +++ incubator/nmaven/tags/SI_MAVEN_INTEGRATION/sandbox/components/dotnet-executable/src/org/apache/maven/dotnet/compiler/impl/NetCompilerContextImpl.java Sun Nov 25 12:46:28 2007 @@ -4,42 +4,38 @@ import org.apache.maven.dotnet.compiler.Compiler; import org.apache.maven.artifact.Artifact; -import java.util.List; +import java.util.Set; import java.io.File; public class NetCompilerContextImpl implements NetCompilerContext -{ - public List getCoreAssemblyNames() - { - return null; - } - public List getDirectModuleDependencies() +{ + public Set getCoreAssemblyNames() { return null; } - public KeyInfo getKeyInfo() + public Set getDirectModuleDependencies() { return null; } - public List getLibraryDependencies() + public Set getLibraryDependencies() { return null; } - public List getModuleDependencies() + public Set getModuleDependencies() { return null; } - public List getLinkedResources() + public Set getLinkedResources() { return null; } - public List getEmbeddedResources() + public Set getEmbeddedResources() { return null; } @@ -49,13 +45,7 @@ return null; } - public List getWin32Resources() - { - return null; - } - - public File getArtifact() - throws InvalidArtifactException + public Set getWin32Resources() { return null; }