svn commit: r513883 - in /incubator/nmaven/branches/SI_IDE/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact: ArtifactType.java impl/ArtifactInstallerImpl.java

[sisbell]

Author: sisbell
Date: Fri Mar  2 10:49:07 2007
New Revision: 513883

URL: http://svn.apache.org/viewvc?view=rev&rev=513883
Log:
Bug fix.

Modified:
    
incubator/nmaven/branches/SI_IDE/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/ArtifactType.java
    
incubator/nmaven/branches/SI_IDE/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/ArtifactInstallerImpl.java

Modified: 
incubator/nmaven/branches/SI_IDE/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/ArtifactType.java
URL: 
http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_IDE/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/ArtifactType.java?view=diff&rev=513883&r1=513882&r2=513883
==============================================================================
--- 
incubator/nmaven/branches/SI_IDE/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/ArtifactType.java
 (original)
+++ 
incubator/nmaven/branches/SI_IDE/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/ArtifactType.java
 Fri Mar  2 10:49:07 2007
@@ -88,6 +88,14 @@
         {
            return ArtifactType.LIBRARY;
         }
+        else if ( name.equals( ArtifactType.NAR.getArtifactTypeName() ) )
+        {
+           return ArtifactType.NAR;
+        }
+        else if ( name.equals( ArtifactType.EXECONFIG.getArtifactTypeName() ) )
+        {
+           return ArtifactType.EXECONFIG;
+        }
         return ArtifactType.NULL;
     }
 
@@ -112,6 +120,10 @@
         else if ( extension.equals( ArtifactType.NAR.getExtension() ) )
         {
            return ArtifactType.LIBRARY;
+        }
+        else if ( extension.equals( ArtifactType.EXECONFIG.getExtension() ) )
+        {
+           return ArtifactType.EXECONFIG;
         }
         return ArtifactType.NULL;
     }

Modified: 
incubator/nmaven/branches/SI_IDE/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/ArtifactInstallerImpl.java
URL: 
http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_IDE/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/ArtifactInstallerImpl.java?view=diff&rev=513883&r1=513882&r2=513883
==============================================================================
--- 
incubator/nmaven/branches/SI_IDE/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/ArtifactInstallerImpl.java
 (original)
+++ 
incubator/nmaven/branches/SI_IDE/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/ArtifactInstallerImpl.java
 Fri Mar  2 10:49:07 2007
@@ -292,18 +292,21 @@
 
             depPath.append( dependency.getArtifactId() ).append( 
File.separator )
                 .append( dependency.getVersion() ).append( File.separator );
-            File file = new File( depPath.toString() + 
dependency.getArtifactId() +
-                ArtifactType.getArtifactTypeForName( dependency.getType() ) ); 
//TODO: other types
+            String extension = ArtifactType.getArtifactTypeForName( 
dependency.getType() ).getExtension();
+            File file =
+                new File( depPath.toString() + dependency.getArtifactId() + 
"." + extension ); //TODO: other types
 
             try
             {
                 logger.info( "NMAVEN-002-016: Installing File: From = " + 
file.getAbsolutePath() + ", To = " +
-                    depPath.toString() + dependency.getArtifactId() + ".dll" );
+                    depPath.toString() + File.separator + 
dependency.getArtifactId() + "." + extension );
                 FileUtils.copyFileToDirectory( file, new File( path.toString() 
) );
             }
             catch ( IOException e )
             {
-                e.printStackTrace();
+                throw new ArtifactInstallationException(
+                    "NMAVEN-002-017: Failed to install file into repo: File 
Name = " + file.getAbsolutePath() +
+                        ", Extension = " + extension + ", Type = " + 
dependency.getType(), e );
             }
         }
     }