svn commit: r1374787 - in /ant/ivy/core/branches/2.3.x: ./ CHANGES.txt src/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorBuilder.java

[maartenc]

Author: maartenc
Date: Sun Aug 19 16:17:22 2012
New Revision: 1374787

URL: http://svn.apache.org/viewvc?rev=1374787&view=rev
Log:
FIX: Maven 'orbit' and 'pear' packaging is now supported (IVY-899) (merged from 
trunk)

Modified:
    ant/ivy/core/branches/2.3.x/   (props changed)
    ant/ivy/core/branches/2.3.x/CHANGES.txt
    
ant/ivy/core/branches/2.3.x/src/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorBuilder.java

Propchange: ant/ivy/core/branches/2.3.x/
------------------------------------------------------------------------------
  Merged /ant/ivy/core/trunk:r1374785

Modified: ant/ivy/core/branches/2.3.x/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/ant/ivy/core/branches/2.3.x/CHANGES.txt?rev=1374787&r1=1374786&r2=1374787&view=diff
==============================================================================
--- ant/ivy/core/branches/2.3.x/CHANGES.txt (original)
+++ ant/ivy/core/branches/2.3.x/CHANGES.txt Sun Aug 19 16:17:22 2012
@@ -129,6 +129,7 @@ for detailed view of each issue, please 
        
    2.3.x
 =====================================
+- FIX: Maven 'orbit' and 'pear' packaging is now supported (IVY-899)
 - FIX: Memory leak and infinite loop in ModuleId.java (IVY-1362)
 - FIX: NullPointerExeption in AbstractOSGiResolver (IVY-1343) (thanks to 
Thomas Kurpick)
 - FIX: Delivered ivy descriptor inconsistent with resolve report / retrieve 
and other post-resolve actions (IVY-1300) (thanks to Ed Burcher)

Modified: 
ant/ivy/core/branches/2.3.x/src/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorBuilder.java
URL: 
http://svn.apache.org/viewvc/ant/ivy/core/branches/2.3.x/src/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorBuilder.java?rev=1374787&r1=1374786&r2=1374787&view=diff
==============================================================================
--- 
ant/ivy/core/branches/2.3.x/src/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorBuilder.java
 (original)
+++ 
ant/ivy/core/branches/2.3.x/src/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorBuilder.java
 Sun Aug 19 16:17:22 2012
@@ -116,7 +116,7 @@ public class PomModuleDescriptorBuilder 
     private static final String EXTRA_INFO_DELIMITER = "__";
     private static final Collection/*<String>*/ JAR_PACKAGINGS = Arrays.asList(
                 new String[] {"ejb", "bundle", "maven-plugin", 
"eclipse-plugin",
-                        "jbi-component", "jbi-shared-library"});
+                        "jbi-component", "jbi-shared-library", "orbit"});
 
     
     static interface ConfMapper {
@@ -266,6 +266,8 @@ public class PomModuleDescriptorBuilder 
             return;
         } else if (JAR_PACKAGINGS.contains(packaging)) {
             ext = "jar";
+        } else if ("pear".equals(packaging)) {
+            ext = "phar";
         } else {
             ext = packaging;
         }