incubator-nmaven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sisb...@apache.org
Subject svn commit: r520983 [3/7] - in /incubator/nmaven/trunk: ./ assemblies/ assemblies/NMaven.Core/ assemblies/NMaven.Core/src/ assemblies/NMaven.Core/src/main/ assemblies/NMaven.Core/src/main/csharp/ assemblies/NMaven.Core/src/main/csharp/Core/ assemblies/...
Date Wed, 21 Mar 2007 19:50:56 GMT
Modified: incubator/nmaven/trunk/components/dotnet-model/compiler-plugins/compiler-plugins.mdo
URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/components/dotnet-model/compiler-plugins/compiler-plugins.mdo?view=diff&rev=520983&r1=520982&r2=520983
==============================================================================
--- incubator/nmaven/trunk/components/dotnet-model/compiler-plugins/compiler-plugins.mdo (original)
+++ incubator/nmaven/trunk/components/dotnet-model/compiler-plugins/compiler-plugins.mdo Wed Mar 21 12:50:36 2007
@@ -1,163 +1,163 @@
 <model>
-    <id>compiler-plugin</id>
-    <name>CompilerPlugin</name>
-    <description>A configuration file for compilers.</description>
-    <defaults>
-        <default>
-            <key>package</key>
-            <value>org.apache.maven.dotnet.model.compiler.plugins</value>
-        </default>
-    </defaults>
-    <classes>
-        <class rootElement="true">
-            <name>CompilerPluginsModel</name>
-            <fields>
-                <field>
-                    <name>compilerPlugins</name>
-                    <description>Plugin configurations.</description>
-                    <association>
-                        <type>CompilerPlugin</type>
-                        <multiplicity>*</multiplicity>
-                    </association>
-                </field>
-            </fields>
-        </class>
+  <id>compiler-plugin</id>
+  <name>CompilerPlugin</name>
+  <description>A configuration file for compilers.</description>
+  <defaults>
+    <default>
+      <key>package</key>
+      <value>org.apache.maven.dotnet.model.compiler.plugins</value>
+    </default>
+  </defaults>
+  <classes>
+    <class rootElement="true">
+      <name>CompilerPluginsModel</name>
+      <fields>
+        <field>
+          <name>compilerPlugins</name>
+          <description>Plugin configurations.</description>
+          <association>
+            <type>CompilerPlugin</type>
+            <multiplicity>*</multiplicity>
+          </association>
+        </field>
+      </fields>
+    </class>
 
-        <class xml.tagName="compilerPlugin">
-            <name>CompilerPlugin</name>
-            <fields>
-                <field>
-                    <name>identifier</name>
-                    <version>1.0.0</version>
-                    <type>String</type>
-                    <description>An id for the compiler. It should be (but is not required to be) unique.</description>
-                </field>
-                <field>
-                    <name>pluginClass</name>
-                    <version>1.0.0</version>
-                    <type>String</type>
-                    <description>
-                        Class name of the compiler. NMaven will pass an instance of this class to the
-                        requesting plugin.
-                    </description>
-                </field>
-                <field>
-                    <name>vendor</name>
-                    <version>1.0.0</version>
-                    <type>String</type>
-                    <description>Vendor of the compiler: MICROSOFT, MONO, DotGNU</description>
-                </field>
-                <field>
-                    <name>language</name>
-                    <version>1.0.0</version>
-                    <type>String</type>
-                    <description>The .NET language to use for compilation.</description>
-                </field>
-                <field>
-                    <name>profile</name>
-                    <version>1.0.0</version>
-                    <type>String</type>
-                    <description>Profile for the plugin.</description>
-                </field>
-                <field>
-                    <name>executable</name>
-                    <version>1.0.0</version>
-                    <type>String</type>
-                    <description>Executable, as run from the command line.</description>
-                </field>
-                <field>
-                    <name>frameworkVersions</name>
-                    <description>Supported framework version(s) of the compiler: 1.1.4322, 2.0.50727, 3.0</description>
-                    <association>
-                        <type>String</type>
-                        <multiplicity>*</multiplicity>
-                    </association>
-                </field>
-                <field>
-                    <name>defaultAssemblyPath</name>
-                    <description>
-                        Path (absolute or relative) of the assemblies given in the assembly fields. This field
-                        is used in conjunction with the profile and the assemblies fields.
-                    </description>
-                    <type>String</type>
-                </field>
-                <field>
-                    <name>assemblies</name>
-                    <description>
-                        Assemblies to reference from the command line. This is used to create custom profiles (such as
-                        .NET Compact) that use a different set of system assemblies. Only include the name of the
-                        assembly, not the .dll extension.
-                    </description>
-                    <association>
-                        <type>String</type>
-                        <multiplicity>*</multiplicity>
-                    </association>
-                </field>
-                <field>
-                    <name>platforms</name>
-                    <version>1.0.0</version>
-                    <description>Platform configuration capabilities.</description>
-                    <association>
-                        <type>Platform</type>
-                        <multiplicity>*</multiplicity>
-                    </association>
-                </field>
-                <field>
-                    <name>commandFilter</name>
-                    <version>1.0.0</version>
-                    <description>A filter for including/excluding user-passed commands options.</description>
-                    <association>
-                        <type>CommandFilter</type>
-                    </association>
-                </field>
-            </fields>
-        </class>
+    <class xml.tagName="compilerPlugin">
+      <name>CompilerPlugin</name>
+      <fields>
+        <field>
+          <name>identifier</name>
+          <version>1.0.0</version>
+          <type>String</type>
+          <description>An id for the compiler. It should be (but is not required to be) unique.</description>
+        </field>
+        <field>
+          <name>pluginClass</name>
+          <version>1.0.0</version>
+          <type>String</type>
+          <description>
+            Class name of the compiler. NMaven will pass an instance of this class to the
+            requesting plugin.
+          </description>
+        </field>
+        <field>
+          <name>vendor</name>
+          <version>1.0.0</version>
+          <type>String</type>
+          <description>Vendor of the compiler: MICROSOFT, MONO, DotGNU</description>
+        </field>
+        <field>
+          <name>language</name>
+          <version>1.0.0</version>
+          <type>String</type>
+          <description>The .NET language to use for compilation.</description>
+        </field>
+        <field>
+          <name>profile</name>
+          <version>1.0.0</version>
+          <type>String</type>
+          <description>Profile for the plugin.</description>
+        </field>
+        <field>
+          <name>executable</name>
+          <version>1.0.0</version>
+          <type>String</type>
+          <description>Executable, as run from the command line.</description>
+        </field>
+        <field>
+          <name>frameworkVersions</name>
+          <description>Supported framework version(s) of the compiler: 1.1.4322, 2.0.50727, 3.0</description>
+          <association>
+            <type>String</type>
+            <multiplicity>*</multiplicity>
+          </association>
+        </field>
+        <field>
+          <name>defaultAssemblyPath</name>
+          <description>
+            Path (absolute or relative) of the assemblies given in the assembly fields. This field
+            is used in conjunction with the profile and the assemblies fields.
+          </description>
+          <type>String</type>
+        </field>
+        <field>
+          <name>assemblies</name>
+          <description>
+            Assemblies to reference from the command line. This is used to create custom profiles (such as
+            .NET Compact) that use a different set of system assemblies. Only include the name of the
+            assembly, not the .dll extension.
+          </description>
+          <association>
+            <type>String</type>
+            <multiplicity>*</multiplicity>
+          </association>
+        </field>
+        <field>
+          <name>platforms</name>
+          <version>1.0.0</version>
+          <description>Platform configuration capabilities.</description>
+          <association>
+            <type>Platform</type>
+            <multiplicity>*</multiplicity>
+          </association>
+        </field>
+        <field>
+          <name>commandFilter</name>
+          <version>1.0.0</version>
+          <description>A filter for including/excluding user-passed commands options.</description>
+          <association>
+            <type>CommandFilter</type>
+          </association>
+        </field>
+      </fields>
+    </class>
 
-        <class>
-            <name>CommandFilter</name>
-            <fields>
-                <field>
-                    <name>excludes</name>
-                    <version>1.0.0</version>
-                    <description>
-                        The command options to exclude from the user specified pass-through parameters (Currently unused)
-                    </description>
-                    <association>
-                        <type>String</type>
-                        <multiplicity>*</multiplicity>
-                    </association>
-                </field>
-                <field>
-                    <name>includes</name>
-                    <version>1.0.0</version>
-                    <description>
-                        The command options to allow from the user specified pass-through parameters.
-                    </description>
-                    <association>
-                        <type>String</type>
-                        <multiplicity>*</multiplicity>
-                    </association>
-                </field>
-            </fields>
-        </class>
+    <class>
+      <name>CommandFilter</name>
+      <fields>
+        <field>
+          <name>excludes</name>
+          <version>1.0.0</version>
+          <description>
+            The command options to exclude from the user specified pass-through parameters (Currently unused)
+          </description>
+          <association>
+            <type>String</type>
+            <multiplicity>*</multiplicity>
+          </association>
+        </field>
+        <field>
+          <name>includes</name>
+          <version>1.0.0</version>
+          <description>
+            The command options to allow from the user specified pass-through parameters.
+          </description>
+          <association>
+            <type>String</type>
+            <multiplicity>*</multiplicity>
+          </association>
+        </field>
+      </fields>
+    </class>
 
-        <class>
-            <name>Platform</name>
-            <fields>
-                <field>
-                    <name>operatingSystem</name>
-                    <version>1.0.0</version>
-                    <type>String</type>
-                    <description>The operating system that the compiler is capable of running on.</description>
-                </field>
-                <field>
-                    <name>architecture</name>
-                    <version>1.0.0</version>
-                    <type>String</type>
-                    <description>The architecture that the compiler is capable of running on (Currently
-                        unused).</description>
-                </field>
-            </fields>
-        </class>
-    </classes>
+    <class>
+      <name>Platform</name>
+      <fields>
+        <field>
+          <name>operatingSystem</name>
+          <version>1.0.0</version>
+          <type>String</type>
+          <description>The operating system that the compiler is capable of running on.</description>
+        </field>
+        <field>
+          <name>architecture</name>
+          <version>1.0.0</version>
+          <type>String</type>
+          <description>The architecture that the compiler is capable of running on (Currently
+            unused).</description>
+        </field>
+      </fields>
+    </class>
+  </classes>
 </model>

Modified: incubator/nmaven/trunk/components/dotnet-model/compiler-plugins/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/components/dotnet-model/compiler-plugins/pom.xml?view=diff&rev=520983&r1=520982&r2=520983
==============================================================================
--- incubator/nmaven/trunk/components/dotnet-model/compiler-plugins/pom.xml (original)
+++ incubator/nmaven/trunk/components/dotnet-model/compiler-plugins/pom.xml Wed Mar 21 12:50:36 2007
@@ -64,7 +64,6 @@
       </plugin>
     </plugins>
   </build>
-
   <dependencies>
     <dependency>
       <groupId>org.codehaus.plexus</groupId>

Modified: incubator/nmaven/trunk/components/dotnet-model/entries/entries.mdo
URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/components/dotnet-model/entries/entries.mdo?view=diff&rev=520983&r1=520982&r2=520983
==============================================================================
--- incubator/nmaven/trunk/components/dotnet-model/entries/entries.mdo (original)
+++ incubator/nmaven/trunk/components/dotnet-model/entries/entries.mdo Wed Mar 21 12:50:36 2007
@@ -1,50 +1,50 @@
 <model>
-    <id>entries</id>
-    <name>Entries</name>
-    <description></description>
-    <defaults>
-        <default>
-            <key>package</key>
-            <value>org.apache.maven.dotnet.model.entries</value>
-        </default>
-    </defaults>
-    <classes>
-        <class rootElement="true" xml.tagName = "Entries">
-            <name>Entries</name>
-            <fields>
-                <field>
-                    <name>entry</name>
-                    <association>
-                        <type>Entry</type>
-                        <multiplicity>*</multiplicity>
-                    </association>
-                </field>
-            </fields>
-        </class>
-        <class xml.tagName="entry">
-            <name>Entry</name>
-            <fields>
-                <field>
-                    <name>schedule</name>
-                    <type>String</type>
-                </field>
-                <field>
-                    <name>groupId</name>
-                    <type>String</type>
-                </field>
-                <field>
-                    <name>artifactId</name>
-                    <type>String</type>
-                </field>
-                <field>
-                    <name>version</name>
-                    <type>String</type>
-                </field>
-                <field>
-                    <name>changeto</name>
-                    <type>String</type>
-                </field>
-            </fields>
-        </class>
-    </classes>
+  <id>entries</id>
+  <name>Entries</name>
+  <description></description>
+  <defaults>
+    <default>
+      <key>package</key>
+      <value>org.apache.maven.dotnet.model.entries</value>
+    </default>
+  </defaults>
+  <classes>
+    <class rootElement="true" xml.tagName="Entries">
+      <name>Entries</name>
+      <fields>
+        <field>
+          <name>entry</name>
+          <association>
+            <type>Entry</type>
+            <multiplicity>*</multiplicity>
+          </association>
+        </field>
+      </fields>
+    </class>
+    <class xml.tagName="entry">
+      <name>Entry</name>
+      <fields>
+        <field>
+          <name>schedule</name>
+          <type>String</type>
+        </field>
+        <field>
+          <name>groupId</name>
+          <type>String</type>
+        </field>
+        <field>
+          <name>artifactId</name>
+          <type>String</type>
+        </field>
+        <field>
+          <name>version</name>
+          <type>String</type>
+        </field>
+        <field>
+          <name>changeto</name>
+          <type>String</type>
+        </field>
+      </fields>
+    </class>
+  </classes>
 </model>

Modified: incubator/nmaven/trunk/components/dotnet-model/entries/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/components/dotnet-model/entries/pom.xml?view=diff&rev=520983&r1=520982&r2=520983
==============================================================================
--- incubator/nmaven/trunk/components/dotnet-model/entries/pom.xml (original)
+++ incubator/nmaven/trunk/components/dotnet-model/entries/pom.xml Wed Mar 21 12:50:36 2007
@@ -1,72 +1,72 @@
 <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.14-SNAPSHOT</version>
-        <artifactId>dotnet-model</artifactId>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
+  <parent>
     <groupId>org.apache.maven.dotnet</groupId>
-    <artifactId>dotnet-model-entries</artifactId>
     <version>0.14-SNAPSHOT</version>
-    <name>dotnet-model-entries</name>
-    <description>
-        Entries Model
-    </description>
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.codehaus.modello</groupId>
-                <artifactId>modello-maven-plugin</artifactId>
-                <version>1.0-alpha-10</version>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>xpp3-reader</goal>
-                            <goal>xpp3-writer</goal>
-                            <goal>java</goal>
-                        </goals>
-                    </execution>
-                </executions>
+    <artifactId>dotnet-model</artifactId>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.apache.maven.dotnet</groupId>
+  <artifactId>dotnet-model-entries</artifactId>
+  <version>0.14-SNAPSHOT</version>
+  <name>dotnet-model-entries</name>
+  <description>
+    Entries Model
+  </description>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.codehaus.modello</groupId>
+        <artifactId>modello-maven-plugin</artifactId>
+        <version>1.0-alpha-10</version>
+        <executions>
+          <execution>
+            <goals>
+              <goal>xpp3-reader</goal>
+              <goal>xpp3-writer</goal>
+              <goal>java</goal>
+            </goals>
+          </execution>
+        </executions>
 
-                <configuration>
-                    <model>entries.mdo</model>
-                    <version>1.0.0</version>
-                </configuration>
-            </plugin>
+        <configuration>
+          <model>entries.mdo</model>
+          <version>1.0.0</version>
+        </configuration>
+      </plugin>
 
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <source>1.5</source>
-                    <target>1.5</target>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-site-plugin</artifactId>
-                <configuration>
-                    <workingDirectory>${project.build.directory}/site</workingDirectory>
-                    <siteDirectory>${project.build.directory}/generated-site</siteDirectory>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <source>1.5</source>
+          <target>1.5</target>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-site-plugin</artifactId>
+        <configuration>
+          <workingDirectory>${project.build.directory}/site</workingDirectory>
+          <siteDirectory>${project.build.directory}/generated-site</siteDirectory>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
 
-    <dependencies>
-        <dependency>
-            <groupId>org.codehaus.plexus</groupId>
-            <artifactId>plexus-utils</artifactId>
-            <version>1.0.4</version>
-        </dependency>
-    </dependencies>
-    <distributionManagement>
-        <site>
-            <id>nmaven-site</id>
-            <name>NMaven Site</name>
-            <url>
-                scp://shell.sourceforge.net//home/groups/n/nm/nmaven/htdocs/components/nmaven-model/nmaven-model-entries</url>
-        </site>
-    </distributionManagement>
+  <dependencies>
+    <dependency>
+      <groupId>org.codehaus.plexus</groupId>
+      <artifactId>plexus-utils</artifactId>
+      <version>1.0.4</version>
+    </dependency>
+  </dependencies>
+  <distributionManagement>
+    <site>
+      <id>nmaven-site</id>
+      <name>NMaven Site</name>
+      <url>
+        scp://shell.sourceforge.net//home/groups/n/nm/nmaven/htdocs/components/nmaven-model/nmaven-model-entries</url>
+    </site>
+  </distributionManagement>
 </project>

Modified: incubator/nmaven/trunk/components/dotnet-model/entries/sample.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/components/dotnet-model/entries/sample.xml?view=diff&rev=520983&r1=520982&r2=520983
==============================================================================
--- incubator/nmaven/trunk/components/dotnet-model/entries/sample.xml (original)
+++ incubator/nmaven/trunk/components/dotnet-model/entries/sample.xml Wed Mar 21 12:50:36 2007
@@ -1,17 +1,17 @@
 <entries>
-    <scm-trunk></scm-trunk>    
-    <entry>
-        <schedule>remove-snapshot</schedule>
-        <groupId></groupId>
-        <artifactId></artifactId>
-        <version>1.0.0</version>
-        <changeto>1.0.0.0</changeto>
-    </entry>
-    <entry>
-        <schedule>increment-version</schedule>
-        <groupId></groupId>
-        <artifactId></artifactId>
-        <version>1.0.0.0</version>
-        <changeto>1.0.1</changeto>
-    </entry>
+  <scm-trunk></scm-trunk>
+  <entry>
+    <schedule>remove-snapshot</schedule>
+    <groupId></groupId>
+    <artifactId></artifactId>
+    <version>1.0.0</version>
+    <changeto>1.0.0.0</changeto>
+  </entry>
+  <entry>
+    <schedule>increment-version</schedule>
+    <groupId></groupId>
+    <artifactId></artifactId>
+    <version>1.0.0.0</version>
+    <changeto>1.0.1</changeto>
+  </entry>
 </entries>

Modified: incubator/nmaven/trunk/components/dotnet-model/executable-plugins/executable-plugins.mdo
URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/components/dotnet-model/executable-plugins/executable-plugins.mdo?view=diff&rev=520983&r1=520982&r2=520983
==============================================================================
--- incubator/nmaven/trunk/components/dotnet-model/executable-plugins/executable-plugins.mdo (original)
+++ incubator/nmaven/trunk/components/dotnet-model/executable-plugins/executable-plugins.mdo Wed Mar 21 12:50:36 2007
@@ -1,138 +1,138 @@
 <model>
-    <id>executable-plugin</id>
-    <name>ExecutablePlugin</name>
-    <description>A configuration file for compilers.</description>
-    <defaults>
-        <default>
-            <key>package</key>
-            <value>org.apache.maven.dotnet.model.compiler.plugins</value>
-        </default>
-    </defaults>
-    <classes>
-        <class rootElement="true">
-            <name>ExecutablePluginsModel</name>
-            <fields>
-                <field>
-                    <name>executablePlugins</name>
-                    <description>Plugin configurations.</description>
-                    <association>
-                        <type>ExecutablePlugin</type>
-                        <multiplicity>*</multiplicity>
-                    </association>
-                </field>
-            </fields>
-        </class>
+  <id>executable-plugin</id>
+  <name>ExecutablePlugin</name>
+  <description>A configuration file for compilers.</description>
+  <defaults>
+    <default>
+      <key>package</key>
+      <value>org.apache.maven.dotnet.model.compiler.plugins</value>
+    </default>
+  </defaults>
+  <classes>
+    <class rootElement="true">
+      <name>ExecutablePluginsModel</name>
+      <fields>
+        <field>
+          <name>executablePlugins</name>
+          <description>Plugin configurations.</description>
+          <association>
+            <type>ExecutablePlugin</type>
+            <multiplicity>*</multiplicity>
+          </association>
+        </field>
+      </fields>
+    </class>
 
-        <class xml.tagName="executablePlugin">
-            <name>ExecutablePlugin</name>
-            <fields>
-                <field>
-                    <name>identifier</name>
-                    <version>1.0.0</version>
-                    <type>String</type>
-                    <description>An id for the compiler. It should be (but is not required to be) unique.</description>
-                </field>
-                <field>
-                    <name>pluginClass</name>
-                    <version>1.0.0</version>
-                    <type>String</type>
-                    <description>
-                        Class name of the compiler. NMaven will pass an instance of this class to the
-                        requesting plugin.
-                    </description>
-                </field>
-                <field>
-                    <name>vendor</name>
-                    <version>1.0.0</version>
-                    <type>String</type>
-                    <description>Vendor of the compiler: MICROSOFT, MONO, DotGNU</description>
-                </field>
-                <field>
-                    <name>profile</name>
-                    <version>1.0.0</version>
-                    <type>String</type>
-                    <description>Profile for the plugin.</description>
-                </field>
-                <field>
-                    <name>executable</name>
-                    <version>1.0.0</version>
-                    <type>String</type>
-                    <description>Executable, as run from the command line.</description>
-                </field>
-                <field>
-                    <name>frameworkVersions</name>
-                    <description>Supported framework version(s) of the compiler: 1.1.4322, 2.0.50727, 3.0</description>
-                    <association>
-                        <type>String</type>
-                        <multiplicity>*</multiplicity>
-                    </association>
-                </field>
-                <field>
-                    <name>platforms</name>
-                    <version>1.0.0</version>
-                    <description>Platform configuration capabilities.</description>
-                    <association>
-                        <type>Platform</type>
-                        <multiplicity>*</multiplicity>
-                    </association>
-                </field>
-                <field>
-                    <name>commandFilter</name>
-                    <version>1.0.0</version>
-                    <description>A filter for including/excluding user-passed commands options.</description>
-                    <association>
-                        <type>CommandFilter</type>
-                    </association>
-                </field>
-            </fields>
-        </class>
+    <class xml.tagName="executablePlugin">
+      <name>ExecutablePlugin</name>
+      <fields>
+        <field>
+          <name>identifier</name>
+          <version>1.0.0</version>
+          <type>String</type>
+          <description>An id for the compiler. It should be (but is not required to be) unique.</description>
+        </field>
+        <field>
+          <name>pluginClass</name>
+          <version>1.0.0</version>
+          <type>String</type>
+          <description>
+            Class name of the compiler. NMaven will pass an instance of this class to the
+            requesting plugin.
+          </description>
+        </field>
+        <field>
+          <name>vendor</name>
+          <version>1.0.0</version>
+          <type>String</type>
+          <description>Vendor of the compiler: MICROSOFT, MONO, DotGNU</description>
+        </field>
+        <field>
+          <name>profile</name>
+          <version>1.0.0</version>
+          <type>String</type>
+          <description>Profile for the plugin.</description>
+        </field>
+        <field>
+          <name>executable</name>
+          <version>1.0.0</version>
+          <type>String</type>
+          <description>Executable, as run from the command line.</description>
+        </field>
+        <field>
+          <name>frameworkVersions</name>
+          <description>Supported framework version(s) of the compiler: 1.1.4322, 2.0.50727, 3.0</description>
+          <association>
+            <type>String</type>
+            <multiplicity>*</multiplicity>
+          </association>
+        </field>
+        <field>
+          <name>platforms</name>
+          <version>1.0.0</version>
+          <description>Platform configuration capabilities.</description>
+          <association>
+            <type>Platform</type>
+            <multiplicity>*</multiplicity>
+          </association>
+        </field>
+        <field>
+          <name>commandFilter</name>
+          <version>1.0.0</version>
+          <description>A filter for including/excluding user-passed commands options.</description>
+          <association>
+            <type>CommandFilter</type>
+          </association>
+        </field>
+      </fields>
+    </class>
 
-        <class>
-            <name>CommandFilter</name>
-            <fields>
-                <field>
-                    <name>excludes</name>
-                    <version>1.0.0</version>
-                    <description>
-                        The command options to exclude from the user specified pass-through parameters (Currently
-                        unused)
-                    </description>
-                    <association>
-                        <type>String</type>
-                        <multiplicity>*</multiplicity>
-                    </association>
-                </field>
-                <field>
-                    <name>includes</name>
-                    <version>1.0.0</version>
-                    <description>
-                        The command options to allow from the user specified pass-through parameters.
-                    </description>
-                    <association>
-                        <type>String</type>
-                        <multiplicity>*</multiplicity>
-                    </association>
-                </field>
-            </fields>
-        </class>
+    <class>
+      <name>CommandFilter</name>
+      <fields>
+        <field>
+          <name>excludes</name>
+          <version>1.0.0</version>
+          <description>
+            The command options to exclude from the user specified pass-through parameters (Currently
+            unused)
+          </description>
+          <association>
+            <type>String</type>
+            <multiplicity>*</multiplicity>
+          </association>
+        </field>
+        <field>
+          <name>includes</name>
+          <version>1.0.0</version>
+          <description>
+            The command options to allow from the user specified pass-through parameters.
+          </description>
+          <association>
+            <type>String</type>
+            <multiplicity>*</multiplicity>
+          </association>
+        </field>
+      </fields>
+    </class>
 
-        <class>
-            <name>Platform</name>
-            <fields>
-                <field>
-                    <name>operatingSystem</name>
-                    <version>1.0.0</version>
-                    <type>String</type>
-                    <description>The operating system that the compiler is capable of running on.</description>
-                </field>
-                <field>
-                    <name>architecture</name>
-                    <version>1.0.0</version>
-                    <type>String</type>
-                    <description>The architecture that the compiler is capable of running on (Currently
-                        unused).</description>
-                </field>
-            </fields>
-        </class>
-    </classes>
+    <class>
+      <name>Platform</name>
+      <fields>
+        <field>
+          <name>operatingSystem</name>
+          <version>1.0.0</version>
+          <type>String</type>
+          <description>The operating system that the compiler is capable of running on.</description>
+        </field>
+        <field>
+          <name>architecture</name>
+          <version>1.0.0</version>
+          <type>String</type>
+          <description>The architecture that the compiler is capable of running on (Currently
+            unused).</description>
+        </field>
+      </fields>
+    </class>
+  </classes>
 </model>

Modified: incubator/nmaven/trunk/components/dotnet-model/netdependency/netdependency.mdo
URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/components/dotnet-model/netdependency/netdependency.mdo?view=diff&rev=520983&r1=520982&r2=520983
==============================================================================
--- incubator/nmaven/trunk/components/dotnet-model/netdependency/netdependency.mdo (original)
+++ incubator/nmaven/trunk/components/dotnet-model/netdependency/netdependency.mdo Wed Mar 21 12:50:36 2007
@@ -1,57 +1,62 @@
 <model>
-    <id>netdependency</id>
-    <name>NetDependency</name>
-    <description></description>
-    <defaults>
-        <default>
-            <key>package</key>
-            <value>org.apache.maven.dotnet.model.netdependency</value>
-        </default>
-    </defaults>
-    <classes>
-        <class rootElement="true">
-            <name>NetDependencyModel</name>
-            <fields>
-                <field>
-                    <name>netDependencies</name>
-                    <description></description>
-                    <association>
-                        <type>NetDependency</type>
-                        <multiplicity>*</multiplicity>
-                    </association>
-                </field>
-            </fields>
-        </class>
-
-        <class xml.tagName="netDependency">
-            <name>NetDependency</name>
-            <fields>
-                <field>
-                    <name>groupId</name>
-                    <version>1.0.0</version>
-                    <type>String</type>
-                    <description></description>
-                </field>
-                <field>
-                    <name>versionId</name>
-                    <version>1.0.0</version>
-                    <type>String</type>
-                    <description>
-                    </description>
-                </field>
-                <field>
-                    <name>artifactId</name>
-                    <version>1.0.0</version>
-                    <type>String</type>
-                    <description></description>
-                </field>
-                <field>
-                    <name>type</name>
-                    <version>1.0.0</version>
-                    <type>String</type>
-                    <description></description>
-                </field>
-            </fields>
-        </class>
-    </classes>
+  <id>netdependency</id>
+  <name>NetDependency</name>
+  <description></description>
+  <defaults>
+    <default>
+      <key>package</key>
+      <value>org.apache.maven.dotnet.model.netdependency</value>
+    </default>
+  </defaults>
+  <classes>
+    <class rootElement="true">
+      <name>NetDependencyModel</name>
+      <fields>
+        <field>
+          <name>netDependencies</name>
+          <description></description>
+          <association>
+            <type>NetDependency</type>
+            <multiplicity>*</multiplicity>
+          </association>
+        </field>
+      </fields>
+    </class>
+    <class xml.tagName="netDependency">
+      <name>NetDependency</name>
+      <fields>
+        <field>
+          <name>groupId</name>
+          <version>1.0.0</version>
+          <type>String</type>
+          <description></description>
+        </field>
+        <field>
+          <name>version</name>
+          <version>1.0.0</version>
+          <type>String</type>
+          <description>
+          </description>
+        </field>
+        <field>
+          <name>artifactId</name>
+          <version>1.0.0</version>
+          <type>String</type>
+          <description></description>
+        </field>
+        <field>
+          <name>type</name>
+          <version>1.0.0</version>
+          <type>String</type>
+          <description></description>
+        </field>
+        <field>
+          <name>profile</name>
+          <version>1.0.0</version>
+          <type>String</type>
+          <description></description>
+        </field>
+      </fields>
+    </class>
+  </classes>
 </model>

Modified: incubator/nmaven/trunk/components/dotnet-model/netdependency/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/components/dotnet-model/netdependency/pom.xml?view=diff&rev=520983&r1=520982&r2=520983
==============================================================================
--- incubator/nmaven/trunk/components/dotnet-model/netdependency/pom.xml (original)
+++ incubator/nmaven/trunk/components/dotnet-model/netdependency/pom.xml Wed Mar 21 12:50:36 2007
@@ -1,69 +1,68 @@
-<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.14-SNAPSHOT</version>
-        <artifactId>dotnet-model</artifactId>
-    </parent>    
-    <modelVersion>4.0.0</modelVersion>
+<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>
-    <artifactId>dotnet-model-netdependency</artifactId>
     <version>0.14-SNAPSHOT</version>
-    <name>dotnet-model-netdependency</name>
-    <description>
-        Net Dependency Model
-    </description>
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.codehaus.modello</groupId>
-                <artifactId>modello-maven-plugin</artifactId>
-                <version>1.0-alpha-10</version>                
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>xpp3-reader</goal>
-                            <goal>java</goal>
-                        </goals>
-                    </execution>
-                </executions>
-
-                <configuration>
-                    <model>netdependency.mdo</model>
-                    <version>1.0.0</version>
-                </configuration>
-            </plugin>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <source>1.5</source>
-                    <target>1.5</target>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-site-plugin</artifactId>
-                <configuration>
-                    <workingDirectory>${project.build.directory}/site</workingDirectory>
-                    <siteDirectory>${project.build.directory}/generated-site</siteDirectory>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.codehaus.plexus</groupId>
-            <artifactId>plexus-utils</artifactId>
-            <version>1.0.4</version>
-        </dependency>
-    </dependencies>
-    <distributionManagement>
-        <site>
-            <id>nmaven-site</id>
-            <name>NMaven Site</name>
-            <url>scp://shell.sourceforge.net//home/groups/n/nm/nmaven/htdocs/components/nmaven-model/nmaven-compile-plugin</url>
-        </site>
-    </distributionManagement>
+    <artifactId>dotnet-model</artifactId>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.apache.maven.dotnet</groupId>
+  <artifactId>dotnet-model-netdependency</artifactId>
+  <version>0.14-SNAPSHOT</version>
+  <name>dotnet-model-netdependency</name>
+  <description>
+    Net Dependency Model
+  </description>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.codehaus.modello</groupId>
+        <artifactId>modello-maven-plugin</artifactId>
+        <version>1.0-alpha-10</version>
+        <executions>
+          <execution>
+            <goals>
+              <goal>xpp3-reader</goal>
+              <goal>java</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <model>netdependency.mdo</model>
+          <version>1.0.0</version>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <source>1.5</source>
+          <target>1.5</target>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-site-plugin</artifactId>
+        <configuration>
+          <workingDirectory>${project.build.directory}/site</workingDirectory>
+          <siteDirectory>${project.build.directory}/generated-site</siteDirectory>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+  <dependencies>
+    <dependency>
+      <groupId>org.codehaus.plexus</groupId>
+      <artifactId>plexus-utils</artifactId>
+      <version>1.0.4</version>
+    </dependency>
+  </dependencies>
+  <distributionManagement>
+    <site>
+      <id>nmaven-site</id>
+      <name>NMaven Site</name>
+      <url>
+        scp://shell.sourceforge.net//home/groups/n/nm/nmaven/htdocs/components/nmaven-model/nmaven-compile-plugin</url>
+    </site>
+  </distributionManagement>
 </project>

Modified: incubator/nmaven/trunk/components/dotnet-model/settings/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/components/dotnet-model/settings/pom.xml?view=diff&rev=520983&r1=520982&r2=520983
==============================================================================
--- incubator/nmaven/trunk/components/dotnet-model/settings/pom.xml (original)
+++ incubator/nmaven/trunk/components/dotnet-model/settings/pom.xml Wed Mar 21 12:50:36 2007
@@ -1,69 +1,68 @@
-<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.14-SNAPSHOT</version>
-        <artifactId>dotnet-model</artifactId>
-    </parent>    
-    <modelVersion>4.0.0</modelVersion>
+<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>
-    <artifactId>dotnet-model-settings</artifactId>
     <version>0.14-SNAPSHOT</version>
-    <name>dotnet-model-settings</name>
-    <description>
-        Net Dependency Model
-    </description>
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.codehaus.modello</groupId>
-                <artifactId>modello-maven-plugin</artifactId>
-                <version>1.0-alpha-10</version>                
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>xpp3-reader</goal>
-                            <goal>java</goal>
-                        </goals>
-                    </execution>
-                </executions>
-
-                <configuration>
-                    <model>settings.mdo</model>
-                    <version>1.0.0</version>
-                </configuration>
-            </plugin>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <source>1.5</source>
-                    <target>1.5</target>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-site-plugin</artifactId>
-                <configuration>
-                    <workingDirectory>${project.build.directory}/site</workingDirectory>
-                    <siteDirectory>${project.build.directory}/generated-site</siteDirectory>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.codehaus.plexus</groupId>
-            <artifactId>plexus-utils</artifactId>
-            <version>1.0.4</version>
-        </dependency>
-    </dependencies>
-    <distributionManagement>
-        <site>
-            <id>nmaven-site</id>
-            <name>NMaven Site</name>
-            <url>scp://shell.sourceforge.net//home/groups/n/nm/nmaven/htdocs/components/nmaven-model/nmaven-model-settings</url>
-        </site>
-    </distributionManagement>
+    <artifactId>dotnet-model</artifactId>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.apache.maven.dotnet</groupId>
+  <artifactId>dotnet-model-settings</artifactId>
+  <version>0.14-SNAPSHOT</version>
+  <name>dotnet-model-settings</name>
+  <description>
+    Net Dependency Model
+  </description>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.codehaus.modello</groupId>
+        <artifactId>modello-maven-plugin</artifactId>
+        <version>1.0-alpha-10</version>
+        <executions>
+          <execution>
+            <goals>
+              <goal>xpp3-reader</goal>
+              <goal>java</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <model>settings.mdo</model>
+          <version>1.0.0</version>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <source>1.5</source>
+          <target>1.5</target>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-site-plugin</artifactId>
+        <configuration>
+          <workingDirectory>${project.build.directory}/site</workingDirectory>
+          <siteDirectory>${project.build.directory}/generated-site</siteDirectory>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+  <dependencies>
+    <dependency>
+      <groupId>org.codehaus.plexus</groupId>
+      <artifactId>plexus-utils</artifactId>
+      <version>1.0.4</version>
+    </dependency>
+  </dependencies>
+  <distributionManagement>
+    <site>
+      <id>nmaven-site</id>
+      <name>NMaven Site</name>
+      <url>
+        scp://shell.sourceforge.net//home/groups/n/nm/nmaven/htdocs/components/nmaven-model/nmaven-model-settings</url>
+    </site>
+  </distributionManagement>
 </project>

Modified: incubator/nmaven/trunk/components/dotnet-model/settings/settings.mdo
URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/components/dotnet-model/settings/settings.mdo?view=diff&rev=520983&r1=520982&r2=520983
==============================================================================
--- incubator/nmaven/trunk/components/dotnet-model/settings/settings.mdo (original)
+++ incubator/nmaven/trunk/components/dotnet-model/settings/settings.mdo Wed Mar 21 12:50:36 2007
@@ -1,96 +1,101 @@
 <model>
-    <id>nmaven-settings</id>
-    <name>NMavenSettings</name>
-    <description></description>
-    <defaults>
-        <default>
-            <key>package</key>
-            <value>org.apache.maven.dotnet.model.settings</value>
-        </default>
-    </defaults>
-    <classes>
-        <class rootElement="true" xml.tagName = "nmavenSettings">
-            <name>NMavenSettings</name>
-            <fields>
-                <field>
-                    <name>operatingSystem</name>
-                    <type>String</type>
-                </field>
-                <field>
-                    <name>vendors</name>
-                    <association>
-                        <type>Vendor</type>
-                        <multiplicity>*</multiplicity>
-                    </association>
-                </field>
-                <field>
-                    <name>defaultSetup</name>
-                    <association>
-                        <type>DefaultSetup</type>
-                        <multiplicity>1</multiplicity>
-                    </association>
-                </field>
-            </fields>
-        </class>
-        <class xml.tagName="defaultSetup">
-            <name>DefaultSetup</name>
-            <fields>
-                <field>
-                    <name>vendorName</name>
-                    <type>String</type>
-                </field>
-                <field>
-                    <name>vendorVersion</name>
-                    <type>String</type>
-                </field>
-                <field>
-                    <name>frameworkVersion</name>
-                    <type>String</type>
-                </field>
-            </fields>
-        </class>
-
-        <class xml.tagName="vendor">
-            <name>Vendor</name>
-            <fields>
-                <field>
-                    <name>vendorName</name>
-                    <type>String</type>
-                </field>
-                <field>
-                    <name>vendorVersion</name>
-                    <type>String</type>
-                </field>
-                <field>
-                    <name>isDefault</name>
-                    <type>String</type>
-                </field>
-                <field>
-                    <name>frameworks</name>
-                    <association>
-                        <type>Framework</type>
-                        <multiplicity>*</multiplicity>
-                    </association>
-                </field>
-            </fields>
-        </class>
-
-        <class>
-            <name>Framework</name>
-            <fields>
-                <field>
-                    <name>frameworkVersion</name>
-                    <type>String</type>
-                </field>
-                <field>
-                    <name>installRoot</name>
-                    <type>String</type>
-                </field>
-                <field>
-                    <name>sdkRoot</name>
-                    <type>String</type>
-                </field>
-            </fields>
-        </class>
-    </classes>
+  <id>nmaven-settings</id>
+  <name>NMavenSettings</name>
+  <description></description>
+  <defaults>
+    <default>
+      <key>package</key>
+      <value>org.apache.maven.dotnet.model.settings</value>
+    </default>
+  </defaults>
+  <classes>
+    <class rootElement="true" xml.tagName="nmavenSettings">
+      <name>NMavenSettings</name>
+      <fields>
+        <field>
+          <name>operatingSystem</name>
+          <type>String</type>
+        </field>
+        <field>
+          <name>vendors</name>
+          <association>
+            <type>Vendor</type>
+            <multiplicity>*</multiplicity>
+          </association>
+        </field>
+        <field>
+          <name>defaultSetup</name>
+          <association>
+            <type>DefaultSetup</type>
+            <multiplicity>1</multiplicity>
+          </association>
+        </field>
+      </fields>
+    </class>
+    <class xml.tagName="defaultSetup">
+      <name>DefaultSetup</name>
+      <fields>
+        <field>
+          <name>vendorName</name>
+          <type>String</type>
+        </field>
+        <field>
+          <name>vendorVersion</name>
+          <type>String</type>
+        </field>
+        <field>
+          <name>frameworkVersion</name>
+          <type>String</type>
+        </field>
+      </fields>
+    </class>
+    <class xml.tagName="vendor">
+      <name>Vendor</name>
+      <fields>
+        <field>
+          <name>vendorName</name>
+          <type>String</type>
+        </field>
+        <field>
+          <name>vendorVersion</name>
+          <type>String</type>
+        </field>
+        <field>
+          <name>isDefault</name>
+          <type>String</type>
+        </field>
+        <field>
+          <name>frameworks</name>
+          <association>
+            <type>Framework</type>
+            <multiplicity>*</multiplicity>
+          </association>
+        </field>
+      </fields>
+    </class>
+    <class>
+      <name>Framework</name>
+      <fields>
+        <field>
+          <name>frameworkVersion</name>
+          <type>String</type>
+        </field>
+        <field>
+          <name>installRoot</name>
+          <type>String</type>
+        </field>
+        <field>
+          <name>sdkInstallRoot</name>
+          <type>String</type>
+        </field>
+        <field>
+          <name>executablePaths</name>
+          <association>
+            <type>String</type>
+            <multiplicity>*</multiplicity>
+          </association>
+        </field>        
+      </fields>
+    </class>
+  </classes>
 </model>

Modified: incubator/nmaven/trunk/components/dotnet-registry/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/components/dotnet-registry/pom.xml?view=diff&rev=520983&r1=520982&r2=520983
==============================================================================
--- incubator/nmaven/trunk/components/dotnet-registry/pom.xml (original)
+++ incubator/nmaven/trunk/components/dotnet-registry/pom.xml Wed Mar 21 12:50:36 2007
@@ -1,70 +1,60 @@
-<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.14-SNAPSHOT</version>
-        <artifactId>dotnet-components</artifactId>
-    </parent>      
-    <modelVersion>4.0.0</modelVersion>
+<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>
-    <artifactId>dotnet-registry</artifactId>
-    <packaging>jar</packaging>
     <version>0.14-SNAPSHOT</version>
-    <name>dotnet-registry</name>
+    <artifactId>dotnet-components</artifactId>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.apache.maven.dotnet</groupId>
+  <artifactId>dotnet-registry</artifactId>
+  <packaging>jar</packaging>
+  <version>0.14-SNAPSHOT</version>
+  <name>dotnet-registry</name>
 
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.maven</groupId>
-            <artifactId>maven-project</artifactId>
-            <version>2.0.4</version>
-        </dependency>        
-        <dependency>
-            <groupId>kxml2</groupId>
-            <artifactId>kxml2</artifactId>
-            <version>2.1.8</version>
-        </dependency>
-        <dependency>
-            <groupId>xmlpull</groupId>
-            <artifactId>xmlpull</artifactId>
-            <version>1.1.3.4a</version>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <resources>
-            <resource>
-                <directory>src/main/resources</directory>
-                <targetPath>/</targetPath>
-            </resource>
-        </resources>
-
-        <testResources>
-            <testResource>
-                <directory>src/test/resources</directory>
-                <includes>
-                    <include>*</include>
-                </includes>
-            </testResource>
-        </testResources>
-    </build>
-
-    <reporting>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-javadoc-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-project-info-reports-plugin</artifactId>
-            </plugin>
-         </plugins>
-    </reporting>
-
-    <distributionManagement>
-        <site>
-            <id>registry-cdc-site</id>
-            <name>Registry CDC Site</name>
-            <url>scp://shell.sourceforge.net/home/groups/j/jv/jvending/htdocs/registry-cdc</url>
-        </site>
-    </distributionManagement>
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.maven</groupId>
+      <artifactId>maven-project</artifactId>
+      <version>2.0.4</version>
+    </dependency>
+    <dependency>
+      <groupId>kxml2</groupId>
+      <artifactId>kxml2</artifactId>
+      <version>2.1.8</version>
+    </dependency>
+    <dependency>
+      <groupId>xmlpull</groupId>
+      <artifactId>xmlpull</artifactId>
+      <version>1.1.3.4a</version>
+    </dependency>
+  </dependencies>
+  <build>
+    <resources>
+      <resource>
+        <directory>src/main/resources</directory>
+        <targetPath>/</targetPath>
+      </resource>
+    </resources>
+    <testResources>
+      <testResource>
+        <directory>src/test/resources</directory>
+        <includes>
+          <include>*</include>
+        </includes>
+      </testResource>
+    </testResources>
+  </build>
+  <reporting>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-javadoc-plugin</artifactId>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-project-info-reports-plugin</artifactId>
+      </plugin>
+    </plugins>
+  </reporting>
 </project>

Modified: incubator/nmaven/trunk/components/dotnet-vendor/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/components/dotnet-vendor/pom.xml?view=diff&rev=520983&r1=520982&r2=520983
==============================================================================
--- incubator/nmaven/trunk/components/dotnet-vendor/pom.xml (original)
+++ incubator/nmaven/trunk/components/dotnet-vendor/pom.xml Wed Mar 21 12:50:36 2007
@@ -1,41 +1,28 @@
-<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.14-SNAPSHOT</version>
-        <artifactId>dotnet-components</artifactId>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
+<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>
-    <artifactId>dotnet-vendor</artifactId>
     <version>0.14-SNAPSHOT</version>
-    <name>dotnet-vendor</name>
-    <description>
-        NMaven
-    </description>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.maven.dotnet</groupId>
-            <artifactId>dotnet-core</artifactId>
-            <version>0.14-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.maven.dotnet</groupId>
-            <artifactId>dotnet-model-settings</artifactId>
-            <version>0.14-SNAPSHOT</version>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <source>1.5</source>
-                    <target>1.5</target>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
+    <artifactId>dotnet-components</artifactId>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.apache.maven.dotnet</groupId>
+  <artifactId>dotnet-vendor</artifactId>
+  <version>0.14-SNAPSHOT</version>
+  <name>dotnet-vendor</name>
+  <description>
+    NMaven
+  </description>
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.maven.dotnet</groupId>
+      <artifactId>dotnet-core</artifactId>
+      <version>0.14-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven.dotnet</groupId>
+      <artifactId>dotnet-model-settings</artifactId>
+      <version>0.14-SNAPSHOT</version>
+    </dependency>
+  </dependencies>
 </project>

Modified: incubator/nmaven/trunk/components/dotnet-vendor/src/main/java/org/apache/maven/dotnet/vendor/VendorInfo.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/components/dotnet-vendor/src/main/java/org/apache/maven/dotnet/vendor/VendorInfo.java?view=diff&rev=520983&r1=520982&r2=520983
==============================================================================
--- incubator/nmaven/trunk/components/dotnet-vendor/src/main/java/org/apache/maven/dotnet/vendor/VendorInfo.java (original)
+++ incubator/nmaven/trunk/components/dotnet-vendor/src/main/java/org/apache/maven/dotnet/vendor/VendorInfo.java Wed Mar 21 12:50:36 2007
@@ -19,6 +19,7 @@
 package org.apache.maven.dotnet.vendor;
 
 import java.io.File;
+import java.util.List;
 
 /**
  * Provides accessors for obtaining information about a vendor. 
@@ -73,14 +74,14 @@
      *
      * @return the path where the executable lives
      */
-    File getExecutablePath();
+    List<File> getExecutablePaths();
 
     /**
      * Sets the path where the executable lives.
      *
-     * @param executablePath the path where the executable lives
+     * @param executablePaths the path where the executable lives
      */
-    void setExecutablePath( File executablePath );
+    void setExecutablePaths( List<File> executablePaths );
 
     /**
      * If the vendor information is the default (or preferred) value for a given vendor, returns true,
@@ -126,7 +127,7 @@
 
                 private String frameworkVersion;
 
-                private File executablePath;
+                private List<File> executablePaths;
 
                 private boolean isDefault;
 
@@ -140,14 +141,14 @@
                     isDefault = aDefault;
                 }
 
-                public File getExecutablePath()
+                public List<File> getExecutablePaths()
                 {
-                    return executablePath;
+                    return executablePaths;
                 }
 
-                public void setExecutablePath( File executablePath )
+                public void setExecutablePaths( List<File> executablePaths )
                 {
-                    this.executablePath = executablePath;
+                    this.executablePaths = executablePaths;
                 }
 
                 public Vendor getVendor()
@@ -183,8 +184,8 @@
                 public String toString()
                 {
                     return "Vendor = " + vendor + ", Vendor Version = " + vendorVersion + ", Framework Version = " +
-                        frameworkVersion + ", Executable Path = " +
-                        ( ( executablePath != null ) ? executablePath.getAbsolutePath() : "" );
+                        frameworkVersion + ", Executable Paths = " +
+                        ( ( executablePaths != null ) ? executablePaths : "" );
                 }
             };
         }

Modified: incubator/nmaven/trunk/components/dotnet-vendor/src/main/java/org/apache/maven/dotnet/vendor/VendorInfoRepository.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/components/dotnet-vendor/src/main/java/org/apache/maven/dotnet/vendor/VendorInfoRepository.java?view=diff&rev=520983&r1=520982&r2=520983
==============================================================================
--- incubator/nmaven/trunk/components/dotnet-vendor/src/main/java/org/apache/maven/dotnet/vendor/VendorInfoRepository.java (original)
+++ incubator/nmaven/trunk/components/dotnet-vendor/src/main/java/org/apache/maven/dotnet/vendor/VendorInfoRepository.java Wed Mar 21 12:50:36 2007
@@ -92,6 +92,9 @@
     File getInstallRootFor( VendorInfo vendorInfo )
         throws PlatformUnsupportedException;
 
+    File getSdkInstallRootFor( VendorInfo vendorInfo )
+        throws PlatformUnsupportedException;
+
     /**
      * Returns true if this repository exists (and can be used), otherwise returns false.
      *

Modified: incubator/nmaven/trunk/components/dotnet-vendor/src/main/java/org/apache/maven/dotnet/vendor/VendorInfoState.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/components/dotnet-vendor/src/main/java/org/apache/maven/dotnet/vendor/VendorInfoState.java?view=diff&rev=520983&r1=520982&r2=520983
==============================================================================
--- incubator/nmaven/trunk/components/dotnet-vendor/src/main/java/org/apache/maven/dotnet/vendor/VendorInfoState.java (original)
+++ incubator/nmaven/trunk/components/dotnet-vendor/src/main/java/org/apache/maven/dotnet/vendor/VendorInfoState.java Wed Mar 21 12:50:36 2007
@@ -118,7 +118,12 @@
     /**
      * Null state of VendorInfo object
      */
-    NULL;
+    NULL,
+
+    /**
+     * Post processing state
+     */
+    POST_PROCESS;
 
     /**
      * Returns the completion state of the specified vendor info
@@ -131,6 +136,16 @@
         if ( vendorInfo == null )
         {
             return NULL;
+        }
+
+        if ( vendorInfo.getVendorVersion() != null && vendorInfo.getVendorVersion().trim().equals( "" ) )
+        {
+            vendorInfo.setVendorVersion( null );
+        }
+
+        if ( vendorInfo.getFrameworkVersion() != null && vendorInfo.getFrameworkVersion().trim().equals( "" ) )
+        {
+            vendorInfo.setFrameworkVersion( null );
         }
 
         if ( vendorInfo.getVendor() == null )

Modified: incubator/nmaven/trunk/components/dotnet-vendor/src/main/java/org/apache/maven/dotnet/vendor/impl/SettingsRepository.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/components/dotnet-vendor/src/main/java/org/apache/maven/dotnet/vendor/impl/SettingsRepository.java?view=diff&rev=520983&r1=520982&r2=520983
==============================================================================
--- incubator/nmaven/trunk/components/dotnet-vendor/src/main/java/org/apache/maven/dotnet/vendor/impl/SettingsRepository.java (original)
+++ incubator/nmaven/trunk/components/dotnet-vendor/src/main/java/org/apache/maven/dotnet/vendor/impl/SettingsRepository.java Wed Mar 21 12:50:36 2007
@@ -86,7 +86,7 @@
         catch ( XmlPullParserException e )
         {
             e.printStackTrace();
-            throw new IOException( "NMAVEN-104-000: Could not read executable-plugins.xml" );
+            throw new IOException( "NMAVEN-104-000: Could not read nmaven-settings.xml" );
         }
         vendors = settings.getVendors();
         defaultSetup = settings.getDefaultSetup();
@@ -99,7 +99,13 @@
             {
                 VendorInfo vendorInfo = VendorInfo.Factory.createDefaultVendorInfo();
                 vendorInfo.setVendorVersion( v.getVendorVersion() );
-                vendorInfo.setExecutablePath( new File( framework.getInstallRoot() ) );
+                List<File> executablePaths = new ArrayList<File>();
+                executablePaths.add(new File( framework.getInstallRoot() ));
+                if(framework.getSdkInstallRoot() != null)
+                {
+                    executablePaths.add( new File(framework.getSdkInstallRoot()));
+                }
+                vendorInfo.setExecutablePaths( executablePaths );
                 vendorInfo.setFrameworkVersion( framework.getFrameworkVersion() );
                 try
                 {
@@ -131,6 +137,33 @@
     List<VendorInfo> getVendorInfos()
     {
         return vendorInfos;
+    }
+
+    File getSdkInstallRootFor( String vendor, String vendorVersion, String frameworkVersion )
+        throws PlatformUnsupportedException
+    {
+        if ( vendor == null || vendorVersion == null || frameworkVersion == null )
+        {
+            throw new PlatformUnsupportedException( "NMAVEN-104-001: One of more of the parameters is null: Vendor = " +
+                vendor + ", Vendor Version = " + vendorVersion + ", Framework Version = " + frameworkVersion );
+        }
+        for ( Vendor v : vendors )
+        {
+            if ( vendor.equals( v.getVendorName().trim() ) && vendorVersion.equals( v.getVendorVersion().trim() ) )
+            {
+                List<Framework> frameworks = v.getFrameworks();
+                for ( Framework framework : frameworks )
+                {
+                    if ( frameworkVersion.equals( framework.getFrameworkVersion().trim() ) )
+                    {
+                         String sdkRoot = framework.getSdkInstallRoot();
+                         if(sdkRoot != null) return new File(sdkRoot );
+                    }
+                }
+            }
+        }
+        throw new PlatformUnsupportedException( "NMAVEN-104-003: Unable to find install root: Vendor = " + vendor +
+            ", Vendor Version = " + vendorVersion + ", Framework Version = " + frameworkVersion );
     }
 
     /**

Modified: incubator/nmaven/trunk/components/dotnet-vendor/src/main/java/org/apache/maven/dotnet/vendor/impl/StateMachineProcessorImpl.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/components/dotnet-vendor/src/main/java/org/apache/maven/dotnet/vendor/impl/StateMachineProcessorImpl.java?view=diff&rev=520983&r1=520982&r2=520983
==============================================================================
--- incubator/nmaven/trunk/components/dotnet-vendor/src/main/java/org/apache/maven/dotnet/vendor/impl/StateMachineProcessorImpl.java (original)
+++ incubator/nmaven/trunk/components/dotnet-vendor/src/main/java/org/apache/maven/dotnet/vendor/impl/StateMachineProcessorImpl.java Wed Mar 21 12:50:36 2007
@@ -80,7 +80,7 @@
         transitionRules.put( VendorInfoState.MTF, factory.createVendorInfoSetterForMTF() );
         transitionRules.put( VendorInfoState.MFT, factory.createVendorInfoSetterForMFT() );
         transitionRules.put( VendorInfoState.NTT, factory.createVendorInfoSetterForNTT() );
-
+        transitionRules.put( VendorInfoState.POST_PROCESS, factory.createPostProcessRule() );
         try
         {
             factory.init( repositoryRegistry, vendorInfoRepository, logger );

Modified: incubator/nmaven/trunk/components/dotnet-vendor/src/main/java/org/apache/maven/dotnet/vendor/impl/VendorInfoRepositoryImpl.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/components/dotnet-vendor/src/main/java/org/apache/maven/dotnet/vendor/impl/VendorInfoRepositoryImpl.java?view=diff&rev=520983&r1=520982&r2=520983
==============================================================================
--- incubator/nmaven/trunk/components/dotnet-vendor/src/main/java/org/apache/maven/dotnet/vendor/impl/VendorInfoRepositoryImpl.java (original)
+++ incubator/nmaven/trunk/components/dotnet-vendor/src/main/java/org/apache/maven/dotnet/vendor/impl/VendorInfoRepositoryImpl.java Wed Mar 21 12:50:36 2007
@@ -87,6 +87,14 @@
                                                      vendorInfo.getVendorVersion(), vendorInfo.getFrameworkVersion() );
     }
 
+    public File getSdkInstallRootFor( VendorInfo vendorInfo )
+        throws PlatformUnsupportedException
+    {
+        SettingsRepository settingsRepository = (SettingsRepository) repositoryRegistry.find( "nmaven-settings" );
+        return settingsRepository.getSdkInstallRootFor( vendorInfo.getVendor().getVendorName(),
+                                                     vendorInfo.getVendorVersion(), vendorInfo.getFrameworkVersion() );
+    }
+
     /**
      * @see org.apache.maven.dotnet.vendor.VendorInfoRepository#getVendorInfos()
      */
@@ -159,7 +167,7 @@
      * Returns true if the specified vendor info matches <i>all</i> of the specified match policies, otherwise returns
      * false.
      *
-     * @param vendorInfo the vendor info to match against the match policies
+     * @param vendorInfo    the vendor info to match against the match policies
      * @param matchPolicies the match policies
      * @return true if the specified vendor info matches <i>all</i> of the specified match policies, otherwise returns
      *         false

Modified: incubator/nmaven/trunk/components/dotnet-vendor/src/main/java/org/apache/maven/dotnet/vendor/impl/VendorInfoTransitionRuleFactory.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/components/dotnet-vendor/src/main/java/org/apache/maven/dotnet/vendor/impl/VendorInfoTransitionRuleFactory.java?view=diff&rev=520983&r1=520982&r2=520983
==============================================================================
--- incubator/nmaven/trunk/components/dotnet-vendor/src/main/java/org/apache/maven/dotnet/vendor/impl/VendorInfoTransitionRuleFactory.java (original)
+++ incubator/nmaven/trunk/components/dotnet-vendor/src/main/java/org/apache/maven/dotnet/vendor/impl/VendorInfoTransitionRuleFactory.java Wed Mar 21 12:50:36 2007
@@ -26,6 +26,7 @@
 import java.util.List;
 import java.util.Set;
 import java.util.HashSet;
+import java.util.ArrayList;
 import java.io.File;
 
 import org.codehaus.plexus.logging.Logger;
@@ -108,6 +109,7 @@
         try
         {
             defaultVendor = VendorFactory.createVendorFromName( settingsRepository.getDefaultSetup().getVendorName() );
+            logger.debug( "NMAVEN-103-036: Default Vendor Initialized: Name = " + defaultVendor );
         }
         catch ( VendorUnsupportedException e )
         {
@@ -118,6 +120,45 @@
         vendorInfos = settingsRepository.getVendorInfos();
     }
 
+    VendorInfoTransitionRule createPostProcessRule()
+    {
+        return new VendorInfoTransitionRule()
+        {
+            public VendorInfoState process( VendorInfo vendorInfo )
+            {
+                logger.debug( "NMAVEN-103-034: Entering State = Post Process" );
+                if ( (vendorInfo.getExecutablePaths() == null ||
+                    vendorInfo.getExecutablePaths().size() == 0) && vendorInfoRepository.exists() )
+                {
+                    File sdkInstallRoot = null;
+                    try
+                    {
+                        sdkInstallRoot = vendorInfoRepository.getSdkInstallRootFor( vendorInfo );
+                    }
+                    catch ( PlatformUnsupportedException e )
+                    {
+                        logger.debug( "NMAVEN-103-36: Failed to resolve install sdk root." );
+                    }
+                    try
+                    {
+                        List<File> executablePaths = new ArrayList<File>();
+                        executablePaths.add( vendorInfoRepository.getInstallRootFor( vendorInfo ) );
+                        if ( sdkInstallRoot != null )
+                        {
+                            executablePaths.add( sdkInstallRoot );
+                        }
+                        vendorInfo.setExecutablePaths( executablePaths );
+                    }
+                    catch ( PlatformUnsupportedException e )
+                    {
+                        logger.debug( "NMAVEN-103-35: Failed to resolve install root." );
+                    }
+                }
+                return VendorInfoState.EXIT;
+            }
+        };
+    }
+
     /**
      * Returns the vendor info transition rule for state: Vendor is Novell, vendor version exists, framework version exists.
      *
@@ -130,7 +171,7 @@
             public VendorInfoState process( VendorInfo vendorInfo )
             {
                 logger.debug( "NMAVEN-103-003: Entering State = NTT" );
-                return VendorInfoState.EXIT;
+                return VendorInfoState.POST_PROCESS;
             }
         };
     }
@@ -146,7 +187,7 @@
                 {
                     vendorInfo.setVendorVersion( defaultVendorVersion );
                     vendorInfo.setFrameworkVersion( defaultFrameworkVersion );
-                    return VendorInfoState.EXIT;
+                    return VendorInfoState.POST_PROCESS;
                 }
                 else
                 {
@@ -159,7 +200,7 @@
                             {
                                 vendorInfo.setVendorVersion( vi.getVendorVersion() );
                                 vendorInfo.setFrameworkVersion( "2.0.50727" );
-                                return VendorInfoState.EXIT;
+                                return VendorInfoState.POST_PROCESS;
                             }
                         }
                     }
@@ -173,7 +214,7 @@
                                 vendorInfo.setVendorVersion( vi.getVendorVersion() );
                                 vendorInfo.setFrameworkVersion(
                                     "2.0.50727" );  //TODO: this should be according to max version
-                                return VendorInfoState.EXIT;
+                                return VendorInfoState.POST_PROCESS;
                             }
                         }
                     }
@@ -203,7 +244,7 @@
             public VendorInfoState process( VendorInfo vendorInfo )
             {
                 logger.debug( "NMAVEN-103-006: Entering State = NFT" );
-                return VendorInfoState.EXIT; //NO WAY TO KNOW
+                return VendorInfoState.POST_PROCESS; //NO WAY TO KNOW
             }
         };
     }
@@ -446,6 +487,14 @@
                 }
                 else
                 {
+                    try
+                    {
+                        vendorInfo.setVendor( VendorFactory.getDefaultVendorForOS() );
+                    }
+                    catch ( PlatformUnsupportedException e )
+                    {
+                        return VendorInfoState.POST_PROCESS;
+                    }
                     List<VendorInfo> v = vendorInfoRepository.getVendorInfosFor( vendorInfo, true );
                     if ( !v.isEmpty() )
                     {
@@ -454,7 +503,6 @@
                             if ( vi.getFrameworkVersion().equals( vendorInfo.getFrameworkVersion() ) )
                             {
                                 vendorInfo.setVendorVersion( vi.getVendorVersion() );
-                                vendorInfo.setVendor( vi.getVendor() );
                                 if ( vi.getVendor().equals( Vendor.MICROSOFT ) )
                                 {
                                     return VendorInfoState.MTT;
@@ -476,7 +524,6 @@
                         if ( vi.getFrameworkVersion().equals( vendorInfo.getFrameworkVersion() ) )
                         {
                             vendorInfo.setVendorVersion( vi.getVendorVersion() );
-                            vendorInfo.setVendor( vi.getVendor() );
                             if ( vi.getVendor().equals( Vendor.MICROSOFT ) )
                             {
                                 return VendorInfoState.MTT;
@@ -511,7 +558,7 @@
                 }
                 catch ( PlatformUnsupportedException e )
                 {
-                    return VendorInfoState.EXIT;
+                    return VendorInfoState.POST_PROCESS;
                 }
                 return ( vendorInfo.getVendor().equals( Vendor.MICROSOFT ) ) ? VendorInfoState.MFT
                     : VendorInfoState.NFT;
@@ -534,7 +581,7 @@
                 }
                 catch ( PlatformUnsupportedException e )
                 {
-                    return VendorInfoState.EXIT;
+                    return VendorInfoState.POST_PROCESS;
                 }
                 if ( ( vendorVersion.equals( "2.0.50727" ) || vendorVersion.equals( "1.1.4322" ) ) &&
                     defaultVendor.equals( Vendor.MICROSOFT ) )
@@ -594,7 +641,7 @@
                 }
                 catch ( PlatformUnsupportedException e )
                 {
-                    return VendorInfoState.EXIT;
+                    return VendorInfoState.POST_PROCESS;
                 }
                 return ( vendorInfo.getVendor().equals( Vendor.MICROSOFT ) ) ? VendorInfoState.MFF
                     : VendorInfoState.NFF;
@@ -612,7 +659,7 @@
                 vendorInfo.setVendor( defaultVendor );
                 vendorInfo.setVendorVersion( defaultVendorVersion );
                 vendorInfo.setFrameworkVersion( defaultFrameworkVersion );
-                return VendorInfoState.EXIT;
+                return VendorInfoState.POST_PROCESS;
             }
         };
     }
@@ -625,7 +672,7 @@
             public VendorInfoState process( VendorInfo vendorInfo )
             {
                 logger.debug( "NMAVEN-103-018: Entering State = MTT" );
-                return VendorInfoState.EXIT;
+                return VendorInfoState.POST_PROCESS;
             }
         };
     }
@@ -665,20 +712,34 @@
                 logger.debug( "NMAVEN-103-021: Entering State = MFF" );
                 File v1 = new File( "C:\\WINDOWS\\Microsoft.NET\\Framework\\v1.1.4322" );
                 File v2 = new File( "C:\\WINDOWS\\Microsoft.NET\\Framework\\v2.0.50727" );
+                File v3 = new File( "C:\\Program Files\\Microsoft.NET\\SDK\\v1.1" );
+                File v4 = new File( "C:\\Program Files\\Microsoft.NET\\SDK\\v2.0" );
+                List<File> executablePaths = new ArrayList<File>();
+
                 if ( v2.exists() )
                 {
                     vendorInfo.setFrameworkVersion( "2.0.50727" );
-                    vendorInfo.setExecutablePath( v2 );
+                    executablePaths.add( v2 );
+                    if ( v4.exists() )
+                    {
+                        executablePaths.add( v4 );
+                    }
                 }
                 else if ( v1.exists() )
                 {
                     vendorInfo.setFrameworkVersion( "1.1.4322" );
-                    vendorInfo.setExecutablePath( v1 );
+                    executablePaths.add( v1 );
+                    if ( v3.exists() )
+                    {
+                        executablePaths.add( v3 );
+                    }
                 }
                 else
                 {
                     vendorInfo.setFrameworkVersion( "2.0.50727" );
                 }
+
+                vendorInfo.setExecutablePaths( executablePaths );
                 return VendorInfoState.MFT;
             }
         };
@@ -738,7 +799,7 @@
                 logger.debug( "NMAVEN-103-023: Entering State = GFF" );
                 vendorInfo.setFrameworkVersion( "2.0.50727" );
                 vendorInfo.setVendorVersion( "2.0.50727" );
-                return VendorInfoState.EXIT;
+                return VendorInfoState.POST_PROCESS;
             }
         };
     }
@@ -749,12 +810,12 @@
         {
             public VendorInfoState process( VendorInfo vendorInfo )
             {
-                logger.debug( "NMAVEN-103-023: Entering State = GFF" );
+                logger.debug( "NMAVEN-103-035: Entering State = GFF" );
                 if ( vendorInfo.getVendor().equals( defaultVendor ) )
                 {
                     vendorInfo.setVendorVersion( defaultVendorVersion );
                     vendorInfo.setFrameworkVersion( "2.0.50727" );
-                    return VendorInfoState.EXIT;
+                    return VendorInfoState.POST_PROCESS;
                 }
                 else
                 {
@@ -773,11 +834,11 @@
                         String maxVersion = vendorInfoRepository.getMaxVersion( versions );
                         vendorInfo.setVendorVersion( maxVersion );
                         vendorInfo.setFrameworkVersion( "2.0.50727" );
-                        return VendorInfoState.EXIT;
+                        return VendorInfoState.POST_PROCESS;
                     }
                     catch ( InvalidVersionFormatException e )
                     {
-                        logger.info( "NMAVEN-103-030: Invalid version. Unable to determine best vendor version", e );
+                        logger.info( "NMAVEN-103-031: Invalid version. Unable to determine best vendor version", e );
                         return createVendorInfoSetterForGFF_NoSettings().process( vendorInfo );
                     }
                 }

Modified: incubator/nmaven/trunk/components/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/components/pom.xml?view=diff&rev=520983&r1=520982&r2=520983
==============================================================================
--- incubator/nmaven/trunk/components/pom.xml (original)
+++ incubator/nmaven/trunk/components/pom.xml Wed Mar 21 12:50:36 2007
@@ -47,14 +47,12 @@
     <system>JIRA Bugtracking</system>
     <url>http://jira.codehaus.org/browse/NMAVEN</url>
   </issueManagement>
-
   <licenses>
     <license>
       <name>Apache 2.0</name>
       <url>LICENSE.txt</url>
     </license>
   </licenses>
-
   <developers>
     <developer>
       <name>Brett Porter</name>
@@ -152,6 +150,14 @@
         <configuration>
           <descriptor>src/assembly/src.xml</descriptor>
           <outputDirectory>src/target</outputDirectory>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <source>1.5</source>
+          <target>1.5</target>
         </configuration>
       </plugin>
     </plugins>

Modified: incubator/nmaven/trunk/integration-tests/tests/README.txt
URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/integration-tests/tests/README.txt?view=diff&rev=520983&r1=520982&r2=520983
==============================================================================
--- incubator/nmaven/trunk/integration-tests/tests/README.txt (original)
+++ incubator/nmaven/trunk/integration-tests/tests/README.txt Wed Mar 21 12:50:36 2007
@@ -21,4 +21,5 @@
 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
+it0024: CS-MS: .NET 3.0 NUnit
+it0027: Compiling CS with flat directory structure
\ No newline at end of file



Mime
View raw message