incubator-nmaven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sisb...@apache.org
Subject svn commit: r523044 - in /incubator/nmaven/branches/SI_XPT: ./ assemblies/ components/ components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/impl/ components/dotnet-vendor/src/main/java/org/apache/maven/dotnet/vendor/ components...
Date Tue, 27 Mar 2007 19:22:09 GMT
Author: sisbell
Date: Tue Mar 27 12:22:08 2007
New Revision: 523044

URL: http://svn.apache.org/viewvc?view=rev&rev=523044
Log:
This isprimarily some prep work for running under Continuum. Build now works with DotGnu.
A new script for running all compiler vendors on Windows. Improved some error handling.

Added:
    incubator/nmaven/branches/SI_XPT/assemblies/README.txt   (with props)
    incubator/nmaven/branches/SI_XPT/assemblies/pom-G_x_x.xml   (with props)
    incubator/nmaven/branches/SI_XPT/assemblies/pom-M_2_2.xml   (with props)
Removed:
    incubator/nmaven/branches/SI_XPT/assemblies/pom-net-bootstrap.xml
Modified:
    incubator/nmaven/branches/SI_XPT/README.txt
    incubator/nmaven/branches/SI_XPT/assemblies/pom.xml
    incubator/nmaven/branches/SI_XPT/bootstrap-build.bat
    incubator/nmaven/branches/SI_XPT/components/README.txt
    incubator/nmaven/branches/SI_XPT/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/impl/NetExecutableFactoryImpl.java
    incubator/nmaven/branches/SI_XPT/components/dotnet-vendor/src/main/java/org/apache/maven/dotnet/vendor/VendorInfoState.java
    incubator/nmaven/branches/SI_XPT/components/dotnet-vendor/src/main/java/org/apache/maven/dotnet/vendor/impl/SettingsRepository.java
    incubator/nmaven/branches/SI_XPT/components/dotnet-vendor/src/main/java/org/apache/maven/dotnet/vendor/impl/VendorInfoTransitionRuleFactory.java
    incubator/nmaven/branches/SI_XPT/maven-dotnet.iml
    incubator/nmaven/branches/SI_XPT/plugins/maven-resgen-plugin/src/main/java/org/apache/maven/dotnet/plugin/resgen/ResourceGeneratorMojo.java
    incubator/nmaven/branches/SI_XPT/plugins/maven-test-plugin/src/main/java/org/apache/maven/dotnet/plugin/test/TesterMojo.java
    incubator/nmaven/branches/SI_XPT/plugins/pom.xml

Modified: incubator/nmaven/branches/SI_XPT/README.txt
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/README.txt?view=diff&rev=523044&r1=523043&r2=523044
==============================================================================
--- incubator/nmaven/branches/SI_XPT/README.txt (original)
+++ incubator/nmaven/branches/SI_XPT/README.txt Tue Mar 27 12:22:08 2007
@@ -5,13 +5,16 @@
 Initial Build
 * On the first build, for Windows execute
     bootstrap-build.bat or
-    bootstrap-build.bat -DwithIDE
+    bootstrap-build.bat -DM_2_2 or
+    bootstrap-build.bat -DG_x_x
  Or on *nix,
     bootstrap-build.sh
 
-Note that the -DwithIDE option requires Microsoft 2.0 or higher. If this is a clean build
(meaning that you do not have a ~./m2/nmaven-settings.xml file)
-then you will also need to make sure that you have csc within your path. On subsequent builds,
you can just type mvn install from
+Note that the -DM_2_2 option requires Microsoft 2.0 or higher. If this is a clean build (meaning
that you do not have a ~./m2/nmaven-settings.xml file)
+then you will also need to make sure that you have csc within your path. On subsequent builds,
you can just type mvn -f pom-M_2_2.xml install from
 the command prompt.
+
+The -DG_x_x option requires DotGNU 0.7.2 or higher.
 
 IntelliJ IDEA Setup
 * Do the initial build. This will create the dotnet modello model source code and will download
all of the maven

Added: incubator/nmaven/branches/SI_XPT/assemblies/README.txt
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/assemblies/README.txt?view=auto&rev=523044
==============================================================================
--- incubator/nmaven/branches/SI_XPT/assemblies/README.txt (added)
+++ incubator/nmaven/branches/SI_XPT/assemblies/README.txt Tue Mar 27 12:22:08 2007
@@ -0,0 +1,7 @@
+Not using the profiles within the pom, since pom profile support for more than one profile
is buggy.
+
+TODO: Submit JIRA and test cases:  1) two profiles using only names causes NPE, 2) two profiles
using name-value pairs will not
+allow execution of first profile.
+
+pom-M_2_2 builds the IDE assemblies for a Microsoft 2.0 build
+pom-G_x_x builds the settings assembly for a DotGNU build
\ No newline at end of file

Propchange: incubator/nmaven/branches/SI_XPT/assemblies/README.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Added: incubator/nmaven/branches/SI_XPT/assemblies/pom-G_x_x.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/assemblies/pom-G_x_x.xml?view=auto&rev=523044
==============================================================================
--- incubator/nmaven/branches/SI_XPT/assemblies/pom-G_x_x.xml (added)
+++ incubator/nmaven/branches/SI_XPT/assemblies/pom-G_x_x.xml Tue Mar 27 12:22:08 2007
@@ -0,0 +1,131 @@
+<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">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>NMaven</groupId>
+  <artifactId>NMaven.Assemblies</artifactId>
+  <packaging>pom</packaging>
+  <version>0.14</version>
+  <name>NMaven.Assemblies</name>
+  <url>http://incubator.apache.org/nmaven</url>
+  <description>
+    NMaven provides Maven 2.x plugins to support building of .NET applications
+  </description>
+  <mailingLists>
+    <mailingList>
+      <name>NMaven Dev List</name>
+      <subscribe>nmaven-dev-subscribe@incubator.apache.org</subscribe>
+      <unsubscribe>nmaven-dev-unsubscribe@incubator.apache.org</unsubscribe>
+      <post>nmaven-dev@incubator.apache.org</post>
+      <archive>http://mail-archives.apache.org/mod_mbox/incubator-nmaven-dev/</archive>
+      <otherArchives>
+        <otherArchive>http://www.nabble.com/nmaven-dev-f17655.html</otherArchive>
+      </otherArchives>
+    </mailingList>
+    <mailingList>
+      <name>NMaven Commits List</name>
+      <subscribe>nmaven-commits-subscribe@incubator.apache.org</subscribe>
+      <unsubscribe>nmaven-commits-unsubscribe@incubator.apache.org</unsubscribe>
+      <post>nmaven-commits@incubator.apache.org</post>
+      <archive>http://mail-archives.apache.org/mod_mbox/incubator-nmaven-commits/</archive>
+      <otherArchives>
+        <otherArchive>http://www.nabble.com/nmaven-commits-f17656.html</otherArchive>
+      </otherArchives>
+    </mailingList>
+  </mailingLists>
+  <scm>
+    <url>https://svn.apache.org/repos/asf/incubator/nmaven/</url>
+    <connection>scm:svn:https://svn.apache.org/repos/asf/incubator/nmaven/</connection>
+    <developerConnection>
+      scm:svn:https://svn.apache.org/repos/asf/incubator/nmaven/</developerConnection>
+    <tag>REL_0_14_SNAPSHOT</tag>
+  </scm>
+  <organization>
+    <name>NMaven</name>
+    <url>http://incubator.apache.org/nmaven</url>
+  </organization>
+  <issueManagement>
+    <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>
+      <id>brett</id>
+      <email>brett@apache.org</email>
+      <roles>
+        <role>champion</role>
+        <role>mentor</role>
+      </roles>
+    </developer>
+    <developer>
+      <name>Jason van Zyl</name>
+      <id>jvanzyl</id>
+      <email>jvanzyl@apache.org</email>
+      <roles>
+        <role>champion</role>
+        <role>mentor</role>
+      </roles>
+    </developer>
+    <developer>
+      <name>Shane Isbell</name>
+      <id>sisbell</id>
+      <email>sisbell@apache.org</email>
+      <url>http://jroller.com/page/random7</url>
+      <roles>
+        <role>committer</role>
+      </roles>
+    </developer>
+    <developer>
+      <name>Dan Fabulich</name>
+      <id>dfabulich</id>
+      <email>dfabulich@apache.org</email>
+      <roles>
+        <role>committer</role>
+      </roles>
+    </developer>
+    <developer>
+      <name>Chris Stevenson</name>
+      <id>chrisjs</id>
+      <email>chrisjs@apache.org</email>
+      <roles>
+        <role>committer</role>
+      </roles>
+    </developer>
+    <developer>
+      <name>Trygve Laugstol</name>
+      <id>trygvis</id>
+      <email>trygvis@apache.org</email>
+      <roles>
+        <role>committer</role>
+      </roles>
+    </developer>
+    <developer>
+      <name>James Strachan</name>
+      <id>jstrachan</id>
+      <email>jstrachan@apache.org</email>
+      <roles>
+        <role>committer</role>
+      </roles>
+    </developer>
+  </developers>
+  <build>
+    <sourceDirectory>src/main/csharp</sourceDirectory>
+    <testSourceDirectory>src/test/csharp</testSourceDirectory>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.dotnet.plugins</groupId>
+        <artifactId>maven-compile-plugin</artifactId>
+        <extensions>true</extensions>
+      </plugin>
+    </plugins>
+  </build>
+  <modules>
+    <module>NMaven.Plugin.Settings</module>
+  </modules>
+</project>
\ No newline at end of file

Propchange: incubator/nmaven/branches/SI_XPT/assemblies/pom-G_x_x.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Added: incubator/nmaven/branches/SI_XPT/assemblies/pom-M_2_2.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/assemblies/pom-M_2_2.xml?view=auto&rev=523044
==============================================================================
--- incubator/nmaven/branches/SI_XPT/assemblies/pom-M_2_2.xml (added)
+++ incubator/nmaven/branches/SI_XPT/assemblies/pom-M_2_2.xml Tue Mar 27 12:22:08 2007
@@ -0,0 +1,135 @@
+<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">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>NMaven</groupId>
+  <artifactId>NMaven.Assemblies</artifactId>
+  <packaging>pom</packaging>
+  <version>0.14</version>
+  <name>NMaven.Assemblies</name>
+  <url>http://incubator.apache.org/nmaven</url>
+  <description>
+    NMaven provides Maven 2.x plugins to support building of .NET applications
+  </description>
+  <mailingLists>
+    <mailingList>
+      <name>NMaven Dev List</name>
+      <subscribe>nmaven-dev-subscribe@incubator.apache.org</subscribe>
+      <unsubscribe>nmaven-dev-unsubscribe@incubator.apache.org</unsubscribe>
+      <post>nmaven-dev@incubator.apache.org</post>
+      <archive>http://mail-archives.apache.org/mod_mbox/incubator-nmaven-dev/</archive>
+      <otherArchives>
+        <otherArchive>http://www.nabble.com/nmaven-dev-f17655.html</otherArchive>
+      </otherArchives>
+    </mailingList>
+    <mailingList>
+      <name>NMaven Commits List</name>
+      <subscribe>nmaven-commits-subscribe@incubator.apache.org</subscribe>
+      <unsubscribe>nmaven-commits-unsubscribe@incubator.apache.org</unsubscribe>
+      <post>nmaven-commits@incubator.apache.org</post>
+      <archive>http://mail-archives.apache.org/mod_mbox/incubator-nmaven-commits/</archive>
+      <otherArchives>
+        <otherArchive>http://www.nabble.com/nmaven-commits-f17656.html</otherArchive>
+      </otherArchives>
+    </mailingList>
+  </mailingLists>
+  <scm>
+    <url>https://svn.apache.org/repos/asf/incubator/nmaven/</url>
+    <connection>scm:svn:https://svn.apache.org/repos/asf/incubator/nmaven/</connection>
+    <developerConnection>
+      scm:svn:https://svn.apache.org/repos/asf/incubator/nmaven/</developerConnection>
+    <tag>REL_0_14_SNAPSHOT</tag>
+  </scm>
+  <organization>
+    <name>NMaven</name>
+    <url>http://incubator.apache.org/nmaven</url>
+  </organization>
+  <issueManagement>
+    <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>
+      <id>brett</id>
+      <email>brett@apache.org</email>
+      <roles>
+        <role>champion</role>
+        <role>mentor</role>
+      </roles>
+    </developer>
+    <developer>
+      <name>Jason van Zyl</name>
+      <id>jvanzyl</id>
+      <email>jvanzyl@apache.org</email>
+      <roles>
+        <role>champion</role>
+        <role>mentor</role>
+      </roles>
+    </developer>
+    <developer>
+      <name>Shane Isbell</name>
+      <id>sisbell</id>
+      <email>sisbell@apache.org</email>
+      <url>http://jroller.com/page/random7</url>
+      <roles>
+        <role>committer</role>
+      </roles>
+    </developer>
+    <developer>
+      <name>Dan Fabulich</name>
+      <id>dfabulich</id>
+      <email>dfabulich@apache.org</email>
+      <roles>
+        <role>committer</role>
+      </roles>
+    </developer>
+    <developer>
+      <name>Chris Stevenson</name>
+      <id>chrisjs</id>
+      <email>chrisjs@apache.org</email>
+      <roles>
+        <role>committer</role>
+      </roles>
+    </developer>
+    <developer>
+      <name>Trygve Laugstol</name>
+      <id>trygvis</id>
+      <email>trygvis@apache.org</email>
+      <roles>
+        <role>committer</role>
+      </roles>
+    </developer>
+    <developer>
+      <name>James Strachan</name>
+      <id>jstrachan</id>
+      <email>jstrachan@apache.org</email>
+      <roles>
+        <role>committer</role>
+      </roles>
+    </developer>
+  </developers>
+  <modules>
+    <module>NMaven.Core</module>
+    <module>NMaven.Model/Pom</module>
+    <module>NMaven.Plugin.Resx</module>
+    <module>NMaven.Plugin.Settings</module>
+    <module>NMaven.Plugin.Solution</module>
+  </modules>
+  <build>
+    <sourceDirectory>src/main/csharp</sourceDirectory>
+    <testSourceDirectory>src/test/csharp</testSourceDirectory>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.dotnet.plugins</groupId>
+        <artifactId>maven-compile-plugin</artifactId>
+        <extensions>true</extensions>
+      </plugin>
+    </plugins>
+  </build>
+</project>
\ No newline at end of file

Propchange: incubator/nmaven/branches/SI_XPT/assemblies/pom-M_2_2.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/nmaven/branches/SI_XPT/assemblies/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/assemblies/pom.xml?view=diff&rev=523044&r1=523043&r2=523044
==============================================================================
--- incubator/nmaven/branches/SI_XPT/assemblies/pom.xml (original)
+++ incubator/nmaven/branches/SI_XPT/assemblies/pom.xml Tue Mar 27 12:22:08 2007
@@ -129,20 +129,4 @@
       </plugin>
     </plugins>
   </build>
-  <profiles>
-    <profile>
-      <activation>
-        <property>
-          <name>withIde</name>
-        </property>
-      </activation>
-      <modules>
-        <module>NMaven.Core</module>
-        <module>NMaven.Model/Pom</module>
-        <module>NMaven.Plugin.Resx</module>
-        <module>NMaven.Plugin.Settings</module>
-        <module>NMaven.Plugin.Solution</module>
-      </modules>
-    </profile>
-  </profiles>
 </project>

Modified: incubator/nmaven/branches/SI_XPT/bootstrap-build.bat
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/bootstrap-build.bat?view=diff&rev=523044&r1=523043&r2=523044
==============================================================================
--- incubator/nmaven/branches/SI_XPT/bootstrap-build.bat (original)
+++ incubator/nmaven/branches/SI_XPT/bootstrap-build.bat Tue Mar 27 12:22:08 2007
@@ -1,5 +1,12 @@
+@echo off
 call mvn -f ./components/pom.xml install
 call mvn -f ./plugins/pom.xml install
 call mvn org.apache.maven.dotnet.plugins:maven-install-plugin:install-file -Dfile=./thirdparty/NUnit/NUnit.Framework.dll
-DgroupId=NUnit -DartifactId=NUnit.Framework -Dpackaging=dll -Dversion=2.2.8.0
-call mvn -f ./assemblies/pom.xml -Dmaven.test.skip=true -Dbootstrap install %*
+if "%1" == "-DM_2_2" (
+    call mvn -f ./assemblies/pom-M_2_2.xml -Dmaven.test.skip=true -Dbootstrap -Dvendor=MICROSOFT
-DframeworkVersion=2.0.50727 install %*
+ ) else if "%1" == "-DG_x_x" (
+    call mvn -f ./assemblies/pom-G_x_x.xml -Dmaven.test.skip=true -Dbootstrap -Dvendor=DotGNU
install %*
+ ) else (
+    call mvn -f ./assemblies/pom.xml -Dmaven.test.skip=true -Dbootstrap install %*
+ )
 rem call mvn org.apache.maven.dotnet.plugins:maven-solution-plugin:solution

Modified: incubator/nmaven/branches/SI_XPT/components/README.txt
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/components/README.txt?view=diff&rev=523044&r1=523043&r2=523044
==============================================================================
--- incubator/nmaven/branches/SI_XPT/components/README.txt (original)
+++ incubator/nmaven/branches/SI_XPT/components/README.txt Tue Mar 27 12:22:08 2007
@@ -1,10 +1,10 @@
 Find the latest documentation at: http://incubator.apache.org/nmaven/
 
 Logs:
-000-019: nmaven-artifact
-020-039: nmaven-assembler
-040-059: nmaven-core
-060-079: nmaven-executable
-080-099: nmaven-registry
-100-019: nmaven-vendor
+000-019: dotnet-artifact
+020-039: dotnet-assembler
+040-059: dotnet-core
+060-079: dotnet-executable
+080-099: dotnet-registry
+100-019: dotnet-vendor
 

Modified: incubator/nmaven/branches/SI_XPT/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/impl/NetExecutableFactoryImpl.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/impl/NetExecutableFactoryImpl.java?view=diff&rev=523044&r1=523043&r2=523044
==============================================================================
--- incubator/nmaven/branches/SI_XPT/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/impl/NetExecutableFactoryImpl.java
(original)
+++ incubator/nmaven/branches/SI_XPT/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/impl/NetExecutableFactoryImpl.java
Tue Mar 27 12:22:08 2007
@@ -94,9 +94,10 @@
             throw new PlatformUnsupportedException( "NMAVEN-066-011: Illegal State: Vendor
Info = " + vendorInfo, e );
         }
 
-        if ( vendorInfo.getVendor() == null )
+        if ( vendorInfo.getVendor() == null || vendorInfo.getFrameworkVersion() == null ||
+            vendorInfo.getVendorVersion() == null )
         {
-            throw new PlatformUnsupportedException( "NMAVEN-066-012: Vendor could not be
found: " + vendorInfo );
+            throw new PlatformUnsupportedException( "NMAVEN-066-012: Missing Vendor Information:
" + vendorInfo );
         }
 
         logger.info( "NMAVEN-066-013: Found Vendor = " + vendorInfo );
@@ -175,6 +176,13 @@
         {
             throw new PlatformUnsupportedException( "NMAVEN-066-010: Illegal State: Vendor
Info = " + vendorInfo, e );
         }
+
+        if ( vendorInfo.getVendor() == null || vendorInfo.getFrameworkVersion() == null ||
+            vendorInfo.getVendorVersion() == null )
+        {
+            throw new PlatformUnsupportedException( "NMAVEN-066-018: Missing Vendor Information:
" + vendorInfo );
+        }
+
         Artifact artifact = artifactContext.getArtifactsFor( groupId, artifactId, null, null
).get( 0 );
         logger.debug( "NMAVEN-066-003: Found Vendor: " + vendorInfo );
 
@@ -262,6 +270,13 @@
         {
             throw new PlatformUnsupportedException( "NMAVEN-066-010: Illegal State: Vendor
Info = " + vendorInfo, e );
         }
+
+        if ( vendorInfo.getVendor() == null || vendorInfo.getFrameworkVersion() == null ||
+            vendorInfo.getVendorVersion() == null )
+        {
+            throw new PlatformUnsupportedException( "NMAVEN-066-019: Missing Vendor Information:
" + vendorInfo );
+        }
+
         logger.debug( "NMAVEN-066-003: Found Vendor: " + vendorInfo );
         ExecutableRequirement executableRequirement =
             ExecutableRequirement.Factory.createDefaultExecutableRequirement();

Modified: incubator/nmaven/branches/SI_XPT/components/dotnet-vendor/src/main/java/org/apache/maven/dotnet/vendor/VendorInfoState.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/components/dotnet-vendor/src/main/java/org/apache/maven/dotnet/vendor/VendorInfoState.java?view=diff&rev=523044&r1=523043&r2=523044
==============================================================================
--- incubator/nmaven/branches/SI_XPT/components/dotnet-vendor/src/main/java/org/apache/maven/dotnet/vendor/VendorInfoState.java
(original)
+++ incubator/nmaven/branches/SI_XPT/components/dotnet-vendor/src/main/java/org/apache/maven/dotnet/vendor/VendorInfoState.java
Tue Mar 27 12:22:08 2007
@@ -252,5 +252,5 @@
         {
             return EXIT;
         }
-    }    
+    }
 }

Modified: incubator/nmaven/branches/SI_XPT/components/dotnet-vendor/src/main/java/org/apache/maven/dotnet/vendor/impl/SettingsRepository.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/components/dotnet-vendor/src/main/java/org/apache/maven/dotnet/vendor/impl/SettingsRepository.java?view=diff&rev=523044&r1=523043&r2=523044
==============================================================================
--- incubator/nmaven/branches/SI_XPT/components/dotnet-vendor/src/main/java/org/apache/maven/dotnet/vendor/impl/SettingsRepository.java
(original)
+++ incubator/nmaven/branches/SI_XPT/components/dotnet-vendor/src/main/java/org/apache/maven/dotnet/vendor/impl/SettingsRepository.java
Tue Mar 27 12:22:08 2007
@@ -144,7 +144,7 @@
     {
         if ( vendor == null || vendorVersion == null || frameworkVersion == null )
         {
-            throw new PlatformUnsupportedException( "NMAVEN-104-001: One of more of the parameters
is null: Vendor = " +
+            throw new PlatformUnsupportedException( "NMAVEN-104-004: One of more of the parameters
is null: Vendor = " +
                 vendor + ", Vendor Version = " + vendorVersion + ", Framework Version = "
+ frameworkVersion );
         }
         for ( Vendor v : vendors )
@@ -162,8 +162,7 @@
                 }
             }
         }
-        throw new PlatformUnsupportedException( "NMAVEN-104-003: Unable to find install root:
Vendor = " + vendor +
-            ", Vendor Version = " + vendorVersion + ", Framework Version = " + frameworkVersion
);
+        return null;
     }
 
     /**

Modified: incubator/nmaven/branches/SI_XPT/components/dotnet-vendor/src/main/java/org/apache/maven/dotnet/vendor/impl/VendorInfoTransitionRuleFactory.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/components/dotnet-vendor/src/main/java/org/apache/maven/dotnet/vendor/impl/VendorInfoTransitionRuleFactory.java?view=diff&rev=523044&r1=523043&r2=523044
==============================================================================
--- incubator/nmaven/branches/SI_XPT/components/dotnet-vendor/src/main/java/org/apache/maven/dotnet/vendor/impl/VendorInfoTransitionRuleFactory.java
(original)
+++ incubator/nmaven/branches/SI_XPT/components/dotnet-vendor/src/main/java/org/apache/maven/dotnet/vendor/impl/VendorInfoTransitionRuleFactory.java
Tue Mar 27 12:22:08 2007
@@ -904,4 +904,5 @@
             }
         };
     }
+    //TODO: add additional DotGNU states
 }

Modified: incubator/nmaven/branches/SI_XPT/maven-dotnet.iml
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/maven-dotnet.iml?view=diff&rev=523044&r1=523043&r2=523044
==============================================================================
--- incubator/nmaven/branches/SI_XPT/maven-dotnet.iml (original)
+++ incubator/nmaven/branches/SI_XPT/maven-dotnet.iml Tue Mar 27 12:22:08 2007
@@ -33,6 +33,7 @@
       <sourceFolder url="file://$MODULE_DIR$/components/dotnet-registry/src/main/resources"
isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/components/dotnet-vendor/src/main/java" isTestSource="false"
/>
       <sourceFolder url="file://$MODULE_DIR$/components/dotnet-vendor/src/main/resources"
isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/components/dotnet-vendor/src/test/java" isTestSource="false"
/>
       <sourceFolder url="file://$MODULE_DIR$/integration-tests/tests/it0001/src/main/csharp"
isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/integration-tests/tests/it0002/src/main/csharp"
isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/integration-tests/tests/it0003/src/main/csharp"
isTestSource="false" />

Modified: incubator/nmaven/branches/SI_XPT/plugins/maven-resgen-plugin/src/main/java/org/apache/maven/dotnet/plugin/resgen/ResourceGeneratorMojo.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/plugins/maven-resgen-plugin/src/main/java/org/apache/maven/dotnet/plugin/resgen/ResourceGeneratorMojo.java?view=diff&rev=523044&r1=523043&r2=523044
==============================================================================
--- incubator/nmaven/branches/SI_XPT/plugins/maven-resgen-plugin/src/main/java/org/apache/maven/dotnet/plugin/resgen/ResourceGeneratorMojo.java
(original)
+++ incubator/nmaven/branches/SI_XPT/plugins/maven-resgen-plugin/src/main/java/org/apache/maven/dotnet/plugin/resgen/ResourceGeneratorMojo.java
Tue Mar 27 12:22:08 2007
@@ -107,6 +107,16 @@
             return;
         }
 
+        /*
+         * We should do this check at a lower level (to keep consistent behavior with the
nmaven-settings.xml)
+         * but we do not currently support the execution of specific plugins based on vendor
info.
+         */
+        if(vendor != null && vendor.equals( "DotGNU"))
+        {
+            getLog().info("NMAVEN-1501-005: Unsupported Plugin" );
+            return;
+        }
+
         File sourceDirectory = new File(
             project.getBuild().getDirectory() + File.separator + "assembly-resources" + File.separator
+ "resgen" );
         if ( !sourceDirectory.exists() )

Modified: incubator/nmaven/branches/SI_XPT/plugins/maven-test-plugin/src/main/java/org/apache/maven/dotnet/plugin/test/TesterMojo.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/plugins/maven-test-plugin/src/main/java/org/apache/maven/dotnet/plugin/test/TesterMojo.java?view=diff&rev=523044&r1=523043&r2=523044
==============================================================================
--- incubator/nmaven/branches/SI_XPT/plugins/maven-test-plugin/src/main/java/org/apache/maven/dotnet/plugin/test/TesterMojo.java
(original)
+++ incubator/nmaven/branches/SI_XPT/plugins/maven-test-plugin/src/main/java/org/apache/maven/dotnet/plugin/test/TesterMojo.java
Tue Mar 27 12:22:08 2007
@@ -206,7 +206,6 @@
         List<String> commands = getCommandsFor( null );
         getLog().debug( "NMAVEN-1100-008: " + commands.toString() );
         CommandExecutor commandExecutor = CommandExecutor.Factory.createDefaultCommmandExecutor();
-        //commandExecutor.setLog(getLog());
         try
         {
             commandExecutor.executeCommand( getExecutableFor( null, null ), commands );

Modified: incubator/nmaven/branches/SI_XPT/plugins/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/plugins/pom.xml?view=diff&rev=523044&r1=523043&r2=523044
==============================================================================
--- incubator/nmaven/branches/SI_XPT/plugins/pom.xml (original)
+++ incubator/nmaven/branches/SI_XPT/plugins/pom.xml Tue Mar 27 12:22:08 2007
@@ -62,6 +62,14 @@
           <target>1.5</target>
         </configuration>
       </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+          <reportFormat>plain</reportFormat>
+        </configuration>
+      </plugin>
+
       <!--
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>



Mime
View raw message