Author: sisbell
Date: Wed Apr 29 17:20:47 2009
New Revision: 769841
URL: http://svn.apache.org/viewvc?rev=769841&view=rev
Log:
Removed more references to ProjectUri. This is now an internal class in the
interpolator package.
Added:
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/interpolator/ProjectUri.java
- copied, changed from r769799,
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/ProjectUri.java
Removed:
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/ModelListener.java
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/ProjectUri.java
Modified:
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/listeners/BuildExtensionListener.java
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/ModelEventListener.java
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/interpolator/DefaultInterpolator.java
Modified:
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/listeners/BuildExtensionListener.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/listeners/BuildExtensionListener.java?rev=769841&r1=769840&r2=769841&view=diff
==============================================================================
---
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/listeners/BuildExtensionListener.java
(original)
+++
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/listeners/BuildExtensionListener.java
Wed Apr 29 17:20:47 2009
@@ -1,14 +1,12 @@
package org.apache.maven.listeners;
import java.util.ArrayList;
-import java.util.Arrays;
import java.util.List;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.execution.MavenSession;
import org.apache.maven.model.Extension;
import org.apache.maven.model.Model;
-import org.apache.maven.model.ProjectUri;
import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.component.annotations.Configuration;
@@ -38,11 +36,6 @@
{
buildExtensions.addAll(new
ArrayList<Extension>(model.getBuild().getExtensions()));
}
-
- public List<String> getUris()
- {
- return Arrays.asList( ProjectUri.Build.Extensions.Extension.xUri );
- }
/**
* Take the extension elements that were found during the POM construction
process and now
Modified:
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/ModelEventListener.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/ModelEventListener.java?rev=769841&r1=769840&r2=769841&view=diff
==============================================================================
---
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/ModelEventListener.java
(original)
+++
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/ModelEventListener.java
Wed Apr 29 17:20:47 2009
@@ -1,14 +1,10 @@
package org.apache.maven.model;
-import java.util.List;
-
import org.apache.maven.model.Model;
public interface ModelEventListener {
void fire(Model model);
-
- List<String> getUris();
}
Modified:
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/interpolator/DefaultInterpolator.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/interpolator/DefaultInterpolator.java?rev=769841&r1=769840&r2=769841&view=diff
==============================================================================
---
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/interpolator/DefaultInterpolator.java
(original)
+++
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/interpolator/DefaultInterpolator.java
Wed Apr 29 17:20:47 2009
@@ -28,7 +28,6 @@
import org.apache.maven.model.Build;
import org.apache.maven.model.Model;
import org.apache.maven.model.DomainModel;
-import org.apache.maven.model.ProjectUri;
import org.apache.maven.model.Reporting;
import org.apache.maven.model.Resource;
import org.apache.maven.model.io.xpp3.MavenXpp3Writer;
Copied:
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/interpolator/ProjectUri.java
(from r769799,
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/ProjectUri.java)
URL:
http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/interpolator/ProjectUri.java?p2=maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/interpolator/ProjectUri.java&p1=maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/ProjectUri.java&r1=769799&r2=769841&rev=769841&view=diff
==============================================================================
---
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/ProjectUri.java
(original)
+++
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/interpolator/ProjectUri.java
Wed Apr 29 17:20:47 2009
@@ -1,4 +1,4 @@
-package org.apache.maven.model;
+package org.apache.maven.model.interpolator;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -22,7 +22,7 @@
/**
* Defines all the unique ids for canonical data model.
*/
-public class ProjectUri
+final class ProjectUri
{
/*
