ant-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From maart...@apache.org
Subject svn commit: r657994 - in /ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/parser/m2: DefaultPomDependencyMgt.java PomDependencyMgt.java PomModuleDescriptorBuilder.java PomReader.java
Date Mon, 19 May 2008 21:42:12 GMT
Author: maartenc
Date: Mon May 19 14:42:11 2008
New Revision: 657994

URL: http://svn.apache.org/viewvc?rev=657994&view=rev
Log:
Fixed type error.

Modified:
    ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/parser/m2/DefaultPomDependencyMgt.java
    ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/parser/m2/PomDependencyMgt.java
    ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorBuilder.java
    ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/parser/m2/PomReader.java

Modified: ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/parser/m2/DefaultPomDependencyMgt.java
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/parser/m2/DefaultPomDependencyMgt.java?rev=657994&r1=657993&r2=657994&view=diff
==============================================================================
--- ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/parser/m2/DefaultPomDependencyMgt.java
(original)
+++ ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/parser/m2/DefaultPomDependencyMgt.java
Mon May 19 14:42:11 2008
@@ -31,7 +31,7 @@
     public String getGroupId() {
         return groupId;
     }
-    public String getArtifaceId() {
+    public String getArtifactId() {
         return artifactId;
     }
     public String getVersion() {

Modified: ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/parser/m2/PomDependencyMgt.java
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/parser/m2/PomDependencyMgt.java?rev=657994&r1=657993&r2=657994&view=diff
==============================================================================
--- ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/parser/m2/PomDependencyMgt.java (original)
+++ ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/parser/m2/PomDependencyMgt.java Mon
May 19 14:42:11 2008
@@ -21,7 +21,7 @@
 
     public abstract String getGroupId();
 
-    public abstract String getArtifaceId();
+    public abstract String getArtifactId();
 
     public abstract String getVersion();
 

Modified: ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorBuilder.java
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorBuilder.java?rev=657994&r1=657993&r2=657994&view=diff
==============================================================================
--- ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorBuilder.java
(original)
+++ ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorBuilder.java
Mon May 19 14:42:11 2008
@@ -214,7 +214,7 @@
             for (Iterator it = getPlugins(ivyModuleDescriptor).iterator(); it.hasNext();)
{
                 PomDependencyMgt plugin = (PomDependencyMgt) it.next();
                 if ("org.apache.felix".equals(plugin.getGroupId())
-                        && "maven-bundle-plugin".equals(plugin.getArtifaceId()))
{
+                        && "maven-bundle-plugin".equals(plugin.getArtifactId()))
{
                     ext = "jar";
                     break;
                 }
@@ -229,7 +229,7 @@
     public void addDependency(Resource res, PomDependencyData dep) throws ParseException
{
         if (!MAVEN2_CONF_MAPPING.containsKey(dep.getScope())) {
             String msg = "Unknown scope " + dep.getScope() + " for dependency "
-                    + ModuleId.newInstance(dep.getGroupId(), dep.getArtifaceId()) + " in
"
+                    + ModuleId.newInstance(dep.getGroupId(), dep.getArtifactId()) + " in
"
                     + res.getName();
             throw new ParseException(msg, 0);
         }
@@ -237,7 +237,7 @@
         String version = dep.getVersion();
         version = (version == null || version.length() == 0) ? getDefaultVersion(dep) : version;
         ModuleRevisionId moduleRevId = ModuleRevisionId.newInstance(dep.getGroupId(), dep
-                .getArtifaceId(), version);
+                .getArtifactId(), version);
         DefaultDependencyDescriptor dd = new DefaultDependencyDescriptor(ivyModuleDescriptor,
                 moduleRevId, true, false, true);
         ConfMapper mapping = (ConfMapper) MAVEN2_CONF_MAPPING.get(dep.getScope());
@@ -278,17 +278,17 @@
 
 
     public void addDependencyMgt(PomDependencyMgt dep) {
-        String key = getDependencyMgtExtraInfoKey(dep.getGroupId(), dep.getArtifaceId());
+        String key = getDependencyMgtExtraInfoKey(dep.getGroupId(), dep.getArtifactId());
         ivyModuleDescriptor.addExtraInfo(key, dep.getVersion());
         // dependency management info is also used for version mediation of transitive dependencies
         ivyModuleDescriptor.addDependencyDescriptorMediator(
-            ModuleId.newInstance(dep.getGroupId(), dep.getArtifaceId()), 
+            ModuleId.newInstance(dep.getGroupId(), dep.getArtifactId()), 
             ExactPatternMatcher.INSTANCE,
             new OverrideDependencyDescriptorMediator(null, dep.getVersion()));
     }
     
     public void addPlugin(PomDependencyMgt plugin) {
-        String pluginValue = plugin.getGroupId() + EXTRA_INFO_DELIMITER + plugin.getArtifaceId()

+        String pluginValue = plugin.getGroupId() + EXTRA_INFO_DELIMITER + plugin.getArtifactId()

                 + EXTRA_INFO_DELIMITER + plugin.getVersion();
         String pluginExtraInfo = (String) ivyModuleDescriptor.getExtraInfo().get("maven.plugins");
         if (pluginExtraInfo == null) {
@@ -329,7 +329,7 @@
             return groupId;
         }
 
-        public String getArtifaceId() {
+        public String getArtifactId() {
             return artifactId;
         }
 
@@ -339,7 +339,7 @@
     }
 
     private String getDefaultVersion(PomDependencyData dep) {
-        String key = getDependencyMgtExtraInfoKey(dep.getGroupId(), dep.getArtifaceId());
       
+        String key = getDependencyMgtExtraInfoKey(dep.getGroupId(), dep.getArtifactId());
       
         return (String) ivyModuleDescriptor.getExtraInfo().get(key);
     }
 

Modified: ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/parser/m2/PomReader.java
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/parser/m2/PomReader.java?rev=657994&r1=657993&r2=657994&view=diff
==============================================================================
--- ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/parser/m2/PomReader.java (original)
+++ ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/parser/m2/PomReader.java Mon May 19
14:42:11 2008
@@ -245,7 +245,7 @@
         /* (non-Javadoc)
          * @see org.apache.ivy.plugins.parser.m2.PomDependencyMgt#getArtifaceId()
          */
-        public String getArtifaceId() {
+        public String getArtifactId() {
             String val = getFirstChildText(depElement , ARTIFACT_ID);
             return replaceProps(val);
         }
@@ -293,7 +293,7 @@
             return replaceProps(val);
         }
 
-        public String getArtifaceId() {
+        public String getArtifactId() {
             String val = getFirstChildText(pluginElement , ARTIFACT_ID);
             return replaceProps(val);
         }



Mime
View raw message