incubator-nmaven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sisb...@apache.org
Subject svn commit: r544390 - in /incubator/nmaven/trunk/plugins: ./ maven-repository-plugin/src/main/java/org/apache/maven/dotnet/plugin/repository/ maven-test-plugin/src/main/java/org/apache/maven/dotnet/plugin/test/ maven-test-plugin/src/site/
Date Tue, 05 Jun 2007 05:49:18 GMT
Author: sisbell
Date: Mon Jun  4 22:49:16 2007
New Revision: 544390

URL: http://svn.apache.org/viewvc?view=rev&rev=544390
Log:
adding additional types for the repository plugin. Updated site info.

Modified:
    incubator/nmaven/trunk/plugins/maven-repository-plugin/src/main/java/org/apache/maven/dotnet/plugin/repository/RepositoryAssemblerMojo.java
    incubator/nmaven/trunk/plugins/maven-test-plugin/src/main/java/org/apache/maven/dotnet/plugin/test/TesterMojo.java
    incubator/nmaven/trunk/plugins/maven-test-plugin/src/site/site.xml
    incubator/nmaven/trunk/plugins/pom.xml

Modified: incubator/nmaven/trunk/plugins/maven-repository-plugin/src/main/java/org/apache/maven/dotnet/plugin/repository/RepositoryAssemblerMojo.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/plugins/maven-repository-plugin/src/main/java/org/apache/maven/dotnet/plugin/repository/RepositoryAssemblerMojo.java?view=diff&rev=544390&r1=544389&r2=544390
==============================================================================
--- incubator/nmaven/trunk/plugins/maven-repository-plugin/src/main/java/org/apache/maven/dotnet/plugin/repository/RepositoryAssemblerMojo.java
(original)
+++ incubator/nmaven/trunk/plugins/maven-repository-plugin/src/main/java/org/apache/maven/dotnet/plugin/repository/RepositoryAssemblerMojo.java
Mon Jun  4 22:49:16 2007
@@ -114,7 +114,14 @@
 
         for ( Dependency dependency : (List<Dependency>) project.getDependencies()
)
         {
-            if ( !dependency.getType().equals( ArtifactType.LIBRARY.getTargetCompileType()
) )
+            if ( !dependency.getType().equals( ArtifactType.LIBRARY.getTargetCompileType())
&&
+                !dependency.getType().equals( ArtifactType.NETPLUGIN.getPackagingType() )
&&
+                !dependency.getType().equals( ArtifactType.EXE.getTargetCompileType() ) &&
+                !dependency.getType().equals( ArtifactType.EXECONFIG.getTargetCompileType()
) &&
+                !dependency.getType().equals( ArtifactType.MODULE.getTargetCompileType()
) &&
+                !dependency.getType().equals( ArtifactType.NAR.getTargetCompileType() ) &&
+                !dependency.getType().equals( ArtifactType.VISUAL_STUDIO_ADDIN.getTargetCompileType()
) &&
+                !dependency.getType().equals( ArtifactType.WINEXE.getTargetCompileType()
))
             {
                 javaDependencies.add( dependency );
             }

Modified: incubator/nmaven/trunk/plugins/maven-test-plugin/src/main/java/org/apache/maven/dotnet/plugin/test/TesterMojo.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/plugins/maven-test-plugin/src/main/java/org/apache/maven/dotnet/plugin/test/TesterMojo.java?view=diff&rev=544390&r1=544389&r2=544390
==============================================================================
--- incubator/nmaven/trunk/plugins/maven-test-plugin/src/main/java/org/apache/maven/dotnet/plugin/test/TesterMojo.java
(original)
+++ incubator/nmaven/trunk/plugins/maven-test-plugin/src/main/java/org/apache/maven/dotnet/plugin/test/TesterMojo.java
Mon Jun  4 22:49:16 2007
@@ -40,7 +40,6 @@
 import org.apache.maven.dotnet.artifact.AssemblyRepositoryLayout;
 import org.apache.maven.dotnet.artifact.AssemblyResolver;
 
-
 /**
  * Runs NUnit tests
  *
@@ -109,14 +108,13 @@
     private String localRepository;
 
 
-    public String getExecutableFor( Vendor vendor, String home )
+    private String getExecutableFor( Vendor vendor, String home )
     {
         return !( nunitHome == null || nunitHome.equals( "" ) ) ? nunitHome + File.separator
+ "bin" + File.separator +
             "nunit-console" : "nunit-console";
     }
 
-    public List<String> getCommandsFor( Vendor vendor )
-        throws MojoExecutionException
+    private List<String> getCommandsFor( Vendor vendor )
     {
         String finalName = project.getBuild().getFinalName();
         List<String> commands = new ArrayList<String>();
@@ -219,7 +217,7 @@
         {
             throw new MojoExecutionException( "NMAVEN-1100-004: Unable to copy library to
target directory: ", e );
         }
-
+        //TODO: Check timestamps
         //Copy Test Artifact
         try
         {

Modified: incubator/nmaven/trunk/plugins/maven-test-plugin/src/site/site.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/plugins/maven-test-plugin/src/site/site.xml?view=diff&rev=544390&r1=544389&r2=544390
==============================================================================
--- incubator/nmaven/trunk/plugins/maven-test-plugin/src/site/site.xml (original)
+++ incubator/nmaven/trunk/plugins/maven-test-plugin/src/site/site.xml Mon Jun  4 22:49:16
2007
@@ -1,16 +1,22 @@
 <project name="NMaven">
     <body>
-        <links>
-            <item name="Project Site" href="http://incubator.apache.org/projects/nmaven.html"/>
-            <item name="NMaven" href="http://incubator.apache.org/nmaven"/>
-            <item name="NMaven SVN" href="http://svn.apache.org/repos/asf/incubator/nmaven/"/>
-            <item name="Maven" href="http://maven.apache.org/"/>
-            <item name="Mono Project" href="http://www.mono-project.com/"/>
-            <item name="DotGNU" href="http://dotgnu.org/"/>
-        </links>
-        <menu name="General Info">
-            <item name="About" href="index.html"/>            
-        </menu>
-        ${reports}
+    <links>
+      <item name="Project Site" href="http://incubator.apache.org/projects/nmaven.html"/>
+      <item name="NMaven" href="http://incubator.apache.org/nmaven"/>
+      <item name="NMaven SVN" href="http://svn.apache.org/repos/asf/incubator/nmaven/"/>
+      <item name="Maven" href="http://maven.apache.org/"/>
+      <item name="Mono Project" href="http://www.mono-project.com/"/>
+      <item name="DotGNU" href="http://dotgnu.org/"/>
+    </links>
+    <menu name="Overview">
+      <item name="Introduction" href="index.html"/>
+      <item name="Goals" href="plugin-info.html"/>
+      <item name="Usage" href="usage.html"/>
+    </menu>
+    <menu name="Examples">
+      <item name="Install From File System" href="examples/install-from-file-system.html"/>
+      <item name="Install From Remote Repo" href="examples/install-from-remote-repo.html"/>
+    </menu>
+    ${reports}
     </body>
 </project>

Modified: incubator/nmaven/trunk/plugins/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/plugins/pom.xml?view=diff&rev=544390&r1=544389&r2=544390
==============================================================================
--- incubator/nmaven/trunk/plugins/pom.xml (original)
+++ incubator/nmaven/trunk/plugins/pom.xml Mon Jun  4 22:49:16 2007
@@ -40,6 +40,7 @@
     <module>maven-link-plugin</module>
     <module>maven-mojo-generator-plugin</module>
     <module>maven-resgen-plugin</module>
+    <module>maven-repository-plugin</module>
     <module>maven-resolver-plugin</module>
     <module>maven-test-plugin</module>
     <module>maven-vsinstaller-plugin</module>    
@@ -110,4 +111,21 @@
       -->
     </plugins>
   </build>
+  <reporting>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-plugin-plugin</artifactId>
+        <version>2.2-SNAPSHOT</version>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jxr-plugin</artifactId>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-javadoc-plugin</artifactId>
+      </plugin>
+    </plugins>
+  </reporting>  
 </project>



Mime
View raw message