Author: brett
Date: Wed Aug 31 18:56:04 2005
New Revision: 265618
URL: http://svn.apache.org/viewcvs?rev=265618&view=rev
Log:
rename group metadata
Added:
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/repository/metadata/GroupRepositoryMetadata.java
(contents, props changed)
- copied, changed from r265606,
maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/PluginMappingMetadata.java
Removed:
maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/PluginMappingMetadata.java
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginMappingManager.java
maven/components/trunk/maven-plugins/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/metadata/PluginMappingDeployMojo.java
maven/components/trunk/maven-plugins/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/metadata/PluginMappingInstallMojo.java
Copied:
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/repository/metadata/GroupRepositoryMetadata.java
(from r265606,
maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/PluginMappingMetadata.java)
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/repository/metadata/GroupRepositoryMetadata.java?p2=maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/repository/metadata/GroupRepositoryMetadata.java&p1=maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/PluginMappingMetadata.java&r1=265606&r2=265618&rev=265618&view=diff
==============================================================================
---
maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/PluginMappingMetadata.java
(original)
+++
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/repository/metadata/GroupRepositoryMetadata.java
Wed Aug 31 18:56:04 2005
@@ -16,26 +16,29 @@
* limitations under the License.
*/
-public class PluginMappingMetadata
+public class GroupRepositoryMetadata
implements RepositoryMetadata
{
- private static final String PLUGIN_MAPPING_FILE = "plugins.xml";
+ /**
+ * TODO: reuse.
+ */
+ protected static final String METADATA_FILE = "maven-metadata.xml";
private final String groupId;
- public PluginMappingMetadata( String groupId )
+ public GroupRepositoryMetadata( String groupId )
{
this.groupId = groupId;
}
public String getRepositoryPath()
{
- return groupId + "/" + PLUGIN_MAPPING_FILE;
+ return groupId + "/" + METADATA_FILE;
}
public String toString()
{
- return PLUGIN_MAPPING_FILE + " (plugin mappings) for group: \'" +
groupId + "\'";
+ return "repository metadata for group: \'" + groupId + "\'";
}
}
Propchange:
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/repository/metadata/GroupRepositoryMetadata.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/repository/metadata/GroupRepositoryMetadata.java
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginMappingManager.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginMappingManager.java?rev=265618&r1=265617&r2=265618&view=diff
==============================================================================
---
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginMappingManager.java
(original)
+++
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginMappingManager.java
Wed Aug 31 18:56:04 2005
@@ -17,9 +17,9 @@
*/
import org.apache.maven.artifact.repository.ArtifactRepository;
+import org.apache.maven.artifact.repository.metadata.GroupRepositoryMetadata;
import org.apache.maven.artifact.repository.metadata.Metadata;
import org.apache.maven.artifact.repository.metadata.Plugin;
-import org.apache.maven.artifact.repository.metadata.PluginMappingMetadata;
import
org.apache.maven.artifact.repository.metadata.RepositoryMetadataManagementException;
import org.apache.maven.artifact.repository.metadata.RepositoryMetadataManager;
import
org.apache.maven.artifact.repository.metadata.io.xpp3.MetadataXpp3Reader;
@@ -97,7 +97,7 @@
private void loadPluginMappings( String groupId, List pluginRepositories,
ArtifactRepository localRepository )
throws RepositoryMetadataManagementException
{
- PluginMappingMetadata metadata = new PluginMappingMetadata( groupId );
+ GroupRepositoryMetadata metadata = new GroupRepositoryMetadata(
groupId );
// TOOD: aggregate the results of this instead
repositoryMetadataManager.resolve( metadata, pluginRepositories,
localRepository );
Modified:
maven/components/trunk/maven-plugins/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/metadata/PluginMappingDeployMojo.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/metadata/PluginMappingDeployMojo.java?rev=265618&r1=265617&r2=265618&view=diff
==============================================================================
---
maven/components/trunk/maven-plugins/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/metadata/PluginMappingDeployMojo.java
(original)
+++
maven/components/trunk/maven-plugins/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/metadata/PluginMappingDeployMojo.java
Wed Aug 31 18:56:04 2005
@@ -17,7 +17,7 @@
*/
import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.apache.maven.artifact.repository.metadata.PluginMappingMetadata;
+import org.apache.maven.artifact.repository.metadata.GroupRepositoryMetadata;
import org.apache.maven.artifact.repository.metadata.RepositoryMetadata;
import
org.apache.maven.artifact.repository.metadata.RepositoryMetadataManagementException;
import org.apache.maven.plugin.MojoExecutionException;
@@ -36,7 +36,7 @@
public void execute()
throws MojoExecutionException
{
- RepositoryMetadata metadata = new PluginMappingMetadata(
getProject().getGroupId() );
+ RepositoryMetadata metadata = new GroupRepositoryMetadata(
getProject().getGroupId() );
ArtifactRepository distributionRepository =
getProject().getDistributionManagementArtifactRepository();
Modified:
maven/components/trunk/maven-plugins/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/metadata/PluginMappingInstallMojo.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/metadata/PluginMappingInstallMojo.java?rev=265618&r1=265617&r2=265618&view=diff
==============================================================================
---
maven/components/trunk/maven-plugins/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/metadata/PluginMappingInstallMojo.java
(original)
+++
maven/components/trunk/maven-plugins/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/metadata/PluginMappingInstallMojo.java
Wed Aug 31 18:56:04 2005
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-import org.apache.maven.artifact.repository.metadata.PluginMappingMetadata;
+import org.apache.maven.artifact.repository.metadata.GroupRepositoryMetadata;
import org.apache.maven.artifact.repository.metadata.RepositoryMetadata;
import
org.apache.maven.artifact.repository.metadata.RepositoryMetadataManagementException;
import org.apache.maven.plugin.MojoExecutionException;
@@ -34,7 +34,7 @@
public void execute()
throws MojoExecutionException
{
- RepositoryMetadata metadata = new PluginMappingMetadata(
getProject().getGroupId() );
+ RepositoryMetadata metadata = new GroupRepositoryMetadata(
getProject().getGroupId() );
try
{
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]