svn commit: r239417 - in /maven/maven-1/core/trunk: ./ src/java/org/apache/maven/repository/ src/java/org/apache/maven/verifier/ src/test/touchstone-build/ xdocs/reference/

[vmassol]

Author: vmassol
Date: Tue Aug 23 07:43:37 2005
New Revision: 239417

URL: http://svn.apache.org/viewcvs?rev=239417&view=rev
Log:
MAVEN-1669: Added support for the ejb-client type.

Modified:
    maven/maven-1/core/trunk/project.xml
    
maven/maven-1/core/trunk/src/java/org/apache/maven/repository/AbstractArtifact.java
    
maven/maven-1/core/trunk/src/java/org/apache/maven/verifier/DependencyVerifier.java
    maven/maven-1/core/trunk/src/test/touchstone-build/project.xml
    maven/maven-1/core/trunk/xdocs/reference/backwards-compatibility.xml

Modified: maven/maven-1/core/trunk/project.xml
URL: 
http://svn.apache.org/viewcvs/maven/maven-1/core/trunk/project.xml?rev=239417&r1=239416&r2=239417&view=diff
==============================================================================
--- maven/maven-1/core/trunk/project.xml (original)
+++ maven/maven-1/core/trunk/project.xml Tue Aug 23 07:43:37 2005
@@ -565,7 +565,7 @@
     <dependency>
       <groupId>maven</groupId>
       <artifactId>maven-model</artifactId>
-      <version>3.0.0</version>
+      <version>3.0.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.maven.wagon</groupId>

Modified: 
maven/maven-1/core/trunk/src/java/org/apache/maven/repository/AbstractArtifact.java
URL: 
http://svn.apache.org/viewcvs/maven/maven-1/core/trunk/src/java/org/apache/maven/repository/AbstractArtifact.java?rev=239417&r1=239416&r2=239417&view=diff
==============================================================================
--- 
maven/maven-1/core/trunk/src/java/org/apache/maven/repository/AbstractArtifact.java
 (original)
+++ 
maven/maven-1/core/trunk/src/java/org/apache/maven/repository/AbstractArtifact.java
 Tue Aug 23 07:43:37 2005
@@ -89,20 +89,19 @@
         return path;
     }
 
-    /** @see Artifact#generatePath */
     public String generatePath()
     {
         return fs + getDependency().getArtifactDirectory()
-             + fs + getDependency().getType() + "s"
+             + fs + getDependency().getTypeDirectory()
              + fs + getDependency().getArtifact();
     }
 
     /** @see Artifact#getUrlPath */
     public String getUrlPath()
     {
-        return "/" + getDependency().getArtifactDirectory()
-             + "/" + getDependency().getType() + "s"
-             + "/" + getDependency().getArtifact();
+        return fs + getDependency().getArtifactDirectory()
+             + fs + getDependency().getTypeDirectory()
+             + fs + getDependency().getArtifact();
     }
 
     /** @see Artifact#getChecksumUrl */

Modified: 
maven/maven-1/core/trunk/src/java/org/apache/maven/verifier/DependencyVerifier.java
URL: 
http://svn.apache.org/viewcvs/maven/maven-1/core/trunk/src/java/org/apache/maven/verifier/DependencyVerifier.java?rev=239417&r1=239416&r2=239417&view=diff
==============================================================================
--- 
maven/maven-1/core/trunk/src/java/org/apache/maven/verifier/DependencyVerifier.java
 (original)
+++ 
maven/maven-1/core/trunk/src/java/org/apache/maven/verifier/DependencyVerifier.java
 Tue Aug 23 07:43:37 2005
@@ -149,6 +149,7 @@
             // The artifact plain doesn't exist so chalk it up as a failed 
dependency.
             if ( !artifact.exists() )
             {
+                log.debug( "Artifact [" + path + "] not found in local 
repository" );
                 failedDependencies.add( artifact );
             }
             else if ( artifact.isSnapshot() && artifact.getOverrideType() != 
Artifact.OVERRIDE_PATH )

Modified: maven/maven-1/core/trunk/src/test/touchstone-build/project.xml
URL: 
http://svn.apache.org/viewcvs/maven/maven-1/core/trunk/src/test/touchstone-build/project.xml?rev=239417&r1=239416&r2=239417&view=diff
==============================================================================
--- maven/maven-1/core/trunk/src/test/touchstone-build/project.xml (original)
+++ maven/maven-1/core/trunk/src/test/touchstone-build/project.xml Tue Aug 23 
07:43:37 2005
@@ -60,7 +60,7 @@
     <dependency>
       <groupId>maven</groupId>
       <artifactId>maven-model</artifactId>
-      <version>3.0.0</version>
+      <version>3.0.1-SNAPSHOT</version>
     </dependency>
     <!-- 
       |

Modified: maven/maven-1/core/trunk/xdocs/reference/backwards-compatibility.xml
URL: 
http://svn.apache.org/viewcvs/maven/maven-1/core/trunk/xdocs/reference/backwards-compatibility.xml?rev=239417&r1=239416&r2=239417&view=diff
==============================================================================
--- maven/maven-1/core/trunk/xdocs/reference/backwards-compatibility.xml 
(original)
+++ maven/maven-1/core/trunk/xdocs/reference/backwards-compatibility.xml Tue 
Aug 23 07:43:37 2005
@@ -110,7 +110,7 @@
           This may also apply if you are using <code>maven-jelly-tags</code>.
         </p>
         <p>
-          <b>Fix:</b> Include <code>maven-model-3.0.0</code> in your project's 
dependencies.
+          <b>Fix:</b> Include <code>maven-model-3.0.1</code> in your project's 
dependencies.
         </p>
         <p>
           <b>Changes to <code>org.apache.maven.project.Repository</code> (and 
use of <code>pom.repository.*</code> in Jelly)</b>



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]