You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by br...@apache.org on 2005/07/26 16:00:36 UTC
svn commit: r225311 - in /maven/components/trunk:
maven-core/src/main/java/org/apache/maven/lifecycle/
maven-core/src/main/resources/META-INF/plexus/
maven-plugins/maven-ear-plugin/src/main/resources/META-INF/plexus/
maven-plugins/maven-ejb-plugin/src/...
Author: brett
Date: Tue Jul 26 07:00:23 2005
New Revision: 225311
URL: http://svn.apache.org/viewcvs?rev=225311&view=rev
Log:
move main J2EE packaging definitions back to being built in
Removed:
maven/components/trunk/maven-plugins/maven-ear-plugin/src/main/resources/META-INF/plexus/components.xml
maven/components/trunk/maven-plugins/maven-ejb-plugin/src/main/resources/META-INF/plexus/components.xml
maven/components/trunk/maven-plugins/maven-war-plugin/src/main/resources/META-INF/plexus/components.xml
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
maven/components/trunk/maven-core/src/main/resources/META-INF/plexus/components.xml
Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java?rev=225311&r1=225310&r2=225311&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java Tue Jul 26 07:00:23 2005
@@ -269,8 +269,8 @@
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() );
}
}
Modified: maven/components/trunk/maven-core/src/main/resources/META-INF/plexus/components.xml
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core/src/main/resources/META-INF/plexus/components.xml?rev=225311&r1=225310&r2=225311&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/resources/META-INF/plexus/components.xml (original)
+++ maven/components/trunk/maven-core/src/main/resources/META-INF/plexus/components.xml Tue Jul 26 07:00:23 2005
@@ -218,6 +218,62 @@
</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>
<implementation>org.apache.maven.plugin.version.DefaultPluginVersionManager</implementation>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org