Author: sisbell
Date: Thu May 24 10:44:48 2007
New Revision: 541365
URL: http://svn.apache.org/viewvc?view=rev&rev=541365
Log:
Various cleanup updates.
Added:
incubator/nmaven/trunk/plugins/net-exe.bat (with props)
incubator/nmaven/trunk/site/conventions.apt
Modified:
incubator/nmaven/trunk/components/dotnet-core/src/main/resources/META-INF/nmaven/executable-plugins.xml
incubator/nmaven/trunk/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/compiler/CompilerContext.java
incubator/nmaven/trunk/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/compiler/impl/DefaultCompiler.java
incubator/nmaven/trunk/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/impl/CompilerContextImpl.java
incubator/nmaven/trunk/integration-tests/tests/it0003/pom.xml
incubator/nmaven/trunk/integration-tests/tests/it0003/src/main/csharp/It0003.cs
incubator/nmaven/trunk/integration-tests/tests/it0004/src/test/csharp/It0003-Test1.cs
incubator/nmaven/trunk/maven-dotnet.iml
incubator/nmaven/trunk/plugins/maven-fxcop-plugin/pom.xml
incubator/nmaven/trunk/plugins/maven-fxcop-plugin/src/main/java/org/apache/maven/dotnet/plugin/fxcop/FxCopAggregateMojo.java
incubator/nmaven/trunk/plugins/maven-fxcop-plugin/src/main/java/org/apache/maven/dotnet/plugin/fxcop/FxCopMojo.java
incubator/nmaven/trunk/site/src/site/apt/adding-executables.apt
Modified:
incubator/nmaven/trunk/components/dotnet-core/src/main/resources/META-INF/nmaven/executable-plugins.xml
URL:
http://svn.apache.org/viewvc/incubator/nmaven/trunk/components/dotnet-core/src/main/resources/META-INF/nmaven/executable-plugins.xml?view=diff&rev=541365&r1=541364&r2=541365
==============================================================================
---
incubator/nmaven/trunk/components/dotnet-core/src/main/resources/META-INF/nmaven/executable-plugins.xml
(original)
+++
incubator/nmaven/trunk/components/dotnet-core/src/main/resources/META-INF/nmaven/executable-plugins.xml
Thu May 24 10:44:48 2007
@@ -1,10 +1,70 @@
<executablePlugins>
<executablePlugin>
+ <identifier>ncover</identifier>
+
<pluginClass>org.apache.maven.dotnet.executable.impl.DefaultNetExecutable</pluginClass>
+ <vendor>MICROSOFT</vendor>
+ <executable>NCover.Console</executable>
+ <profile>NCover:NCover.Console</profile>
+ <frameworkVersions>
+ <frameworkVersion>2.0.50727</frameworkVersion>
+ </frameworkVersions>
+ <platforms>
+ <platform>
+ <operatingSystem>Windows</operatingSystem>
+ </platform>
+ </platforms>
+ </executablePlugin>
+ <executablePlugin>
<identifier>fxcop</identifier>
<pluginClass>org.apache.maven.dotnet.executable.impl.DefaultNetExecutable</pluginClass>
<vendor>MICROSOFT</vendor>
<executable>FxCopCmd</executable>
- <profile>DEFAULT</profile>
+ <profile>Microsoft:FxCop:FxCopCmd</profile>
+ <frameworkVersions>
+ <frameworkVersion>2.0.50727</frameworkVersion>
+ </frameworkVersions>
+ <platforms>
+ <platform>
+ <operatingSystem>Windows</operatingSystem>
+ </platform>
+ </platforms>
+ </executablePlugin>
+ <executablePlugin>
+ <identifier>BuildAssembler</identifier>
+
<pluginClass>org.apache.maven.dotnet.executable.impl.DefaultNetExecutable</pluginClass>
+ <vendor>MICROSOFT</vendor>
+ <executable>BuildAssembler</executable>
+ <profile>Microsoft:SandCastle:BuildAssembler</profile>
+ <frameworkVersions>
+ <frameworkVersion>2.0.50727</frameworkVersion>
+ </frameworkVersions>
+ <platforms>
+ <platform>
+ <operatingSystem>Windows</operatingSystem>
+ </platform>
+ </platforms>
+ </executablePlugin>
+ <executablePlugin>
+ <identifier>XslTransform</identifier>
+
<pluginClass>org.apache.maven.dotnet.executable.impl.DefaultNetExecutable</pluginClass>
+ <vendor>MICROSOFT</vendor>
+ <executable>XslTransform</executable>
+ <profile>Microsoft:SandCastle:XslTransform</profile>
+ <frameworkVersions>
+ <frameworkVersion>2.0.50727</frameworkVersion>
+ </frameworkVersions>
+ <platforms>
+ <platform>
+ <operatingSystem>Windows</operatingSystem>
+ </platform>
+ </platforms>
+ </executablePlugin>
+ <executablePlugin>
+ <identifier>MRefBuilder</identifier>
+
<pluginClass>org.apache.maven.dotnet.executable.impl.DefaultNetExecutable</pluginClass>
+ <vendor>MICROSOFT</vendor>
+ <executable>MRefBuilder</executable>
+ <profile>Microsoft:SandCastle:MRefBuilder</profile>
<frameworkVersions>
<frameworkVersion>2.0.50727</frameworkVersion>
</frameworkVersions>
Modified:
incubator/nmaven/trunk/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/compiler/CompilerContext.java
URL:
http://svn.apache.org/viewvc/incubator/nmaven/trunk/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/compiler/CompilerContext.java?view=diff&rev=541365&r1=541364&r2=541365
==============================================================================
---
incubator/nmaven/trunk/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/compiler/CompilerContext.java
(original)
+++
incubator/nmaven/trunk/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/compiler/CompilerContext.java
Thu May 24 10:44:48 2007
@@ -117,6 +117,8 @@
* @return Returns the source directory (or test source directory) path of
the class files.
*/
String getSourceDirectoryName();
+
+ File getTargetDirectory();
/**
* Returns an instance of the NetExecutable appropriate for given
language/vendor/OS.
Modified:
incubator/nmaven/trunk/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/compiler/impl/DefaultCompiler.java
URL:
http://svn.apache.org/viewvc/incubator/nmaven/trunk/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/compiler/impl/DefaultCompiler.java?view=diff&rev=541365&r1=541364&r2=541365
==============================================================================
---
incubator/nmaven/trunk/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/compiler/impl/DefaultCompiler.java
(original)
+++
incubator/nmaven/trunk/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/compiler/impl/DefaultCompiler.java
Thu May 24 10:44:48 2007
@@ -146,12 +146,18 @@
commands.add( "/reference:System.Windows.Forms" );
commands.add( "/reference:System.Web.Services" );
}
+ if ( !compilerContext.getNetCompilerConfig().isTestCompile() )
+ {
+ commands.add(
+ "/doc:" + new File( compilerContext.getTargetDirectory(),
"comments.xml" ).getAbsolutePath() );
+ }
+
CommandFilter filter = compilerContext.getCommandFilter();
return filter.filter( commands );
}
public void resetCommands( List<String> commands )
{
-
+
}
}
Modified:
incubator/nmaven/trunk/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/impl/CompilerContextImpl.java
URL:
http://svn.apache.org/viewvc/incubator/nmaven/trunk/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/impl/CompilerContextImpl.java?view=diff&rev=541365&r1=541364&r2=541365
==============================================================================
---
incubator/nmaven/trunk/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/impl/CompilerContextImpl.java
(original)
+++
incubator/nmaven/trunk/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/impl/CompilerContextImpl.java
Thu May 24 10:44:48 2007
@@ -197,6 +197,11 @@
: project.getBuild().getDirectory() + File.separator +
"build-sources";
}
+ public File getTargetDirectory()
+ {
+ return new File(project.getBuild().getDirectory());
+ }
+
/**
* This method will return a File where File.isExist() returns false, if
NetCompile.compile has not been
* invoked.
Modified: incubator/nmaven/trunk/integration-tests/tests/it0003/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/nmaven/trunk/integration-tests/tests/it0003/pom.xml?view=diff&rev=541365&r1=541364&r2=541365
==============================================================================
--- incubator/nmaven/trunk/integration-tests/tests/it0003/pom.xml (original)
+++ incubator/nmaven/trunk/integration-tests/tests/it0003/pom.xml Thu May 24
10:44:48 2007
@@ -23,6 +23,9 @@
<groupId>org.apache.maven.dotnet.plugins</groupId>
<artifactId>maven-compile-plugin</artifactId>
<extensions>true</extensions>
+ <configuration>
+
+ </configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.dotnet.plugins</groupId>
Modified:
incubator/nmaven/trunk/integration-tests/tests/it0003/src/main/csharp/It0003.cs
URL:
http://svn.apache.org/viewvc/incubator/nmaven/trunk/integration-tests/tests/it0003/src/main/csharp/It0003.cs?view=diff&rev=541365&r1=541364&r2=541365
==============================================================================
---
incubator/nmaven/trunk/integration-tests/tests/it0003/src/main/csharp/It0003.cs
(original)
+++
incubator/nmaven/trunk/integration-tests/tests/it0003/src/main/csharp/It0003.cs
Thu May 24 10:44:48 2007
@@ -1,10 +1,17 @@
namespace org.apache.maven.it {
+using System;
+
public class It0003 {
public static void Main () {
System.Console.Write("Hello World!");
new It0002();
- }
+ }
+
+ public String GetValue()
+ {
+ return "test";
+ }
}
}
Modified:
incubator/nmaven/trunk/integration-tests/tests/it0004/src/test/csharp/It0003-Test1.cs
URL:
http://svn.apache.org/viewvc/incubator/nmaven/trunk/integration-tests/tests/it0004/src/test/csharp/It0003-Test1.cs?view=diff&rev=541365&r1=541364&r2=541365
==============================================================================
---
incubator/nmaven/trunk/integration-tests/tests/it0004/src/test/csharp/It0003-Test1.cs
(original)
+++
incubator/nmaven/trunk/integration-tests/tests/it0004/src/test/csharp/It0003-Test1.cs
Thu May 24 10:44:48 2007
@@ -17,7 +17,9 @@
public void TestSample() {
new It0001();
new It0002();
- Assert.AreEqual("hello", hello);
+ Assert.AreEqual("hello", hello);
+ It0003 it = new It0003();
+ Assert.AreEqual("test", it.GetValue());
}
}
Modified: incubator/nmaven/trunk/maven-dotnet.iml
URL:
http://svn.apache.org/viewvc/incubator/nmaven/trunk/maven-dotnet.iml?view=diff&rev=541365&r1=541364&r2=541365
==============================================================================
--- incubator/nmaven/trunk/maven-dotnet.iml (original)
+++ incubator/nmaven/trunk/maven-dotnet.iml Thu May 24 10:44:48 2007
@@ -69,8 +69,10 @@
<sourceFolder
url="file://$MODULE_DIR$/plugins/maven-install-plugin/src/main/java"
isTestSource="false" />
<sourceFolder
url="file://$MODULE_DIR$/plugins/maven-link-plugin/src/main/java"
isTestSource="false" />
<sourceFolder
url="file://$MODULE_DIR$/plugins/maven-mojo-generator-plugin/src/main/java"
isTestSource="false" />
+ <sourceFolder
url="file://$MODULE_DIR$/plugins/maven-ncover-plugin/src/main/java"
isTestSource="false" />
<sourceFolder
url="file://$MODULE_DIR$/plugins/maven-resgen-plugin/src/main/java"
isTestSource="false" />
<sourceFolder
url="file://$MODULE_DIR$/plugins/maven-resolver-plugin/src/main/java"
isTestSource="false" />
+ <sourceFolder
url="file://$MODULE_DIR$/plugins/maven-sandcastle-plugin/src/main/java"
isTestSource="false" />
<sourceFolder
url="file://$MODULE_DIR$/plugins/maven-sdaddin-plugin/src/main/java"
isTestSource="false" />
<sourceFolder
url="file://$MODULE_DIR$/plugins/maven-test-plugin/src/main/java"
isTestSource="false" />
<sourceFolder
url="file://$MODULE_DIR$/plugins/maven-test-plugin/src/main/resources"
isTestSource="false" />
Modified: incubator/nmaven/trunk/plugins/maven-fxcop-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/nmaven/trunk/plugins/maven-fxcop-plugin/pom.xml?view=diff&rev=541365&r1=541364&r2=541365
==============================================================================
--- incubator/nmaven/trunk/plugins/maven-fxcop-plugin/pom.xml (original)
+++ incubator/nmaven/trunk/plugins/maven-fxcop-plugin/pom.xml Thu May 24
10:44:48 2007
@@ -9,6 +9,7 @@
<artifactId>maven-fxcop-plugin</artifactId>
<version>0.14-SNAPSHOT</version>
<packaging>maven-plugin</packaging>
+ <name>maven-fxcop-plugin</name>
<dependencies>
<dependency>
<groupId>junit</groupId>
Modified:
incubator/nmaven/trunk/plugins/maven-fxcop-plugin/src/main/java/org/apache/maven/dotnet/plugin/fxcop/FxCopAggregateMojo.java
URL:
http://svn.apache.org/viewvc/incubator/nmaven/trunk/plugins/maven-fxcop-plugin/src/main/java/org/apache/maven/dotnet/plugin/fxcop/FxCopAggregateMojo.java?view=diff&rev=541365&r1=541364&r2=541365
==============================================================================
---
incubator/nmaven/trunk/plugins/maven-fxcop-plugin/src/main/java/org/apache/maven/dotnet/plugin/fxcop/FxCopAggregateMojo.java
(original)
+++
incubator/nmaven/trunk/plugins/maven-fxcop-plugin/src/main/java/org/apache/maven/dotnet/plugin/fxcop/FxCopAggregateMojo.java
Thu May 24 10:44:48 2007
@@ -64,7 +64,7 @@
/**
* The profile that the executable should use.
*
- * @parameter expression = "${profile}" default-value = "DEFAULT"
+ * @parameter expression = "${profile}" default-value =
"Microsoft:FxCop:FxCopCmd"
*/
private String profile;
Modified:
incubator/nmaven/trunk/plugins/maven-fxcop-plugin/src/main/java/org/apache/maven/dotnet/plugin/fxcop/FxCopMojo.java
URL:
http://svn.apache.org/viewvc/incubator/nmaven/trunk/plugins/maven-fxcop-plugin/src/main/java/org/apache/maven/dotnet/plugin/fxcop/FxCopMojo.java?view=diff&rev=541365&r1=541364&r2=541365
==============================================================================
---
incubator/nmaven/trunk/plugins/maven-fxcop-plugin/src/main/java/org/apache/maven/dotnet/plugin/fxcop/FxCopMojo.java
(original)
+++
incubator/nmaven/trunk/plugins/maven-fxcop-plugin/src/main/java/org/apache/maven/dotnet/plugin/fxcop/FxCopMojo.java
Thu May 24 10:44:48 2007
@@ -56,7 +56,7 @@
/**
* The profile that the executable should use.
*
- * @parameter expression = "${profile}" default-value = "DEFAULT"
+ * @parameter expression = "${profile}" default-value =
"Microsoft:FxCop:FxCopCmd"
*/
private String profile;
Added: incubator/nmaven/trunk/plugins/net-exe.bat
URL:
http://svn.apache.org/viewvc/incubator/nmaven/trunk/plugins/net-exe.bat?view=auto&rev=541365
==============================================================================
--- incubator/nmaven/trunk/plugins/net-exe.bat (added)
+++ incubator/nmaven/trunk/plugins/net-exe.bat Thu May 24 10:44:48 2007
@@ -0,0 +1 @@
+mvn archetype:create -DpackageName=org.apache.maven.dotnet.plugin.%1
-DartifactId=maven-%1-plugin -DgroupId=org.apache.maven.dotnet.plugins
-Dversion=0.14-SNAPSHOT -DarchetypeArtifactId=maven-archetype-netexecutable
-DarchetypeGroupId=org.apache.maven.dotnet -DarchetypeVersion=0.14-SNAPSHOT
Propchange: incubator/nmaven/trunk/plugins/net-exe.bat
------------------------------------------------------------------------------
svn:eol-style = native
Added: incubator/nmaven/trunk/site/conventions.apt
URL:
http://svn.apache.org/viewvc/incubator/nmaven/trunk/site/conventions.apt?view=auto&rev=541365
==============================================================================
--- incubator/nmaven/trunk/site/conventions.apt (added)
+++ incubator/nmaven/trunk/site/conventions.apt Thu May 24 10:44:48 2007
@@ -0,0 +1,74 @@
+Conventions
+
+ The following sections describe the conventions used within NMaven itself.
This section is useful for developers wishing to
+ contribute to NMaven, as well as developers looking for a baseline for their
own projects.
+ These conventions are evolving and subject to change as better ideas emerge:
{{{mailto:[EMAIL PROTECTED] Got better ideas?}}
+
+ * Artifact ID - specified within the pom - is equivalent to the project's
module name.
+
+ Project Structure:
+
++------+
+ |-- NMaven.Artifact
+ | `-- main
+ | `-- csharp
+ | `-- NMaven
+ | `-- Artifact
+ | `-- ArtifactContext.cs
+ | `-- Artifact.cs
+ `-- pom.xml
++------+
+
+ pom.xml file
+
++------+
+<project xmlns="http://maven.apache.org/POM/4.0.0";>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>NMaven.Artifact</groupId>
+ <artifactId>NMaven.Artifact</artifactId>
+ <packaging>library</packaging>
+ <version>0.14-SNAPSHOT</version>
+ <name>NMaven.Artifact</name>
+</project>
++------+
+
+ * If the module does not contain children modules, the Group ID is the same
as the artifact ID.
+
+ * If a module contains children modules, the child module Group ID should
either be equivalent to the parent module
+ Group ID or be a deriviative of the parent module Group ID.
+
+ * The directory structure of the source directory (typically src/main/csharp)
will follow the same pattern as the group ID.
+
+ * If an assembly will only compile under a specific platform, those values
should be specified within the compiler-config.
+
++------+
+
+ <project xmlns="http://maven.apache.org/POM/4.0.0";>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>NMaven.Plugins</groupId>
+ <artifactId>NMaven.Plugins</artifactId>
+ <packaging>pom</packaging>
+ <version>0.14-SNAPSHOT</version>
+ <name>NMaven.Plugins</name>
+ <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>
+ <configuration>
+ <vendor>MONO</vendor>
+ <frameworkVersion>2.0.50727</frameworkVersion>
+ <vendorVersion>1.2.3.1</vendorVersion>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
++------+
+
+
+ * Use the default setup within the nmaven-settings.xml is to configure
cross-platform builds.
+
Modified: incubator/nmaven/trunk/site/src/site/apt/adding-executables.apt
URL:
http://svn.apache.org/viewvc/incubator/nmaven/trunk/site/src/site/apt/adding-executables.apt?view=diff&rev=541365&r1=541364&r2=541365
==============================================================================
--- incubator/nmaven/trunk/site/src/site/apt/adding-executables.apt (original)
+++ incubator/nmaven/trunk/site/src/site/apt/adding-executables.apt Thu May 24
10:44:48 2007
@@ -98,7 +98,7 @@
-DarchetypeVersion=0.14-SNAPSHOT
+----+
- [[2]] Make sure to add an entry in the net-executables.xml file, located
within the dotnet-core module. Replace each
+ [[2]] Make sure to add an entry in the executable-plugins.xml file, located
within the dotnet-core module. Replace each
param: ${vendor}, ${exe}, .. with the appropriate values.
+----+
@@ -121,7 +121,7 @@
+----+
[[3]] 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.
+ the ${profile} within the executable-plugins.xml.
[[4]] Add any special commands to the getCommands method.
