Index: GenericArtifact.java
===================================================================
RCS file: /home/cvspublic/jakarta-turbine-maven/src/java/org/apache/maven/repository/GenericArtifact.java,v
retrieving revision 1.1
diff -u -r1.1 GenericArtifact.java
--- GenericArtifact.java	1 Oct 2002 21:28:26 -0000	1.1
+++ GenericArtifact.java	2 Oct 2002 17:26:53 -0000
@@ -1,144 +1,145 @@
-package org.apache.maven.repository;
-
-/* ====================================================================
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 2002 The Apache Software Foundation.  All rights
- * reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. The end-user documentation included with the redistribution,
- *    if any, must include the following acknowledgment:
- *       "This product includes software developed by the
- *        Apache Software Foundation (http://www.apache.org/)."
- *    Alternately, this acknowledgment may appear in the software itself,
- *    if and wherever such third-party acknowledgments normally appear.
- *
- * 4. The names "Apache" and "Apache Software Foundation" and
- *    "Apache Maven" must not be used to endorse or promote products
- *    derived from this software without prior written permission. For
- *    written permission, please contact apache@apache.org.
- *
- * 5. Products derived from this software may not be called "Apache",
- *    "Apache Maven", nor may "Apache" appear in their name, without
- *    prior written permission of the Apache Software Foundation.
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of the Apache Software Foundation.  For more
- * information on the Apache Software Foundation, please see
- * <http://www.apache.org/>.
- *
- * ====================================================================
- */
-
-import java.io.File;
-
-import org.apache.maven.project.Dependency;
-
-/**
- * Generic artifact that builds its path and url information based on its
- * associated dependency. URLs are of the form "id/type/artifact".
- *
- * @version $Id: GenericArtifact.java,v 1.1 2002/10/01 21:28:26 jvanzyl Exp $
- */
-public class GenericArtifact 
-    extends AbstractArtifact
-{
-    /**
-     * Platform specific file separator used for file system operations.
-     */
-    private final static String ps = File.separator;
-    private Dependency dependency;
-    private String path;
-    private String url;
-
-    /**
-     * Constructor for the GenericArtifact object
-     *
-     * @param dependency
-     */
-    public GenericArtifact(Dependency dependency)
-    {
-        this.dependency = dependency;
-        String projectId = dependency.getProjectId();
-        String artifact = dependency.getArtifact();
-        String typeDir;
-
-        if (dependency.isCompileType() || dependency.isTestType())
-        {
-            typeDir = "jars";
-        }
-        else
-        {
-            typeDir = dependency.getType();
-            if ("distribution".equals(typeDir))
-            {
-                // make plural to conform to existing naming
-                // conventions.
-                typeDir = "distributions";
-            }
-        }
-        this.path = ps + projectId + ps + typeDir + ps + artifact;
-        this.url = "/" + projectId + "/" + typeDir + "/" + artifact;
-    }
-
-    /**
-     * Return the associated dependency of this artifact.
-     */
-    public Dependency getDependency()
-    {
-        return this.dependency;
-    }
-
-    /**
-     * Get the path of the artifact using platform specific naming conventions.
-     * The path is derived from the underlying dependency in the form
-     * "id/type/artifact".
-     */
-    public String getPath()
-    {
-        return this.path;
-    }
-
-    /**
-     * Get an URL path that is platform agnostic. The returned URL is derived
-     * from the underlying dependency in the form "id/type/artifact".
-     */
-    public String getUrlPath()
-    {
-        return this.url;
-    }
-
-    /**
-     * Get the name of the artifact from the underlying dependency.
-     */
-    public String getName()
-    {
-        return this.dependency.getArtifact();
-    }
-}
+package org.apache.maven.repository;
+
+/* ====================================================================
+ * The Apache Software License, Version 1.1
+ *
+ * Copyright (c) 2002 The Apache Software Foundation.  All rights
+ * reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. The end-user documentation included with the redistribution,
+ *    if any, must include the following acknowledgment:
+ *       "This product includes software developed by the
+ *        Apache Software Foundation (http://www.apache.org/)."
+ *    Alternately, this acknowledgment may appear in the software itself,
+ *    if and wherever such third-party acknowledgments normally appear.
+ *
+ * 4. The names "Apache" and "Apache Software Foundation" and
+ *    "Apache Maven" must not be used to endorse or promote products
+ *    derived from this software without prior written permission. For
+ *    written permission, please contact apache@apache.org.
+ *
+ * 5. Products derived from this software may not be called "Apache",
+ *    "Apache Maven", nor may "Apache" appear in their name, without
+ *    prior written permission of the Apache Software Foundation.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Apache Software Foundation.  For more
+ * information on the Apache Software Foundation, please see
+ * <http://www.apache.org/>.
+ *
+ * ====================================================================
+ */
+
+import java.io.File;
+
+import org.apache.maven.project.Dependency;
+
+/**
+ * Generic artifact that builds its path and url information based on its
+ * associated dependency. URLs are of the form "id/type/artifact".
+ *
+ * @version $Id: GenericArtifact.java,v 1.1 2002/10/01 21:28:26 jvanzyl Exp $
+ */
+public class GenericArtifact 
+    extends AbstractArtifact
+{
+    /**
+     * Platform specific file separator used for file system operations.
+     */
+    private final static String ps = File.separator;
+    private Dependency dependency;
+    private String path;
+    private String url;
+
+    /**
+     * Constructor for the GenericArtifact object
+     *
+     * @param dependency
+     */
+    public GenericArtifact(Dependency dependency)
+    {
+        this.dependency = dependency;
+        String projectId = dependency.getProjectId();
+        String artifact = dependency.getArtifact();
+        String typeDir;
+
+        if (dependency.isCompileType() || dependency.isTestType() 
+	    || "jar".equals(dependency.getType()))
+        {
+            typeDir = "jars";
+        }
+        else
+        {
+            typeDir = dependency.getType();
+            if ("distribution".equals(typeDir))
+            {
+                // make plural to conform to existing naming
+                // conventions.
+                typeDir = "distributions";
+            }
+        }
+        this.path = ps + projectId + ps + typeDir + ps + artifact;
+        this.url = "/" + projectId + "/" + typeDir + "/" + artifact;
+    }
+
+    /**
+     * Return the associated dependency of this artifact.
+     */
+    public Dependency getDependency()
+    {
+        return this.dependency;
+    }
+
+    /**
+     * Get the path of the artifact using platform specific naming conventions.
+     * The path is derived from the underlying dependency in the form
+     * "id/type/artifact".
+     */
+    public String getPath()
+    {
+        return this.path;
+    }
+
+    /**
+     * Get an URL path that is platform agnostic. The returned URL is derived
+     * from the underlying dependency in the form "id/type/artifact".
+     */
+    public String getUrlPath()
+    {
+        return this.url;
+    }
+
+    /**
+     * Get the name of the artifact from the underlying dependency.
+     */
+    public String getName()
+    {
+        return this.dependency.getArtifact();
+    }
+}
