incubator-nmaven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sisb...@apache.org
Subject svn commit: r539528 - in /incubator/nmaven/branches/SI_XPT: ./ assemblies/ plugins/ plugins/NMaven.Plugin.Addin/src/main/csharp/NMaven/Plugin/Addin/ plugins/maven-embedder-plugin/src/main/java/org/apache/maven/dotnet/plugin/embedder/ plugins/maven-inst...
Date Fri, 18 May 2007 17:21:29 GMT
Author: sisbell
Date: Fri May 18 10:21:28 2007
New Revision: 539528

URL: http://svn.apache.org/viewvc?view=rev&rev=539528
Log:
Fixed some build problems.

Modified:
    incubator/nmaven/branches/SI_XPT/assemblies/pom.xml
    incubator/nmaven/branches/SI_XPT/bootstrap-build.bat
    incubator/nmaven/branches/SI_XPT/plugins/NMaven.Plugin.Addin/src/main/csharp/NMaven/Plugin/Addin/AutomationExtensibilityMojo.cs
    incubator/nmaven/branches/SI_XPT/plugins/maven-embedder-plugin/src/main/java/org/apache/maven/dotnet/plugin/embedder/EmbedderStarterMojo.java
    incubator/nmaven/branches/SI_XPT/plugins/maven-install-plugin/src/main/java/org/apache/maven/dotnet/plugin/install/InstallerMojo.java
    incubator/nmaven/branches/SI_XPT/plugins/pom-netplugins.xml
    incubator/nmaven/branches/SI_XPT/site/pom.xml
    incubator/nmaven/branches/SI_XPT/site/src/site/apt/adding-executables.apt
    incubator/nmaven/branches/SI_XPT/site/src/site/apt/features.apt
    incubator/nmaven/branches/SI_XPT/site/src/site/apt/getting-started.apt
    incubator/nmaven/branches/SI_XPT/site/src/site/apt/index.apt
    incubator/nmaven/branches/SI_XPT/site/src/site/site.xml

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=539528&r1=539527&r2=539528
==============================================================================
--- incubator/nmaven/branches/SI_XPT/assemblies/pom.xml (original)
+++ incubator/nmaven/branches/SI_XPT/assemblies/pom.xml Fri May 18 10:21:28 2007
@@ -153,6 +153,9 @@
         <groupId>org.apache.maven.dotnet.plugins</groupId>
         <artifactId>maven-compile-plugin</artifactId>
         <extensions>true</extensions>
+        <configuration>
+          <frameworkVersion>2.0.50727</frameworkVersion>
+        </configuration>
       </plugin>
     </plugins>
   </build>
@@ -167,6 +170,19 @@
         <module>NMaven.VisualStudio</module>
         <module>NMaven.VisualStudio.Addin</module>
       </modules>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.dotnet.plugins</groupId>
+            <artifactId>maven-compile-plugin</artifactId>
+            <extensions>true</extensions>
+            <configuration>
+              <vendor>MICROSOFT</vendor>
+              <frameworkVersion>2.0.50727</frameworkVersion>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
     </profile>
   </profiles>
   <distributionManagement>

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=539528&r1=539527&r2=539528
==============================================================================
--- incubator/nmaven/branches/SI_XPT/bootstrap-build.bat (original)
+++ incubator/nmaven/branches/SI_XPT/bootstrap-build.bat Fri May 18 10:21:28 2007
@@ -1,5 +1,5 @@
 @echo off
-IF %phase%=="" SET phase=install
+IF "%phase%"=="" SET phase=install
 ECHO Executing Phase: %phase%
 
 call mvn %phase%
@@ -24,18 +24,18 @@
 
 if "%1" == "-DMicrosoft" (
     ECHO Compiling Assemblies with Microsoft
-    call mvn -f ./assemblies/pom.xml -Dmaven.test.skip=true -Dbootstrap -Dvendor=MICROSOFT
-DframeworkVersion=2.0.50727 %phase% %*
+    call mvn -f ./assemblies/pom.xml -Dmaven.test.skip=true -Dbootstrap -Dvendor=MICROSOFT
%phase% %*
     IF errorlevel 1 GOTO END
 
-    call mvn -f ./plugins/pom-netplugins.xml -Dmaven.test.skip=true -Dbootstrap -Dvendor=MICROSOFT
-DframeworkVersion=2.0.50727 %phase% %*
+    call mvn -f ./plugins/pom-netplugins.xml -Dmaven.test.skip=true -Dbootstrap -Dvendor=MICROSOFT
%phase% %*
     IF errorlevel 1 GOTO END
 
  ) else  if "%1" == "-DMono" (
     ECHO Compiling Assemblies with Mono
-    call mvn -f ./assemblies/pom.xml -Dmaven.test.skip=true -Dbootstrap -Dvendor=MONO -DframeworkVersion=2.0.50727
%phase% %*
+    call mvn -f ./assemblies/pom.xml -Dmaven.test.skip=true -Dbootstrap -Dvendor=MONO %phase%
%*
     IF errorlevel 1 GOTO END
 
-    call mvn -f ./plugins/pom-netplugins.xml -Dmaven.test.skip=true -Dbootstrap -Dvendor=MONO
-DframeworkVersion=2.0.50727 %phase% %*
+    call mvn -f ./plugins/pom-netplugins.xml -Dmaven.test.skip=true -Dbootstrap -Dvendor=MONO
%phase% %*
     IF errorlevel 1 GOTO END
 
  ) else (
@@ -43,10 +43,8 @@
     call mvn -f ./assemblies/pom.xml -Dmaven.test.skip=true -Dbootstrap %phase% %*
     IF errorlevel 1 GOTO END
 
-    call mvn -f ./plugins/pom-netplugins.xml -Dmaven.test.skip=true -Dbootstrap -DframeworkVersion=2.0.50727
%phase% %*
+    call mvn -f ./plugins/pom-netplugins.xml -Dmaven.test.skip=true -Dbootstrap %phase% %*
     IF errorlevel 1 GOTO END
  )
 
-:END
-
-rem call mvn org.apache.maven.dotnet.plugins:maven-solution-plugin:solution
\ No newline at end of file
+:END
\ No newline at end of file

Modified: incubator/nmaven/branches/SI_XPT/plugins/NMaven.Plugin.Addin/src/main/csharp/NMaven/Plugin/Addin/AutomationExtensibilityMojo.cs
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/plugins/NMaven.Plugin.Addin/src/main/csharp/NMaven/Plugin/Addin/AutomationExtensibilityMojo.cs?view=diff&rev=539528&r1=539527&r2=539528
==============================================================================
--- incubator/nmaven/branches/SI_XPT/plugins/NMaven.Plugin.Addin/src/main/csharp/NMaven/Plugin/Addin/AutomationExtensibilityMojo.cs
(original)
+++ incubator/nmaven/branches/SI_XPT/plugins/NMaven.Plugin.Addin/src/main/csharp/NMaven/Plugin/Addin/AutomationExtensibilityMojo.cs
Fri May 18 10:21:28 2007
@@ -53,7 +53,7 @@
 
 		public override void Execute()
 		{
-            ArtifactRepositoryLayout layout = new ArtifactRepositoryLayout();
+            ArtifactRepositoryLayout layout = new AssemblyRepositoryLayout();
             ArtifactContext artifactContext = new ArtifactContext();
             NMaven.Artifact.Artifact artifact = artifactContext.GetArtifactFor(mavenProject);
             FileInfo artifactFileInfo = new FileInfo(localRepository + @"\" + layout.pathOf(artifact));

Modified: incubator/nmaven/branches/SI_XPT/plugins/maven-embedder-plugin/src/main/java/org/apache/maven/dotnet/plugin/embedder/EmbedderStarterMojo.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/plugins/maven-embedder-plugin/src/main/java/org/apache/maven/dotnet/plugin/embedder/EmbedderStarterMojo.java?view=diff&rev=539528&r1=539527&r2=539528
==============================================================================
--- incubator/nmaven/branches/SI_XPT/plugins/maven-embedder-plugin/src/main/java/org/apache/maven/dotnet/plugin/embedder/EmbedderStarterMojo.java
(original)
+++ incubator/nmaven/branches/SI_XPT/plugins/maven-embedder-plugin/src/main/java/org/apache/maven/dotnet/plugin/embedder/EmbedderStarterMojo.java
Fri May 18 10:21:28 2007
@@ -208,19 +208,6 @@
             throw new MojoExecutionException(
                 "NMAVEN-1400-001: Platform Unsupported: Vendor " + ", frameworkVersion =
" + frameworkVersion, e );
         }
-        /*
-        while(true)
-        {
-            try
-            {
-                Thread.sleep( 500);
-            }
-            catch ( InterruptedException e )
-            {
-                e.printStackTrace();  //To change body of catch statement use File | Settings
| File Templates.
-            }
-        }
-        */
     }
 
     private String artifactsToClassPath( Set<Artifact> artifacts )

Modified: incubator/nmaven/branches/SI_XPT/plugins/maven-install-plugin/src/main/java/org/apache/maven/dotnet/plugin/install/InstallerMojo.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/plugins/maven-install-plugin/src/main/java/org/apache/maven/dotnet/plugin/install/InstallerMojo.java?view=diff&rev=539528&r1=539527&r2=539528
==============================================================================
--- incubator/nmaven/branches/SI_XPT/plugins/maven-install-plugin/src/main/java/org/apache/maven/dotnet/plugin/install/InstallerMojo.java
(original)
+++ incubator/nmaven/branches/SI_XPT/plugins/maven-install-plugin/src/main/java/org/apache/maven/dotnet/plugin/install/InstallerMojo.java
Fri May 18 10:21:28 2007
@@ -55,7 +55,6 @@
 
     /**
      * @parameter expression="${project.file}"
-     * @required
      * @readonly
      */
     private File pomFile;

Modified: incubator/nmaven/branches/SI_XPT/plugins/pom-netplugins.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/plugins/pom-netplugins.xml?view=diff&rev=539528&r1=539527&r2=539528
==============================================================================
--- incubator/nmaven/branches/SI_XPT/plugins/pom-netplugins.xml (original)
+++ incubator/nmaven/branches/SI_XPT/plugins/pom-netplugins.xml Fri May 18 10:21:28 2007
@@ -40,6 +40,9 @@
         <groupId>org.apache.maven.dotnet.plugins</groupId>
         <artifactId>maven-compile-plugin</artifactId>
         <extensions>true</extensions>
+        <configuration>
+          <frameworkVersion>2.0.50727</frameworkVersion>
+        </configuration>        
       </plugin>
     </plugins>
   </build>

Modified: incubator/nmaven/branches/SI_XPT/site/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/site/pom.xml?view=diff&rev=539528&r1=539527&r2=539528
==============================================================================
--- incubator/nmaven/branches/SI_XPT/site/pom.xml (original)
+++ incubator/nmaven/branches/SI_XPT/site/pom.xml Fri May 18 10:21:28 2007
@@ -35,7 +35,7 @@
     <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>
+      scm:svn:https://svn.apache.org/repos/asf/incubator/nmaven/trunk</developerConnection>
     <tag>REL_0_14_SNAPSHOT</tag>
   </scm>
   <organization>
@@ -46,14 +46,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>

Modified: incubator/nmaven/branches/SI_XPT/site/src/site/apt/adding-executables.apt
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/site/src/site/apt/adding-executables.apt?view=diff&rev=539528&r1=539527&r2=539528
==============================================================================
--- incubator/nmaven/branches/SI_XPT/site/src/site/apt/adding-executables.apt (original)
+++ incubator/nmaven/branches/SI_XPT/site/src/site/apt/adding-executables.apt Fri May 18 10:21:28
2007
@@ -7,22 +7,28 @@
  [[1]] An executable plugin that exists in a predetermined place on the file system. These
are typically executables
  that are part of the .NET framework or part of some other 3rd party program.
 
- [[2]] An executable plugin that is resolved from a Maven repo. The NMaven .NET plugins,
nmaven-utility-rex and nmaven-utility-settings
+ [[2]] An executable plugin that is resolved from a Maven repo. The NMaven .NET plugins NMaven.Plugin.Resx
and NMaven.Plugin.Settings
  fall into this category.
 
  []
 
  How you handle each case is slightly different. In the first case, where the executable
is already installed on the
  file system, you add support for the executable by adding an entry
- in the {{{components/dotnet-model/executable-plugins/executable-plugin.html}executable-plugins.xml}}
file. Take the example below where XSD is part of the .NET framework.
+ in the {{{components/dotnet-model/executable-plugins/executable-plugin.html}executable-plugins.xml}}
file. Take the
+ example below where XSD is part of the .NET framework.
  The MS:XSD:SCHEMA entry uses a standard DefaultNetExecutable implementation. The <<executable>>
  tag denotes the command as it is executed from the commandline, in this case xsd.  The <<commandFilter>>
gives a list
  of command options that the plugin will accept from the invoking AbstractMojo implementation.
 
- NMaven will look at the <<vendor>> and <<framework>> to see if the
xsd executable exists within the framework's install root.
- If it does, then it constructs the absolute path. If it does not find the file, it will
execute without a path (so
+ NMaven will look at the <<vendor>> and <<frameworkVersion>> to see
if the xsd executable exists within the framework's install
+ or SDK root for either Microsoft of Mono, depending on which vendor you are using to build.
If the executable does exist in one of
+ these locations, then it constructs the absolute path. In the xsd case, on windows NMaven
may find the xsd file at:
+ C:\Program Files\Microsoft.NET\SDK\v2.0\Bin or C:\Program Files\Mono-1.2.3.1\bin.
+ If NMaven does not find the file, it will execute without a path (so
  in this case you will need to make sure that the executable exists within the system path).
 
+ Sample executable plugins entry:
+
 +----+
 
  <executablePlugins>
@@ -78,6 +84,120 @@
 
 +----+
 
+* Adding an executable plugin that exists in a predetermined place
+
+ To create an executable plugin that exists in a predetermined place, do the following:
+
+ [[1]] Create your module directory
+
+ [[2]] From the root of your module directory, type:
+
++----+
+mvn archetype:create
+  -DgroupId=[your project's group id]
+  -DartifactId=[your project's artifact id]
+  -DarchetypeArtifactId=maven-archetype-netexecutable
++----+
+
+ [[3]] Make sure to add an entry in the net-executables.xml file, located within the dotnet-core
module. Replace each
+  param: ${vendor}, ${exe}, .. with the appropriate values.
+
++----+
+  <executablePlugin>
+    <identifier>${ID}</identifier>
+    <pluginClass>org.apache.maven.dotnet.executable.impl.DefaultNetExecutable</pluginClass>
+    <vendor>${vendor}</vendor>
+    <executable>${exe}</executable>
+    <profile>${profile}</profile>
+    <frameworkVersions>
+      <frameworkVersion>2.0.50727</frameworkVersion>
+      <frameworkVersion>1.1.4322</frameworkVersion>
+    </frameworkVersions>
+    <platforms>
+      <platform>
+        <operatingSystem>Windows</operatingSystem>
+      </platform>
+    </platforms>
+  </executablePlugin>
++----+
+
+ [[4]]  Add profile <<ADD_PROFILE>> to the meta-data of the profile field of
this class. This profile name should match
+  the ${profile} within the net-executables.xml.
+
+ [[5]] Add any special commands to the getCommands method.
+
+ [[6]]  Recompile the dotnet-core component.
+
+ [[7]]  Rename this class and install this Mojo component.
+
++----+
+public class NetExecutableMojo
+    extends AbstractMojo
+{
+    /**
+     * @component
+     */
+    private org.apache.maven.dotnet.executable.NetExecutableFactory netExecutableFactory;
+
+    /**
+     * The maven project.
+     *
+     * @parameter expression="${project}"
+     * @required
+     */
+    private MavenProject project;
+
+    /**
+     * The Vendor for the executable.
+     *
+     * @parameter expression="${vendor}"
+     */
+    private String vendor;
+
+    /**
+     * @parameter expression = "${frameworkVersion}"
+     */
+    private String frameworkVersion;
+
+    /**
+     * The profile that the executable should use.
+     *
+     * @parameter expression = "${profile}" default-value = "<<ADD_PROFILE>>"
+     */
+    private String profile;
+
+    public void execute()
+        throws MojoExecutionException
+    {
+        try
+        {
+            netExecutableFactory.getNetExecutableFor( vendor, frameworkVersion,
+                profile, getCommands(), null ).execute();
+        }
+        catch ( ExecutionException e )
+        {
+            throw new MojoExecutionException( "NMAVEN-xxx-000: Unable to execute: Vendor
" + vendor +
+                ", frameworkVersion = " + frameworkVersion + ", Profile = " + profile, e
);
+        }
+        catch ( PlatformUnsupportedException e )
+        {
+            throw new MojoExecutionException( "NMAVEN-xxx-001: Platform Unsupported: Vendor
" + vendor +
+                ", frameworkVersion = " + frameworkVersion + ", Profile = " + profile, e
);
+        }
+    }
+
+    public List<String> getCommands()
+        throws MojoExecutionException
+    {
+        List<String> commands = new ArrayList<String>();
+        //<<ADD COMMANDS HERE>>
+        return commands;
+    }
+}
++----+
+
+* Creating an executable plugin that is resolved from a Maven repo
+
  In the second case, where the executable is not already installed, you add an entry within
the net-dependencies.xml file.
  This file tells NMaven how to resolve the executable from a Maven repository.
 
@@ -106,8 +226,8 @@
   you should use the NetExecutableFactory.getNetExecutableFor method within the Mojo's execute
method.
 
 +----+
-             netExecutableFactory.getNetExecutableFor(vendor, frameworkVersion, profile,
-                    project, getCommands(), null).execute();
+  netExecutableFactory.getNetExecutableFor(vendor, frameworkVersion, profile,
+    project, getCommands(), null).execute();
 +----+
 
 
@@ -115,6 +235,8 @@
   you should use the NetExecutableFactory.getNetExecutableFromRepository method within the
Mojo's execute method.
 
 +----+
-              netExecutableFactory.getNetExecutableFromRepository("NMaven.Utility.ResX",
"resx",
-                    vendorInfo, project, localRepository, commands).execute();
+  netExecutableFactory.getNetExecutableFromRepository("NMaven.Plugin.ResX", "resx",
+    vendorInfo, project, localRepository, commands).execute();
 +----+
+
+

Modified: incubator/nmaven/branches/SI_XPT/site/src/site/apt/features.apt
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/site/src/site/apt/features.apt?view=diff&rev=539528&r1=539527&r2=539528
==============================================================================
--- incubator/nmaven/branches/SI_XPT/site/src/site/apt/features.apt (original)
+++ incubator/nmaven/branches/SI_XPT/site/src/site/apt/features.apt Fri May 18 10:21:28 2007
@@ -10,9 +10,9 @@
 
  * NUnit support
 
- * Resource generation and embedding
+ * Writing Maven Plugins in .NET
 
- * Autmomatic Generation of AssemblyInfo.* based on language and contents of the pom.
+ * Resource generation and embedding
 
  * Web Application Packaging and Deployment
 

Modified: incubator/nmaven/branches/SI_XPT/site/src/site/apt/getting-started.apt
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/site/src/site/apt/getting-started.apt?view=diff&rev=539528&r1=539527&r2=539528
==============================================================================
--- incubator/nmaven/branches/SI_XPT/site/src/site/apt/getting-started.apt (original)
+++ incubator/nmaven/branches/SI_XPT/site/src/site/apt/getting-started.apt Fri May 18 10:21:28
2007
@@ -28,13 +28,23 @@
 
   [[1]] {{{ http://java.sun.com/javase/downloads/index_jdk5.jsp} JDK 5.0 Update x}}
 
-  [[2]] {{{http://msdn2.microsoft.com/en-us/netframework/default.aspx} Microsoft .NET Framework}}
(1.1+)
-  OR {{{http://www.mono-project.com} Mono}} (1.1.13+ for Windows and 1.1.18+ for Linux)
+  [[2]] {{{http://msdn2.microsoft.com/en-us/netframework/default.aspx} Microsoft .NET Framework}}
(2.0+)
+  OR {{{http://www.mono-project.com} Mono}} (1.1.13+ for Windows and 1.1.18+ for Linux).
Note that the 2.0+ framework
+  (either MONO or Microsoft) is required to run NMaven but you can still target 1.1 for your
builds provided that the 1.1 version
+  is installed.
 
   [[3]] Subversion client 1.3+ (although 1.4 will soon be required). Click here for
  {{{ http://subversion.tigris.org/servlets/ProjectDocumentView?documentID=35379&showInfo=true}
Windows Subversion Client}}.
 
-  [[4]] {{{http://nunit.org/index.php?p=download} NUnit 2.2+}}
+  [[4]] {{{http://nunit.org/index.php?p=download} NUnit 2.2+}}.
+
+  [[5]] {{{http://maven.apache.org/download.html} Maven 2.0.5 or higher}}
+
+  [[]]
+
+  If you are planning on using NMaven with Visual Studio 2005 you will also need VS installed
+  prior to building NMaven. Since NMaven does not directly use any Sharp Develop APIs (yet),
you do not need Sharp Develop
+  installed prior to a build.
 
 ** Bootstrap Build
 
@@ -54,13 +64,15 @@
    [[c]] If using Mono on Windows, both the csc executable and the nunit-console executable
are located within the same path:
    typically something like "C:\Program Files\Mono-1.1.18\bin"
 
-  [[3]] Execute bootstrap-build.bat (or bootstrap-build.sh) from the nmaven directory.
+  [[3]] Execute bootstrap-build.bat (or bootstrap-build.sh) from the nmaven directory. If
you want to compile with
+  Visual Studio 2005 support execute: bootstrap-build.bat -DVisualStudio2005
 
  During step (1), you may receive an error similar to the following:
 
 +----+
 
- svn: This client is too old to work with working copy 'nmaven-utility-resx\src\main\csharp';
please get a newer Subversion client
+ svn: This client is too old to work with working copy 'nmaven-utility-resx\src\main\csharp';
+ please get a newer Subversion client
 +----+
 
  In this case will need to upgrade to subversion 1.4 or higher.
@@ -120,11 +132,14 @@
 *-------------------------+--------------------------------------------+
 
  Since the pom version is mapped to the assembly manifest, you MUST follow the 0.0.0.0 version
convention specified by
- Microsoft (or the build will fail).
+ Microsoft (or the build will fail). You may, however, optionally add -SNAPSHOT to the version.
Valid versions would include
+ 1.3.4 or 1.2-SNAPSHOT. 1.2-RC1 is invalid because NMaven would not recognize the RC1 identifier.
The SNAPSHOT
+ within the version will not be included within the file name, but rather is contained both
within the InformationalVersion attribute of the
+ AssemblyInfo class and within the pom.xml file.
 
 * {Unit Testing with NUnit}
 
- Add the org.nunit dependency to your pom.xml (as shown below). You
+ Add the NUnit dependency to your pom.xml (as shown below). You
  will only need to add the nmaven-test-plugin to the pom under the following circumstances:
 
   [[1]] If you do not add the nunit bin to your path;
@@ -146,19 +161,16 @@
 	        <type>module</type>
             <version>2.0.0.0</version>
         </dependency>
-
         <dependency>
           <groupId>NUnit</groupId>
-          <artifactId>nunit.framework</artifactId>
+          <artifactId>NUnit.Framework</artifactId>
           <version>2.2.8.0</version>
           <type>library</type>
         </dependency>
     </dependencies>
-
     <build>
         <sourceDirectory>src/main/csharp</sourceDirectory>
         <testSourceDirectory>src/test/csharp</testSourceDirectory>
-
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -218,17 +230,16 @@
         <artifactId>maven-compile-plugin</artifactId>
         <extensions>true</extensions>
         <configuration>
-            <language>C_SHARP</language>
-            <vendor>MONO</vendor>
             <frameworkVersion>1.1.4322</frameworkVersion>
-            <testLanguage>VB</testLanguage>
-            <testVendor>MICROSOFT</testVendor>
             <testFrameworkVersion>1.1.4322</testFrameworkVersion>
         </configuration>
     </plugin>
 </plugins>
 
 +----+
+
+ You also have the option of changing changing the framework version by modifying the default
setup within the nmaven-settings.xml file. See
+ {{{getting-started.html#Using NMaven Settings File}Using NMaven Settings File}}.
 
  To disable the NUnit tests, add the system property -Dmaven.test.skip=true to the command
line. You can also disable
  tests by adding \<skipTests>true\</skipTests> to the configuration above.

Modified: incubator/nmaven/branches/SI_XPT/site/src/site/apt/index.apt
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/site/src/site/apt/index.apt?view=diff&rev=539528&r1=539527&r2=539528
==============================================================================
--- incubator/nmaven/branches/SI_XPT/site/src/site/apt/index.apt (original)
+++ incubator/nmaven/branches/SI_XPT/site/src/site/apt/index.apt Fri May 18 10:21:28 2007
@@ -5,7 +5,7 @@
  leverages Maven (and its plugin architecture) for the build
  lifecycle, making it a small, compiler-plugin-framework on top of the larger Maven build-framework.
 
-RoadMap
+Road Map
 
  The primary goal of NMaven is to provide a common Maven build environment across .NET compilers
(C#, VB),
  vendors (Microsoft, Novell, DotGNU) and platforms (Windows, Linux). Specific, near-term
goals include:
@@ -17,8 +17,6 @@
  * Support for Classifiers
 
  * IDE Support: Visual Studio and SharpDevelop
-
- * .NET Plugin Support (for writing Maven plugins in .NET).
 
 Reporting Bugs/Requesting Features
 

Modified: incubator/nmaven/branches/SI_XPT/site/src/site/site.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/site/src/site/site.xml?view=diff&rev=539528&r1=539527&r2=539528
==============================================================================
--- incubator/nmaven/branches/SI_XPT/site/src/site/site.xml (original)
+++ incubator/nmaven/branches/SI_XPT/site/src/site/site.xml Fri May 18 10:21:28 2007
@@ -19,7 +19,12 @@
       <item name="Plugins" href="/plugins/index.html"/>
       <item name="Configuration" href="environment-configuration.html"/>
     </menu>
+    <menu name="IDE Integration">
+      <item name="Visual Studio" href="/ide/visual-studio.html"/>
+      <item name="Sharp Develop" href="/ide/sharp-develop.html"/>
+    </menu>
     <menu name="Developer Documentation">
+      <item name="Writing .NET Mojos" href="net-plugins.html"/>
       <item name="Adding Compilers" href="adding-plugins.html"/>
       <item name="Adding Executables" href="adding-executables.html"/>
       <item name="JavaDocs" href="apidocs/index.html"/>



Mime
View raw message