svn commit: r658956 - /incubator/nmaven/trunk/components/maven-dotnet-toolchain/src/main/java/org/apache/maven/dotnet/toolchain/DotnetToolchain.java

2008-05-21 Thread sisbell 
Author: sisbell
Date: Wed May 21 17:35:32 2008
New Revision: 658956

URL: http://svn.apache.org/viewvc?rev=658956&view=rev
Log:
Removed use of method only supported on jdk 1.6.

Modified:

incubator/nmaven/trunk/components/maven-dotnet-toolchain/src/main/java/org/apache/maven/dotnet/toolchain/DotnetToolchain.java

Modified: 
incubator/nmaven/trunk/components/maven-dotnet-toolchain/src/main/java/org/apache/maven/dotnet/toolchain/DotnetToolchain.java
URL: 
http://svn.apache.org/viewvc/incubator/nmaven/trunk/components/maven-dotnet-toolchain/src/main/java/org/apache/maven/dotnet/toolchain/DotnetToolchain.java?rev=658956&r1=658955&r2=658956&view=diff
==
--- 
incubator/nmaven/trunk/components/maven-dotnet-toolchain/src/main/java/org/apache/maven/dotnet/toolchain/DotnetToolchain.java
 (original)
+++ 
incubator/nmaven/trunk/components/maven-dotnet-toolchain/src/main/java/org/apache/maven/dotnet/toolchain/DotnetToolchain.java
 Wed May 21 17:35:32 2008
@@ -9,7 +9,6 @@
 
 import java.util.List;
 import java.util.Arrays;
-import java.io.File;
 
 public final class DotnetToolchain
 extends DefaultToolchain
@@ -61,7 +60,7 @@
 
 public String findTool( String toolName )
 {
-if ( toolName == null || toolName.isEmpty() )
+if ( toolName == null || toolName.trim().length() == 0 )
 {
 throw new IllegalArgumentException( "toolName" );
 }

svn commit: r659023 - in /incubator/nmaven/branches/NMAVEN_0.14: components/pom.xml misc/dotnet-repository-builder/pom.xml plugins/maven-vsinstaller-plugin/src/main/java/org/apache/maven/dotnet/plugin

2008-05-21 Thread eworley 
Author: eworley
Date: Wed May 21 23:57:10 2008
New Revision: 659023

URL: http://svn.apache.org/viewvc?rev=659023&view=rev
Log:
Appling NMAVEN-123.patch, http://jira.codehaus.org/browse/NMAVEN-123

Modified:
incubator/nmaven/branches/NMAVEN_0.14/components/pom.xml
incubator/nmaven/branches/NMAVEN_0.14/misc/dotnet-repository-builder/pom.xml

incubator/nmaven/branches/NMAVEN_0.14/plugins/maven-vsinstaller-plugin/src/main/java/org/apache/maven/dotnet/plugin/vsinstaller/VsInstallerMojo.java
incubator/nmaven/branches/NMAVEN_0.14/pom.xml

Modified: incubator/nmaven/branches/NMAVEN_0.14/components/pom.xml
URL: 
http://svn.apache.org/viewvc/incubator/nmaven/branches/NMAVEN_0.14/components/pom.xml?rev=659023&r1=659022&r2=659023&view=diff
==
--- incubator/nmaven/branches/NMAVEN_0.14/components/pom.xml (original)
+++ incubator/nmaven/branches/NMAVEN_0.14/components/pom.xml Wed May 21 
23:57:10 2008
@@ -36,14 +36,12 @@
 dotnet-assembler  
 dotnet-core  
 dotnet-dao/project  
-dotnet-embedder  
 dotnet-executable  
 dotnet-jetty  
 dotnet-model  
 dotnet-plugin  
 dotnet-registry  
 dotnet-repository  
-dotnet-service/embedder  
 dotnet-vendor 
 


Modified: 
incubator/nmaven/branches/NMAVEN_0.14/misc/dotnet-repository-builder/pom.xml
URL: 
http://svn.apache.org/viewvc/incubator/nmaven/branches/NMAVEN_0.14/misc/dotnet-repository-builder/pom.xml?rev=659023&r1=659022&r2=659023&view=diff
==
--- 
incubator/nmaven/branches/NMAVEN_0.14/misc/dotnet-repository-builder/pom.xml 
(original)
+++ 
incubator/nmaven/branches/NMAVEN_0.14/misc/dotnet-repository-builder/pom.xml 
Wed May 21 23:57:10 2008
@@ -25,7 +25,7 @@
   dotnet-repository-builder  
   pom  

-2.1-SNAPSHOT  
+2.0.8
 ${pom.version}  
 6.1.5  
 1.2.5 
@@ -69,11 +69,6 @@
   
  
   org.apache.maven.dotnet  
-  dotnet-embedder  
-  0.14-incubating-SNAPSHOT 
-  
- 
-  org.apache.maven.dotnet  
   dotnet-executable  
   0.14-incubating-SNAPSHOT 
   
@@ -108,12 +103,6 @@
   dotnet-vendor  
   0.14-incubating-SNAPSHOT 
   
- 
-  org.apache.maven.dotnet  
-  dotnet-service-embedder  
-  war  
-  0.14-incubating-SNAPSHOT 
-  
   
  
   org.apache.maven.dotnet.plugins  
@@ -233,11 +222,6 @@
   ${mavenVersion} 
   
  
-  org.apache.maven  
-  maven-embedder  
-  ${mavenVersion} 
-  
- 
   org.codehaus.xfire  
   xfire-plexus  
   ${xfireVersion} 

Modified: 
incubator/nmaven/branches/NMAVEN_0.14/plugins/maven-vsinstaller-plugin/src/main/java/org/apache/maven/dotnet/plugin/vsinstaller/VsInstallerMojo.java
URL: 
http://svn.apache.org/viewvc/incubator/nmaven/branches/NMAVEN_0.14/plugins/maven-vsinstaller-plugin/src/main/java/org/apache/maven/dotnet/plugin/vsinstaller/VsInstallerMojo.java?rev=659023&r1=659022&r2=659023&view=diff
==
--- 
incubator/nmaven/branches/NMAVEN_0.14/plugins/maven-vsinstaller-plugin/src/main/java/org/apache/maven/dotnet/plugin/vsinstaller/VsInstallerMojo.java
 (original)
+++ 
incubator/nmaven/branches/NMAVEN_0.14/plugins/maven-vsinstaller-plugin/src/main/java/org/apache/maven/dotnet/plugin/vsinstaller/VsInstallerMojo.java
 Wed May 21 23:57:10 2008
@@ -141,23 +141,6 @@
new 
DefaultRepositoryLayout() ) );
 }
 artifactContext.init( null, remoteRepositories, new File( 
localRepository ) );
-List javaDependencies = new ArrayList();
-Dependency warFile = new Dependency();
-warFile.setGroupId( "org.apache.maven.dotnet" );
-warFile.setArtifactId( "dotnet-service-embedder" );
-warFile.setVersion( pomVersion );
-warFile.setType( "war" );
-javaDependencies.add( warFile );
-
-try
-{
-
artifactContext.getArtifactInstaller().resolveAndInstallNetDependenciesForProfile(
 "VisualStudio2005", null,
-   
javaDependencies );
-}
-catch ( IOException e )
-{
-throw new MojoExecutionException( e.getMessage() );
-}
 
 //GAC Installs
 

Modified: incubator/nmaven/branches/NMAVEN_0.14/pom.xml
URL: 
http://svn.apache.org/viewvc/incubator/nmaven/branches/NMAVEN_0.14/pom.xml?rev=659023&r1=659022&r2=659023&view=diff
==
--- incubator/nmaven/branches/NMAVEN_0.14/pom.xml (original)
+++ incubator/nmaven/branches/NMAVEN_0.14/pom.xml Wed May 21 23:57:10 2008
@@ -258,11 +258,6 @@
 ${mavenVersion} 
 

-org.apache.maven  
-maven-