Author: felipeal Date: Sun Jan 16 18:05:08 2005 New Revision: 125384 URL: http://svn.apache.org/viewcvs?view=rev&rev=125384 Log: MPEAR-25: added property maven.ear.final.name Modified: maven/maven-1/plugins/trunk/ear/plugin.jelly maven/maven-1/plugins/trunk/ear/plugin.properties maven/maven-1/plugins/trunk/ear/src/plugin-test/appXmlBundledTest/maven.xml maven/maven-1/plugins/trunk/ear/src/plugin-test/appXmlLocationTest/maven.xml maven/maven-1/plugins/trunk/ear/src/plugin-test/bundlePropertiesTest/maven.xml maven/maven-1/plugins/trunk/ear/src/plugin-test/sarBundledTest/maven.xml maven/maven-1/plugins/trunk/ear/src/plugin-test/simpleTest/maven.xml maven/maven-1/plugins/trunk/ear/xdocs/changes.xml maven/maven-1/plugins/trunk/ear/xdocs/properties.xml
Modified: maven/maven-1/plugins/trunk/ear/plugin.jelly Url: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/ear/plugin.jelly?view=diff&rev=125384&p1=maven/maven-1/plugins/trunk/ear/plugin.jelly&r1=125383&p2=maven/maven-1/plugins/trunk/ear/plugin.jelly&r2=125384 ============================================================================== --- maven/maven-1/plugins/trunk/ear/plugin.jelly (original) +++ maven/maven-1/plugins/trunk/ear/plugin.jelly Sun Jan 16 18:05:08 2005 @@ -72,12 +72,12 @@ </j:choose> - <ant:echo>Building EAR ${maven.final.name} with appxml "${finalAppxml}"</ant:echo> + <ant:echo>Building EAR ${maven.ear.final.name} with appxml "${finalAppxml}"</ant:echo> <ant:available property="maven.ear.manifest.available" file="${maven.ear.manifest}"/> - <ant:ear destfile="${maven.build.dir}/${maven.final.name}.ear" + <ant:ear destfile="${maven.build.dir}/${maven.ear.final.name}" appxml="${finalAppxml}"> <!-- include files from maven.ear.src if available --> @@ -233,7 +233,7 @@ description="Install the ear in the local repository"> <artifact:install - artifact="${maven.build.dir}/${maven.final.name}.ear" + artifact="${maven.build.dir}/${maven.ear.final.name}" type="ear" project="${pom}"/> @@ -247,7 +247,7 @@ description="Install the snapshot version of the ear in the local repository"> <artifact:install-snapshot - artifact="${maven.build.dir}/${maven.final.name}.ear" + artifact="${maven.build.dir}/${maven.ear.final.name}" type="ear" project="${pom}"/> @@ -261,7 +261,7 @@ description="Deploys the ear to the remote repository"> <artifact:deploy - artifact="${maven.build.dir}/${maven.final.name}.ear" + artifact="${maven.build.dir}/${maven.ear.final.name}" type="ear" project="${pom}"/> @@ -275,7 +275,7 @@ description="Deploys the snapshot version of the ear to remote repository"> <artifact:deploy-snapshot - artifact="${maven.build.dir}/${maven.final.name}.ear" + artifact="${maven.build.dir}/${maven.ear.final.name}" type="ear" project="${pom}"/> Modified: maven/maven-1/plugins/trunk/ear/plugin.properties Url: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/ear/plugin.properties?view=diff&rev=125384&p1=maven/maven-1/plugins/trunk/ear/plugin.properties&r1=125383&p2=maven/maven-1/plugins/trunk/ear/plugin.properties&r2=125384 ============================================================================== --- maven/maven-1/plugins/trunk/ear/plugin.properties (original) +++ maven/maven-1/plugins/trunk/ear/plugin.properties Sun Jan 16 18:05:08 2005 @@ -32,3 +32,5 @@ maven.ear.appxml.version=1.3 maven.ear.resources=${maven.build.dir}/ear maven.ear.appxml.encoding=UTF-8 +# Name of generated EAR file +maven.ear.final.name=${maven.final.name}.ear Modified: maven/maven-1/plugins/trunk/ear/src/plugin-test/appXmlBundledTest/maven.xml Url: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/ear/src/plugin-test/appXmlBundledTest/maven.xml?view=diff&rev=125384&p1=maven/maven-1/plugins/trunk/ear/src/plugin-test/appXmlBundledTest/maven.xml&r1=125383&p2=maven/maven-1/plugins/trunk/ear/src/plugin-test/appXmlBundledTest/maven.xml&r2=125384 ============================================================================== --- maven/maven-1/plugins/trunk/ear/src/plugin-test/appXmlBundledTest/maven.xml (original) +++ maven/maven-1/plugins/trunk/ear/src/plugin-test/appXmlBundledTest/maven.xml Sun Jan 16 18:05:08 2005 @@ -37,10 +37,11 @@ <assert:assertFileExists file="${maven.ear.src}/META-INF/application.xml"/> <!-- tests that the ear is generated --> - <assert:assertFileExists file="${maven.build.dir}/${maven.final.name}.ear"/> + <j:set var="earFile" value="${maven.build.dir}/${maven.ear.final.name}"/> + <assert:assertFileExists file="${earFile}"/> <!-- extracts the EAR --> <j:set var="tmpEarDir" value="${maven.build.dir}/extractedEar"/> - <ant:unzip src="${maven.build.dir}/${maven.final.name}.ear" dest="${tmpEarDir}"/> + <ant:unzip src="${earFile}" dest="${tmpEarDir}"/> <!-- asserts the application.xml is there --> <assert:assertFileExists file="${tmpEarDir}/META-INF/application.xml"/> Modified: maven/maven-1/plugins/trunk/ear/src/plugin-test/appXmlLocationTest/maven.xml Url: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/ear/src/plugin-test/appXmlLocationTest/maven.xml?view=diff&rev=125384&p1=maven/maven-1/plugins/trunk/ear/src/plugin-test/appXmlLocationTest/maven.xml&r1=125383&p2=maven/maven-1/plugins/trunk/ear/src/plugin-test/appXmlLocationTest/maven.xml&r2=125384 ============================================================================== --- maven/maven-1/plugins/trunk/ear/src/plugin-test/appXmlLocationTest/maven.xml (original) +++ maven/maven-1/plugins/trunk/ear/src/plugin-test/appXmlLocationTest/maven.xml Sun Jan 16 18:05:08 2005 @@ -40,10 +40,11 @@ </util:available> <!-- tests that the ear is generated --> - <assert:assertFileExists file="${maven.build.dir}/${maven.final.name}.ear"/> + <j:set var="earFile" value="${maven.build.dir}/${maven.ear.final.name}"/> + <assert:assertFileExists file="${earFile}"/> <!-- extracts the EAR --> <j:set var="tmpEarDir" value="${maven.build.dir}/extractedEar"/> - <ant:unzip src="${maven.build.dir}/${maven.final.name}.ear" dest="${tmpEarDir}"/> + <ant:unzip src="${earFile}" dest="${tmpEarDir}"/> <!-- asserts the application.xml is there --> <assert:assertFileExists file="${tmpEarDir}/META-INF/application.xml"/> Modified: maven/maven-1/plugins/trunk/ear/src/plugin-test/bundlePropertiesTest/maven.xml Url: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/ear/src/plugin-test/bundlePropertiesTest/maven.xml?view=diff&rev=125384&p1=maven/maven-1/plugins/trunk/ear/src/plugin-test/bundlePropertiesTest/maven.xml&r1=125383&p2=maven/maven-1/plugins/trunk/ear/src/plugin-test/bundlePropertiesTest/maven.xml&r2=125384 ============================================================================== --- maven/maven-1/plugins/trunk/ear/src/plugin-test/bundlePropertiesTest/maven.xml (original) +++ maven/maven-1/plugins/trunk/ear/src/plugin-test/bundlePropertiesTest/maven.xml Sun Jan 16 18:05:08 2005 @@ -28,11 +28,10 @@ <goal name="test-ear"> <!-- tests that the ear is generated --> - <assert:assertFileExists file="${maven.build.dir}/${maven.final.name}.ear"/> + <j:set var="earFile" value="${maven.build.dir}/${maven.ear.final.name}"/> + <assert:assertFileExists file="${earFile}"/> <!-- unzip the ear and look for the jars --> - <j:set var="earFile" - value="${maven.build.dir}/${maven.final.name}.ear"/> <j:set var="unzipDir" value= "${maven.build.dir}/eartest"/> <mkdir dir="${unzipDir}"/> <unzip src="${earFile}" dest="${unzipDir}"/> Modified: maven/maven-1/plugins/trunk/ear/src/plugin-test/sarBundledTest/maven.xml Url: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/ear/src/plugin-test/sarBundledTest/maven.xml?view=diff&rev=125384&p1=maven/maven-1/plugins/trunk/ear/src/plugin-test/sarBundledTest/maven.xml&r1=125383&p2=maven/maven-1/plugins/trunk/ear/src/plugin-test/sarBundledTest/maven.xml&r2=125384 ============================================================================== --- maven/maven-1/plugins/trunk/ear/src/plugin-test/sarBundledTest/maven.xml (original) +++ maven/maven-1/plugins/trunk/ear/src/plugin-test/sarBundledTest/maven.xml Sun Jan 16 18:05:08 2005 @@ -28,9 +28,9 @@ <goal name="test-ear" prereqs="ear"> <!-- tests that the ear is generated --> - <assert:assertFileExists file="${maven.build.dir}/${maven.final.name}.ear"/> + <j:set var="earFile" value="${maven.build.dir}/${maven.ear.final.name}"/> + <assert:assertFileExists file="${earFile}"/> <!-- unzip the ear and look for the jars --> - <j:set var="earFile" value="${maven.build.dir}/${maven.final.name}.ear"/> <j:set var="unzipDir" value= "${maven.build.dir}/eartest"/> <mkdir dir="${unzipDir}"/> <unzip src="${earFile}" dest="${unzipDir}"/> Modified: maven/maven-1/plugins/trunk/ear/src/plugin-test/simpleTest/maven.xml Url: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/ear/src/plugin-test/simpleTest/maven.xml?view=diff&rev=125384&p1=maven/maven-1/plugins/trunk/ear/src/plugin-test/simpleTest/maven.xml&r1=125383&p2=maven/maven-1/plugins/trunk/ear/src/plugin-test/simpleTest/maven.xml&r2=125384 ============================================================================== --- maven/maven-1/plugins/trunk/ear/src/plugin-test/simpleTest/maven.xml (original) +++ maven/maven-1/plugins/trunk/ear/src/plugin-test/simpleTest/maven.xml Sun Jan 16 18:05:08 2005 @@ -28,12 +28,11 @@ <goal name="test-ear"> + <j:set var="earFile" value="${maven.build.dir}/${maven.ear.final.name}"/> <!-- tests that the ear is generated --> - <assert:assertFileExists file="${maven.build.dir}/${maven.final.name}.ear"/> + <assert:assertFileExists file="${earFile}"/> <!-- unzip the ear and look for the jars --> - <j:set var="earFile" - value="${maven.build.dir}/${maven.final.name}.ear"/> <j:set var="unzipDir" value= "${maven.build.dir}/eartest"/> <mkdir dir="${unzipDir}"/> <unzip src="${earFile}" dest="${unzipDir}"/> Modified: maven/maven-1/plugins/trunk/ear/xdocs/changes.xml Url: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/ear/xdocs/changes.xml?view=diff&rev=125384&p1=maven/maven-1/plugins/trunk/ear/xdocs/changes.xml&r1=125383&p2=maven/maven-1/plugins/trunk/ear/xdocs/changes.xml&r2=125384 ============================================================================== --- maven/maven-1/plugins/trunk/ear/xdocs/changes.xml (original) +++ maven/maven-1/plugins/trunk/ear/xdocs/changes.xml Sun Jan 16 18:05:08 2005 @@ -25,6 +25,8 @@ </properties> <body> <release version="1.7-SNAPSHOT" date="on CVS"> + <action dev="felipeal" type="add" issue="MPEAR-25">Added property <code>maven.ear.final.name</code>. + </action> <action dev="felipeal" type="remove" issue="MPEAR-37">Removed checking introduced by MPEAR-9, as the fix introduced more bugs than it solved</code>. </action> <action dev="dion" type="fix" issue="MPEAR-32">Re-added property <code>maven.ear.appxml</code>. Modified: maven/maven-1/plugins/trunk/ear/xdocs/properties.xml Url: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/ear/xdocs/properties.xml?view=diff&rev=125384&p1=maven/maven-1/plugins/trunk/ear/xdocs/properties.xml&r1=125383&p2=maven/maven-1/plugins/trunk/ear/xdocs/properties.xml&r2=125384 ============================================================================== --- maven/maven-1/plugins/trunk/ear/xdocs/properties.xml (original) +++ maven/maven-1/plugins/trunk/ear/xdocs/properties.xml Sun Jan 16 18:05:08 2005 @@ -28,6 +28,13 @@ <section name="ear settings"> <table> <tr><th>Property</th><th>Optional?</th><th>Description</th><th>Default</th></tr> + <tr> + <td>maven.ear.final.name</td> + <td>Name of the generated EAR file.</code></td> + <td> + ${maven.final.name}.ear + </td> + </tr> <tr> <td>maven.ear.manifest</td> <td>Yes</td> --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
