You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2011/06/09 17:18:43 UTC
svn commit: r1133922 - in /karaf/trunk:
manual/src/main/webapp/developers-guide/
tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/cmdhelp/
tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/commands/
tooling/karaf-maven-...
Author: jbonofre
Date: Thu Jun 9 15:18:42 2011
New Revision: 1133922
URL: http://svn.apache.org/viewvc?rev=1133922&view=rev
Log:
[KARAF-665] Rename karaf-maven-plugin goals and document all goals.
Added:
karaf/trunk/manual/src/main/webapp/developers-guide/karaf-maven-plugin-commands-generate-docbook-help.conf
karaf/trunk/manual/src/main/webapp/developers-guide/karaf-maven-plugin-features-add-to-repository.conf
- copied, changed from r1133718, karaf/trunk/manual/src/main/webapp/developers-guide/karaf-maven-plugin-add.conf
karaf/trunk/manual/src/main/webapp/developers-guide/karaf-maven-plugin-features-generate-descriptor.conf
- copied, changed from r1133718, karaf/trunk/manual/src/main/webapp/developers-guide/karaf-maven-plugin-generate.conf
karaf/trunk/manual/src/main/webapp/developers-guide/karaf-maven-plugin-features-validate-descriptor.conf
- copied, changed from r1133718, karaf/trunk/manual/src/main/webapp/developers-guide/karaf-maven-plugin-validate.conf
karaf/trunk/manual/src/main/webapp/developers-guide/karaf-maven-plugin-instance-create-archive.conf
karaf/trunk/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/commands/
karaf/trunk/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/commands/GenerateDocBookHelpMojo.java
- copied, changed from r1133718, karaf/trunk/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/cmdhelp/CmdHelpMojo.java
karaf/trunk/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/AddToRepositoryMojo.java
- copied, changed from r1133718, karaf/trunk/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/AddFeaturesToRepoMojo.java
karaf/trunk/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/CreateKarMojo.java
- copied, changed from r1133718, karaf/trunk/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/ArchiveKarMojo.java
karaf/trunk/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/GenerateDescriptorMojo.java
- copied, changed from r1133718, karaf/trunk/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/GenerateFeaturesXmlMojo2.java
karaf/trunk/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/ValidateDescriptorMojo.java
- copied, changed from r1133718, karaf/trunk/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/ValidateFeaturesMojo.java
karaf/trunk/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/instances/
karaf/trunk/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/instances/CreateArchiveMojo.java
- copied, changed from r1133718, karaf/trunk/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/ArchiveServerMojo.java
karaf/trunk/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/utils/
karaf/trunk/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/utils/MojoSupport.java
- copied, changed from r1133718, karaf/trunk/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/MojoSupport.java
karaf/trunk/tooling/karaf-maven-plugin/src/test/java/org/apache/karaf/tooling/features/GenerateDescriptorMojoTest.java
- copied, changed from r1133718, karaf/trunk/tooling/karaf-maven-plugin/src/test/java/org/apache/karaf/tooling/features/GenerateFeaturesXmlMojo2Test.java
Removed:
karaf/trunk/manual/src/main/webapp/developers-guide/karaf-maven-plugin-add.conf
karaf/trunk/manual/src/main/webapp/developers-guide/karaf-maven-plugin-generate.conf
karaf/trunk/manual/src/main/webapp/developers-guide/karaf-maven-plugin-validate.conf
karaf/trunk/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/cmdhelp/CmdHelpMojo.java
karaf/trunk/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/AddFeaturesToRepoMojo.java
karaf/trunk/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/ArchiveKarMojo.java
karaf/trunk/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/ArchiveServerMojo.java
karaf/trunk/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/GenerateFeaturesXmlMojo2.java
karaf/trunk/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/MojoSupport.java
karaf/trunk/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/ValidateFeaturesMojo.java
karaf/trunk/tooling/karaf-maven-plugin/src/test/java/org/apache/karaf/tooling/features/GenerateFeaturesXmlMojo2Test.java
Modified:
karaf/trunk/manual/src/main/webapp/developers-guide/karaf-maven-plugin.conf
karaf/trunk/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/InstallKarsMojo.java
karaf/trunk/tooling/karaf-maven-plugin/src/test/java/org/apache/karaf/tooling/features/BundleToArtifactTest.java
Added: karaf/trunk/manual/src/main/webapp/developers-guide/karaf-maven-plugin-commands-generate-docbook-help.conf
URL: http://svn.apache.org/viewvc/karaf/trunk/manual/src/main/webapp/developers-guide/karaf-maven-plugin-commands-generate-docbook-help.conf?rev=1133922&view=auto
==============================================================================
--- karaf/trunk/manual/src/main/webapp/developers-guide/karaf-maven-plugin-commands-generate-docbook-help.conf (added)
+++ karaf/trunk/manual/src/main/webapp/developers-guide/karaf-maven-plugin-commands-generate-docbook-help.conf Thu Jun 9 15:18:42 2011
@@ -0,0 +1,40 @@
+h2. Goal {{karaf:commands-generate-docbook-help}}
+
+The {{karaf:commands-generate-docbook-help}} goal generates DocBook documents containing Karaf commands help.
+
+It looks for command in the current project class loader to find Karaf commands, and generate the DocBook help as displayed with the --help option in the Karaf shell console.
+
+h3. Example
+The example below generates the help for the commands in the current project:
+{pygmentize:xml}
+<project>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.karaf.tooling</groupId>
+ <artifactId>karaf-maven-plugin</artifactId>
+ <version>${project.version}</version>
+
+ <executions>
+ <execution>
+ <id>document-commands</id>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>commands-generate-docbook-help</goal>
+ </goals>
+ <configuration>
+ <targetFolder>${project.build.directory}/docbook/sources</targetFolder>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
+{pygmentize}
+
+h3. Parameters
+|| Name || Type || Description ||
+| {{targetFolder}} | {{File}} | The directory where the DocBook files are generated \\ Default value: ${project.build.directory}/docbkx/sources |
+| {{format}} | {{String}} | The output format of the commands documentation. \\ Default value: docbx |
+| {{classLoader}} | {{String}} | The class loader to use to load the commands. \\ Default value: ${project} |
\ No newline at end of file
Copied: karaf/trunk/manual/src/main/webapp/developers-guide/karaf-maven-plugin-features-add-to-repository.conf (from r1133718, karaf/trunk/manual/src/main/webapp/developers-guide/karaf-maven-plugin-add.conf)
URL: http://svn.apache.org/viewvc/karaf/trunk/manual/src/main/webapp/developers-guide/karaf-maven-plugin-features-add-to-repository.conf?p2=karaf/trunk/manual/src/main/webapp/developers-guide/karaf-maven-plugin-features-add-to-repository.conf&p1=karaf/trunk/manual/src/main/webapp/developers-guide/karaf-maven-plugin-add.conf&r1=1133718&r2=1133922&rev=1133922&view=diff
==============================================================================
--- karaf/trunk/manual/src/main/webapp/developers-guide/karaf-maven-plugin-add.conf (original)
+++ karaf/trunk/manual/src/main/webapp/developers-guide/karaf-maven-plugin-features-add-to-repository.conf Thu Jun 9 15:18:42 2011
@@ -1,6 +1,6 @@
-h2. Goal {{karaf:add-features-to-repo}}
+h2. Goal {{karaf:features-add-to-repository}}
-The {{karaf:add-features-to-repo}} goal adds all the required bundles for a given set of features into directory. You can use this goal to create a {{/system}} directory for building your own Karaf-based distribution.
+The {{karaf:features-add-to-repository}} goal adds all the required bundles for a given set of features into directory. You can use this goal to create a {{/system}} directory for building your own Karaf-based distribution.
By default, the Karaf core features descriptors (standard and enterprise) are automatically included in the descriptors set.
@@ -17,10 +17,10 @@ The example below copies the bundles for
<executions>
<execution>
- <id>add-features-to-repo</id>
+ <id>features-add-to-repo</id>
<phase>generate-resources</phase>
<goals>
- <goal>add-features-to-repo</goal>
+ <goal>features-add-to-repository</goal>
</goals>
<configuration>
<descriptors>
Copied: karaf/trunk/manual/src/main/webapp/developers-guide/karaf-maven-plugin-features-generate-descriptor.conf (from r1133718, karaf/trunk/manual/src/main/webapp/developers-guide/karaf-maven-plugin-generate.conf)
URL: http://svn.apache.org/viewvc/karaf/trunk/manual/src/main/webapp/developers-guide/karaf-maven-plugin-features-generate-descriptor.conf?p2=karaf/trunk/manual/src/main/webapp/developers-guide/karaf-maven-plugin-features-generate-descriptor.conf&p1=karaf/trunk/manual/src/main/webapp/developers-guide/karaf-maven-plugin-generate.conf&r1=1133718&r2=1133922&rev=1133922&view=diff
==============================================================================
--- karaf/trunk/manual/src/main/webapp/developers-guide/karaf-maven-plugin-generate.conf (original)
+++ karaf/trunk/manual/src/main/webapp/developers-guide/karaf-maven-plugin-features-generate-descriptor.conf Thu Jun 9 15:18:42 2011
@@ -1,6 +1,6 @@
-h2. Goal {{karaf:generate}}
+h2. Goal {{karaf:features-generate-descriptor}}
-The {{karaf:generate}} goal generates a features XML file for every bundle listed in the project's dependencies. In order to satisfy the required imports in these bundles, the plugin will add bundles:
+The {{karaf:features-generate-descriptor}} goal generates a features XML file for every bundle listed in the project's dependencies. In order to satisfy the required imports in these bundles, the plugin will add bundles:
- bundles provided by Apache Karaf
- a list of bundles
- bundles discovered in the POM's transitive dependencies
@@ -29,7 +29,7 @@ The example below generates one feature
<id>generate</id>
<phase>generate-resources</phase>
<goals>
- <goal>generate</goal>
+ <goal>features-generate-descriptor</goal>
</goals>
<configuration>
<bundles>src/main/resources/bundles.properties</bundles>
Copied: karaf/trunk/manual/src/main/webapp/developers-guide/karaf-maven-plugin-features-validate-descriptor.conf (from r1133718, karaf/trunk/manual/src/main/webapp/developers-guide/karaf-maven-plugin-validate.conf)
URL: http://svn.apache.org/viewvc/karaf/trunk/manual/src/main/webapp/developers-guide/karaf-maven-plugin-features-validate-descriptor.conf?p2=karaf/trunk/manual/src/main/webapp/developers-guide/karaf-maven-plugin-features-validate-descriptor.conf&p1=karaf/trunk/manual/src/main/webapp/developers-guide/karaf-maven-plugin-validate.conf&r1=1133718&r2=1133922&rev=1133922&view=diff
==============================================================================
--- karaf/trunk/manual/src/main/webapp/developers-guide/karaf-maven-plugin-validate.conf (original)
+++ karaf/trunk/manual/src/main/webapp/developers-guide/karaf-maven-plugin-features-validate-descriptor.conf Thu Jun 9 15:18:42 2011
@@ -1,6 +1,6 @@
-h2. Goal {{karaf:validate}}
+h2. Goal {{karaf:features-validate-descriptor}}
-The {{karaf:validate}} goal validates a features XML descriptor by checking if all the required imports for the bundles defined in the features can be matched to a provided export.
+The {{karaf:features-validate-descriptor}} goal validates a features XML descriptor by checking if all the required imports for the bundles defined in the features can be matched to a provided export.
By default, the plugin tries to add the Karaf core features (standard and enterprise) in the repositories set.
It means that it's not required to explicitly define the Karaf features descriptor in the repository section of your features descriptor.
@@ -20,7 +20,7 @@ The example below validates the features
<id>validate</id>
<phase>process-resources</phase>
<goals>
- <goal>validate</goal>
+ <goal>features-validate-descriptor</goal>
</goals>
<configuration>
<file>target/features.xml</file>
Added: karaf/trunk/manual/src/main/webapp/developers-guide/karaf-maven-plugin-instance-create-archive.conf
URL: http://svn.apache.org/viewvc/karaf/trunk/manual/src/main/webapp/developers-guide/karaf-maven-plugin-instance-create-archive.conf?rev=1133922&view=auto
==============================================================================
--- karaf/trunk/manual/src/main/webapp/developers-guide/karaf-maven-plugin-instance-create-archive.conf (added)
+++ karaf/trunk/manual/src/main/webapp/developers-guide/karaf-maven-plugin-instance-create-archive.conf Thu Jun 9 15:18:42 2011
@@ -0,0 +1,41 @@
+h2. Goal {{karaf:instance-create-archive}}
+
+The {{karaf:instance-create-archive}} goal packages a Karaf instance archive from a given assembled instance.
+
+Both tar.gz and zip formats are generated in the destination folder.
+
+h3. Example
+The example below create archives for the given Karaf instance:
+{pygmentize:xml}
+<project>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.karaf.tooling</groupId>
+ <artifactId>karaf-maven-plugin</artifactId>
+ <version>${project.version}</version>
+ <executions>
+ <execution>
+ <id>generate</id>
+ <phase>package</phase>
+ <goals>
+ <goal>instance-create-archive</goal>
+ </goals>
+ <configuration>
+ <destDir>${project.build.directory}</destDir>
+ <targetServerDirectory>${project.build.directory}/assembly</targetServerDirectory>
+ <targetFile>${project.file}</targetFile>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
+{pygmentize}
+
+h3. Parameters
+|| Name || Type || Description ||
+| {{destDir}} | {{File}} | he target directory of the project. \\ Default value: ${project.build.directory} |
+| {{targetServerDirectory}} | {{File}} | The location of the server repository. \\ Default value: ${project.build.directory}/assembly |
+| {{targetFile}} | {{File}} | The target file to set as the project's artifact. \\ Default value: ${project.file} |
Modified: karaf/trunk/manual/src/main/webapp/developers-guide/karaf-maven-plugin.conf
URL: http://svn.apache.org/viewvc/karaf/trunk/manual/src/main/webapp/developers-guide/karaf-maven-plugin.conf?rev=1133922&r1=1133921&r2=1133922&view=diff
==============================================================================
--- karaf/trunk/manual/src/main/webapp/developers-guide/karaf-maven-plugin.conf (original)
+++ karaf/trunk/manual/src/main/webapp/developers-guide/karaf-maven-plugin.conf Thu Jun 9 15:18:42 2011
@@ -11,11 +11,21 @@ h2. Features goals
The {{karaf-maven-plugin}} provides several goals to help you create and validate features XML descriptors as well as leverage your features to create a custom Karaf distribution.
|| Goal || Description ||
-| {{[karaf:add-features-to-repo|karaf-maven-plugin-add]}} | Copies all the bundles required for a given set of features into a directory \\ (e.g. for creating your own Karaf-based distribution) |
-| {{[karaf:generate-features-xml|karaf-maven-plugin-generate]}} | Generates a features XML descriptor for a set of bundles |
-| {{[karaf:validate|karaf-maven-plugin-validate]}} | Validate a features XML descriptor by checking if all the required imports can be matched to exports |
+| {{[karaf:features-add-to-repository|karaf-maven-plugin-features-add-to-repository]}} | Copies all the bundles required for a given set of features into a directory \\ (e.g. for creating your own Karaf-based distribution) |
+| {{[karaf:features-generate-descriptor|karaf-maven-plugin-features-generate-descriptor]}} | Generates a features XML descriptor for a set of bundles |
+| {{[karaf:features-validate-descriptor|karaf-maven-plugin-validate-descriptor]}} | Validate a features XML descriptor by checking if all the required imports can be matched to exports |
-h2. Commands help goals
+h2. Commands goals
-h2. Instances and distributions goals
\ No newline at end of file
+The {{karaf-maven-plugin}} is able to generate a DocBook documentation for Karaf commands:
+
+|| Goal || Description ||
+| {{[karaf:commands-generate-docbook-help|karaf-maven-plugin-commands-generate-docbook-help]}} | Generates help for Karaf commands in DocBook format. |
+
+h2. Instances and distributions goals
+
+The {{karaf-maven-plugin}} helps you to build custom Karaf distributions or archives existing Karaf instances:
+
+|| Goal || Description ||
+| {{[karaf:instance-create-archive|karaf-maven-plugin-instance-create-archive]}} | Package a server archive from an assembled server. |
\ No newline at end of file
Copied: karaf/trunk/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/commands/GenerateDocBookHelpMojo.java (from r1133718, karaf/trunk/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/cmdhelp/CmdHelpMojo.java)
URL: http://svn.apache.org/viewvc/karaf/trunk/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/commands/GenerateDocBookHelpMojo.java?p2=karaf/trunk/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/commands/GenerateDocBookHelpMojo.java&p1=karaf/trunk/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/cmdhelp/CmdHelpMojo.java&r1=1133718&r2=1133922&rev=1133922&view=diff
==============================================================================
--- karaf/trunk/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/cmdhelp/CmdHelpMojo.java (original)
+++ karaf/trunk/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/commands/GenerateDocBookHelpMojo.java Thu Jun 9 15:18:42 2011
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.karaf.tooling.cmdhelp;
+package org.apache.karaf.tooling.commands;
import java.io.ByteArrayOutputStream;
import java.io.File;
@@ -55,14 +55,14 @@ import org.fusesource.jansi.Ansi;
* Generates docbook for Karaf commands
*
* @version $Revision: 1.1 $
- * @goal cmdhelp
+ * @goal commands-generate-docbook-help
* @phase generate-resources
* @execute phase="generate-resources"
* @requiresDependencyResolution runtime
* @inheritByDefault false
* @description Generates help for Karaf commands
*/
-public class CmdHelpMojo extends AbstractMojo {
+public class GenerateDocBookHelpMojo extends AbstractMojo {
/**
* The maven project.
Copied: karaf/trunk/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/AddToRepositoryMojo.java (from r1133718, karaf/trunk/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/AddFeaturesToRepoMojo.java)
URL: http://svn.apache.org/viewvc/karaf/trunk/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/AddToRepositoryMojo.java?p2=karaf/trunk/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/AddToRepositoryMojo.java&p1=karaf/trunk/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/AddFeaturesToRepoMojo.java&r1=1133718&r2=1133922&rev=1133922&view=diff
==============================================================================
--- karaf/trunk/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/AddFeaturesToRepoMojo.java (original)
+++ karaf/trunk/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/AddToRepositoryMojo.java Thu Jun 9 15:18:42 2011
@@ -38,10 +38,9 @@ import java.util.Set;
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.ParserConfigurationException;
+import org.apache.karaf.tooling.utils.MojoSupport;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.apache.maven.artifact.repository.DefaultArtifactRepository;
-import org.apache.maven.artifact.repository.layout.DefaultRepositoryLayout;
import org.apache.maven.artifact.resolver.ArtifactNotFoundException;
import org.apache.maven.artifact.resolver.ArtifactResolutionException;
import org.apache.maven.plugin.MojoExecutionException;
@@ -55,14 +54,14 @@ import org.xml.sax.SAXException;
* Generates the features XML file
*
* @version $Revision: 1.1 $
- * @goal add-features-to-repo
+ * @goal features-add-to-repository
* @phase compile
* @execute phase="compile"
* @requiresDependencyResolution runtime
* @inheritByDefault true
* @description Add the features to the repository
*/
-public class AddFeaturesToRepoMojo extends MojoSupport {
+public class AddToRepositoryMojo extends MojoSupport {
private final static String KARAF_CORE_STANDARD_FEATURE_URL = "mvn:org.apache.karaf.assemblies.features/standard/%s/xml/features";
private final static String KARAF_CORE_ENTERPRISE_FEATURE_URL = "mvn:org.apache.karaf.assemblies.features/enterprise/%s/xml/features";
Copied: karaf/trunk/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/CreateKarMojo.java (from r1133718, karaf/trunk/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/ArchiveKarMojo.java)
URL: http://svn.apache.org/viewvc/karaf/trunk/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/CreateKarMojo.java?p2=karaf/trunk/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/CreateKarMojo.java&p1=karaf/trunk/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/ArchiveKarMojo.java&r1=1133718&r2=1133922&rev=1133922&view=diff
==============================================================================
--- karaf/trunk/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/ArchiveKarMojo.java (original)
+++ karaf/trunk/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/CreateKarMojo.java Thu Jun 9 15:18:42 2011
@@ -31,6 +31,7 @@ import org.apache.karaf.features.BundleI
import org.apache.karaf.features.internal.model.Feature;
import org.apache.karaf.features.internal.model.Features;
import org.apache.karaf.features.internal.model.JaxbUtil;
+import org.apache.karaf.tooling.utils.MojoSupport;
import org.apache.maven.archiver.MavenArchiveConfiguration;
import org.apache.maven.archiver.MavenArchiver;
import org.apache.maven.artifact.Artifact;
@@ -44,13 +45,13 @@ import org.codehaus.plexus.archiver.jar.
* assembles a kar archive from a features.xml file
*
* @version $Revision: 1.1 $
- * @goal archive-kar
+ * @goal feature-create-kar
* @phase package
* @requiresDependencyResolution runtime
* @inheritByDefault true
* @description Assemble a kar archive from a features.xml file
*/
-public class ArchiveKarMojo extends MojoSupport {
+public class CreateKarMojo extends MojoSupport {
/**
Copied: karaf/trunk/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/GenerateDescriptorMojo.java (from r1133718, karaf/trunk/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/GenerateFeaturesXmlMojo2.java)
URL: http://svn.apache.org/viewvc/karaf/trunk/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/GenerateDescriptorMojo.java?p2=karaf/trunk/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/GenerateDescriptorMojo.java&p1=karaf/trunk/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/GenerateFeaturesXmlMojo2.java&r1=1133718&r2=1133922&rev=1133922&view=diff
==============================================================================
--- karaf/trunk/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/GenerateFeaturesXmlMojo2.java (original)
+++ karaf/trunk/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/GenerateDescriptorMojo.java Thu Jun 9 15:18:42 2011
@@ -75,7 +75,7 @@ import static org.apache.karaf.deployer.
* NB this requires a recent maven-install-plugin such as 2.3.1
*
* @version $Revision: 1.1 $
- * @goal generate-features-xml
+ * @goal features-generate-descriptor
* @phase compile
* @requiresDependencyResolution runtime
* @inheritByDefault true
@@ -83,7 +83,7 @@ import static org.apache.karaf.deployer.
* project dependencies as bundles and feature/car dependencies
*/
@SuppressWarnings("unchecked")
-public class GenerateFeaturesXmlMojo2 extends AbstractLogEnabled implements Mojo {
+public class GenerateDescriptorMojo extends AbstractLogEnabled implements Mojo {
/**
* The (optional) input feature.file to extend
Modified: karaf/trunk/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/InstallKarsMojo.java
URL: http://svn.apache.org/viewvc/karaf/trunk/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/InstallKarsMojo.java?rev=1133922&r1=1133921&r2=1133922&view=diff
==============================================================================
--- karaf/trunk/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/InstallKarsMojo.java (original)
+++ karaf/trunk/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/InstallKarsMojo.java Thu Jun 9 15:18:42 2011
@@ -49,6 +49,7 @@ import org.apache.karaf.features.interna
import org.apache.karaf.features.internal.model.Features;
import org.apache.karaf.features.internal.model.Feature;
import org.apache.karaf.features.internal.model.JaxbUtil;
+import org.apache.karaf.tooling.utils.MojoSupport;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.repository.layout.DefaultRepositoryLayout;
import org.apache.maven.plugin.MojoExecutionException;
Copied: karaf/trunk/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/ValidateDescriptorMojo.java (from r1133718, karaf/trunk/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/ValidateFeaturesMojo.java)
URL: http://svn.apache.org/viewvc/karaf/trunk/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/ValidateDescriptorMojo.java?p2=karaf/trunk/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/ValidateDescriptorMojo.java&p1=karaf/trunk/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/ValidateFeaturesMojo.java&r1=1133718&r2=1133922&rev=1133922&view=diff
==============================================================================
--- karaf/trunk/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/ValidateFeaturesMojo.java (original)
+++ karaf/trunk/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/ValidateDescriptorMojo.java Thu Jun 9 15:18:42 2011
@@ -39,6 +39,7 @@ import org.apache.karaf.features.Feature
import org.apache.karaf.features.Repository;
import org.apache.karaf.features.internal.FeatureValidationUtil;
import org.apache.karaf.features.internal.RepositoryImpl;
+import org.apache.karaf.tooling.utils.MojoSupport;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.repository.DefaultArtifactRepository;
@@ -61,14 +62,14 @@ import static org.apache.karaf.tooling.f
* Validates a features XML file
*
* @version $Revision: 1.1 $
- * @goal validate
+ * @goal features-validate-descriptor
* @execute phase="process-resources"
* @requiresDependencyResolution runtime
* @inheritByDefault true
* @description Validates the features XML file
*/
@SuppressWarnings("unchecked")
-public class ValidateFeaturesMojo extends MojoSupport {
+public class ValidateDescriptorMojo extends MojoSupport {
private static final String MVN_URI_PREFIX = "mvn:";
private static final String MVN_REPO_SEPARATOR = "!";
Copied: karaf/trunk/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/instances/CreateArchiveMojo.java (from r1133718, karaf/trunk/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/ArchiveServerMojo.java)
URL: http://svn.apache.org/viewvc/karaf/trunk/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/instances/CreateArchiveMojo.java?p2=karaf/trunk/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/instances/CreateArchiveMojo.java&p1=karaf/trunk/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/ArchiveServerMojo.java&r1=1133718&r2=1133922&rev=1133922&view=diff
==============================================================================
--- karaf/trunk/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/ArchiveServerMojo.java (original)
+++ karaf/trunk/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/instances/CreateArchiveMojo.java Thu Jun 9 15:18:42 2011
@@ -18,11 +18,12 @@
*/
-package org.apache.karaf.tooling.features;
+package org.apache.karaf.tooling.instances;
import java.io.File;
import java.io.IOException;
+import org.apache.karaf.tooling.utils.MojoSupport;
import org.apache.tools.ant.Project;
import org.apache.tools.ant.taskdefs.MatchingTask;
import org.apache.tools.ant.taskdefs.Tar;
@@ -37,13 +38,13 @@ import org.apache.maven.plugin.MojoFailu
* Package a server archive from an assembled server
*
* @version $Revision: 1.1 $
- * @goal archive-server
+ * @goal instance-create-archive
* @phase package
* @requiresDependencyResolution runtime
* @inheritByDefault true
* @description Package a server archive from an assembled server
*/
-public class ArchiveServerMojo extends MojoSupport {
+public class CreateArchiveMojo extends MojoSupport {
/**
* The target directory of the project.
Copied: karaf/trunk/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/utils/MojoSupport.java (from r1133718, karaf/trunk/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/MojoSupport.java)
URL: http://svn.apache.org/viewvc/karaf/trunk/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/utils/MojoSupport.java?p2=karaf/trunk/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/utils/MojoSupport.java&p1=karaf/trunk/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/MojoSupport.java&r1=1133718&r2=1133922&rev=1133922&view=diff
==============================================================================
--- karaf/trunk/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/MojoSupport.java (original)
+++ karaf/trunk/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/utils/MojoSupport.java Thu Jun 9 15:18:42 2011
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.karaf.tooling.features;
+package org.apache.karaf.tooling.utils;
import java.io.File;
@@ -30,6 +30,8 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
+import org.apache.karaf.tooling.features.Node;
+import org.apache.karaf.tooling.features.ResolutionListenerImpl;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.factory.ArtifactFactory;
import org.apache.maven.artifact.metadata.ArtifactMetadataSource;
Modified: karaf/trunk/tooling/karaf-maven-plugin/src/test/java/org/apache/karaf/tooling/features/BundleToArtifactTest.java
URL: http://svn.apache.org/viewvc/karaf/trunk/tooling/karaf-maven-plugin/src/test/java/org/apache/karaf/tooling/features/BundleToArtifactTest.java?rev=1133922&r1=1133921&r2=1133922&view=diff
==============================================================================
--- karaf/trunk/tooling/karaf-maven-plugin/src/test/java/org/apache/karaf/tooling/features/BundleToArtifactTest.java (original)
+++ karaf/trunk/tooling/karaf-maven-plugin/src/test/java/org/apache/karaf/tooling/features/BundleToArtifactTest.java Thu Jun 9 15:18:42 2011
@@ -23,6 +23,7 @@ package org.apache.karaf.tooling.feature
import java.lang.reflect.Field;
import java.util.HashMap;
+import org.apache.karaf.tooling.utils.MojoSupport;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.factory.DefaultArtifactFactory;
import org.apache.maven.artifact.handler.manager.ArtifactHandlerManager;
Copied: karaf/trunk/tooling/karaf-maven-plugin/src/test/java/org/apache/karaf/tooling/features/GenerateDescriptorMojoTest.java (from r1133718, karaf/trunk/tooling/karaf-maven-plugin/src/test/java/org/apache/karaf/tooling/features/GenerateFeaturesXmlMojo2Test.java)
URL: http://svn.apache.org/viewvc/karaf/trunk/tooling/karaf-maven-plugin/src/test/java/org/apache/karaf/tooling/features/GenerateDescriptorMojoTest.java?p2=karaf/trunk/tooling/karaf-maven-plugin/src/test/java/org/apache/karaf/tooling/features/GenerateDescriptorMojoTest.java&p1=karaf/trunk/tooling/karaf-maven-plugin/src/test/java/org/apache/karaf/tooling/features/GenerateFeaturesXmlMojo2Test.java&r1=1133718&r2=1133922&rev=1133922&view=diff
==============================================================================
--- karaf/trunk/tooling/karaf-maven-plugin/src/test/java/org/apache/karaf/tooling/features/GenerateFeaturesXmlMojo2Test.java (original)
+++ karaf/trunk/tooling/karaf-maven-plugin/src/test/java/org/apache/karaf/tooling/features/GenerateDescriptorMojoTest.java Thu Jun 9 15:18:42 2011
@@ -34,7 +34,7 @@ import org.xml.sax.SAXException;
/**
* @version $Rev:$ $Date:$
*/
-public class GenerateFeaturesXmlMojo2Test {
+public class GenerateDescriptorMojoTest {
@Test
public void testReadXml() throws JAXBException, SAXException, ParserConfigurationException, XMLStreamException {