You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by ve...@apache.org on 2009/04/18 14:57:52 UTC
svn commit: r766317 - in /webservices/axis2/branches/java/1_5: ./
modules/tool/axis2-aar-maven-plugin/src/main/resources/META-INF/plexus/components.xml
modules/tool/axis2-mar-maven-plugin/src/main/resources/META-INF/plexus/components.xml
Author: veithen
Date: Sat Apr 18 12:57:52 2009
New Revision: 766317
URL: http://svn.apache.org/viewvc?rev=766317&view=rev
Log:
Merged fixed for AXIS2-4183 into 1.5 branch.
Modified:
webservices/axis2/branches/java/1_5/ (props changed)
webservices/axis2/branches/java/1_5/modules/tool/axis2-aar-maven-plugin/src/main/resources/META-INF/plexus/components.xml
webservices/axis2/branches/java/1_5/modules/tool/axis2-mar-maven-plugin/src/main/resources/META-INF/plexus/components.xml
Propchange: webservices/axis2/branches/java/1_5/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Apr 18 12:57:52 2009
@@ -1 +1 @@
-/webservices/axis2/trunk/java:732924,732927,732939,733776,741873,748761,754467,754503,757151-757153,759488,759507,759878,759968,761025,761044,761709,761770,761952,763148,765102
+/webservices/axis2/trunk/java:732924,732927,732939,733776,741873,748761,754458,754467,754503,757151-757153,759488,759507,759878,759968,761025,761044,761709,761770,761952,763148,765102
Modified: webservices/axis2/branches/java/1_5/modules/tool/axis2-aar-maven-plugin/src/main/resources/META-INF/plexus/components.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_5/modules/tool/axis2-aar-maven-plugin/src/main/resources/META-INF/plexus/components.xml?rev=766317&r1=766316&r2=766317&view=diff
==============================================================================
--- webservices/axis2/branches/java/1_5/modules/tool/axis2-aar-maven-plugin/src/main/resources/META-INF/plexus/components.xml (original)
+++ webservices/axis2/branches/java/1_5/modules/tool/axis2-aar-maven-plugin/src/main/resources/META-INF/plexus/components.xml Sat Apr 18 12:57:52 2009
@@ -24,10 +24,8 @@
<role-hint>aar</role-hint>
<implementation>org.apache.maven.artifact.handler.DefaultArtifactHandler</implementation>
<configuration>
- <classifier></classifier>
<extension>aar</extension>
<type>aar</type>
- <packaging>jar</packaging>
<language>java</language>
<addedToClasspath>false</addedToClasspath>
</configuration>
@@ -37,16 +35,21 @@
<role-hint>aar</role-hint>
<implementation>org.apache.maven.lifecycle.mapping.DefaultLifecycleMapping</implementation>
<configuration>
- <phases>
- <process-resources>org.apache.maven.plugins:maven-resources-plugin:resources</process-resources>
- <compile>org.apache.maven.plugins:maven-compiler-plugin:compile</compile>
- <process-test-resources>org.apache.maven.plugins:maven-resources-plugin:testResources</process-test-resources>
- <test-compile>org.apache.maven.plugins:maven-compiler-plugin:testCompile</test-compile>
- <test>org.apache.maven.plugins:maven-surefire-plugin:test</test>
- <package>org.apache.axis2:axis2-aar-maven-plugin:aar</package>
- <install>org.apache.maven.plugins:maven-install-plugin:install</install>
- <deploy>org.apache.maven.plugins:maven-deploy-plugin:deploy</deploy>
- </phases>
+ <lifecycles>
+ <lifecycle>
+ <id>default</id>
+ <phases>
+ <process-resources>org.apache.maven.plugins:maven-resources-plugin:resources</process-resources>
+ <compile>org.apache.maven.plugins:maven-compiler-plugin:compile</compile>
+ <process-test-resources>org.apache.maven.plugins:maven-resources-plugin:testResources</process-test-resources>
+ <test-compile>org.apache.maven.plugins:maven-compiler-plugin:testCompile</test-compile>
+ <test>org.apache.maven.plugins:maven-surefire-plugin:test</test>
+ <package>org.apache.axis2:axis2-aar-maven-plugin:aar</package>
+ <install>org.apache.maven.plugins:maven-install-plugin:install</install>
+ <deploy>org.apache.maven.plugins:maven-deploy-plugin:deploy</deploy>
+ </phases>
+ </lifecycle>
+ </lifecycles>
</configuration>
</component>
</components>
Modified: webservices/axis2/branches/java/1_5/modules/tool/axis2-mar-maven-plugin/src/main/resources/META-INF/plexus/components.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_5/modules/tool/axis2-mar-maven-plugin/src/main/resources/META-INF/plexus/components.xml?rev=766317&r1=766316&r2=766317&view=diff
==============================================================================
--- webservices/axis2/branches/java/1_5/modules/tool/axis2-mar-maven-plugin/src/main/resources/META-INF/plexus/components.xml (original)
+++ webservices/axis2/branches/java/1_5/modules/tool/axis2-mar-maven-plugin/src/main/resources/META-INF/plexus/components.xml Sat Apr 18 12:57:52 2009
@@ -24,10 +24,8 @@
<role-hint>mar</role-hint>
<implementation>org.apache.maven.artifact.handler.DefaultArtifactHandler</implementation>
<configuration>
- <classifier></classifier>
<extension>mar</extension>
<type>mar</type>
- <packaging>jar</packaging>
<language>java</language>
<addedToClasspath>false</addedToClasspath>
</configuration>
@@ -37,16 +35,21 @@
<role-hint>mar</role-hint>
<implementation>org.apache.maven.lifecycle.mapping.DefaultLifecycleMapping</implementation>
<configuration>
- <phases>
- <process-resources>org.apache.maven.plugins:maven-resources-plugin:resources</process-resources>
- <compile>org.apache.maven.plugins:maven-compiler-plugin:compile</compile>
- <process-test-resources>org.apache.maven.plugins:maven-resources-plugin:testResources</process-test-resources>
- <test-compile>org.apache.maven.plugins:maven-compiler-plugin:testCompile</test-compile>
- <test>org.apache.maven.plugins:maven-surefire-plugin:test</test>
- <package>org.apache.axis2:axis2-mar-maven-plugin:mar</package>
- <install>org.apache.maven.plugins:maven-install-plugin:install</install>
- <deploy>org.apache.maven.plugins:maven-deploy-plugin:deploy</deploy>
- </phases>
+ <lifecycles>
+ <lifecycle>
+ <id>default</id>
+ <phases>
+ <process-resources>org.apache.maven.plugins:maven-resources-plugin:resources</process-resources>
+ <compile>org.apache.maven.plugins:maven-compiler-plugin:compile</compile>
+ <process-test-resources>org.apache.maven.plugins:maven-resources-plugin:testResources</process-test-resources>
+ <test-compile>org.apache.maven.plugins:maven-compiler-plugin:testCompile</test-compile>
+ <test>org.apache.maven.plugins:maven-surefire-plugin:test</test>
+ <package>org.apache.axis2:axis2-mar-maven-plugin:mar</package>
+ <install>org.apache.maven.plugins:maven-install-plugin:install</install>
+ <deploy>org.apache.maven.plugins:maven-deploy-plugin:deploy</deploy>
+ </phases>
+ </lifecycle>
+ </lifecycles>
</configuration>
</component>
</components>