svn commit: r509110 - in /geronimo/server/trunk/maven-plugins/geronimo-maven-plugin/src: main/java/org/apache/geronimo/mavenplugins/geronimo/module/DeployModuleMojo.java site/apt/usage/modules.apt site/apt/usage/server.apt

[jd...@apache.org]

Author: jdillon
Date: Sun Feb 18 22:48:46 2007
New Revision: 509110

URL: http://svn.apache.org/viewvc?view=rev&rev=509110
Log:
Update assembly names to match what we have
Using javaee instead of j2ee

Modified:
    geronimo/server/trunk/maven-plugins/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/module/DeployModuleMojo.java
    geronimo/server/trunk/maven-plugins/geronimo-maven-plugin/src/site/apt/usage/modules.apt
    geronimo/server/trunk/maven-plugins/geronimo-maven-plugin/src/site/apt/usage/server.apt

Modified: geronimo/server/trunk/maven-plugins/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/module/DeployModuleMojo.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/maven-plugins/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/module/DeployModuleMojo.java?view=diff&rev=509110&r1=509109&r2=509110
==============================================================================
--- geronimo/server/trunk/maven-plugins/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/module/DeployModuleMojo.java (original)
+++ geronimo/server/trunk/maven-plugins/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/module/DeployModuleMojo.java Sun Feb 18 22:48:46 2007
@@ -136,7 +136,7 @@
             (!"rar".equals(type)) &&
             (!"jar".equals(type)))
         {
-            throw new MojoExecutionException("Module does not look like a J2EE archive: " + module);
+            throw new MojoExecutionException("Module does not look like a JavaEE archive: " + module);
         }
 
         return file;

Modified: geronimo/server/trunk/maven-plugins/geronimo-maven-plugin/src/site/apt/usage/modules.apt
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/maven-plugins/geronimo-maven-plugin/src/site/apt/usage/modules.apt?view=diff&rev=509110&r1=509109&r2=509110
==============================================================================
--- geronimo/server/trunk/maven-plugins/geronimo-maven-plugin/src/site/apt/usage/modules.apt (original)
+++ geronimo/server/trunk/maven-plugins/geronimo-maven-plugin/src/site/apt/usage/modules.apt Sun Feb 18 22:48:46 2007
@@ -27,11 +27,11 @@
 
 * <deploy-module> configuration
 
- <<<j2ee>>> modules can be deployed into a running Geronimo server using the <deploy-module> goal.
+ <<<JavaEE>>> modules can be deployed into a running Geronimo server using the <deploy-module> goal.
  Multiple modules can be specified as maven artifacts in which case they will be retrieved from
  the local maven repository or a single module can be specified by it's absolute file location.
 
- <<NOTE:>> Archive files <<MUST>> be a valid <<<j2ee>>> artifact of the type <<<jar>>>, <<<war>>>, <<<rar>>> or <<<ear>>>.
+ <<NOTE:>> Archive files <<MUST>> be a valid <<<JavaEE>>> artifact of the type <<<jar>>>, <<<war>>>, <<<rar>>> or <<<ear>>>.
 
  This example shows one module from an absolute file location which will be deployed by setting
  the <<<moduleArchive>>> parameter.

Modified: geronimo/server/trunk/maven-plugins/geronimo-maven-plugin/src/site/apt/usage/server.apt
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/maven-plugins/geronimo-maven-plugin/src/site/apt/usage/server.apt?view=diff&rev=509110&r1=509109&r2=509110
==============================================================================
--- geronimo/server/trunk/maven-plugins/geronimo-maven-plugin/src/site/apt/usage/server.apt (original)
+++ geronimo/server/trunk/maven-plugins/geronimo-maven-plugin/src/site/apt/usage/server.apt Sun Feb 18 22:48:46 2007
@@ -44,7 +44,7 @@
         <assemblies>
             <assembly>
                 <groupId>org.apache.geronimo.assemblies</groupId>
-                <artifactId>geronimo-jetty-j2ee</artifactId>
+                <artifactId>geronimo-jetty-jee5</artifactId>
                 <version>${pom.version}</version>
                 <classifier>bin</classifier>
                 <type>zip</type>
@@ -68,7 +68,7 @@
             <assembly>
                 <id>jetty</id>
                 <groupId>org.apache.geronimo.assemblies</groupId>
-                <artifactId>geronimo-jetty-j2ee</artifactId>
+                <artifactId>geronimo-jetty6-jee5</artifactId>
                 <version>${pom.version}</version>
                 <classifier>bin</classifier>
                 <type>zip</type>
@@ -77,7 +77,7 @@
             <assembly>
                 <id>jetty-minimal</id>
                 <groupId>org.apache.geronimo.assemblies</groupId>
-                <artifactId>geronimo-jetty-minimal</artifactId>
+                <artifactId>geronimo-jetty6-minimal</artifactId>
                 <version>${pom.version}</version>
                 <classifier>bin</classifier>
                 <type>zip</type>
@@ -86,7 +86,7 @@
             <assembly>
                 <id>tomcat</id>
                 <groupId>org.apache.geronimo.assemblies</groupId>
-                <artifactId>geronimo-tomcat-j2ee</artifactId>
+                <artifactId>geronimo-tomcat6-jee5</artifactId>
                 <version>${pom.version}</version>
                 <classifier>bin</classifier>
                 <type>zip</type>
@@ -95,7 +95,7 @@
             <assembly>
                 <id>tomcat-minimal</id>
                 <groupId>org.apache.geronimo.assemblies</groupId>
-                <artifactId>geronimo-tomcat-minimal</artifactId>
+                <artifactId>geronimo-tomcat6-minimal</artifactId>
                 <version>${pom.version}</version>
                 <classifier>bin</classifier>
                 <type>zip</type>