From 2d666f57a75ec1568aad1d8cd91f32f8cf552fe1 Mon Sep 17 00:00:00 2001
From: Brett Leslie Porter <brett@apache.org>
Date: Tue, 26 Jul 2005 14:00:23 +0000
Subject: [PATCH] move main J2EE packaging definitions back to being built in

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@225311 13f79535-47bb-0310-9956-ffa450edef68
---
 .../lifecycle/DefaultLifecycleExecutor.java   |  4 +-
 .../resources/META-INF/plexus/components.xml  | 56 +++++++++++++++++++
 .../resources/META-INF/plexus/components.xml  | 19 -------
 .../resources/META-INF/plexus/components.xml  | 23 --------
 .../resources/META-INF/plexus/components.xml  | 23 --------
 5 files changed, 58 insertions(+), 67 deletions(-)
 delete mode 100644 maven-plugins/maven-ear-plugin/src/main/resources/META-INF/plexus/components.xml
 delete mode 100644 maven-plugins/maven-ejb-plugin/src/main/resources/META-INF/plexus/components.xml
 delete mode 100644 maven-plugins/maven-war-plugin/src/main/resources/META-INF/plexus/components.xml

diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java b/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
index 2080bb1839..a601ae8d1d 100644
--- a/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
+++ b/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
@@ -269,8 +269,8 @@ public class DefaultLifecycleExecutor
                     String goal = tok.nextToken().trim();
 
                     MojoDescriptor mojoDescriptor = getMojoDescriptor( goal, session, project );
-                    addToLifecycleMappings( lifecycleMappings, phase, new MojoExecution( mojoDescriptor ), session
-                        .getSettings() );
+                    addToLifecycleMappings( lifecycleMappings, phase, new MojoExecution( mojoDescriptor ),
+                                            session.getSettings() );
                 }
             }
 
diff --git a/maven-core/src/main/resources/META-INF/plexus/components.xml b/maven-core/src/main/resources/META-INF/plexus/components.xml
index 72682043c5..c869e0816f 100644
--- a/maven-core/src/main/resources/META-INF/plexus/components.xml
+++ b/maven-core/src/main/resources/META-INF/plexus/components.xml
@@ -217,6 +217,62 @@
       </configuration>
     </component>
 
+    <component>
+      <role>org.apache.maven.lifecycle.mapping.LifecycleMapping</role>
+      <role-hint>ejb</role-hint>
+      <implementation>org.apache.maven.lifecycle.mapping.DefaultLifecycleMapping</implementation>
+      <configuration>
+        <!-- START SNIPPET: ejb-lifecycle -->
+        <phases>
+          <process-resources>resources:resources</process-resources>
+          <compile>compiler:compile</compile>
+          <process-test-resources>resources:testResources</process-test-resources>
+          <test-compile>compiler:testCompile</test-compile>
+          <test>surefire:test</test>
+          <package>ejb:ejb,source:jar</package>
+          <install>install:install</install>
+          <deploy>deploy:deploy</deploy>
+        </phases>
+        <!-- END SNIPPET: ejb-lifecycle -->
+      </configuration>
+    </component>
+
+    <component>
+      <role>org.apache.maven.lifecycle.mapping.LifecycleMapping</role>
+      <role-hint>war</role-hint>
+      <implementation>org.apache.maven.lifecycle.mapping.DefaultLifecycleMapping</implementation>
+      <configuration>
+        <!-- START SNIPPET: war-lifecycle -->
+        <phases>
+          <process-resources>resources:resources</process-resources>
+          <compile>compiler:compile</compile>
+          <process-test-resources>resources:testResources</process-test-resources>
+          <test-compile>compiler:testCompile</test-compile>
+          <test>surefire:test</test>
+          <package>war:war</package>
+          <install>install:install</install>
+          <deploy>deploy:deploy</deploy>
+        </phases>
+        <!-- END SNIPPET: war-lifecycle -->
+      </configuration>
+    </component>
+
+    <component>
+      <role>org.apache.maven.lifecycle.mapping.LifecycleMapping</role>
+      <role-hint>ear</role-hint>
+      <implementation>org.apache.maven.lifecycle.mapping.DefaultLifecycleMapping</implementation>
+      <configuration>
+        <!-- START SNIPPET: ear-lifecycle -->
+        <phases>
+          <generate-resources>ear:generate-application-xml</generate-resources>
+          <package>ear:ear</package>
+          <install>install:install</install>
+          <deploy>deploy:deploy</deploy>
+        </phases>
+        <!-- END SNIPPET: ear-lifecycle -->
+      </configuration>
+    </component>
+
     <component>
       <role>org.apache.maven.plugin.version.PluginVersionManager</role>
       <role-hint>default</role-hint>
diff --git a/maven-plugins/maven-ear-plugin/src/main/resources/META-INF/plexus/components.xml b/maven-plugins/maven-ear-plugin/src/main/resources/META-INF/plexus/components.xml
deleted file mode 100644
index 84d391b47c..0000000000
--- a/maven-plugins/maven-ear-plugin/src/main/resources/META-INF/plexus/components.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<component-set>
-  <components>
-    <component>
-      <role>org.apache.maven.lifecycle.mapping.LifecycleMapping</role>
-      <role-hint>ear</role-hint>
-      <implementation>org.apache.maven.lifecycle.mapping.DefaultLifecycleMapping</implementation>
-      <configuration>
-        <!-- START SNIPPET: ear-lifecycle -->
-        <phases>
-          <generate-resources>ear:generate-application-xml</generate-resources>
-          <package>ear:ear</package>
-          <install>install:install</install>
-          <deploy>deploy:deploy</deploy>
-        </phases>
-        <!-- END SNIPPET: ear-lifecycle -->
-      </configuration>
-    </component>
-  </components>
-</component-set>
diff --git a/maven-plugins/maven-ejb-plugin/src/main/resources/META-INF/plexus/components.xml b/maven-plugins/maven-ejb-plugin/src/main/resources/META-INF/plexus/components.xml
deleted file mode 100644
index 9395c6c670..0000000000
--- a/maven-plugins/maven-ejb-plugin/src/main/resources/META-INF/plexus/components.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<component-set>
-  <components>
-    <component>
-      <role>org.apache.maven.lifecycle.mapping.LifecycleMapping</role>
-      <role-hint>ejb</role-hint>
-      <implementation>org.apache.maven.lifecycle.mapping.DefaultLifecycleMapping</implementation>
-      <configuration>
-        <!-- START SNIPPET: ejb-lifecycle -->
-        <phases>
-          <process-resources>resources:resources</process-resources>
-          <compile>compiler:compile</compile>
-          <process-test-resources>resources:testResources</process-test-resources>
-          <test-compile>compiler:testCompile</test-compile>
-          <test>surefire:test</test>
-          <package>ejb:ejb,source:jar</package>
-          <install>install:install</install>
-          <deploy>deploy:deploy</deploy>
-        </phases>
-        <!-- END SNIPPET: ejb-lifecycle -->
-      </configuration>
-    </component>
-  </components>
-</component-set>
diff --git a/maven-plugins/maven-war-plugin/src/main/resources/META-INF/plexus/components.xml b/maven-plugins/maven-war-plugin/src/main/resources/META-INF/plexus/components.xml
deleted file mode 100644
index 794dc33140..0000000000
--- a/maven-plugins/maven-war-plugin/src/main/resources/META-INF/plexus/components.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<component-set>
-  <components>
-    <component>
-      <role>org.apache.maven.lifecycle.mapping.LifecycleMapping</role>
-      <role-hint>war</role-hint>
-      <implementation>org.apache.maven.lifecycle.mapping.DefaultLifecycleMapping</implementation>
-      <configuration>
-        <!-- START SNIPPET: war-lifecycle -->
-        <phases>
-          <process-resources>resources:resources</process-resources>
-          <compile>compiler:compile</compile>
-          <process-test-resources>resources:testResources</process-test-resources>
-          <test-compile>compiler:testCompile</test-compile>
-          <test>surefire:test</test>
-          <package>war:war</package>
-          <install>install:install</install>
-          <deploy>deploy:deploy</deploy>
-        </phases>
-        <!-- END SNIPPET: war-lifecycle -->
-      </configuration>
-    </component>
-  </components>
-</component-set>