diff --git a/ear/plugin.jelly b/ear/plugin.jelly index c27144b9..634092ee 100644 --- a/ear/plugin.jelly +++ b/ear/plugin.jelly @@ -16,183 +16,131 @@ * limitations under the License. */ --> - - - - + - - + - - - Properties maven.ear.src and maven.ear.resources cannot have the same value + Properties maven.ear.src and maven.ear.resources cannot have the same value - - - + - - + + - - - - - - - - + + + + + + + + - - Building EAR ${maven.ear.final.name} with appxml "${finalAppxml}" - - - - - + + - + - - + - - - - - - - - - - - - - - Dependency ${originalPath} will be bundled as ${bundledPath} - - - - - + + + + + + + + + + Dependency ${originalPath} will be bundled as ${bundledPath} + + + + - - + - - + + + - - + - - + - - - - - - + + + + + + - - + - - - - - - - - Generating appxml file:"${finalAppxml} version ${maven.ear.appxml.version} encoding: ${maven.ear.appxml.encoding}" - - - - - - - - - - - - - + Generating appxml file:"${finalAppxml} version ${maven.ear.appxml.version} encoding: ${maven.ear.appxml.encoding}" + + + + + + + + + + ${maven.ear.displayname} + + + ${maven.ear.appxml.description} + - + @@ -201,24 +149,24 @@ ${bundledPath} ${dep.getProperty('ear.appxml.war.context-root')} - + - ${bundledPath} + ${bundledPath} - + - - ${bundledPath} + + ${bundledPath} - - ${bundledPath} + + ${bundledPath} @@ -231,95 +179,55 @@ ${bundledPath} - - + + - - ${maven.ear.appxml.securityRoles} - - - ${role.trim()} - - - - - - - - - - + + ${maven.ear.appxml.securityRoles} + + + ${role.trim()} + + + + + + - - - - - + + + - - - - - - + + + - - - - - - - - + + + + - - - - - + + + - - + DEPRECATED: do not use ear:load, there is no need - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + ${context.setVariable(var,'parent',thePath)} - - - + + - - - diff --git a/ear/plugin.properties b/ear/plugin.properties index ceaf8451..9ad892f3 100644 --- a/ear/plugin.properties +++ b/ear/plugin.properties @@ -25,15 +25,17 @@ maven.ear.src=${maven.src.dir}/application # Location of xml configs and manifest files maven.ear.descriptordir=${maven.build.dir} -maven.ear.appxml=${maven.ear.src}/META-INF/application.xml maven.ear.manifest=${maven.ear.src}/META-INF/MANIFEST.MF -maven.ear.appxml.generate=false maven.ear.displayname=${pom.artifactId} -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 +maven.ear.appxml=${maven.ear.src}/META-INF/application.xml +maven.ear.appxml.generate=false +maven.ear.appxml.version=1.3 +maven.ear.appxml.encoding=UTF-8 # Security role (a comma separated list) # maven.ear.appxml.securityRoles = role1, role2 +# Description +maven.ear.appxml.description=${pom.description} \ No newline at end of file diff --git a/ear/src/plugin-test/simpleTest/maven.xml b/ear/src/plugin-test/simpleTest/maven.xml index d7ee9252..7d0a81d2 100644 --- a/ear/src/plugin-test/simpleTest/maven.xml +++ b/ear/src/plugin-test/simpleTest/maven.xml @@ -56,6 +56,9 @@ value="${firstJavaModule}" msg="commons collections was not the first java module"/> + + + diff --git a/ear/xdocs/changes.xml b/ear/xdocs/changes.xml index ee83ff43..f78b92c4 100644 --- a/ear/xdocs/changes.xml +++ b/ear/xdocs/changes.xml @@ -23,6 +23,9 @@ Nathan Coast + + Added support to set the description and the security roles in the generated application.xml. + Added support of JbossNet archive in application.xml generation. Update dependencies to match ones in maven 1.1 core and to unify them between plugins. The following dependencies are updated : diff --git a/ear/xdocs/properties.xml b/ear/xdocs/properties.xml index 40a97b0d..49bddd29 100644 --- a/ear/xdocs/properties.xml +++ b/ear/xdocs/properties.xml @@ -45,6 +45,47 @@ ${maven.ear.src}/META-INF/MANIFEST.MF + + maven.ear.displayname + Yes + + Display name of the application to be used + when application.xml file is autogenerated + + + ${pom.artifactId} + + + + maven.ear.resources + Yes + + Directory that resources are copied to during the build.NOTE: cannot have the same value of ${maven.ear.src}! + + + ${maven.build.dir}/ear + + + + maven.ear.src + Yes + + Single directory for extra files to include in the EAR. NOTE: cannot have the same value of ${maven.ear.resources}! + + + ${maven.src.dir}/application + + + + maven.ear.descriptordir + Yes + + Directory where the application.xml file will be auto-generated (only if maven.ear.appxml.generate is true). + + + ${maven.build.dir} + + maven.ear.appxml Yes @@ -77,37 +118,6 @@ 1.3 - - maven.ear.displayname - Yes - - Display name of the application to be used - when application.xml file is autogenerated - - - ${pom.artifactId} - - - - maven.ear.resources - Yes - - Directory that resources are copied to during the build.NOTE: cannot have the same value of ${maven.ear.src}! - - - ${maven.build.dir}/ear - - - - maven.ear.src - Yes - - Single directory for extra files to include in the EAR. NOTE: cannot have the same value of ${maven.ear.resources}! - - - ${maven.src.dir}/application - - maven.ear.appxml.encoding Yes @@ -119,13 +129,13 @@ - maven.ear.descriptordir + maven.ear.appxml.description Yes - Directory where the application.xml file will be auto-generated (only if maven.ear.appxml.generate is true). + The description element inserted in the descriptor. - ${maven.build.dir} + ${pom.description}