svn commit: r718687 - in /geronimo/server/trunk/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car: ArchiveCarMojo.java ClasspathElement.java

[ga...@apache.org]

Author: gawor
Date: Tue Nov 18 11:20:50 2008
New Revision: 718687

URL: http://svn.apache.org/viewvc?rev=718687&view=rev
Log:
revert changes made in r718644

Modified:
    geronimo/server/trunk/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/ArchiveCarMojo.java
    geronimo/server/trunk/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/ClasspathElement.java

Modified: geronimo/server/trunk/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/ArchiveCarMojo.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/ArchiveCarMojo.java?rev=718687&r1=718686&r2=718687&view=diff
==============================================================================
--- geronimo/server/trunk/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/ArchiveCarMojo.java (original)
+++ geronimo/server/trunk/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/ArchiveCarMojo.java Tue Nov 18 11:20:50 2008
@@ -133,19 +133,6 @@
      * @parameter
      */
     private String classpathPrefix = null;
-    
-    /**
-     * Generate classpath prefix based on the artifactId and groupId. The generated classpath
-     * prefix will be in the following form:
-     * <tt>../repository/&lt;groupId&gt;/&lt;artifactId&gt;/&lt;version&gt;</tt>.
-     * This is the default setting applied to all elements of the <tt>classpath</tt> which
-     * do not provide a prefix or do not set the generateClasspathPrefix parameter.  The 
-     * classpath prefix will only be generated if the <tt>classpathPrefix</tt> parameter is not
-     * set.
-     *
-     * @parameter
-     */
-    private boolean generateClasspathPrefix;
 
     /**
      * Location of resources directory for additional content to include in the car.
@@ -256,22 +243,7 @@
 
                 String prefix = classpath[i].getClasspathPrefix();
                 if (prefix == null) {
-                    Boolean generatePrefix = classpath[i].getGenerateClasspathPrefix();
-                    if (generatePrefix == null) {
-                        // generatePrefix is not set - try defaults                        
-                        if (classpathPrefix == null) {
-                            if (generateClasspathPrefix) {
-                                prefix = generatePrefix(artifact);
-                            }
-                        } else {                            
-                            prefix = classpathPrefix;
-                        }
-                    } else if (Boolean.TRUE.equals(generatePrefix)) {
-                        // generatePrefix is explicitly set to true - generate prefix
-                        prefix = generatePrefix(artifact);
-                    } else {
-                        // generatePrefix is explicitly set to false - leave null prefix
-                    }
+                    prefix = classpathPrefix;
                 }
 
                 if (prefix != null) {
@@ -297,8 +269,4 @@
         return buff.toString();
     }
 
-    private static String generatePrefix(Artifact artifact) {
-        return "../repository/" + artifact.getGroupId().replace('.', '/') + "/" + artifact.getArtifactId() + "/" + artifact.getVersion(); 
-    }
-    
-}
+}
\ No newline at end of file

Modified: geronimo/server/trunk/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/ClasspathElement.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/ClasspathElement.java?rev=718687&r1=718686&r2=718687&view=diff
==============================================================================
--- geronimo/server/trunk/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/ClasspathElement.java (original)
+++ geronimo/server/trunk/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/ClasspathElement.java Tue Nov 18 11:20:50 2008
@@ -78,17 +78,6 @@
      * @parameter
      */
     private String entry;
-    
-    /**
-     * Generate classpath prefix based on the artifactId and groupId. The generated classpath
-     * prefix will be in the following form:
-     * <tt>../repository/&lt;groupId&gt;/&lt;artifactId&gt;/&lt;version&gt;</tt>.
-     * The classpath prefix will only be generated if the <tt>classpathPrefix</tt> parameter 
-     * is not set.
-     *
-     * @parameter
-     */
-    private Boolean generateClasspathPrefix;
 
     /**
      * @return Returns the artifactId.
@@ -174,24 +163,6 @@
         this.classpathPrefix = classpathPrefix;
     }
 
-    /**     
-     * @return Returns null if the classpath prefix parameter was not set.
-     *         Returns true if the classpath prefix should be automatically generated.
-     *         Returns false if the classpath prefix should NOT be automatically generated. 
-     */
-    public Boolean getGenerateClasspathPrefix() {
-        return generateClasspathPrefix;
-    }
-
-    /**
-     * Sets whether classpath prefix should be automatically generated.
-     * 
-     * @param generateClasspathPrefix
-     */
-    public void setGenerateClasspathPrefix(Boolean generateClasspathPrefix) {
-        this.generateClasspathPrefix = generateClasspathPrefix;
-    }
-
     public String getEntry() {
         return entry;
     }