DPML Notify

[mcconnell at BerliOS <mcconnell AT mail.berlios.de>]

Author: mcconnell
Date: 2006-01-15 22:03:25 +0100 (Sun, 15 Jan 2006)
New Revision: 928

Modified:
   trunk/main/transit/core/src/main/net/dpml/transit/ModernLayout.java
Log:
add transit handling of modern layout implied groups via "." character in 
group name

Modified: trunk/main/transit/core/src/main/net/dpml/transit/ModernLayout.java
===================================================================
--- trunk/main/transit/core/src/main/net/dpml/transit/ModernLayout.java 
2006-01-15 20:53:27 UTC (rev 927)
+++ trunk/main/transit/core/src/main/net/dpml/transit/ModernLayout.java 
2006-01-15 21:03:25 UTC (rev 928)
@@ -53,21 +53,19 @@
             }
             else
             {
-                String group = artifact.getGroup();
-                group = group.replace( '.', '/' );
+                String group = getGroupPath( artifact );
                 return group + "/" + artifact.getName();
             }
         }
         else
         {
-            if( null == artifact.getGroup() )
+            if( null == artifact.getGroup( artifact ) )
             {
                 return artifact.getName() + "/" + version;
             }
             else
             {
-                String group = artifact.getGroup();
-                group = group.replace( '.', '/' );
+                String group = getGroupPath( artifact );
                 return group + "/" + artifact.getName() + "/" + version;
             }
         }
@@ -129,4 +127,16 @@
             return artifact.getName() + "-" + version + "." + 
artifact.getType();
         }
     }
+    
+   /**
+    * To be compatible with the maven-2 strategy we need to subsitute period 
+    * characters with a group separator.
+    * @param artifact the artifact from which to resolve the group path
+    * @return the group path
+    */
+    private String getGroupPath( Artifact artifact )
+    {
+        String group = artifact.getGroup();
+        return group.replace( '.', '/' );
+    }
 }