Author: hboutemy
Date: Sun May 13 11:09:17 2012
New Revision: 1337845
URL: http://svn.apache.org/viewvc?rev=1337845&view=rev
Log:
refactoring: split generators part of maven-plugin-tools-api to its own
maven-plugin-tools-generators module
Added:
maven/plugin-tools/trunk/maven-plugin-tools-generators/ (with props)
maven/plugin-tools/trunk/maven-plugin-tools-generators/pom.xml (with
props)
maven/plugin-tools/trunk/maven-plugin-tools-generators/src/
maven/plugin-tools/trunk/maven-plugin-tools-generators/src/main/
maven/plugin-tools/trunk/maven-plugin-tools-generators/src/main/java/
maven/plugin-tools/trunk/maven-plugin-tools-generators/src/main/java/org/
maven/plugin-tools/trunk/maven-plugin-tools-generators/src/main/java/org/apache/
maven/plugin-tools/trunk/maven-plugin-tools-generators/src/main/java/org/apache/maven/
maven/plugin-tools/trunk/maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/
maven/plugin-tools/trunk/maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/
maven/plugin-tools/trunk/maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/
- copied from r1337841,
maven/plugin-tools/trunk/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/generator/
maven/plugin-tools/trunk/maven-plugin-tools-generators/src/main/resources/
maven/plugin-tools/trunk/maven-plugin-tools-generators/src/main/resources/help-class-source.vm
- copied unchanged from r1337841,
maven/plugin-tools/trunk/maven-plugin-tools-api/src/main/resources/help-class-source.vm
maven/plugin-tools/trunk/maven-plugin-tools-generators/src/main/resources/pluginxdoc.properties
- copied unchanged from r1337841,
maven/plugin-tools/trunk/maven-plugin-tools-api/src/main/resources/pluginxdoc.properties
maven/plugin-tools/trunk/maven-plugin-tools-generators/src/main/resources/pluginxdoc_de.properties
- copied unchanged from r1337841,
maven/plugin-tools/trunk/maven-plugin-tools-api/src/main/resources/pluginxdoc_de.properties
maven/plugin-tools/trunk/maven-plugin-tools-generators/src/main/resources/pluginxdoc_en.properties
- copied unchanged from r1337841,
maven/plugin-tools/trunk/maven-plugin-tools-api/src/main/resources/pluginxdoc_en.properties
maven/plugin-tools/trunk/maven-plugin-tools-generators/src/main/resources/pluginxdoc_fr.properties
- copied unchanged from r1337841,
maven/plugin-tools/trunk/maven-plugin-tools-api/src/main/resources/pluginxdoc_fr.properties
maven/plugin-tools/trunk/maven-plugin-tools-generators/src/site/
maven/plugin-tools/trunk/maven-plugin-tools-generators/src/site/site.xml
(with props)
maven/plugin-tools/trunk/maven-plugin-tools-generators/src/test/
maven/plugin-tools/trunk/maven-plugin-tools-generators/src/test/java/
maven/plugin-tools/trunk/maven-plugin-tools-generators/src/test/java/org/
maven/plugin-tools/trunk/maven-plugin-tools-generators/src/test/java/org/apache/
maven/plugin-tools/trunk/maven-plugin-tools-generators/src/test/java/org/apache/maven/
maven/plugin-tools/trunk/maven-plugin-tools-generators/src/test/java/org/apache/maven/tools/
maven/plugin-tools/trunk/maven-plugin-tools-generators/src/test/java/org/apache/maven/tools/plugin/
maven/plugin-tools/trunk/maven-plugin-tools-generators/src/test/java/org/apache/maven/tools/plugin/generator/
- copied from r1337841,
maven/plugin-tools/trunk/maven-plugin-tools-api/src/test/java/org/apache/maven/tools/plugin/generator/
Removed:
maven/plugin-tools/trunk/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/generator/
maven/plugin-tools/trunk/maven-plugin-tools-api/src/main/resources/help-class-source.vm
maven/plugin-tools/trunk/maven-plugin-tools-api/src/main/resources/pluginxdoc.properties
maven/plugin-tools/trunk/maven-plugin-tools-api/src/main/resources/pluginxdoc_de.properties
maven/plugin-tools/trunk/maven-plugin-tools-api/src/main/resources/pluginxdoc_en.properties
maven/plugin-tools/trunk/maven-plugin-tools-api/src/main/resources/pluginxdoc_fr.properties
maven/plugin-tools/trunk/maven-plugin-tools-api/src/test/java/org/apache/maven/tools/plugin/generator/
Modified:
maven/plugin-tools/trunk/maven-plugin-plugin/pom.xml
maven/plugin-tools/trunk/maven-plugin-tools-api/pom.xml
maven/plugin-tools/trunk/maven-plugin-tools-java/pom.xml
maven/plugin-tools/trunk/pom.xml
maven/plugin-tools/trunk/src/site/apt/index.apt
Modified: maven/plugin-tools/trunk/maven-plugin-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-plugin/pom.xml?rev=1337845&r1=1337844&r2=1337845&view=diff
==============================================================================
--- maven/plugin-tools/trunk/maven-plugin-plugin/pom.xml (original)
+++ maven/plugin-tools/trunk/maven-plugin-plugin/pom.xml Sun May 13 11:09:17
2012
@@ -76,6 +76,11 @@
</dependency>
<dependency>
<groupId>org.apache.maven.plugin-tools</groupId>
+ <artifactId>maven-plugin-tools-generators</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.plugin-tools</groupId>
<artifactId>maven-plugin-tools-model</artifactId>
<version>${project.version}</version>
</dependency>
@@ -189,6 +194,10 @@
<groupId>org.apache.maven.plugin-tools</groupId>
<artifactId>maven-plugin-tools-api</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.maven.plugin-tools</groupId>
+ <artifactId>maven-plugin-tools-generators</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.maven</groupId>
@@ -224,7 +233,6 @@
<artifactId>maven-plugin-tools-beanshell</artifactId>
<scope>runtime</scope>
</dependency>
-
<dependency>
<groupId>org.apache.maven.plugin-tools</groupId>
<artifactId>maven-plugin-tools-annotations</artifactId>
Modified: maven/plugin-tools/trunk/maven-plugin-tools-api/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-tools-api/pom.xml?rev=1337845&r1=1337844&r2=1337845&view=diff
==============================================================================
--- maven/plugin-tools/trunk/maven-plugin-tools-api/pom.xml (original)
+++ maven/plugin-tools/trunk/maven-plugin-tools-api/pom.xml Sun May 13 11:09:17
2012
@@ -31,7 +31,7 @@
<artifactId>maven-plugin-tools-api</artifactId>
<name>Maven Plugin Tools APIs</name>
- <description>The Maven Plugin Tools API provides an API to extract
information from and generate documentation for Maven Plugins.</description>
+ <description>The Maven Plugin Tools API provides an API to extract
descriptor information from Maven Plugins.</description>
<dependencies>
<!-- maven -->
@@ -71,31 +71,6 @@
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-container-default</artifactId>
</dependency>
- <dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-velocity</artifactId>
- <exclusions>
- <exclusion>
- <groupId>velocity</groupId>
- <artifactId>velocity</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <!-- other -->
- <dependency>
- <groupId>org.apache.velocity</groupId>
- <artifactId>velocity</artifactId>
- </dependency>
-
- <dependency>
- <groupId>asm</groupId>
- <artifactId>asm</artifactId>
- </dependency>
- <dependency>
- <groupId>asm</groupId>
- <artifactId>asm-commons</artifactId>
- </dependency>
<!-- misc -->
<dependency>
@@ -131,25 +106,4 @@
</plugin>
</plugins>
</build>
-
- <profiles>
- <profile>
- <id>reporting</id>
- <reporting>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>l10n-maven-plugin</artifactId>
- <version>1.0-alpha-2</version>
- <configuration>
- <locales>
- <locale>de</locale>
- <locale>fr</locale>
- </locales>
- </configuration>
- </plugin>
- </plugins>
- </reporting>
- </profile>
- </profiles>
</project>
Propchange: maven/plugin-tools/trunk/maven-plugin-tools-generators/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sun May 13 11:09:17 2012
@@ -0,0 +1,11 @@
+target
+*~
+*.log
+.classpath
+.project
+*.ipr
+*.iws
+*.iml
+.settings
+bin
+target-eclipse
Added: maven/plugin-tools/trunk/maven-plugin-tools-generators/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-tools-generators/pom.xml?rev=1337845&view=auto
==============================================================================
--- maven/plugin-tools/trunk/maven-plugin-tools-generators/pom.xml (added)
+++ maven/plugin-tools/trunk/maven-plugin-tools-generators/pom.xml Sun May 13
11:09:17 2012
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you under the Apache License, Version 2.0 (the
+ ~ "License"); you may not use this file except in compliance
+ ~ with the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing,
+ ~ software distributed under the License is distributed on an
+ ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ~ KIND, either express or implied. See the License for the
+ ~ specific language governing permissions and limitations
+ ~ under the License.
+ -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.maven.plugin-tools</groupId>
+ <artifactId>maven-plugin-tools</artifactId>
+ <version>3.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>maven-plugin-tools-generators</artifactId>
+
+ <name>Maven Plugin Tools Generators</name>
+ <description>The Maven Plugin Tools Generators provides content generation
(documentation, help) from plugin descriptor.</description>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.plugin-tools</groupId>
+ <artifactId>maven-plugin-tools-api</artifactId>
+ </dependency>
+
+ <!-- maven -->
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-project</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-model</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-plugin-descriptor</artifactId>
+ </dependency>
+
+ <!-- plexus -->
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-container-default</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-velocity</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>velocity</groupId>
+ <artifactId>velocity</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <!-- other -->
+ <dependency>
+ <groupId>org.apache.velocity</groupId>
+ <artifactId>velocity</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>asm</groupId>
+ <artifactId>asm</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>asm</groupId>
+ <artifactId>asm-commons</artifactId>
+ </dependency>
+ </dependencies>
+
+ <profiles>
+ <profile>
+ <id>reporting</id>
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>l10n-maven-plugin</artifactId>
+ <version>1.0-alpha-2</version>
+ <configuration>
+ <locales>
+ <locale>de</locale>
+ <locale>fr</locale>
+ </locales>
+ </configuration>
+ </plugin>
+ </plugins>
+ </reporting>
+ </profile>
+ </profiles>
+</project>
Propchange: maven/plugin-tools/trunk/maven-plugin-tools-generators/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugin-tools/trunk/maven-plugin-tools-generators/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: maven/plugin-tools/trunk/maven-plugin-tools-generators/pom.xml
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: maven/plugin-tools/trunk/maven-plugin-tools-generators/src/site/site.xml
URL:
http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-tools-generators/src/site/site.xml?rev=1337845&view=auto
==============================================================================
--- maven/plugin-tools/trunk/maven-plugin-tools-generators/src/site/site.xml
(added)
+++ maven/plugin-tools/trunk/maven-plugin-tools-generators/src/site/site.xml
Sun May 13 11:09:17 2012
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<project xmlns="http://maven.apache.org/DECORATION/1.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/DECORATION/1.0.0
http://maven.apache.org/xsd/decoration-1.0.0.xsd";>
+ <body>
+ <menu name="Overview">
+ <item name="Introduction" href="index.html"/>
+ <item name="JavaDocs" href="apidocs/index.html"/>
+ <item name="Source Xref" href="xref/index.html"/>
+ <!--item name="FAQ" href="faq.html"/-->
+ </menu>
+ </body>
+</project>
Propchange:
maven/plugin-tools/trunk/maven-plugin-tools-generators/src/site/site.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugin-tools/trunk/maven-plugin-tools-generators/src/site/site.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange:
maven/plugin-tools/trunk/maven-plugin-tools-generators/src/site/site.xml
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: maven/plugin-tools/trunk/maven-plugin-tools-java/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-tools-java/pom.xml?rev=1337845&r1=1337844&r2=1337845&view=diff
==============================================================================
--- maven/plugin-tools/trunk/maven-plugin-tools-java/pom.xml (original)
+++ maven/plugin-tools/trunk/maven-plugin-tools-java/pom.xml Sun May 13
11:09:17 2012
@@ -34,6 +34,12 @@
<description>Descriptor extractor for plugins written in Java annotated with
Mojo Javadoc Tags.</description>
<dependencies>
+ <dependency>
+ <groupId>org.apache.maven.plugin-tools</groupId>
+ <artifactId>maven-plugin-tools-generators</artifactId>
+ <scope>test</scope>
+ </dependency>
+
<!-- maven -->
<dependency>
<groupId>org.apache.maven</groupId>
Modified: maven/plugin-tools/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugin-tools/trunk/pom.xml?rev=1337845&r1=1337844&r2=1337845&view=diff
==============================================================================
--- maven/plugin-tools/trunk/pom.xml (original)
+++ maven/plugin-tools/trunk/pom.xml Sun May 13 11:09:17 2012
@@ -124,14 +124,15 @@
<modules>
<module>maven-plugin-tools-api</module>
- <module>maven-plugin-tools-ant</module>
- <module>maven-plugin-tools-java</module>
- <module>maven-plugin-tools-beanshell</module>
+ <module>maven-plugin-tools-generators</module>
<module>maven-plugin-plugin</module>
- <module>maven-plugin-tools-model</module>
+ <module>maven-plugin-tools-java</module>
<module>maven-plugin-tools-javadoc</module>
- <module>maven-plugin-tools-annotations</module>
<module>maven-plugin-annotations</module>
+ <module>maven-plugin-tools-annotations</module>
+ <module>maven-plugin-tools-ant</module>
+ <module>maven-plugin-tools-beanshell</module>
+ <module>maven-plugin-tools-model</module>
</modules>
<scm>
@@ -168,6 +169,11 @@
</dependency>
<dependency>
<groupId>org.apache.maven.plugin-tools</groupId>
+ <artifactId>maven-plugin-tools-generators</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.plugin-tools</groupId>
<artifactId>maven-plugin-tools-model</artifactId>
<version>${project.version}</version>
</dependency>
Modified: maven/plugin-tools/trunk/src/site/apt/index.apt
URL:
http://svn.apache.org/viewvc/maven/plugin-tools/trunk/src/site/apt/index.apt?rev=1337845&r1=1337844&r2=1337845&view=diff
==============================================================================
--- maven/plugin-tools/trunk/src/site/apt/index.apt (original)
+++ maven/plugin-tools/trunk/src/site/apt/index.apt Sun May 13 11:09:17 2012
@@ -39,6 +39,8 @@ Maven Plugin Tools
*-----------------------------------------------------------------------------+---------------------------------------------------------+
| {{{./maven-plugin-tools-api/index.html}maven-plugin-tools-api}}
| Descriptor extractor API, used by maven-plugin-plugin to extract Plugin
information.
*-----------------------------------------------------------------------------+---------------------------------------------------------+
+|
{{{./maven-plugin-tools-generators/index.html}maven-plugin-tools-generators}} |
Generators (help, documentation), used by maven-plugin-plugin to generate
content from descriptor.
+*-----------------------------------------------------------------------------+---------------------------------------------------------+
| \ \ {{{./maven-plugin-tools-java/index.html}maven-plugin-tools-java}}
| Descriptor extractor for plugins written in Java annotated with Mojo
Javadoc Tags.
*-----------------------------------------------------------------------------+---------------------------------------------------------+
| \ \ \ \
{{{./maven-plugin-tools-javadoc/index.html}maven-plugin-tools-javadoc}} |
Provides the support of Mojo Javadoc Tags in the Javadoc Tool.
