incubator-nmaven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sisb...@apache.org
Subject svn commit: r636129 - in /incubator/nmaven/trunk: ./ components/ components/maven-dotnet-compiler/ components/maven-dotnet-compiler/src/main/java/org/apache/maven/dotnet/compiler/impl/ components/maven-dotnet-extensions/ components/maven-dotnet-extensi...
Date Tue, 11 Mar 2008 22:21:05 GMT
Author: sisbell
Date: Tue Mar 11 15:20:54 2008
New Revision: 636129

URL: http://svn.apache.org/viewvc?rev=636129&view=rev
Log:
Updated with better toolchain support.

Added:
    incubator/nmaven/trunk/components/maven-dotnet-toolchain/
    incubator/nmaven/trunk/components/maven-dotnet-toolchain/pom.xml
      - copied, changed from r633575, incubator/nmaven/trunk/components/maven-dotnet-extensions/pom.xml
    incubator/nmaven/trunk/components/maven-dotnet-toolchain/src/
    incubator/nmaven/trunk/components/maven-dotnet-toolchain/src/main/
    incubator/nmaven/trunk/components/maven-dotnet-toolchain/src/main/java/
    incubator/nmaven/trunk/components/maven-dotnet-toolchain/src/main/java/org/
    incubator/nmaven/trunk/components/maven-dotnet-toolchain/src/main/java/org/apache/
    incubator/nmaven/trunk/components/maven-dotnet-toolchain/src/main/java/org/apache/maven/
    incubator/nmaven/trunk/components/maven-dotnet-toolchain/src/main/java/org/apache/maven/dotnet/
    incubator/nmaven/trunk/components/maven-dotnet-toolchain/src/main/java/org/apache/maven/dotnet/toolchain/
    incubator/nmaven/trunk/components/maven-dotnet-toolchain/src/main/java/org/apache/maven/dotnet/toolchain/ConfigurationTag.java
    incubator/nmaven/trunk/components/maven-dotnet-toolchain/src/main/java/org/apache/maven/dotnet/toolchain/DotnetToolchain.java
    incubator/nmaven/trunk/components/maven-dotnet-toolchain/src/main/java/org/apache/maven/dotnet/toolchain/DotnetToolchainFactory.java
    incubator/nmaven/trunk/components/maven-dotnet-toolchain/src/main/java/org/apache/maven/dotnet/toolchain/ProvidesTag.java
    incubator/nmaven/trunk/components/maven-dotnet-toolchain/src/main/resources/
    incubator/nmaven/trunk/components/maven-dotnet-toolchain/src/main/resources/META-INF/
    incubator/nmaven/trunk/components/maven-dotnet-toolchain/src/main/resources/META-INF/plexus/
    incubator/nmaven/trunk/components/maven-dotnet-toolchain/src/main/resources/META-INF/plexus/components.xml
      - copied, changed from r633575, incubator/nmaven/trunk/components/maven-dotnet-extensions/src/main/resources/META-INF/plexus/components.xml
Removed:
    incubator/nmaven/trunk/components/maven-dotnet-extensions/src/main/java/org/apache/maven/dotnet/extensions/toolchain/
    incubator/nmaven/trunk/components/maven-dotnet-extensions/src/main/resources/META-INF/plexus/
Modified:
    incubator/nmaven/trunk/components/maven-dotnet-compiler/pom.xml
    incubator/nmaven/trunk/components/maven-dotnet-compiler/src/main/java/org/apache/maven/dotnet/compiler/impl/DotnetCompilerContextImpl.java
    incubator/nmaven/trunk/components/maven-dotnet-extensions/pom.xml
    incubator/nmaven/trunk/components/pom.xml
    incubator/nmaven/trunk/core-integration-tests/src/test/resources/MavenITmng-0000-CSharpCompileLibrary/pom.xml
    incubator/nmaven/trunk/maven-dotnet.iml
    incubator/nmaven/trunk/plugins/maven-dotnet-compiler-plugin/pom.xml
    incubator/nmaven/trunk/plugins/maven-dotnet-compiler-plugin/src/main/java/org/apache/maven/dotnet/plugin/compiler/CompilerMojo.java
    incubator/nmaven/trunk/plugins/maven-dotnet-compiler-plugin/src/main/resources/META-INF/plexus/components.xml
    incubator/nmaven/trunk/pom.xml

Modified: incubator/nmaven/trunk/components/maven-dotnet-compiler/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/components/maven-dotnet-compiler/pom.xml?rev=636129&r1=636128&r2=636129&view=diff
==============================================================================
--- incubator/nmaven/trunk/components/maven-dotnet-compiler/pom.xml (original)
+++ incubator/nmaven/trunk/components/maven-dotnet-compiler/pom.xml Tue Mar 11 15:20:54 2008
@@ -56,9 +56,8 @@
       <artifactId>plexus-utils</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.maven.shared</groupId>
+      <groupId>org.apache.maven</groupId>
       <artifactId>maven-toolchain</artifactId>
-      <version>1.0-SNAPSHOT</version>
     </dependency>       
   </dependencies>
 </project>

Modified: incubator/nmaven/trunk/components/maven-dotnet-compiler/src/main/java/org/apache/maven/dotnet/compiler/impl/DotnetCompilerContextImpl.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/components/maven-dotnet-compiler/src/main/java/org/apache/maven/dotnet/compiler/impl/DotnetCompilerContextImpl.java?rev=636129&r1=636128&r2=636129&view=diff
==============================================================================
--- incubator/nmaven/trunk/components/maven-dotnet-compiler/src/main/java/org/apache/maven/dotnet/compiler/impl/DotnetCompilerContextImpl.java
(original)
+++ incubator/nmaven/trunk/components/maven-dotnet-compiler/src/main/java/org/apache/maven/dotnet/compiler/impl/DotnetCompilerContextImpl.java
Tue Mar 11 15:20:54 2008
@@ -184,6 +184,7 @@
             throw new IllegalArgumentException( "NMAVEN-061-001: compilerConfig" );
         }
 
+        this.toolchain = toolchain;
         this.project = project;
         this.netCompilerConfig = (DotnetCompilerConfig) compilerConfig;
         netCompilerConfig.verifyCompilerConfig();

Modified: incubator/nmaven/trunk/components/maven-dotnet-extensions/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/components/maven-dotnet-extensions/pom.xml?rev=636129&r1=636128&r2=636129&view=diff
==============================================================================
--- incubator/nmaven/trunk/components/maven-dotnet-extensions/pom.xml (original)
+++ incubator/nmaven/trunk/components/maven-dotnet-extensions/pom.xml Tue Mar 11 15:20:54
2008
@@ -44,12 +44,7 @@
       <groupId>org.apache.maven.dotnet</groupId>
       <artifactId>maven-dotnet-compiler</artifactId>
       <version>0.16-incubating-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven.shared</groupId>
-      <artifactId>maven-toolchain</artifactId>
-      <version>1.0-SNAPSHOT</version>
-    </dependency>
+    </dependency>   
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-artifact</artifactId>

Copied: incubator/nmaven/trunk/components/maven-dotnet-toolchain/pom.xml (from r633575, incubator/nmaven/trunk/components/maven-dotnet-extensions/pom.xml)
URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/components/maven-dotnet-toolchain/pom.xml?p2=incubator/nmaven/trunk/components/maven-dotnet-toolchain/pom.xml&p1=incubator/nmaven/trunk/components/maven-dotnet-extensions/pom.xml&r1=633575&r2=636129&rev=636129&view=diff
==============================================================================
--- incubator/nmaven/trunk/components/maven-dotnet-extensions/pom.xml (original)
+++ incubator/nmaven/trunk/components/maven-dotnet-toolchain/pom.xml Tue Mar 11 15:20:54 2008
@@ -18,7 +18,8 @@
 specific language governing permissions and limitations
 under the License.
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
     <groupId>org.apache.maven.dotnet</groupId>
     <version>0.16-incubating-SNAPSHOT</version>
@@ -26,17 +27,12 @@
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.maven.dotnet</groupId>
-  <artifactId>maven-dotnet-extensions</artifactId>
-  <name>Apache NMaven: maven-dotnet-extensions</name>
+  <artifactId>maven-dotnet-toolchain</artifactId>
+  <name>Apache NMaven: maven-dotnet-toolchain</name>
   <description>NMaven</description>
   <dependencies>
     <dependency>
       <groupId>org.apache.maven.dotnet</groupId>
-      <artifactId>maven-dotnet-assembler</artifactId>
-      <version>0.16-incubating-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven.dotnet</groupId>
       <artifactId>maven-dotnet-core</artifactId>
       <version>0.16-incubating-SNAPSHOT</version>
     </dependency>
@@ -44,15 +40,22 @@
       <groupId>org.apache.maven.dotnet</groupId>
       <artifactId>maven-dotnet-compiler</artifactId>
       <version>0.16-incubating-SNAPSHOT</version>
-    </dependency>
+    </dependency>    
     <dependency>
-      <groupId>org.apache.maven.shared</groupId>
+      <groupId>org.apache.maven</groupId>
       <artifactId>maven-toolchain</artifactId>
-      <version>1.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-artifact</artifactId>
+      <groupId>org.codehaus.plexus</groupId>
+      <artifactId>plexus-utils</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.codehaus.plexus</groupId>
+      <artifactId>plexus-component-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.codehaus.plexus</groupId>
+      <artifactId>plexus-container-default</artifactId>
     </dependency>
   </dependencies>
 </project>

Added: incubator/nmaven/trunk/components/maven-dotnet-toolchain/src/main/java/org/apache/maven/dotnet/toolchain/ConfigurationTag.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/components/maven-dotnet-toolchain/src/main/java/org/apache/maven/dotnet/toolchain/ConfigurationTag.java?rev=636129&view=auto
==============================================================================
--- incubator/nmaven/trunk/components/maven-dotnet-toolchain/src/main/java/org/apache/maven/dotnet/toolchain/ConfigurationTag.java
(added)
+++ incubator/nmaven/trunk/components/maven-dotnet-toolchain/src/main/java/org/apache/maven/dotnet/toolchain/ConfigurationTag.java
Tue Mar 11 15:20:54 2008
@@ -0,0 +1,20 @@
+package org.apache.maven.dotnet.toolchain;
+
+public enum ConfigurationTag
+{
+    CSharpCompiler("csharpCompiler"),
+    NUnitConsole("nunitConsole");
+
+    private String tagName;
+
+    ConfigurationTag(String tagName)
+    {
+        this.tagName = tagName;
+    }
+
+    public String getTagName()
+    {
+        return tagName;
+    }
+
+}

Added: incubator/nmaven/trunk/components/maven-dotnet-toolchain/src/main/java/org/apache/maven/dotnet/toolchain/DotnetToolchain.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/components/maven-dotnet-toolchain/src/main/java/org/apache/maven/dotnet/toolchain/DotnetToolchain.java?rev=636129&view=auto
==============================================================================
--- incubator/nmaven/trunk/components/maven-dotnet-toolchain/src/main/java/org/apache/maven/dotnet/toolchain/DotnetToolchain.java
(added)
+++ incubator/nmaven/trunk/components/maven-dotnet-toolchain/src/main/java/org/apache/maven/dotnet/toolchain/DotnetToolchain.java
Tue Mar 11 15:20:54 2008
@@ -0,0 +1,72 @@
+package org.apache.maven.dotnet.toolchain;
+
+import org.apache.maven.toolchain.DefaultToolchain;
+import org.apache.maven.toolchain.model.ToolchainModel;
+import org.apache.maven.dotnet.Vendor;
+import org.apache.maven.dotnet.compiler.DotnetCompilerPlatformVersion;
+import org.codehaus.plexus.logging.Logger;
+import org.codehaus.plexus.util.xml.Xpp3Dom;
+
+import java.util.List;
+import java.util.Arrays;
+
+public final class DotnetToolchain
+    extends DefaultToolchain
+{
+    private String csharpCompiler;
+
+    private String nunitConsole;
+
+    public DotnetToolchain( ToolchainModel model, Logger logger )
+    {
+        this( model, null, logger );
+    }
+
+    public Vendor getVendor()
+    {
+        return Vendor.MICROSOFT;
+    }
+
+    public DotnetCompilerPlatformVersion getDotnetCompilerPlatformVersion()
+    {
+        return DotnetCompilerPlatformVersion.VERSION_2_0_50727;        
+    }
+
+    public DotnetToolchain( ToolchainModel model, String type, Logger logger )
+    {
+        super( model, type, logger );
+        Xpp3Dom dom = (Xpp3Dom) model.getConfiguration();
+        List<Xpp3Dom> configurations = Arrays.asList( dom.getChildren() );
+        for ( Xpp3Dom configuration : configurations )
+        {
+            String key = configuration.getName();
+            String value = configuration.getValue();
+            if ( ConfigurationTag.CSharpCompiler.getTagName().equals( key ) )
+            {
+                this.csharpCompiler = value;
+            }
+            else if(ConfigurationTag.NUnitConsole.getTagName().equals( key ))
+            {
+                this.nunitConsole = value;
+            }
+        }
+    }
+
+    public String findTool( String toolName )
+    {
+        if ( toolName == null || toolName.isEmpty() )
+        {
+            throw new IllegalArgumentException( "toolName" );
+        }
+
+        if ( toolName.equals( ConfigurationTag.CSharpCompiler.getTagName() ) )
+        {
+            return csharpCompiler;
+        }
+        else if(toolName.equals( ConfigurationTag.NUnitConsole.getTagName() ))
+        {
+            return nunitConsole;
+        }
+        return null;
+    }      
+}

Added: incubator/nmaven/trunk/components/maven-dotnet-toolchain/src/main/java/org/apache/maven/dotnet/toolchain/DotnetToolchainFactory.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/components/maven-dotnet-toolchain/src/main/java/org/apache/maven/dotnet/toolchain/DotnetToolchainFactory.java?rev=636129&view=auto
==============================================================================
--- incubator/nmaven/trunk/components/maven-dotnet-toolchain/src/main/java/org/apache/maven/dotnet/toolchain/DotnetToolchainFactory.java
(added)
+++ incubator/nmaven/trunk/components/maven-dotnet-toolchain/src/main/java/org/apache/maven/dotnet/toolchain/DotnetToolchainFactory.java
Tue Mar 11 15:20:54 2008
@@ -0,0 +1,65 @@
+package org.apache.maven.dotnet.toolchain;
+
+import org.apache.maven.toolchain.ToolchainFactory;
+import org.apache.maven.toolchain.ToolchainPrivate;
+import org.apache.maven.toolchain.MisconfiguredToolchainException;
+import org.apache.maven.toolchain.RequirementMatcherFactory;
+import org.apache.maven.toolchain.model.ToolchainModel;
+import org.codehaus.plexus.logging.LogEnabled;
+import org.codehaus.plexus.logging.Logger;
+import org.codehaus.plexus.util.xml.Xpp3Dom;
+
+import java.util.Arrays;
+import java.util.List;
+
+public final class DotnetToolchainFactory
+    implements ToolchainFactory, LogEnabled
+{
+    private Logger logger;
+
+    public ToolchainPrivate createToolchain( ToolchainModel model )
+        throws MisconfiguredToolchainException
+    {
+        if ( model == null )
+        {
+            throw new MisconfiguredToolchainException("Toolchain model is null");
+        }
+
+        DotnetToolchain dotnetToolchain = new DotnetToolchain( model, logger );
+
+        Xpp3Dom dom = (Xpp3Dom) model.getProvides();
+        List<Xpp3Dom> provides = Arrays.asList(dom.getChildren());
+
+        for(Xpp3Dom provide: provides)
+        {
+            String key = provide.getName();
+            String value = provide.getValue();
+            if ( value == null )
+            {
+                throw new MisconfiguredToolchainException(
+                    "Provides token '" + key + "' doesn't have any value configured." );
+            }
+            else if ( ProvidesTag.FrameworkVersion.getTagName().equals( key ) ||
+                ProvidesTag.VendorVersion.getTagName().equals( key ) )
+            {
+                dotnetToolchain.addProvideToken( key, RequirementMatcherFactory.createVersionMatcher(
value ) );
+            }
+            else
+            {
+                dotnetToolchain.addProvideToken( key, RequirementMatcherFactory.createExactMatcher(
value ) );
+            }
+        }
+        return dotnetToolchain;
+    }
+
+    public ToolchainPrivate createDefaultToolchain()
+    {
+        return null;
+       // return new DotnetToolchain(new ToolchainModel(), logger);
+    }
+
+    public void enableLogging( Logger logger )
+    {
+        this.logger = logger;
+    }
+}

Added: incubator/nmaven/trunk/components/maven-dotnet-toolchain/src/main/java/org/apache/maven/dotnet/toolchain/ProvidesTag.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/components/maven-dotnet-toolchain/src/main/java/org/apache/maven/dotnet/toolchain/ProvidesTag.java?rev=636129&view=auto
==============================================================================
--- incubator/nmaven/trunk/components/maven-dotnet-toolchain/src/main/java/org/apache/maven/dotnet/toolchain/ProvidesTag.java
(added)
+++ incubator/nmaven/trunk/components/maven-dotnet-toolchain/src/main/java/org/apache/maven/dotnet/toolchain/ProvidesTag.java
Tue Mar 11 15:20:54 2008
@@ -0,0 +1,21 @@
+package org.apache.maven.dotnet.toolchain;
+
+public enum ProvidesTag
+{
+    FrameworkVersion( "frameworkVersion" ),
+    Vendor( "vendor" ),
+    VendorVersion( "vendorVersion" ),
+    Id( "id" );
+
+    private String tagName;
+
+    ProvidesTag( String tagName )
+    {
+        this.tagName = tagName;
+    }
+
+    public String getTagName()
+    {
+        return tagName;
+    }
+}

Copied: incubator/nmaven/trunk/components/maven-dotnet-toolchain/src/main/resources/META-INF/plexus/components.xml
(from r633575, incubator/nmaven/trunk/components/maven-dotnet-extensions/src/main/resources/META-INF/plexus/components.xml)
URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/components/maven-dotnet-toolchain/src/main/resources/META-INF/plexus/components.xml?p2=incubator/nmaven/trunk/components/maven-dotnet-toolchain/src/main/resources/META-INF/plexus/components.xml&p1=incubator/nmaven/trunk/components/maven-dotnet-extensions/src/main/resources/META-INF/plexus/components.xml&r1=633575&r2=636129&rev=636129&view=diff
==============================================================================
--- incubator/nmaven/trunk/components/maven-dotnet-extensions/src/main/resources/META-INF/plexus/components.xml
(original)
+++ incubator/nmaven/trunk/components/maven-dotnet-toolchain/src/main/resources/META-INF/plexus/components.xml
Tue Mar 11 15:20:54 2008
@@ -22,7 +22,7 @@
     <component>
       <role>org.apache.maven.toolchain.ToolchainFactory</role>
       <role-hint>dotnet</role-hint>
-      <implementation>org.apache.maven.dotnet.extensions.toolchain.DotnetToolchainFactory</implementation>
+      <implementation>org.apache.maven.dotnet.toolchain.DotnetToolchainFactory</implementation>
     </component>
   </components>
 </component-set>

Modified: incubator/nmaven/trunk/components/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/components/pom.xml?rev=636129&r1=636128&r2=636129&view=diff
==============================================================================
--- incubator/nmaven/trunk/components/pom.xml (original)
+++ incubator/nmaven/trunk/components/pom.xml Tue Mar 11 15:20:54 2008
@@ -37,6 +37,7 @@
     <module>maven-dotnet-core</module>
     <module>maven-dotnet-compiler</module>
     <module>maven-dotnet-extensions</module>
+    <module>maven-dotnet-toolchain</module>    
   </modules>
   <profiles>
     <profile>

Modified: incubator/nmaven/trunk/core-integration-tests/src/test/resources/MavenITmng-0000-CSharpCompileLibrary/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/core-integration-tests/src/test/resources/MavenITmng-0000-CSharpCompileLibrary/pom.xml?rev=636129&r1=636128&r2=636129&view=diff
==============================================================================
--- incubator/nmaven/trunk/core-integration-tests/src/test/resources/MavenITmng-0000-CSharpCompileLibrary/pom.xml
(original)
+++ incubator/nmaven/trunk/core-integration-tests/src/test/resources/MavenITmng-0000-CSharpCompileLibrary/pom.xml
Tue Mar 11 15:20:54 2008
@@ -26,10 +26,37 @@
   <name>NMaven.It.It0000</name>
   <build>
     <sourceDirectory>.</sourceDirectory>
+    <extensions>
+      <extension>
+        <groupId>org.apache.maven.dotnet</groupId>
+        <artifactId>maven-dotnet-toolchain</artifactId>
+        <version>0.16-incubating-SNAPSHOT</version>
+      </extension>
+    </extensions>
     <plugins>
       <plugin>
         <groupId>org.apache.maven.dotnet.plugins</groupId>
         <artifactId>maven-dotnet-compiler-plugin</artifactId>
+        <extensions>true</extensions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-toolchains-plugin</artifactId>
+        <executions>
+          <execution>
+            <phase>validate</phase>
+            <goals>
+              <goal>toolchain</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <toolchains>
+            <dotnet>
+              <vendor>MICROSOFT</vendor>
+            </dotnet>
+          </toolchains>
+        </configuration>
         <extensions>true</extensions>
       </plugin>
     </plugins>

Modified: incubator/nmaven/trunk/maven-dotnet.iml
URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/maven-dotnet.iml?rev=636129&r1=636128&r2=636129&view=diff
==============================================================================
--- incubator/nmaven/trunk/maven-dotnet.iml (original)
+++ incubator/nmaven/trunk/maven-dotnet.iml Tue Mar 11 15:20:54 2008
@@ -11,6 +11,7 @@
       <sourceFolder url="file://$MODULE_DIR$/components/maven-dotnet-core-it-runner/src/test/java"
isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/components/maven-dotnet-core/src/main/java"
isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/components/maven-dotnet-extensions/src/main/java"
isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/components/maven-dotnet-toolchain/src/main/java"
isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/core-integration-tests/src/test/java" isTestSource="true"
/>
       <sourceFolder url="file://$MODULE_DIR$/imports/maven-toolchain-plugin/src/main/java"
isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/imports/maven-toolchain/src/main/java" isTestSource="false"
/>
@@ -408,6 +409,15 @@
       <library>
         <CLASSES>
           <root url="jar://$localRepository$/org/codehaus/plexus/plexus-container-default/1.0-alpha-8/plexus-container-default-1.0-alpha-8.jar!/"
/>
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://$localRepository$/org/apache/maven/maven-toolchain/2.1-SNAPSHOT/maven-toolchain-2.1-SNAPSHOT.jar!/"
/>
         </CLASSES>
         <JAVADOC />
         <SOURCES />

Modified: incubator/nmaven/trunk/plugins/maven-dotnet-compiler-plugin/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/plugins/maven-dotnet-compiler-plugin/pom.xml?rev=636129&r1=636128&r2=636129&view=diff
==============================================================================
--- incubator/nmaven/trunk/plugins/maven-dotnet-compiler-plugin/pom.xml (original)
+++ incubator/nmaven/trunk/plugins/maven-dotnet-compiler-plugin/pom.xml Tue Mar 11 15:20:54
2008
@@ -18,7 +18,8 @@
 specific language governing permissions and limitations
 under the License.
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
     <groupId>org.apache.maven.dotnet.plugins</groupId>
     <version>0.16-incubating-SNAPSHOT</version>
@@ -50,6 +51,13 @@
       <groupId>org.apache.maven.dotnet</groupId>
       <artifactId>maven-dotnet-extensions</artifactId>
       <version>0.16-incubating-SNAPSHOT</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven.dotnet</groupId>
+      <artifactId>maven-dotnet-toolchain</artifactId>
+      <version>0.16-incubating-SNAPSHOT</version>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
@@ -72,10 +80,9 @@
       <artifactId>plexus-utils</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.maven.shared</groupId>
+      <groupId>org.apache.maven</groupId>
       <artifactId>maven-toolchain</artifactId>
-      <version>1.0-SNAPSHOT</version>
-    </dependency>    
+    </dependency>
   </dependencies>
   <distributionManagement>
     <site>

Modified: incubator/nmaven/trunk/plugins/maven-dotnet-compiler-plugin/src/main/java/org/apache/maven/dotnet/plugin/compiler/CompilerMojo.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/plugins/maven-dotnet-compiler-plugin/src/main/java/org/apache/maven/dotnet/plugin/compiler/CompilerMojo.java?rev=636129&r1=636128&r2=636129&view=diff
==============================================================================
--- incubator/nmaven/trunk/plugins/maven-dotnet-compiler-plugin/src/main/java/org/apache/maven/dotnet/plugin/compiler/CompilerMojo.java
(original)
+++ incubator/nmaven/trunk/plugins/maven-dotnet-compiler-plugin/src/main/java/org/apache/maven/dotnet/plugin/compiler/CompilerMojo.java
Tue Mar 11 15:20:54 2008
@@ -31,12 +31,10 @@
 import org.apache.maven.dotnet.BuildDirectories;
 import org.apache.maven.dotnet.ArtifactType;
 import org.apache.maven.dotnet.InitializationException;
-import org.apache.maven.dotnet.extensions.toolchain.DotnetToolchain;
+import org.apache.maven.dotnet.toolchain.DotnetToolchain;
 import org.apache.maven.project.MavenProject;
 import org.apache.maven.execution.MavenSession;
 import org.apache.maven.toolchain.ToolchainManager;
-import org.apache.maven.toolchain.Toolchain;
-import org.apache.maven.toolchain.DefaultToolchain;
 
 import java.io.File;
 import java.io.IOException;
@@ -121,14 +119,13 @@
     public void execute()
         throws MojoExecutionException, MojoFailureException
     {
-        DotnetToolchain toolchain =
-            (DotnetToolchain) toolchainManager.getToolchainFromBuildContext( "dotnet", mavenSession
);
 
+        DotnetToolchain toolchain = (DotnetToolchain) toolchainManager.getToolchainFromBuildContext(
"dotnet", mavenSession );
+        
         if ( toolchain == null )
         {
             this.getLog().info( "Could not find dotnet toolchain." );
         }
-
 
         File sourceDir =
             new File( project.getBuild().getDirectory(), BuildDirectories.BUILD_SOURCES.getBuildDirectoryName()
);

Modified: incubator/nmaven/trunk/plugins/maven-dotnet-compiler-plugin/src/main/resources/META-INF/plexus/components.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/plugins/maven-dotnet-compiler-plugin/src/main/resources/META-INF/plexus/components.xml?rev=636129&r1=636128&r2=636129&view=diff
==============================================================================
--- incubator/nmaven/trunk/plugins/maven-dotnet-compiler-plugin/src/main/resources/META-INF/plexus/components.xml
(original)
+++ incubator/nmaven/trunk/plugins/maven-dotnet-compiler-plugin/src/main/resources/META-INF/plexus/components.xml
Tue Mar 11 15:20:54 2008
@@ -292,7 +292,7 @@
     <component>
       <role>org.apache.maven.toolchain.ToolchainFactory</role>
       <role-hint>dotnet</role-hint>
-      <implementation>org.apache.maven.dotnet.extensions.toolchain.DotnetToolchainFactory</implementation>
+      <implementation>org.apache.maven.dotnet.toolchain.DotnetToolchainFactory</implementation>
     </component>    
   </components>
 </component-set>

Modified: incubator/nmaven/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/pom.xml?rev=636129&r1=636128&r2=636129&view=diff
==============================================================================
--- incubator/nmaven/trunk/pom.xml (original)
+++ incubator/nmaven/trunk/pom.xml Tue Mar 11 15:20:54 2008
@@ -151,7 +151,6 @@
     <module>archetypes</module>
     <module>components</module>
     <module>plugins</module>
-    <module>imports/maven-toolchain</module>
     <module>imports/maven-toolchain-plugin</module>
   </modules>
   <build>
@@ -234,7 +233,7 @@
     </dependency>
   </dependencies>
   <properties>
-    <mavenVersion>2.0.8</mavenVersion>
+    <mavenVersion>2.0.9-SNAPSHOT</mavenVersion>
   </properties>
   <dependencyManagement>
     <dependencies>
@@ -261,6 +260,11 @@
       <dependency>
         <groupId>org.apache.maven</groupId>
         <artifactId>maven-project</artifactId>
+        <version>${mavenVersion}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.maven</groupId>
+        <artifactId>maven-toolchain</artifactId>
         <version>${mavenVersion}</version>
       </dependency>
       <dependency>



Mime
View raw message