commit e9281fc05419491e302b35a16a142a50e54ef71a
Author: Michal Srb <msrb(a)redhat.com>
Date: Tue Jun 3 09:38:40 2014 +0200
[artifact] Remove Ivy code
Ivy specific code will be in separate module
python/javapackages/pom/artifact.py | 24 ++----------------------
1 files changed, 2 insertions(+), 22 deletions(-)
---
diff --git a/python/javapackages/pom/artifact.py b/python/javapackages/pom/artifact.py
index 3cabd75..914ff8a 100644
--- a/python/javapackages/pom/artifact.py
+++ b/python/javapackages/pom/artifact.py
@@ -1,5 +1,6 @@
import sys
+from pomreader import POMReader
from printer import Printer
from lxml.etree import Element, SubElement, tostring
@@ -151,40 +152,19 @@ class Artifact(AbstractArtifact):
within pom.xml or a dependency map.
"""
- # TODO: find better way of handling pom/ivy/xyz differences
parts = {'groupId':'',
'artifactId':'',
'extension':'',
'classifier':'',
'version':''}
- ivyparts = {'org': '',
- 'name': '',
- 'revision': ''}
-
- for key in parts:
- node = xmlnode.find("./{*}" + key)
- if node is not None and node.text is not None:
- parts[key] = node.text.strip()
-
- if hasattr(xmlnode, "attrib"):
- attribs = xmlnode.attrib
- for key in ivyparts:
- try:
- ivyparts[key] = attribs[key]
- except KeyError:
- pass
-
- parts['groupId'] = parts['groupId'] or
ivyparts['org']
- parts['artifactId'] = parts['artifactId'] or
ivyparts['name']
- parts['version'] = parts['version'] or
ivyparts['revision']
+ parts = POMReader.find_parts(xmlnode, parts)
if not parts['groupId'] or not parts['artifactId']:
raise ArtifactFormatException(
"Empty groupId or artifactId encountered. "
"This is a bug, please report it!")
-
return cls(parts['groupId'], parts['artifactId'],
parts['extension'],
parts['classifier'], parts['version'])
Show replies by date