Author: hboutemy
Date: Tue Jan 6 18:56:48 2015
New Revision: 1649908
URL: http://svn.apache.org/r1649908
Log:
[MPLUGIN-288] refactoring: changed plugin-tools' model package
Added:
maven/plugin-tools/trunk/maven-script/maven-plugin-tools-model/src/main/java/org/apache/maven/tools/
maven/plugin-tools/trunk/maven-script/maven-plugin-tools-model/src/main/java/org/apache/maven/tools/plugin/
maven/plugin-tools/trunk/maven-script/maven-plugin-tools-model/src/main/java/org/apache/maven/tools/plugin/extractor/
maven/plugin-tools/trunk/maven-script/maven-plugin-tools-model/src/main/java/org/apache/maven/tools/plugin/extractor/model/
- copied from r1648914,
maven/plugin-tools/trunk/maven-script/maven-plugin-tools-model/src/main/java/org/apache/maven/plugin/tools/model/
maven/plugin-tools/trunk/maven-script/maven-plugin-tools-model/src/test/java/org/apache/maven/tools/
maven/plugin-tools/trunk/maven-script/maven-plugin-tools-model/src/test/java/org/apache/maven/tools/plugin/
maven/plugin-tools/trunk/maven-script/maven-plugin-tools-model/src/test/java/org/apache/maven/tools/plugin/extractor/
maven/plugin-tools/trunk/maven-script/maven-plugin-tools-model/src/test/java/org/apache/maven/tools/plugin/extractor/model/
- copied from r1648914,
maven/plugin-tools/trunk/maven-script/maven-plugin-tools-model/src/test/java/org/apache/maven/plugin/tools/model/
Removed:
maven/plugin-tools/trunk/maven-script/maven-plugin-tools-model/src/main/java/org/apache/maven/plugin/
maven/plugin-tools/trunk/maven-script/maven-plugin-tools-model/src/test/java/org/apache/maven/plugin/
Modified:
maven/plugin-tools/trunk/maven-script/maven-plugin-tools-ant/src/main/java/org/apache/maven/tools/plugin/extractor/ant/AntMojoDescriptorExtractor.java
maven/plugin-tools/trunk/maven-script/maven-plugin-tools-model/src/main/java/org/apache/maven/tools/plugin/extractor/model/PluginMetadataParseException.java
maven/plugin-tools/trunk/maven-script/maven-plugin-tools-model/src/main/java/org/apache/maven/tools/plugin/extractor/model/PluginMetadataParser.java
maven/plugin-tools/trunk/maven-script/maven-plugin-tools-model/src/main/mdo/plugin-metadata.mdo
maven/plugin-tools/trunk/maven-script/maven-plugin-tools-model/src/test/java/org/apache/maven/tools/plugin/extractor/model/PluginMetadataParserTest.java
Modified:
maven/plugin-tools/trunk/maven-script/maven-plugin-tools-ant/src/main/java/org/apache/maven/tools/plugin/extractor/ant/AntMojoDescriptorExtractor.java
URL:
http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-script/maven-plugin-tools-ant/src/main/java/org/apache/maven/tools/plugin/extractor/ant/AntMojoDescriptorExtractor.java?rev=1649908&r1=1649907&r2=1649908&view=diff
==============================================================================
---
maven/plugin-tools/trunk/maven-script/maven-plugin-tools-ant/src/main/java/org/apache/maven/tools/plugin/extractor/ant/AntMojoDescriptorExtractor.java
(original)
+++
maven/plugin-tools/trunk/maven-script/maven-plugin-tools-ant/src/main/java/org/apache/maven/tools/plugin/extractor/ant/AntMojoDescriptorExtractor.java
Tue Jan 6 18:56:48 2015
@@ -29,14 +29,14 @@ import java.util.Set;
import org.apache.maven.plugin.descriptor.InvalidPluginDescriptorException;
import org.apache.maven.plugin.descriptor.MojoDescriptor;
import org.apache.maven.plugin.descriptor.Parameter;
-import org.apache.maven.plugin.tools.model.PluginMetadataParseException;
-import org.apache.maven.plugin.tools.model.PluginMetadataParser;
import org.apache.maven.project.MavenProject;
import org.apache.maven.project.path.PathTranslator;
import org.apache.maven.tools.plugin.PluginToolsRequest;
import
org.apache.maven.tools.plugin.extractor.AbstractScriptedMojoDescriptorExtractor;
import org.apache.maven.tools.plugin.extractor.ExtractionException;
import org.apache.maven.tools.plugin.extractor.MojoDescriptorExtractor;
+import
org.apache.maven.tools.plugin.extractor.model.PluginMetadataParseException;
+import org.apache.maven.tools.plugin.extractor.model.PluginMetadataParser;
import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.component.repository.ComponentRequirement;
import org.codehaus.plexus.util.StringUtils;
Modified:
maven/plugin-tools/trunk/maven-script/maven-plugin-tools-model/src/main/java/org/apache/maven/tools/plugin/extractor/model/PluginMetadataParseException.java
URL:
http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-script/maven-plugin-tools-model/src/main/java/org/apache/maven/tools/plugin/extractor/model/PluginMetadataParseException.java?rev=1649908&r1=1648914&r2=1649908&view=diff
==============================================================================
---
maven/plugin-tools/trunk/maven-script/maven-plugin-tools-model/src/main/java/org/apache/maven/tools/plugin/extractor/model/PluginMetadataParseException.java
(original)
+++
maven/plugin-tools/trunk/maven-script/maven-plugin-tools-model/src/main/java/org/apache/maven/tools/plugin/extractor/model/PluginMetadataParseException.java
Tue Jan 6 18:56:48 2015
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.tools.model;
+package org.apache.maven.tools.plugin.extractor.model;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Modified:
maven/plugin-tools/trunk/maven-script/maven-plugin-tools-model/src/main/java/org/apache/maven/tools/plugin/extractor/model/PluginMetadataParser.java
URL:
http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-script/maven-plugin-tools-model/src/main/java/org/apache/maven/tools/plugin/extractor/model/PluginMetadataParser.java?rev=1649908&r1=1648914&r2=1649908&view=diff
==============================================================================
---
maven/plugin-tools/trunk/maven-script/maven-plugin-tools-model/src/main/java/org/apache/maven/tools/plugin/extractor/model/PluginMetadataParser.java
(original)
+++
maven/plugin-tools/trunk/maven-script/maven-plugin-tools-model/src/main/java/org/apache/maven/tools/plugin/extractor/model/PluginMetadataParser.java
Tue Jan 6 18:56:48 2015
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.tools.model;
+package org.apache.maven.tools.plugin.extractor.model;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -29,7 +29,7 @@ import java.util.Set;
import org.apache.maven.plugin.descriptor.DuplicateParameterException;
import org.apache.maven.plugin.descriptor.MojoDescriptor;
import org.apache.maven.plugin.descriptor.Parameter;
-import org.apache.maven.plugin.tools.model.io.xpp3.PluginMetadataXpp3Reader;
+import
org.apache.maven.tools.plugin.extractor.model.io.xpp3.PluginMetadataXpp3Reader;
import org.codehaus.plexus.component.repository.ComponentRequirement;
import org.codehaus.plexus.util.IOUtil;
import org.codehaus.plexus.util.ReaderFactory;
@@ -136,11 +136,11 @@ public class PluginMetadataParser
descriptor.setExecuteGoal( le.getGoal() );
}
- List<org.apache.maven.plugin.tools.model.Parameter> parameters =
mojo.getParameters();
+ List<org.apache.maven.tools.plugin.extractor.model.Parameter>
parameters = mojo.getParameters();
if ( parameters != null && !parameters.isEmpty() )
{
- for ( org.apache.maven.plugin.tools.model.Parameter param :
parameters )
+ for ( org.apache.maven.tools.plugin.extractor.model.Parameter
param : parameters )
{
Parameter dParam = new Parameter();
dParam.setAlias( param.getAlias() );
Modified:
maven/plugin-tools/trunk/maven-script/maven-plugin-tools-model/src/main/mdo/plugin-metadata.mdo
URL:
http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-script/maven-plugin-tools-model/src/main/mdo/plugin-metadata.mdo?rev=1649908&r1=1649907&r2=1649908&view=diff
==============================================================================
---
maven/plugin-tools/trunk/maven-script/maven-plugin-tools-model/src/main/mdo/plugin-metadata.mdo
(original)
+++
maven/plugin-tools/trunk/maven-script/maven-plugin-tools-model/src/main/mdo/plugin-metadata.mdo
Tue Jan 6 18:56:48 2015
@@ -78,7 +78,7 @@
<defaults>
<default>
<key>package</key>
- <value>org.apache.maven.plugin.tools.model</value>
+ <value>org.apache.maven.tools.plugin.extractor.model</value>
</default>
</defaults>
<classes>
Modified:
maven/plugin-tools/trunk/maven-script/maven-plugin-tools-model/src/test/java/org/apache/maven/tools/plugin/extractor/model/PluginMetadataParserTest.java
URL:
http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-script/maven-plugin-tools-model/src/test/java/org/apache/maven/tools/plugin/extractor/model/PluginMetadataParserTest.java?rev=1649908&r1=1648914&r2=1649908&view=diff
==============================================================================
---
maven/plugin-tools/trunk/maven-script/maven-plugin-tools-model/src/test/java/org/apache/maven/tools/plugin/extractor/model/PluginMetadataParserTest.java
(original)
+++
maven/plugin-tools/trunk/maven-script/maven-plugin-tools-model/src/test/java/org/apache/maven/tools/plugin/extractor/model/PluginMetadataParserTest.java
Tue Jan 6 18:56:48 2015
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.tools.model;
+package org.apache.maven.tools.plugin.extractor.model;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -20,6 +20,8 @@ package org.apache.maven.plugin.tools.mo
*/
import org.apache.maven.plugin.descriptor.MojoDescriptor;
+import
org.apache.maven.tools.plugin.extractor.model.PluginMetadataParseException;
+import org.apache.maven.tools.plugin.extractor.model.PluginMetadataParser;
import org.codehaus.plexus.util.StringUtils;
import java.io.File;
