incubator-nmaven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sisb...@apache.org
Subject svn commit: r579756 - /incubator/nmaven/trunk/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/ArtifactInstallerImpl.java
Date Wed, 26 Sep 2007 18:52:27 GMT
Author: sisbell
Date: Wed Sep 26 11:52:26 2007
New Revision: 579756

URL: http://svn.apache.org/viewvc?rev=579756&view=rev
Log:
Fixed problem that caused certain assemblies not to install into the pab.

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

Modified: incubator/nmaven/trunk/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/ArtifactInstallerImpl.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/ArtifactInstallerImpl.java?rev=579756&r1=579755&r2=579756&view=diff
==============================================================================
--- incubator/nmaven/trunk/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/ArtifactInstallerImpl.java
(original)
+++ incubator/nmaven/trunk/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/ArtifactInstallerImpl.java
Wed Sep 26 11:52:26 2007
@@ -266,11 +266,15 @@
                                                                                     dependency.getType(),
                                                                                     dependency.getClassifier(),
scope,
                                                                                     null
);
-
             File artifactDependencyFile = PathUtil.getUserAssemblyCacheFileFor( artifactDependency,
localRepository );
-
-             //Removing the following check because it breaks compatibility with Mono. We
would have to initialize
-             // the Executable Context (perf hit) to get this check for vendor. Fix This.
+            // if(artifactDependencyFile != null) System.out.println("AD = " + artifactDependencyFile.getAbsolutePath());
+            //Removing the following check because it breaks compatibility with Mono. We
would have to initialize
+            // the Executable Context (perf hit) to get this check for vendor. Fix This.
+            if ( ( artifactDependencyFile == null || !artifactDependencyFile.exists() ) &&
+                artifactDependency.getType().startsWith( "gac" ) )
+            {
+                continue;
+            }
             /*
             if ( artifactDependencyFile == null || !artifactDependencyFile.exists() )
             {
@@ -285,13 +289,13 @@
                     ( artifactDependencyFile != null && !artifactDependencyFile.exists()
)
                         ? artifactDependencyFile.getAbsolutePath() : null ) );
             }
-            */
 
+            */
             if ( artifactDependencyFile == null || !artifactDependencyFile.exists() )
             {
-                logger.info("NMAVEN-000-017: Could not find artifact to install: Artifact
ID = "
-                    + artifact.getArtifactId() +", File Path = "
-                    + ((artifactDependencyFile != null) ? artifactDependencyFile.getAbsolutePath()
: null));
+                logger.warn( "NMAVEN-000-017: Could not find artifact to install: Artifact
ID = " +
+                    artifact.getArtifactId() + ", File Path = " +
+                    ( ( artifactDependencyFile != null ) ? artifactDependencyFile.getAbsolutePath()
: null ) );
                 return;
             }
 



Mime
View raw message