date:20070604

svn commit: r544156 - in /incubator/nmaven/trunk/plugins/maven-vsinstaller-plugin: pom.xml src/main/java/org/apache/maven/dotnet/plugin/vsinstaller/VsInstallerMojo.java

2007-06-04 Thread sisbell

Author: sisbell
Date: Mon Jun  4 07:53:40 2007
New Revision: 544156

URL: http://svn.apache.org/viewvc?view=rev&rev=544156
Log:
Updated docs.

Modified:
incubator/nmaven/trunk/plugins/maven-vsinstaller-plugin/pom.xml

incubator/nmaven/trunk/plugins/maven-vsinstaller-plugin/src/main/java/org/apache/maven/dotnet/plugin/vsinstaller/VsInstallerMojo.java

Modified: incubator/nmaven/trunk/plugins/maven-vsinstaller-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/incubator/nmaven/trunk/plugins/maven-vsinstaller-plugin/pom.xml?view=diff&rev=544156&r1=544155&r2=544156
==
--- incubator/nmaven/trunk/plugins/maven-vsinstaller-plugin/pom.xml (original)
+++ incubator/nmaven/trunk/plugins/maven-vsinstaller-plugin/pom.xml Mon Jun  4 
07:53:40 2007
@@ -31,4 +31,11 @@
   
 Maven Plugin for .NET
   
+  
+
+  nmaven-apache-site
+  NMaven Site
+  
file://${basedir}/../../../www/plugins/maven-vsinstaller-plugin
+
+  
 

Modified: 
incubator/nmaven/trunk/plugins/maven-vsinstaller-plugin/src/main/java/org/apache/maven/dotnet/plugin/vsinstaller/VsInstallerMojo.java
URL: 
http://svn.apache.org/viewvc/incubator/nmaven/trunk/plugins/maven-vsinstaller-plugin/src/main/java/org/apache/maven/dotnet/plugin/vsinstaller/VsInstallerMojo.java?view=diff&rev=544156&r1=544155&r2=544156
==
--- 
incubator/nmaven/trunk/plugins/maven-vsinstaller-plugin/src/main/java/org/apache/maven/dotnet/plugin/vsinstaller/VsInstallerMojo.java
 (original)
+++ 
incubator/nmaven/trunk/plugins/maven-vsinstaller-plugin/src/main/java/org/apache/maven/dotnet/plugin/vsinstaller/VsInstallerMojo.java
 Mon Jun  4 07:53:40 2007
@@ -32,6 +32,8 @@
 import java.util.List;
 
 /**
+ * Installs Visual Studio 2005 addin.
+ *
  * @author Shane Isbell
  * @goal install
  * @requiresProject false
@@ -50,16 +52,22 @@
 private MavenProject project;
 
 /**
+ * The the path to the local maven repository.
+ *
  * @parameter expression="${settings.localRepository}"
  */
 private String localRepository;
 
 /**
+ * The remote repository that contains the vsinstaller and NMaven 
artifacts.
+ *
  * @parameter expression="${remoteRepository}"
  */
 private String remoteRepository;
 
 /**
+ * Provides services for obtaining artifact information and dependencies
+ *
  * @component
  */
 private ArtifactContext artifactContext;
@@ -70,11 +78,15 @@
 private ArtifactHandlerManager artifactHandlerManager;
 
 /**
+ * Provides access to configuration information used by NMaven.
+ *
  * @component
  */
 private org.apache.maven.dotnet.NMavenRepositoryRegistry nmavenRegistry;
 
 /**
+ * Provides services to obtain executables.
+ *
  * @component
  */
 private org.apache.maven.dotnet.executable.NetExecutableFactory 
netExecutableFactory;
@@ -190,8 +202,7 @@
 }
 }
 
-public List getGacInstallCommandsFor( Artifact artifact )
-throws MojoExecutionException
+private List getGacInstallCommandsFor( Artifact artifact )
 {
 List commands = new ArrayList();
 commands.add( "/nologo" );

svn commit: r544157 - in /incubator/nmaven/trunk/site/src/site/apt: ide/visual-studio.apt plugins/index.apt

2007-06-04 Thread sisbell

Author: sisbell
Date: Mon Jun  4 07:54:02 2007
New Revision: 544157

URL: http://svn.apache.org/viewvc?view=rev&rev=544157
Log:
Updated site docs.

Modified:
incubator/nmaven/trunk/site/src/site/apt/ide/visual-studio.apt
incubator/nmaven/trunk/site/src/site/apt/plugins/index.apt

Modified: incubator/nmaven/trunk/site/src/site/apt/ide/visual-studio.apt
URL: 
http://svn.apache.org/viewvc/incubator/nmaven/trunk/site/src/site/apt/ide/visual-studio.apt?view=diff&rev=544157&r1=544156&r2=544157
==
--- incubator/nmaven/trunk/site/src/site/apt/ide/visual-studio.apt (original)
+++ incubator/nmaven/trunk/site/src/site/apt/ide/visual-studio.apt Mon Jun  4 
07:54:02 2007
@@ -4,7 +4,7 @@
 
  The current version of the Visual Studio plugin is experimental and is meant 
as a proof of concept demonstrating
  that VS2005 can build .NET applications through Maven. It is being put out 
there to get early feedback on what developers
- want to see. The plugin is not currently ready to use for any serious 
development.
+ want to see. 
 
 * Installing
 

Modified: incubator/nmaven/trunk/site/src/site/apt/plugins/index.apt
URL: 
http://svn.apache.org/viewvc/incubator/nmaven/trunk/site/src/site/apt/plugins/index.apt?view=diff&rev=544157&r1=544156&r2=544157
==
--- incubator/nmaven/trunk/site/src/site/apt/plugins/index.apt (original)
+++ incubator/nmaven/trunk/site/src/site/apt/plugins/index.apt Mon Jun  4 
07:54:02 2007
@@ -15,6 +15,8 @@
 
*---+--+
 | {{{maven-test-plugin/index.html} <<>>}}  | Tests class 
files with NUnit
 
*---+--+
+| {{{maven-vsinstaller-plugin/index.html} <<>>}}  | Installs the 
Visual Studio 2005 Addin
+*---+--+
 | {{{maven-webapp-plugin/index.html} <<>>}}  | Packages and 
deploys web applications
 
*---+--+
 | {{{maven-wsdl-plugin/index.html} <<>>}}  | Generates WSDLs

svn commit: r544158 [4/4] - in /incubator/nmaven/www: ./ ide/ images/ images/logos/ plugins/ plugins/maven-vsinstaller-plugin/ plugins/maven-vsinstaller-plugin/apidocs/ plugins/maven-vsinstaller-plugi

2007-06-04 Thread sisbell

Added: 
incubator/nmaven/www/plugins/maven-vsinstaller-plugin/xref/org/apache/maven/dotnet/plugin/vsinstaller/VsInstallerMojo.html
URL: 
http://svn.apache.org/viewvc/incubator/nmaven/www/plugins/maven-vsinstaller-plugin/xref/org/apache/maven/dotnet/plugin/vsinstaller/VsInstallerMojo.html?view=auto&rev=544158
==
--- 
incubator/nmaven/www/plugins/maven-vsinstaller-plugin/xref/org/apache/maven/dotnet/plugin/vsinstaller/VsInstallerMojo.html
 (added)
+++ 
incubator/nmaven/www/plugins/maven-vsinstaller-plugin/xref/org/apache/maven/dotnet/plugin/vsinstaller/VsInstallerMojo.html
 Mon Jun  4 07:58:16 2007
@@ -0,0 +1,244 @@
+http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
+http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en">
+
+
+VsInstallerMojo xref
+
+
+
+View
 Javadoc
+
+1   package 
org.apache.maven.dotnet.plugin.vsinstaller;
+2   
+3   import 
org.apache.maven.plugin.AbstractMojo;
+4   import 
org.apache.maven.plugin.MojoExecutionException;
+5   import 
org.apache.maven.plugin.MojoFailureException;
+6   import 
org.apache.maven.model.Dependency;
+7   import 
org.apache.maven.artifact.resolver.ArtifactResolutionException;
+8   import 
org.apache.maven.artifact.resolver.ArtifactNotFoundException;
+9   import 
org.apache.maven.artifact.installer.ArtifactInstallationException;
+10  import 
org.apache.maven.artifact.handler.manager.ArtifactHandlerManager;
+11  import 
org.apache.maven.artifact.repository.ArtifactRepository;
+12  import 
org.apache.maven.artifact.repository.DefaultArtifactRepository;
+13  import 
org.apache.maven.artifact.repository.layout.DefaultRepositoryLayout;
+14  import 
org.apache.maven.artifact.Artifact;
+15  import 
org.apache.maven.dotnet.artifact.ArtifactContext;
+16  import 
org.apache.maven.dotnet.artifact.NetDependenciesRepository;
+17  import 
org.apache.maven.dotnet.artifact.NetDependencyMatchPolicy;
+18  import 
org.apache.maven.dotnet.executable.NetExecutable;
+19  import 
org.apache.maven.dotnet.executable.ExecutionException;
+20  import 
org.apache.maven.dotnet.PlatformUnsupportedException;
+21  import 
org.apache.maven.dotnet.registry.RepositoryRegistry;
+22  import 
org.apache.maven.dotnet.vendor.Vendor;
+23  import 
org.apache.maven.dotnet.model.netdependency.NetDependency;
+24  import 
org.apache.maven.project.MavenProject;
+25  import 
org.codehaus.plexus.util.IOUtil;
+26  
+27  import 
java.io.File;
+28  import 
java.io.IOException;
+29  import 
java.io.FileOutputStream;
+30  import 
java.io.OutputStreamWriter;
+31  import 
java.util.ArrayList;
+32  import 
java.util.List;
+33  
+34  /**
+35   * Installs 
Visual Studio 2005 addin.
+36   *
+37   * @author 
Shane Isbell
+38   * @goal 
install
+39   * 
@requiresProject false
+40   * 
@requiresDirectInvocation true
+41   */
+42  public 
class VsInstallerMojo
+43  extends AbstractMojo
+44  {
+45  
+46  /**
+47   * The 
maven project.
+48   *
+49   * 
@parameter expression="${project}"
+50   * 
@required
+51   */
+52  private MavenProject project;
+53  
+54  /**
+55   * The the 
path to the local maven repository.
+56   *
+57   * 
@parameter expression="${settings.localRepository}"
+58   */
+59  private String localRepository;
+60  
+61  /**
+62   * The 
remote repository that contains the vsinstaller and NMaven artifacts.
+63   *
+64   * 
@parameter expression="${remoteRepository}"
+65   */
+66  private String remoteRepository;
+67  
+68  /**
+69   * Provides 
services for obtaining artifact information and dependencies
+70   *
+71   * 
@component
+72   */
+73  private ArtifactContext artifactContext;
+74  
+75  /**
+76   * 
@component
+77   */
+78  private ArtifactHandlerManager 
artifactHandlerManager;
+79  
+80  /**
+81   * Provides 
access to configuration information used by NMaven.
+82   *
+83   * 
@component
+84   */
+85  private 
org.apache.maven.dotnet.NMavenRepositoryRegistry nmavenRegistry;
+86  
+87  /**
+88   * Provides 
services to obtain executables.
+89   *
+90   * 
@component
+91   */
+92  private 
org.apache.maven.dotnet.executable.NetExecutableFactory netExecutableFactory;
+93  
+94  public void 
execute()
+95  throws MojoExecutionException, MojoFailureException
+96  {
+97  
+98  RepositoryRegistry repositoryRegistry;
+99  try
+100 {
+101 repositoryRegistry = 
nmavenRegistry.createRepositoryRegistry();
+102 }
+103 catch ( IOException e )
+104 {
+105 throw new 
MojoExecutionException(
+106 "NMAVEN-1600-000: Failed to create the repository registry 
for this plugin", e );
+107 }
+108 List 
remoteRepositories = new 
ArrayList();
+109 if ( remoteRepository != null )
+110 {
+111

svn commit: r544174 - /incubator/nmaven/www/plugins/maven-vsinstaller-plugin/index.html

2007-06-04 Thread sisbell

Author: sisbell
Date: Mon Jun  4 09:01:45 2007
New Revision: 544174

URL: http://svn.apache.org/viewvc?view=rev&rev=544174
Log:
Minor website update to vsinstaller.

Modified:
incubator/nmaven/www/plugins/maven-vsinstaller-plugin/index.html

Modified: incubator/nmaven/www/plugins/maven-vsinstaller-plugin/index.html
URL: 
http://svn.apache.org/viewvc/incubator/nmaven/www/plugins/maven-vsinstaller-plugin/index.html?view=diff&rev=544174&r1=544173&r2=544174
==
--- incubator/nmaven/www/plugins/maven-vsinstaller-plugin/index.html (original)
+++ incubator/nmaven/www/plugins/maven-vsinstaller-plugin/index.html Mon Jun  4 
09:01:45 2007
@@ -40,7 +40,7 @@
   
   
 
-Last Published: 06/03/2007
+Last Published: 06/04/2007
   
   http://incubator.apache.org/projects/nmaven.html";>Project Site
   |
@@ -93,7 +93,11 @@
 
   
 
-  Compile 
Using A Different JDK
+  Install From 
File System
+
+  
+
+  Install From 
Remote Repo
 
   
   Project Documentation
@@ -119,6 +123,18 @@
   
 
   Project Information
+  
+  
+
+  
+  
+
+  
+
+  
+  
+
+  Project Reports
   
   
http://maven.apache.org/"; 
title="Built by Maven" id="poweredBy">

svn commit: r544189 - in /incubator/nmaven/trunk: pom-dotnet.xml pom.xml

2007-06-04 Thread sisbell

Author: sisbell
Date: Mon Jun  4 10:21:47 2007
New Revision: 544189

URL: http://svn.apache.org/viewvc?view=rev&rev=544189
Log:
Added the maven-parent pom reference.

Modified:
incubator/nmaven/trunk/pom-dotnet.xml
incubator/nmaven/trunk/pom.xml

Modified: incubator/nmaven/trunk/pom-dotnet.xml
URL: 
http://svn.apache.org/viewvc/incubator/nmaven/trunk/pom-dotnet.xml?view=diff&rev=544189&r1=544188&r2=544189
==
--- incubator/nmaven/trunk/pom-dotnet.xml (original)
+++ incubator/nmaven/trunk/pom-dotnet.xml Mon Jun  4 10:21:47 2007
@@ -19,6 +19,12 @@
 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";>
   4.0.0
+  
+org.apache.maven
+maven-parent
+5
+pom/maven/pom.xml
+  
   NMaven.Project
   NMaven.Project
   pom

Modified: incubator/nmaven/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/incubator/nmaven/trunk/pom.xml?view=diff&rev=544189&r1=544188&r2=544189
==
--- incubator/nmaven/trunk/pom.xml (original)
+++ incubator/nmaven/trunk/pom.xml Mon Jun  4 10:21:47 2007
@@ -19,6 +19,12 @@
 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";>
   4.0.0
+  
+org.apache.maven
+maven-parent
+5
+pom/maven/pom.xml
+  
   org.apache.maven.dotnet
   dotnet-project
   pom

svn commit: r544312 - /incubator/nmaven/trunk/plugins/maven-deploy-plugin/src/main/java/org/apache/maven/dotnet/plugins/DeployFileMojo.java

2007-06-04 Thread sisbell

Author: sisbell
Date: Mon Jun  4 15:23:55 2007
New Revision: 544312

URL: http://svn.apache.org/viewvc?view=rev&rev=544312
Log:
Fixed the deploy-file plugin to accept repositoryId. It is now able to deploy 
remotely using authentication.

Modified:

incubator/nmaven/trunk/plugins/maven-deploy-plugin/src/main/java/org/apache/maven/dotnet/plugins/DeployFileMojo.java

Modified: 
incubator/nmaven/trunk/plugins/maven-deploy-plugin/src/main/java/org/apache/maven/dotnet/plugins/DeployFileMojo.java
URL: 
http://svn.apache.org/viewvc/incubator/nmaven/trunk/plugins/maven-deploy-plugin/src/main/java/org/apache/maven/dotnet/plugins/DeployFileMojo.java?view=diff&rev=544312&r1=544311&r2=544312
==
--- 
incubator/nmaven/trunk/plugins/maven-deploy-plugin/src/main/java/org/apache/maven/dotnet/plugins/DeployFileMojo.java
 (original)
+++ 
incubator/nmaven/trunk/plugins/maven-deploy-plugin/src/main/java/org/apache/maven/dotnet/plugins/DeployFileMojo.java
 Mon Jun  4 15:23:55 2007
@@ -60,6 +60,12 @@
 private String version;
 
 /**
+ * @parameter expression = "${repositoryId}
+ */
+private String repositoryId;
+
+
+/**
  * @parameter expression = "${packaging}
  * @required
  */
@@ -97,7 +103,7 @@
 artifact.addMetadata( metadata );
 
 ArtifactRepository deploymentRepository =
-repositoryFactory.createDeploymentArtifactRepository( null, url, 
new AssemblyRepositoryLayout(), true );
+repositoryFactory.createDeploymentArtifactRepository( 
repositoryId, url, new AssemblyRepositoryLayout(), true );
 
 try
 {

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/pl

2007-06-04 Thread sisbell

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) 
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 getCommandsFor( Vendor vendor )
-throws MojoExecutionException
+private List getCommandsFor( Vendor vendor )
 {
 String finalName = project.getBuild().getFinalName();
 List commands = new ArrayList();
@@ -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 @@
 
 
-
-http://incubator.apache.org/projects/nmaven.html"/>
-http://incubator.apache.org/nmaven"/>
-http://svn.apache.org/repos/asf/incubator/nmaven/"/>
-http://maven.apache.org/"/>
-http://www.mono-project.com/"/>
-http://dotgnu.org/"/>
-
-

svn commit: r544156 - in /incubator/nmaven/trunk/plugins/maven-vsinstaller-plugin: pom.xml src/main/java/org/apache/maven/dotnet/plugin/vsinstaller/VsInstallerMojo.java

svn commit: r544157 - in /incubator/nmaven/trunk/site/src/site/apt: ide/visual-studio.apt plugins/index.apt

svn commit: r544158 [4/4] - in /incubator/nmaven/www: ./ ide/ images/ images/logos/ plugins/ plugins/maven-vsinstaller-plugin/ plugins/maven-vsinstaller-plugin/apidocs/ plugins/maven-vsinstaller-plugi

svn commit: r544174 - /incubator/nmaven/www/plugins/maven-vsinstaller-plugin/index.html

svn commit: r544189 - in /incubator/nmaven/trunk: pom-dotnet.xml pom.xml

svn commit: r544312 - /incubator/nmaven/trunk/plugins/maven-deploy-plugin/src/main/java/org/apache/maven/dotnet/plugins/DeployFileMojo.java

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/pl

7 matches

Site Navigation

Mail list logo

Footer information