From nmaven-commits-return-175-apmail-incubator-nmaven-commits-archive=incubator.apache.org@incubator.apache.org Wed Mar 14 06:08:28 2007 Return-Path: Delivered-To: apmail-incubator-nmaven-commits-archive@locus.apache.org Received: (qmail 80041 invoked from network); 14 Mar 2007 06:08:27 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 14 Mar 2007 06:08:27 -0000 Received: (qmail 3664 invoked by uid 500); 14 Mar 2007 06:08:36 -0000 Delivered-To: apmail-incubator-nmaven-commits-archive@incubator.apache.org Received: (qmail 3636 invoked by uid 500); 14 Mar 2007 06:08:36 -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 3627 invoked by uid 99); 14 Mar 2007 06:08:35 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 13 Mar 2007 23:08:35 -0700 X-ASF-Spam-Status: No, hits=-99.5 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME 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; Tue, 13 Mar 2007 23:08:26 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 85E2A1A9838; Tue, 13 Mar 2007 23:08:06 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r518030 - in /incubator/nmaven/branches/SI_IDE/components/dotnet-assembler: ./ src/main/java/org/apache/maven/dotnet/assembler/ src/main/java/org/apache/maven/dotnet/assembler/impl/ Date: Wed, 14 Mar 2007 06:08:06 -0000 To: nmaven-commits@incubator.apache.org From: sisbell@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070314060806.85E2A1A9838@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: sisbell Date: Tue Mar 13 23:08:03 2007 New Revision: 518030 URL: http://svn.apache.org/viewvc?view=rev&rev=518030 Log: Added support for getting the extension of a language from the context. This is needed because some plugins need know the language extension to know what to copy from the source directory into the build directory (this in turn is related the project structure necessary for IDE). Modified: incubator/nmaven/branches/SI_IDE/components/dotnet-assembler/pom.xml incubator/nmaven/branches/SI_IDE/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/AssemblerContext.java incubator/nmaven/branches/SI_IDE/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/impl/AssemblerContextImpl.java incubator/nmaven/branches/SI_IDE/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/impl/AssemblyPluginsRepository.java incubator/nmaven/branches/SI_IDE/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/impl/JavaAssemblyInfoMarshaller.java incubator/nmaven/branches/SI_IDE/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/impl/VBAssemblyInfoMarshaller.java Modified: incubator/nmaven/branches/SI_IDE/components/dotnet-assembler/pom.xml URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_IDE/components/dotnet-assembler/pom.xml?view=diff&rev=518030&r1=518029&r2=518030 ============================================================================== --- incubator/nmaven/branches/SI_IDE/components/dotnet-assembler/pom.xml (original) +++ incubator/nmaven/branches/SI_IDE/components/dotnet-assembler/pom.xml Tue Mar 13 23:08:03 2007 @@ -1,57 +1,43 @@ - - - org.apache.maven.dotnet - 0.14-SNAPSHOT - dotnet-components - - 4.0.0 + + org.apache.maven.dotnet - dotnet-assembler 0.14-SNAPSHOT - dotnet-assembler - - NMaven - - - - - - org.apache.maven - maven-plugin-api - 2.0.4 - - - org.apache.maven - maven-project - 2.0.4 - - - org.apache.maven.dotnet - dotnet-model-assembly-plugins - 0.14-SNAPSHOT - - - org.apache.maven.dotnet - dotnet-artifact - 0.14-SNAPSHOT - - - org.apache.maven.dotnet - dotnet-core - 0.14-SNAPSHOT - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.5 - 1.5 - - - - + dotnet-components + + 4.0.0 + org.apache.maven.dotnet + dotnet-assembler + 0.14-SNAPSHOT + dotnet-assembler + + NMaven + + + + org.apache.maven + maven-plugin-api + 2.0.4 + + + org.apache.maven + maven-project + 2.0.4 + + + org.apache.maven.dotnet + dotnet-model-assembly-plugins + 0.14-SNAPSHOT + + + org.apache.maven.dotnet + dotnet-artifact + 0.14-SNAPSHOT + + + org.apache.maven.dotnet + dotnet-core + 0.14-SNAPSHOT + + Modified: incubator/nmaven/branches/SI_IDE/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/AssemblerContext.java URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_IDE/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/AssemblerContext.java?view=diff&rev=518030&r1=518029&r2=518030 ============================================================================== --- incubator/nmaven/branches/SI_IDE/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/AssemblerContext.java (original) +++ incubator/nmaven/branches/SI_IDE/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/AssemblerContext.java Tue Mar 13 23:08:03 2007 @@ -19,6 +19,7 @@ package org.apache.maven.dotnet.assembler; import org.apache.maven.dotnet.InitializationException; +import org.apache.maven.dotnet.PlatformUnsupportedException; import org.apache.maven.project.MavenProject; /** @@ -50,6 +51,15 @@ */ AssemblyInfoMarshaller getAssemblyInfoMarshallerFor( String language ) throws AssemblyInfoException; + + /** + * Returns the class extension (cs, vb) for the specified language. + * + * @param language the class language. Must match language within the assembly-plugins.xml file. + * @return the class extension (cs, vb) for the specified language. + * @throws PlatformUnsupportedException the language is not supported + */ + String getClassExtensionFor(String language) throws PlatformUnsupportedException; /** * Initializes the context Modified: incubator/nmaven/branches/SI_IDE/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/impl/AssemblerContextImpl.java URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_IDE/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/impl/AssemblerContextImpl.java?view=diff&rev=518030&r1=518029&r2=518030 ============================================================================== --- incubator/nmaven/branches/SI_IDE/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/impl/AssemblerContextImpl.java (original) +++ incubator/nmaven/branches/SI_IDE/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/impl/AssemblerContextImpl.java Tue Mar 13 23:08:03 2007 @@ -23,6 +23,7 @@ import org.apache.maven.dotnet.assembler.AssemblyInfoMarshaller; import org.apache.maven.dotnet.assembler.AssemblyInfoException; import org.apache.maven.dotnet.InitializationException; +import org.apache.maven.dotnet.PlatformUnsupportedException; import org.apache.maven.dotnet.model.assembly.plugins.AssemblyPlugin; import org.apache.maven.project.MavenProject; import org.apache.maven.model.Organization; @@ -161,6 +162,21 @@ } return marshaller; + } + + /** + * @see AssemblerContext#getClassExtensionFor(String) + */ + public String getClassExtensionFor(String language) throws PlatformUnsupportedException + { + try + { + return repository.getAssemblyPluginFor( language ).getExtension(); + } + catch ( AssemblyInfoException e ) + { + throw new PlatformUnsupportedException("NMAVEN-020-006: Language not supported: Language = " + language, e); + } } /** Modified: incubator/nmaven/branches/SI_IDE/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/impl/AssemblyPluginsRepository.java URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_IDE/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/impl/AssemblyPluginsRepository.java?view=diff&rev=518030&r1=518029&r2=518030 ============================================================================== --- incubator/nmaven/branches/SI_IDE/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/impl/AssemblyPluginsRepository.java (original) +++ incubator/nmaven/branches/SI_IDE/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/impl/AssemblyPluginsRepository.java Tue Mar 13 23:08:03 2007 @@ -38,7 +38,7 @@ * * @author Shane Isbell */ -public class AssemblyPluginsRepository +public final class AssemblyPluginsRepository implements Repository { @@ -87,6 +87,9 @@ } } + /** + * @see Repository#setRepositoryRegistry(org.apache.maven.dotnet.registry.RepositoryRegistry) + */ public void setRepositoryRegistry( RepositoryRegistry repositoryRegistry ) { } @@ -106,7 +109,7 @@ * Returns an assembly plugin for the specified programming language. * * @param language the programming language to use for matching an assembly plugin - * @return assembly plugin for the specified programming language + * @return assembly plugin for the specified programming language. May not be null. * @throws AssemblyInfoException if there is no plugin for the specified language */ public AssemblyPlugin getAssemblyPluginFor( String language ) Modified: incubator/nmaven/branches/SI_IDE/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/impl/JavaAssemblyInfoMarshaller.java URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_IDE/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/impl/JavaAssemblyInfoMarshaller.java?view=diff&rev=518030&r1=518029&r2=518030 ============================================================================== --- incubator/nmaven/branches/SI_IDE/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/impl/JavaAssemblyInfoMarshaller.java (original) +++ incubator/nmaven/branches/SI_IDE/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/impl/JavaAssemblyInfoMarshaller.java Tue Mar 13 23:08:03 2007 @@ -67,9 +67,11 @@ FileOutputStream man = null; try { - File file = new File( src + "/META-INF/net/sf/nmaven" ); + String groupIdAsDir = mavenProject.getGroupId().replace( ".", File.separator ); + File file = new File( src + "/META-INF/" + groupIdAsDir ); file.mkdirs(); - man = new FileOutputStream( src + "/META-INF/net/sf/nmaven/AssemblyInfo." + plugin.getExtension() ); + man = new FileOutputStream( + src + "/META-INF/" + groupIdAsDir + File.separator + "AssemblyInfo." + plugin.getExtension() ); man.write( sb.toString().getBytes() ); } catch ( IOException e ) Modified: incubator/nmaven/branches/SI_IDE/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/impl/VBAssemblyInfoMarshaller.java URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_IDE/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/impl/VBAssemblyInfoMarshaller.java?view=diff&rev=518030&r1=518029&r2=518030 ============================================================================== --- incubator/nmaven/branches/SI_IDE/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/impl/VBAssemblyInfoMarshaller.java (original) +++ incubator/nmaven/branches/SI_IDE/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/impl/VBAssemblyInfoMarshaller.java Tue Mar 13 23:08:03 2007 @@ -68,9 +68,11 @@ FileOutputStream man = null; try { - File file = new File( src + "/META-INF/net/sf/nmaven" ); + String groupIdAsDir = mavenProject.getGroupId().replace( ".", File.separator ); + File file = new File( src + "/META-INF/" + groupIdAsDir ); file.mkdirs(); - man = new FileOutputStream( src + "/META-INF/net/sf/nmaven/AssemblyInfo." + plugin.getExtension() ); + man = new FileOutputStream( + src + "/META-INF/" + groupIdAsDir + File.separator + "AssemblyInfo." + plugin.getExtension() ); man.write( sb.toString().getBytes() ); } catch ( IOException e )