From nmaven-commits-return-41-apmail-incubator-nmaven-commits-archive=incubator.apache.org@incubator.apache.org Thu Dec 28 02:26:26 2006 Return-Path: Delivered-To: apmail-incubator-nmaven-commits-archive@locus.apache.org Received: (qmail 65053 invoked from network); 28 Dec 2006 02:26:25 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 28 Dec 2006 02:26:25 -0000 Received: (qmail 4290 invoked by uid 500); 28 Dec 2006 02:26:32 -0000 Delivered-To: apmail-incubator-nmaven-commits-archive@incubator.apache.org Received: (qmail 4266 invoked by uid 500); 28 Dec 2006 02:26:32 -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 4257 invoked by uid 99); 28 Dec 2006 02:26:32 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 27 Dec 2006 18:26:32 -0800 X-ASF-Spam-Status: No, hits=-9.4 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; Wed, 27 Dec 2006 18:26:24 -0800 Received: by eris.apache.org (Postfix, from userid 65534) id 70D3E1A981A; Wed, 27 Dec 2006 18:25:31 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r490630 - in /incubator/nmaven/branches/SI_NET3: components/dotnet-core/src/main/resources/META-INF/nmaven/ components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/compiler/impl/ components/dotnet-executable/src/main/j... Date: Thu, 28 Dec 2006 02:25:31 -0000 To: nmaven-commits@incubator.apache.org From: sisbell@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20061228022531.70D3E1A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: sisbell Date: Wed Dec 27 18:25:30 2006 New Revision: 490630 URL: http://svn.apache.org/viewvc?view=rev&rev=490630 Log: Support for .NET 3.0 Modified: incubator/nmaven/branches/SI_NET3/components/dotnet-core/src/main/resources/META-INF/nmaven/compiler-plugins.xml incubator/nmaven/branches/SI_NET3/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/compiler/impl/CSharpCompilerForProfile.java incubator/nmaven/branches/SI_NET3/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/compiler/impl/DefaultCompiler.java incubator/nmaven/branches/SI_NET3/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/impl/CompilerContextImpl.java incubator/nmaven/branches/SI_NET3/integration-tests/tests/README.txt incubator/nmaven/branches/SI_NET3/integration-tests/tests/integration-tests.txt incubator/nmaven/branches/SI_NET3/integration-tests/tests/it0021/pom.xml incubator/nmaven/branches/SI_NET3/plugins/maven-compile-plugin/src/main/java/org/apache/maven/dotnet/plugin/compile/TestCompilerMojo.java incubator/nmaven/branches/SI_NET3/plugins/nmaven-utility-resx/pom.xml incubator/nmaven/branches/SI_NET3/plugins/nmaven-utility-settings/src/main/csharp/SettingsGenerator.cs Modified: incubator/nmaven/branches/SI_NET3/components/dotnet-core/src/main/resources/META-INF/nmaven/compiler-plugins.xml URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_NET3/components/dotnet-core/src/main/resources/META-INF/nmaven/compiler-plugins.xml?view=diff&rev=490630&r1=490629&r2=490630 ============================================================================== --- incubator/nmaven/branches/SI_NET3/components/dotnet-core/src/main/resources/META-INF/nmaven/compiler-plugins.xml (original) +++ incubator/nmaven/branches/SI_NET3/components/dotnet-core/src/main/resources/META-INF/nmaven/compiler-plugins.xml Wed Dec 27 18:25:30 2006 @@ -60,6 +60,7 @@ FULL 2.0.50727 + 3.0 Modified: incubator/nmaven/branches/SI_NET3/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/compiler/impl/CSharpCompilerForProfile.java URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_NET3/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/compiler/impl/CSharpCompilerForProfile.java?view=diff&rev=490630&r1=490629&r2=490630 ============================================================================== --- incubator/nmaven/branches/SI_NET3/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/compiler/impl/CSharpCompilerForProfile.java (original) +++ incubator/nmaven/branches/SI_NET3/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/compiler/impl/CSharpCompilerForProfile.java Wed Dec 27 18:25:30 2006 @@ -89,7 +89,6 @@ public List getCommands() throws ExecutionException { - String fv = compilerContext.getCompilerRequirement().getFrameworkVersion(); File path = new File( compilerContext.getCompilerCapability().getAssemblyPath() ); if ( !path.exists() ) { Modified: incubator/nmaven/branches/SI_NET3/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/compiler/impl/DefaultCompiler.java URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_NET3/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/compiler/impl/DefaultCompiler.java?view=diff&rev=490630&r1=490629&r2=490630 ============================================================================== --- incubator/nmaven/branches/SI_NET3/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/compiler/impl/DefaultCompiler.java (original) +++ incubator/nmaven/branches/SI_NET3/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/compiler/impl/DefaultCompiler.java Wed Dec 27 18:25:30 2006 @@ -140,11 +140,28 @@ commands.add( "/nologo" ); } - if(compilerContext.getKeyInfo().getKeyFileUri() != null) + if ( compilerContext.getCompilerRequirement().getVendor().equals( Vendor.MICROSOFT ) && + compilerContext.getCompilerRequirement().getFrameworkVersion().equals( "3.0" ) ) { - commands.add("/keyfile:" + compilerContext.getKeyInfo().getKeyFileUri()); - } else if(compilerContext.getKeyInfo().getKeyContainerName() != null) { - commands.add("/keycontainer:" + compilerContext.getKeyInfo().getKeyContainerName()); + String wcfRef = + "/reference:C:\\WINDOWS\\Microsoft.NET\\Framework\\v3.0\\Windows Communication Foundation\\"; + //TODO: This is a hard-coded path: Don't have a registry value either. + commands.add( wcfRef + "System.ServiceModel.dll" ); + commands.add( wcfRef + "Microsoft.Transactions.Bridge.dll" ); + commands.add( wcfRef + "Microsoft.Transactions.Bridge.Dtc.dll" ); + commands.add( wcfRef + "System.ServiceModel.Install.dll" ); + commands.add( wcfRef + "System.ServiceModel.WasHosting.dll" ); + commands.add( wcfRef + "System.Runtime.Serialization.dll" ); + commands.add( wcfRef + "SMDiagnostics.dll" ); + } + + if ( compilerContext.getKeyInfo().getKeyFileUri() != null ) + { + commands.add( "/keyfile:" + compilerContext.getKeyInfo().getKeyFileUri() ); + } + else if ( compilerContext.getKeyInfo().getKeyContainerName() != null ) + { + commands.add( "/keycontainer:" + compilerContext.getKeyInfo().getKeyContainerName() ); } if ( config.getCommands() != null ) Modified: incubator/nmaven/branches/SI_NET3/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/impl/CompilerContextImpl.java URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_NET3/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/impl/CompilerContextImpl.java?view=diff&rev=490630&r1=490629&r2=490630 ============================================================================== --- incubator/nmaven/branches/SI_NET3/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/impl/CompilerContextImpl.java (original) +++ incubator/nmaven/branches/SI_NET3/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/impl/CompilerContextImpl.java Wed Dec 27 18:25:30 2006 @@ -153,6 +153,7 @@ { libraries.add( project.getArtifact() ); } + return libraries; } @@ -241,7 +242,7 @@ modules = new ArrayList(); artifactContext.init( project, config.getLocalRepository() ); - Set artifacts = project.getDependencyArtifacts(); + Set artifacts = project.getDependencyArtifacts();//Can add WFC deps prior for ( Artifact artifact : artifacts ) { String type = artifact.getType(); Modified: incubator/nmaven/branches/SI_NET3/integration-tests/tests/README.txt URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_NET3/integration-tests/tests/README.txt?view=diff&rev=490630&r1=490629&r2=490630 ============================================================================== --- incubator/nmaven/branches/SI_NET3/integration-tests/tests/README.txt (original) +++ incubator/nmaven/branches/SI_NET3/integration-tests/tests/README.txt Wed Dec 27 18:25:30 2006 @@ -6,7 +6,7 @@ it0006: PATH: Generate a class binding from a schema it0007: PATH: Generate a schema from an XML instance and then create a class binding from the generated schema it0008: PATH: Generate a WSDL (not included) -it0009: Test ccnet plugin (run manually: change m2Home in ccnet.config and then type ccnet from the commandline). +it0009: Removed it0010: VB-MS: Build a library that is dependent on a .netmodule it0011: CS-MONO: Build a library that is dependent on a .netmodule it0012: CS-GNU: Build a .netmodule @@ -17,4 +17,8 @@ it0017: CS-GNU: Run an NUnit test that uses library dependencies. it0018: CS-MS-v1.1: Build a library with version 1.1 of the framework (verify manually by looking at the dll manifest) it0019: CS-MS-Compact: Build a library with the COMPACT framework (windows only) -it0020: CS-MS-Resources: Generate resource file and embed into assembly \ No newline at end of file +it0020: CS-MS-Resources: Generate resource file and embed into assembly +it0021: VB: Resource generation for VB +it0022: Signing of an assembly (verify manually by looking for the signature in the manifest) +it0023: CS-MS: .NET 3.0 compiling +it0024: CS-MS: .NET 3.0 NUnit \ No newline at end of file Modified: incubator/nmaven/branches/SI_NET3/integration-tests/tests/integration-tests.txt URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_NET3/integration-tests/tests/integration-tests.txt?view=diff&rev=490630&r1=490629&r2=490630 ============================================================================== --- incubator/nmaven/branches/SI_NET3/integration-tests/tests/integration-tests.txt (original) +++ incubator/nmaven/branches/SI_NET3/integration-tests/tests/integration-tests.txt Wed Dec 27 18:25:30 2006 @@ -14,4 +14,6 @@ it0018 it0019 it0020 -it0021 \ No newline at end of file +it0021 +it0022 +it0023 \ No newline at end of file Modified: incubator/nmaven/branches/SI_NET3/integration-tests/tests/it0021/pom.xml URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_NET3/integration-tests/tests/it0021/pom.xml?view=diff&rev=490630&r1=490629&r2=490630 ============================================================================== --- incubator/nmaven/branches/SI_NET3/integration-tests/tests/it0021/pom.xml (original) +++ incubator/nmaven/branches/SI_NET3/integration-tests/tests/it0021/pom.xml Wed Dec 27 18:25:30 2006 @@ -1,22 +1,22 @@ - 4.0.0 - org.apache.maven.it - it0021 - library - 1.0.0 - it0021 + 4.0.0 + org.apache.maven.it + it0021 + library + 1.0.0 + it0021 - - src/main/vb - - - org.apache.maven.dotnet.plugins - maven-compile-plugin - true - - VB - - - - + + src/main/vb + + + org.apache.maven.dotnet.plugins + maven-compile-plugin + true + + VB + + + + Modified: incubator/nmaven/branches/SI_NET3/plugins/maven-compile-plugin/src/main/java/org/apache/maven/dotnet/plugin/compile/TestCompilerMojo.java URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_NET3/plugins/maven-compile-plugin/src/main/java/org/apache/maven/dotnet/plugin/compile/TestCompilerMojo.java?view=diff&rev=490630&r1=490629&r2=490630 ============================================================================== --- incubator/nmaven/branches/SI_NET3/plugins/maven-compile-plugin/src/main/java/org/apache/maven/dotnet/plugin/compile/TestCompilerMojo.java (original) +++ incubator/nmaven/branches/SI_NET3/plugins/maven-compile-plugin/src/main/java/org/apache/maven/dotnet/plugin/compile/TestCompilerMojo.java Wed Dec 27 18:25:30 2006 @@ -76,6 +76,11 @@ private String testFrameworkVersion; /** + * @parameter expression = "${frameworkVersion}" + */ + private String frameworkVersion; + + /** * The Vendor for the Compiler. Supports MONO and MICROSOFT: the default value is MICROSOFT. Not * case or white-space sensitive. * @@ -140,6 +145,10 @@ if ( testVendor == null ) { testVendor = vendor; + } + if ( testFrameworkVersion == null ) + { + testFrameworkVersion = frameworkVersion; } //Requirement Modified: incubator/nmaven/branches/SI_NET3/plugins/nmaven-utility-resx/pom.xml URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_NET3/plugins/nmaven-utility-resx/pom.xml?view=diff&rev=490630&r1=490629&r2=490630 ============================================================================== --- incubator/nmaven/branches/SI_NET3/plugins/nmaven-utility-resx/pom.xml (original) +++ incubator/nmaven/branches/SI_NET3/plugins/nmaven-utility-resx/pom.xml Wed Dec 27 18:25:30 2006 @@ -13,6 +13,9 @@ org.apache.maven.dotnet.plugins maven-compile-plugin true + + 3.0 + Modified: incubator/nmaven/branches/SI_NET3/plugins/nmaven-utility-settings/src/main/csharp/SettingsGenerator.cs URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_NET3/plugins/nmaven-utility-settings/src/main/csharp/SettingsGenerator.cs?view=diff&rev=490630&r1=490629&r2=490630 ============================================================================== --- incubator/nmaven/branches/SI_NET3/plugins/nmaven-utility-settings/src/main/csharp/SettingsGenerator.cs (original) +++ incubator/nmaven/branches/SI_NET3/plugins/nmaven-utility-settings/src/main/csharp/SettingsGenerator.cs Wed Dec 27 18:25:30 2006 @@ -187,9 +187,10 @@ string installRoot = (string) microsoftRegistryKey.GetValue("InstallRoot"); if(installRoot == null) throw new ExecutionException("NMAVEN-9011-005"); - nmavenSettingsVendor[] vendors = new nmavenSettingsVendor[2]; + nmavenSettingsVendor[] vendors = new nmavenSettingsVendor[3]; DirectoryInfo dirInfo11 = new DirectoryInfo(Path.Combine(installRoot, "v1.1.4322")); DirectoryInfo dirInfo20 = new DirectoryInfo(Path.Combine(installRoot, "v2.0.50727")); + DirectoryInfo dirInfo30 = new DirectoryInfo(Path.Combine(installRoot, "v3.0")); int vendorCounter = 0; if (dirInfo11.Exists) { @@ -213,6 +214,19 @@ nmavenSettingsVendorFramework vf11 = new nmavenSettingsVendorFramework(); vf11.installRoot = dirInfo20.FullName; vf11.frameworkVersion = "2.0.50727"; + vendorFrameworks[0] = vf11; + vendor.frameworks = vendorFrameworks; + vendors[vendorCounter++] = vendor; + } + if (dirInfo30.Exists) + { + nmavenSettingsVendor vendor = new nmavenSettingsVendor(); + vendor.vendorName = "MICROSOFT"; + vendor.vendorVersion = "3.0"; + nmavenSettingsVendorFramework[] vendorFrameworks = new nmavenSettingsVendorFramework[1]; + nmavenSettingsVendorFramework vf11 = new nmavenSettingsVendorFramework(); + vf11.installRoot = dirInfo30.FullName; + vf11.frameworkVersion = "3.0"; vendorFrameworks[0] = vf11; vendor.frameworks = vendorFrameworks; vendors[vendorCounter++] = vendor;