Author: rmannibucau
Date: Sat Oct 13 17:05:05 2012
New Revision: 1397894
URL: http://svn.apache.org/viewvc?rev=1397894&view=rev
Log:
TOMEE-463 mvn annotations
Modified:
openejb/trunk/openejb/maven/openejb-embedded-maven-plugin/pom.xml
openejb/trunk/openejb/maven/openejb-embedded-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/embedded/OpenEJBEmbeddedMojo.java
openejb/trunk/openejb/maven/pom.xml
openejb/trunk/openejb/maven/tomee-embedded-maven-plugin/pom.xml
openejb/trunk/openejb/maven/tomee-embedded-maven-plugin/src/main/java/org/apache/openejb/maven/plugins/TomEEEmbeddedMojo.java
openejb/trunk/openejb/maven/tomee-maven-plugin/pom.xml
openejb/trunk/openejb/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/AbstractAddressMojo.java
openejb/trunk/openejb/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/AbstractDeployMojo.java
openejb/trunk/openejb/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/AbstractTomEEMojo.java
openejb/trunk/openejb/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/BuildTomEEMojo.java
openejb/trunk/openejb/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/ConfigTestTomEEMojo.java
openejb/trunk/openejb/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/DebugTomEEMojo.java
openejb/trunk/openejb/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/DeployMojo.java
openejb/trunk/openejb/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/HelpTomEEMojo.java
openejb/trunk/openejb/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/ListEjbMojo.java
openejb/trunk/openejb/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/RunTomEEMojo.java
openejb/trunk/openejb/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/StartTomEEMojo.java
openejb/trunk/openejb/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/StopTomEEMojo.java
openejb/trunk/openejb/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/UnDeployMojo.java
openejb/trunk/openejb/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/UpdatableTomEEMojo.java
Modified: openejb/trunk/openejb/maven/openejb-embedded-maven-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/maven/openejb-embedded-maven-plugin/pom.xml?rev=1397894&r1=1397893&r2=1397894&view=diff
==============================================================================
--- openejb/trunk/openejb/maven/openejb-embedded-maven-plugin/pom.xml (original)
+++ openejb/trunk/openejb/maven/openejb-embedded-maven-plugin/pom.xml Sat Oct
13 17:05:05 2012
@@ -48,6 +48,14 @@
<artifactId>maven-util</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.maven.plugin-tools</groupId>
+ <artifactId>maven-plugin-annotations</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ </dependency>
</dependencies>
<properties>
Modified:
openejb/trunk/openejb/maven/openejb-embedded-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/embedded/OpenEJBEmbeddedMojo.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/maven/openejb-embedded-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/embedded/OpenEJBEmbeddedMojo.java?rev=1397894&r1=1397893&r2=1397894&view=diff
==============================================================================
---
openejb/trunk/openejb/maven/openejb-embedded-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/embedded/OpenEJBEmbeddedMojo.java
(original)
+++
openejb/trunk/openejb/maven/openejb-embedded-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/embedded/OpenEJBEmbeddedMojo.java
Sat Oct 13 17:05:05 2012
@@ -20,6 +20,9 @@ import org.apache.maven.artifact.Artifac
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
+import org.apache.maven.plugins.annotations.LifecyclePhase;
+import org.apache.maven.plugins.annotations.Mojo;
+import org.apache.maven.plugins.annotations.Parameter;
import org.apache.maven.project.MavenProject;
import org.apache.openejb.maven.util.MavenLogStreamFactory;
@@ -35,45 +38,24 @@ import java.util.Map;
import java.util.Set;
import java.util.concurrent.CountDownLatch;
-/**
- * @goal run
- * @phase compile
- */
+@Mojo(name = "run", defaultPhase = LifecyclePhase.COMPILE)
public class OpenEJBEmbeddedMojo extends AbstractMojo {
- /**
- * @parameter expression="${project.artifactId}"
- * @required
- */
+ @Parameter(defaultValue = "${project.artifactId}")
private String id;
- /**
- * @parameter expression="${embedded.provider}"
default-value="org.apache.openejb.OpenEjbContainer"
- * @required
- */
+ @Parameter(property = "embedded.provider", defaultValue =
"org.apache.openejb.OpenEjbContainer")
private String provider;
- /**
- * @parameter expression="${embedded.modules}"
default-value="${project.build.outputDirectory}"
- * @required
- */
+ @Parameter(property = "embedded.modules", defaultValue =
"${project.build.outputDirectory}")
private String modules;
- /**
- * @parameter expression="${embedded.await}" default-value="true"
- * @required
- */
+ @Parameter(property = "embedded.await", defaultValue = "true")
private boolean await;
- /**
- * @parameter
- */
+ @Parameter
private Map<String, String> properties;
- /**
- * @parameter expression="${project}"
- * @required
- * @readonly
- */
+ @Parameter(defaultValue = "${project}", readonly = true, required = true)
private MavenProject project;
@Override
Modified: openejb/trunk/openejb/maven/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/maven/pom.xml?rev=1397894&r1=1397893&r2=1397894&view=diff
==============================================================================
--- openejb/trunk/openejb/maven/pom.xml (original)
+++ openejb/trunk/openejb/maven/pom.xml Sat Oct 13 17:05:05 2012
@@ -46,6 +46,16 @@
<dependencyManagement>
<dependencies>
<dependency>
+ <groupId>org.apache.maven.plugin-tools</groupId>
+ <artifactId>maven-plugin-annotations</artifactId>
+ <version>3.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ <version>3.0.1</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
<version>${maven.version}</version>
@@ -92,9 +102,18 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugin-plugin</artifactId>
- <version>2.9</version>
+ <version>3.1</version>
+ <executions>
+ <execution>
+ <id>mojo-descriptor</id>
+ <goals>
+ <goal>descriptor</goal>
+ </goals>
+ </execution>
+ </executions>
<configuration>
<goalPrefix>${maven-plugin.prefix}</goalPrefix>
+ <skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound>
</configuration>
</plugin>
</plugins>
Modified: openejb/trunk/openejb/maven/tomee-embedded-maven-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/maven/tomee-embedded-maven-plugin/pom.xml?rev=1397894&r1=1397893&r2=1397894&view=diff
==============================================================================
--- openejb/trunk/openejb/maven/tomee-embedded-maven-plugin/pom.xml (original)
+++ openejb/trunk/openejb/maven/tomee-embedded-maven-plugin/pom.xml Sat Oct 13
17:05:05 2012
@@ -50,6 +50,14 @@
<artifactId>maven-util</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.maven.plugin-tools</groupId>
+ <artifactId>maven-plugin-annotations</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ </dependency>
</dependencies>
<properties>
Modified:
openejb/trunk/openejb/maven/tomee-embedded-maven-plugin/src/main/java/org/apache/openejb/maven/plugins/TomEEEmbeddedMojo.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/maven/tomee-embedded-maven-plugin/src/main/java/org/apache/openejb/maven/plugins/TomEEEmbeddedMojo.java?rev=1397894&r1=1397893&r2=1397894&view=diff
==============================================================================
---
openejb/trunk/openejb/maven/tomee-embedded-maven-plugin/src/main/java/org/apache/openejb/maven/plugins/TomEEEmbeddedMojo.java
(original)
+++
openejb/trunk/openejb/maven/tomee-embedded-maven-plugin/src/main/java/org/apache/openejb/maven/plugins/TomEEEmbeddedMojo.java
Sat Oct 13 17:05:05 2012
@@ -16,63 +16,43 @@
*/
package org.apache.openejb.maven.plugins;
-import java.io.File;
-import java.lang.reflect.Field;
-import java.util.concurrent.CountDownLatch;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
+import org.apache.maven.plugins.annotations.Mojo;
+import org.apache.maven.plugins.annotations.Parameter;
+import org.apache.maven.plugins.annotations.ResolutionScope;
import org.apache.tomee.embedded.Configuration;
import org.apache.tomee.embedded.Container;
-/**
- * @goal run
- * @requiresDependencyResolution runtime
- */
+import java.io.File;
+import java.lang.reflect.Field;
+import java.util.concurrent.CountDownLatch;
+
+@Mojo(name = "run", requiresDependencyResolution =
ResolutionScope.RUNTIME_PLUS_SYSTEM)
public class TomEEEmbeddedMojo extends AbstractMojo {
- /**
- * @parameter expression="${project.packaging}"
- */
+ @Parameter(defaultValue = "${project.packaging}")
protected String packaging;
- /**
- * @parameter
default-value="${project.build.directory}/${project.build.finalName}"
- * @readonly
- */
+ @Parameter(defaultValue =
"${project.build.directory}/${project.build.finalName}")
protected File warFile;
- /** config of the container itself -> match 1-1 Configuration attributes
-->
-
- /**
- * @parameter expression="${tomee-embedded-plugin.http}"
default-value="8080"
- */
+ @Parameter(property = "tomee-embedded-plugin.http", defaultValue = "8080")
private int httpPort;
- /**
- * @parameter expression="${tomee-embedded-plugin.ajp}"
default-value="8009"
- */
+ @Parameter(property = "tomee-embedded-plugin.ajp", defaultValue = "8009")
private int ajpPort = 8009;
- /**
- * @parameter expression="${tomee-embedded-plugin.stop}"
default-value="8005"
- */
+ @Parameter(property = "tomee-embedded-plugin.stop", defaultValue = "8005")
private int stopPort;
- /**
- * @parameter expression="${tomee-embedded-plugin.host}"
default-value="localhost"
- */
+ @Parameter(property = "tomee-embedded-plugin.host", defaultValue =
"localhost")
private String host;
- /**
- * @parameter expression="${tomee-embedded-plugin.lib}"
default-value="${project.build.directory}/apache-tomee-embedded"
- * @optional
- */
+ @Parameter(property = "tomee-embedded-plugin.lib", defaultValue =
"${project.build.directory}/apache-tomee-embedded")
protected String dir;
- /**
- * @parameter
- * @optional
- */
+ @Parameter
private File serverXml;
@Override
Modified: openejb/trunk/openejb/maven/tomee-maven-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/maven/tomee-maven-plugin/pom.xml?rev=1397894&r1=1397893&r2=1397894&view=diff
==============================================================================
--- openejb/trunk/openejb/maven/tomee-maven-plugin/pom.xml (original)
+++ openejb/trunk/openejb/maven/tomee-maven-plugin/pom.xml Sat Oct 13 17:05:05
2012
@@ -53,6 +53,14 @@
<artifactId>tomee-util</artifactId>
<version>${tomee.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.maven.plugin-tools</groupId>
+ <artifactId>maven-plugin-annotations</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ </dependency>
</dependencies>
<properties>
Modified:
openejb/trunk/openejb/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/AbstractAddressMojo.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/AbstractAddressMojo.java?rev=1397894&r1=1397893&r2=1397894&view=diff
==============================================================================
---
openejb/trunk/openejb/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/AbstractAddressMojo.java
(original)
+++
openejb/trunk/openejb/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/AbstractAddressMojo.java
Sat Oct 13 17:05:05 2012
@@ -18,30 +18,21 @@
package org.apache.openejb.maven.plugin;
import org.apache.maven.plugin.AbstractMojo;
+import org.apache.maven.plugins.annotations.Parameter;
public abstract class AbstractAddressMojo extends AbstractMojo {
- /**
- * @parameter expression="${tomee-plugin.http}" default-value="8080"
- */
+ @Parameter(property = "tomee-plugin.http", defaultValue = "8080")
protected int tomeeHttpPort = 8080;
- /**
- * @parameter expression="${tomee-plugin.host}" default-value="localhost"
- */
+ @Parameter(property = "tomee-plugin.host", defaultValue = "localhost")
protected String tomeeHost;
- /**
- * @parameter expression="${tomee-plugin.user}"
- */
+ @Parameter(property = "tomee-plugin.user")
protected String user;
- /**
- * @parameter expression="${tomee-plugin.pwd}"
- */
+ @Parameter(property = "tomee-plugin.pwd")
protected String password;
- /**
- * @parameter expression="${tomee-plugin.realm}"
- */
+ @Parameter(property = "tomee-plugin.realm")
protected String realm;
}
Modified:
openejb/trunk/openejb/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/AbstractDeployMojo.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/AbstractDeployMojo.java?rev=1397894&r1=1397893&r2=1397894&view=diff
==============================================================================
---
openejb/trunk/openejb/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/AbstractDeployMojo.java
(original)
+++
openejb/trunk/openejb/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/AbstractDeployMojo.java
Sat Oct 13 17:05:05 2012
@@ -17,10 +17,9 @@
package org.apache.openejb.maven.plugin;
+import org.apache.maven.plugins.annotations.Parameter;
+
public abstract class AbstractDeployMojo extends AbstractCommandMojo {
- /**
- * @parameter expression="${tomee-plugin.archive}"
- * @required
- */
+ @Parameter(property = "tomee-plugin.archive", required = true)
protected String path;
}
Modified:
openejb/trunk/openejb/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/AbstractTomEEMojo.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/AbstractTomEEMojo.java?rev=1397894&r1=1397893&r2=1397894&view=diff
==============================================================================
---
openejb/trunk/openejb/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/AbstractTomEEMojo.java
(original)
+++
openejb/trunk/openejb/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/AbstractTomEEMojo.java
Sat Oct 13 17:05:05 2012
@@ -25,6 +25,8 @@ import org.apache.maven.artifact.reposit
import org.apache.maven.artifact.resolver.ArtifactResolver;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
+import org.apache.maven.plugins.annotations.Component;
+import org.apache.maven.plugins.annotations.Parameter;
import org.apache.maven.settings.Settings;
import org.apache.openejb.config.RemoteServer;
import org.apache.openejb.loader.Files;
@@ -72,150 +74,94 @@ public abstract class AbstractTomEEMojo
private static final String UNZIP_PREFIX = "unzip:";
private static final String REMOVE_PREFIX = "remove:";
-
- /**
- * @component
- */
+ @Component
protected ArtifactFactory factory;
- /**
- * @component
- */
+ @Component
protected ArtifactResolver resolver;
- /**
- * @parameter expression="${localRepository}"
- * @readonly
- * @required
- */
+ @Parameter(defaultValue = "${localRepository}", readonly = true, required
= true)
protected ArtifactRepository local;
- /**
- * @parameter expression="${project.remoteArtifactRepositories}"
- * @readonly
- * @required
- */
+ @Parameter(defaultValue = "${project.remoteArtifactRepositories}",
readonly = true, required = true)
protected List<ArtifactRepository> remoteRepos;
- /**
- * @parameter expression="${tomee-plugin.skipCurrentProject}"
default-value="false"
- */
+ @Parameter(property = "tomee-plugin.skipCurrentProject", defaultValue =
"false")
protected boolean skipCurrentProject;
- /**
- * @parameter expression="${tomee-plugin.version}"
default-value="1.5.1-SNAPSHOT"
- */
+ @Parameter(property = "tomee-plugin.version", defaultValue =
"1.5.1-SNAPSHOT")
protected String tomeeVersion;
- /**
- * @parameter expression="${tomee-plugin.groupId}"
default-value="org.apache.openejb"
- */
+ @Parameter(property = "tomee-plugin.groupId", defaultValue =
"org.apache.openejb")
protected String tomeeGroupId;
- /**
- * @parameter expression="${tomee-plugin.artifactId}"
default-value="apache-tomee"
- */
+ @Parameter(property = "tomee-plugin.artifactId", defaultValue =
"apache-tomee")
protected String tomeeArtifactId;
/**
- * @parameter expression="${tomee-plugin.type}" default-value="zip"
- * @readonly // while tar.gz is not managed
+ * while tar.gz is not managed it is readonly
*/
+ @Parameter(property = "tomee-plugin.type", defaultValue = "zip", readonly
= true)
protected String tomeeType;
- /**
- * @parameter expression="${tomee-plugin.apache-repos}"
default-value="snapshots"
- */
+ @Parameter(property = "tomee-plugin.apache-repos", defaultValue =
"snapshots")
protected String apacheRepos;
- /**
- * @parameter expression="${tomee-plugin.classifier}"
default-value="webprofile"
- */
+ @Parameter(property = "tomee-plugin.classifier", defaultValue =
"webprofile")
protected String tomeeClassifier;
- /**
- * @parameter expression="${tomee-plugin.shutdown}" default-value="8005"
- */
+ @Parameter(property = "tomee-plugin.shutdown", defaultValue = "8005")
protected int tomeeShutdownPort = 8005;
- /**
- * @parameter expression="${tomee-plugin.ajp}" default-value="8009"
- */
+ @Parameter(property = "tomee-plugin.ajp", defaultValue = "8009")
protected int tomeeAjpPort = 8009;
- /**
- * @parameter expression="${tomee-plugin.https}" default-value="8443"
- */
+ @Parameter(property = "tomee-plugin.https", defaultValue = "8443")
protected int tomeeHttpsPort = 8080;
- /**
- * @parameter expression="${tomee-plugin.args}"
- */
+ @Parameter(property = "tomee-plugin.args")
protected String args;
- /**
- * @parameter expression="${tomee-plugin.debug}" default-value="false"
- */
+ @Parameter(property = "tomee-plugin.debug", defaultValue = "false")
protected boolean debug;
- /**
- * @parameter expression="${tomee-plugin.debugPort}" default-value="5005"
- */
+ @Parameter(property = "tomee-plugin.debugPort", defaultValue = "5005")
protected int debugPort;
- /**
- * @parameter default-value="${project.build.directory}/apache-tomee"
- * @readonly
- */
+ @Parameter(defaultValue = "${project.build.directory}/apache-tomee")
protected File catalinaBase;
/**
* relative to tomee.base.
- *
- * @parameter default-value="webapps"
*/
+ @Parameter(defaultValue = "webapps")
protected String webappDir;
/**
* relative to tomee.base.
- *
- * @parameter default-value="apps"
*/
+ @Parameter(defaultValue = "apps")
protected String appDir;
/**
* relative to tomee.base.
- *
- * @parameter default-value="lib"
*/
+ @Parameter(defaultValue = "lib")
protected String libDir;
- /**
- * @parameter expression="${tomee-plugin.conf}"
default-value="${project.basedir}/src/main/tomee/conf"
- * @optional
- */
+ @Parameter(property = "tomee-plugin.conf", defaultValue =
"${project.basedir}/src/main/tomee/conf")
protected File config;
- /**
- * @parameter expression="${tomee-plugin.bin}"
default-value="${project.basedir}/src/main/tomee/bin"
- * @optional
- */
+ @Parameter(property = "tomee-plugin.bin", defaultValue =
"${project.basedir}/src/main/tomee/bin")
protected File bin;
- /**
- * @parameter expression="${tomee-plugin.lib}"
default-value="${project.basedir}/src/main/tomee/lib"
- * @optional
- */
+ @Parameter(property = "tomee-plugin.lib", defaultValue =
"${project.basedir}/src/main/tomee/lib")
protected File lib;
- /**
- * @parameter
- */
+ @Parameter
protected Map<String, String> systemVariables;
- /**
- * @parameter expression="${tomee-plugin.quick-session}"
default-value="true"
- */
+ @Parameter(property = "tomee-plugin.quick-session", defaultValue = "true")
private boolean quickSession;
/**
@@ -223,54 +169,35 @@ public abstract class AbstractTomEEMojo
* --> groupId:artifactId:version...
* --> unzip:groupId:artifactId:version...
* --> remove:prefix (often prefix = artifactId)
- *
- * @parameter
*/
+ @Parameter
protected List<String> libs;
- /**
- * @parameter
- */
+ @Parameter
protected List<String> webapps;
- /**
- * @parameter
- */
+ @Parameter
protected List<String> apps;
- /**
- * @parameter
default-value="${project.build.directory}/${project.build.finalName}.${project.packaging}"
- * @readonly
- */
+ @Parameter(defaultValue =
"${project.build.directory}/${project.build.finalName}.${project.packaging}")
protected File warFile;
- /**
- * @parameter expression="${tomee-plugin.remove-default-webapps}"
default-value="true"
- */
+ @Parameter(property = "tomee-plugin.remove-default-webapps", defaultValue
= "true")
protected boolean removeDefaultWebapps;
- /**
- * @parameter expression="${tomee-plugin.remove-tomee-webapps}"
default-value="false"
- */
+ @Parameter(property = "tomee-plugin.remove-tomee-webapps", defaultValue =
"false")
protected boolean removeTomeeWebapp;
- /**
- * @parameter expression="${project.packaging}"
- */
+ @Parameter(defaultValue = "${project.packaging}", readonly = true,
required = true)
protected String packaging;
- /**
- * @parameter expression="${tomee-plugin.keep-server-xml}"
default-value="false"
- */
+ @Parameter(property = "tomee-plugin.keep-server-xml", defaultValue =
"false")
protected boolean keepServerXmlAsthis;
/**
* The current user system settings for use in Maven.
- *
- * @parameter expression="${settings}"
- * @required
- * @readonly
*/
+ @Parameter(defaultValue = "${settings}", required = true, readonly = true)
protected Settings settings;
protected File deployedFile = null;
Modified:
openejb/trunk/openejb/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/BuildTomEEMojo.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/BuildTomEEMojo.java?rev=1397894&r1=1397893&r2=1397894&view=diff
==============================================================================
---
openejb/trunk/openejb/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/BuildTomEEMojo.java
(original)
+++
openejb/trunk/openejb/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/BuildTomEEMojo.java
Sat Oct 13 17:05:05 2012
@@ -19,6 +19,10 @@ package org.apache.openejb.maven.plugin;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
+import org.apache.maven.plugins.annotations.Component;
+import org.apache.maven.plugins.annotations.Mojo;
+import org.apache.maven.plugins.annotations.Parameter;
+import org.apache.maven.plugins.annotations.ResolutionScope;
import org.apache.maven.project.MavenProject;
import org.apache.maven.project.MavenProjectHelper;
@@ -27,43 +31,24 @@ import java.io.IOException;
import static org.apache.openejb.maven.plugin.util.Zips.zip;
-/**
- * @goal build
- * @requiresDependencyResolution runtime
- */
+@Mojo(name = "build", requiresDependencyResolution =
ResolutionScope.RUNTIME_PLUS_SYSTEM)
public class BuildTomEEMojo extends AbstractTomEEMojo {
- /**
- * @parameter expression="${tomee-plugin.zip}" default-value="true"
- */
+ @Parameter(property = "tomee-plugin.zip", defaultValue = "true")
protected boolean zip;
- /**
- * @parameter expression="${tomee-plugin.attach}" default-value="true"
- */
+ @Parameter(property = "tomee-plugin.attach", defaultValue = "true")
protected boolean attach;
- /**
- * @parameter expression="${tomee-plugin.zip-file}"
default-value="${project.build.directory}/${project.build.finalName}.zip""
- * @required
- * @readOnly
- */
+ @Parameter(property = "tomee-plugin.zip-file", defaultValue =
"${project.build.directory}/${project.build.finalName}.zip")
private File zipFile;
- /**
- * @component
- */
+ @Component
private MavenProjectHelper projectHelper;
- /**
- * @parameter default-value="${project}"
- * @required
- * @readonly
- */
+ @Parameter(defaultValue = "${project}", required = true, readonly = true)
private MavenProject project;
- /**
- * @parameter expression="${tomee-plugin.classifier}"
- */
+ @Parameter(property = "tomee-plugin.classifier")
protected String classifier = null;
@Override
Modified:
openejb/trunk/openejb/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/ConfigTestTomEEMojo.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/ConfigTestTomEEMojo.java?rev=1397894&r1=1397893&r2=1397894&view=diff
==============================================================================
---
openejb/trunk/openejb/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/ConfigTestTomEEMojo.java
(original)
+++
openejb/trunk/openejb/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/ConfigTestTomEEMojo.java
Sat Oct 13 17:05:05 2012
@@ -17,10 +17,10 @@
package org.apache.openejb.maven.plugin;
-/**
- * @goal configtest
- * @requiresDependencyResolution runtime
- */
+import org.apache.maven.plugins.annotations.Mojo;
+import org.apache.maven.plugins.annotations.ResolutionScope;
+
+@Mojo(name = "configtest", requiresDependencyResolution =
ResolutionScope.RUNTIME_PLUS_SYSTEM)
public class ConfigTestTomEEMojo extends AbstractTomEEMojo {
@Override
public String getCmd() {
Modified:
openejb/trunk/openejb/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/DebugTomEEMojo.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/DebugTomEEMojo.java?rev=1397894&r1=1397893&r2=1397894&view=diff
==============================================================================
---
openejb/trunk/openejb/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/DebugTomEEMojo.java
(original)
+++
openejb/trunk/openejb/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/DebugTomEEMojo.java
Sat Oct 13 17:05:05 2012
@@ -17,10 +17,10 @@
package org.apache.openejb.maven.plugin;
-/**
- * @goal debug
- * @requiresDependencyResolution runtime
- */
+import org.apache.maven.plugins.annotations.Mojo;
+import org.apache.maven.plugins.annotations.ResolutionScope;
+
+@Mojo(name = "debug", requiresDependencyResolution =
ResolutionScope.RUNTIME_PLUS_SYSTEM)
public class DebugTomEEMojo extends RunTomEEMojo {
@Override
protected void run() {
Modified:
openejb/trunk/openejb/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/DeployMojo.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/DeployMojo.java?rev=1397894&r1=1397893&r2=1397894&view=diff
==============================================================================
---
openejb/trunk/openejb/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/DeployMojo.java
(original)
+++
openejb/trunk/openejb/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/DeployMojo.java
Sat Oct 13 17:05:05 2012
@@ -19,6 +19,8 @@ package org.apache.openejb.maven.plugin;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
+import org.apache.maven.plugins.annotations.Mojo;
+import org.apache.maven.plugins.annotations.Parameter;
import org.apache.openejb.OpenEJBException;
import org.apache.openejb.assembler.Deployer;
@@ -26,13 +28,9 @@ import java.util.HashMap;
import java.util.Map;
import java.util.Properties;
-/**
- * @goal deploy
- */
+@Mojo(name = "deploy")
public class DeployMojo extends AbstractDeployMojo {
- /**
- * @parameter
- */
+ @Parameter
protected Map<String, String> systemVariables = new HashMap<String,
String>();
@Override
Modified:
openejb/trunk/openejb/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/HelpTomEEMojo.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/HelpTomEEMojo.java?rev=1397894&r1=1397893&r2=1397894&view=diff
==============================================================================
---
openejb/trunk/openejb/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/HelpTomEEMojo.java
(original)
+++
openejb/trunk/openejb/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/HelpTomEEMojo.java
Sat Oct 13 17:05:05 2012
@@ -20,10 +20,9 @@ package org.apache.openejb.maven.plugin;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
+import org.apache.maven.plugins.annotations.Mojo;
-/**
- * @goal help
- */
+@Mojo(name = "help")
public class HelpTomEEMojo extends AbstractMojo {
@Override
public void execute() throws MojoExecutionException, MojoFailureException {
Modified:
openejb/trunk/openejb/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/ListEjbMojo.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/ListEjbMojo.java?rev=1397894&r1=1397893&r2=1397894&view=diff
==============================================================================
---
openejb/trunk/openejb/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/ListEjbMojo.java
(original)
+++
openejb/trunk/openejb/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/ListEjbMojo.java
Sat Oct 13 17:05:05 2012
@@ -20,6 +20,7 @@ package org.apache.openejb.maven.plugin;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
import org.apache.maven.plugin.logging.Log;
+import org.apache.maven.plugins.annotations.Mojo;
import org.apache.openejb.assembler.Deployer;
import org.apache.openejb.assembler.classic.AppInfo;
import org.apache.openejb.assembler.classic.EjbJarInfo;
@@ -35,9 +36,8 @@ import java.util.Collection;
/**
* highly inspired from openejb command helper but with some different data.
- *
- * @goal list
*/
+@Mojo(name = "list")
public class ListEjbMojo extends AbstractCommandMojo {
@Override
public void execute() throws MojoExecutionException, MojoFailureException {
Modified:
openejb/trunk/openejb/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/RunTomEEMojo.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/RunTomEEMojo.java?rev=1397894&r1=1397893&r2=1397894&view=diff
==============================================================================
---
openejb/trunk/openejb/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/RunTomEEMojo.java
(original)
+++
openejb/trunk/openejb/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/RunTomEEMojo.java
Sat Oct 13 17:05:05 2012
@@ -17,10 +17,10 @@
package org.apache.openejb.maven.plugin;
-/**
- * @goal run
- * @requiresDependencyResolution runtime
- */
+import org.apache.maven.plugins.annotations.Mojo;
+import org.apache.maven.plugins.annotations.ResolutionScope;
+
+@Mojo(name = "run", requiresDependencyResolution =
ResolutionScope.RUNTIME_PLUS_SYSTEM)
public class RunTomEEMojo extends UpdatableTomEEMojo {
@Override
public String getCmd() {
Modified:
openejb/trunk/openejb/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/StartTomEEMojo.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/StartTomEEMojo.java?rev=1397894&r1=1397893&r2=1397894&view=diff
==============================================================================
---
openejb/trunk/openejb/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/StartTomEEMojo.java
(original)
+++
openejb/trunk/openejb/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/StartTomEEMojo.java
Sat Oct 13 17:05:05 2012
@@ -17,10 +17,10 @@
package org.apache.openejb.maven.plugin;
-/**
- * @goal start
- * @requiresDependencyResolution runtime
- */
+import org.apache.maven.plugins.annotations.Mojo;
+import org.apache.maven.plugins.annotations.ResolutionScope;
+
+@Mojo(name = "start", requiresDependencyResolution =
ResolutionScope.RUNTIME_PLUS_SYSTEM)
public class StartTomEEMojo extends UpdatableTomEEMojo {
@Override
public String getCmd() {
Modified:
openejb/trunk/openejb/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/StopTomEEMojo.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/StopTomEEMojo.java?rev=1397894&r1=1397893&r2=1397894&view=diff
==============================================================================
---
openejb/trunk/openejb/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/StopTomEEMojo.java
(original)
+++
openejb/trunk/openejb/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/StopTomEEMojo.java
Sat Oct 13 17:05:05 2012
@@ -19,11 +19,11 @@ package org.apache.openejb.maven.plugin;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
+import org.apache.maven.plugins.annotations.Mojo;
+import org.apache.maven.plugins.annotations.ResolutionScope;
-/**
- * @goal stop
- * @requiresDependencyResolution runtime
- */
+
+@Mojo(name = "stop", requiresDependencyResolution =
ResolutionScope.RUNTIME_PLUS_SYSTEM)
public class StopTomEEMojo extends AbstractTomEEMojo {
@Override
public String getCmd() {
Modified:
openejb/trunk/openejb/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/UnDeployMojo.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/UnDeployMojo.java?rev=1397894&r1=1397893&r2=1397894&view=diff
==============================================================================
---
openejb/trunk/openejb/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/UnDeployMojo.java
(original)
+++
openejb/trunk/openejb/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/UnDeployMojo.java
Sat Oct 13 17:05:05 2012
@@ -19,12 +19,11 @@ package org.apache.openejb.maven.plugin;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
+import org.apache.maven.plugins.annotations.Mojo;
import org.apache.openejb.OpenEJBException;
import org.apache.openejb.assembler.Deployer;
-/**
- * @goal undeploy
- */
+@Mojo(name = "undeploy")
public class UnDeployMojo extends AbstractDeployMojo {
@Override
public void execute() throws MojoExecutionException, MojoFailureException {
Modified:
openejb/trunk/openejb/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/UpdatableTomEEMojo.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/UpdatableTomEEMojo.java?rev=1397894&r1=1397893&r2=1397894&view=diff
==============================================================================
---
openejb/trunk/openejb/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/UpdatableTomEEMojo.java
(original)
+++
openejb/trunk/openejb/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/UpdatableTomEEMojo.java
Sat Oct 13 17:05:05 2012
@@ -16,6 +16,7 @@
*/
package org.apache.openejb.maven.plugin;
+import org.apache.maven.plugins.annotations.Parameter;
import org.apache.openejb.OpenEJBRuntimeException;
import org.apache.openejb.assembler.Deployer;
import org.apache.openejb.client.RemoteInitialContextFactory;
@@ -41,35 +42,19 @@ import java.util.regex.Pattern;
public abstract class UpdatableTomEEMojo extends AbstractTomEEMojo {
public static final int INITIAL_DELAY = 5000;
- /**
- * @parameter
- */
+ @Parameter
private Synchronization synchronization;
- /**
- * @parameter expression="${tomee-plugin.buildDir}"
default-value="${project.build.directory}"
- * @required
- * @readOnly
- */
+ @Parameter(property = "tomee-plugin.buildDir", defaultValue =
"${project.build.directory}", readonly = true, required = true)
private File buildDir;
- /**
- * @parameter expression="${tomee-plugin.baseDir}"
default-value="${project.basedir}"
- * @required
- * @readOnly
- */
+ @Parameter(property = "tomee-plugin.baseDir", defaultValue =
"${project.basedir}", readonly = true, required = true)
private File baseDir;
- /**
- * @parameter expression="${tomee-plugin.finalName}"
default-value="${project.build.finalName}"
- * @required
- */
+ @Parameter(property = "tomee-plugin.finalName", defaultValue =
"${project.build.finalName}", required = true)
private String finalName;
- /**
- * @parameter expression="${tomee-plugin.reload-on-update}"
default-value="false"
- * @required
- */
+ @Parameter(property = "tomee-plugin.reload-on-update", defaultValue =
"false")
private boolean reloadOnUpdate;
private Timer timer;
