You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by fe...@apache.org on 2004/10/15 07:07:35 UTC
cvs commit: maven-plugins/ear/xdocs changes.xml properties.xml
felipeal 2004/10/14 22:07:35
Modified: ear plugin.jelly plugin.properties
ear/xdocs changes.xml properties.xml
Log:
MPEAR-21: added property maven.ear.appxml.encoding
Revision Changes Path
1.21 +2 -2 maven-plugins/ear/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/maven-plugins/ear/plugin.jelly,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- plugin.jelly 21 Jul 2004 08:03:22 -0000 1.20
+++ plugin.jelly 15 Oct 2004 05:07:35 -0000 1.21
@@ -133,12 +133,12 @@
<!--==================================================================-->
<goal name="ear:generate-ear-descriptor" description="Generates the ear descriptor">
- <ant:echo>Generating appxml file:"${maven.ear.appxml} version ${maven.ear.appxml.version}"</ant:echo>
+ <ant:echo>Generating appxml file:"${maven.ear.appxml} version ${maven.ear.appxml.version} encoding: ${maven.ear.appxml.encoding}"</ant:echo>
<j:file name="${maven.ear.appxml}"
outputMode="xml"
prettyPrint="true"
- encoding="UTF-8"
+ encoding="${maven.ear.appxml.encoding}"
>
<j:switch on="${maven.ear.appxml.version}">
1.7 +2 -1 maven-plugins/ear/plugin.properties
Index: plugin.properties
===================================================================
RCS file: /home/cvs/maven-plugins/ear/plugin.properties,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- plugin.properties 15 Mar 2004 10:54:10 -0000 1.6
+++ plugin.properties 15 Oct 2004 05:07:35 -0000 1.7
@@ -30,4 +30,5 @@
maven.ear.appxml.generate=false
maven.ear.displayname=${pom.id}
maven.ear.appxml.version=1.3
-maven.ear.resources=${maven.build.dir}/ear
\ No newline at end of file
+maven.ear.resources=${maven.build.dir}/ear
+maven.ear.appxml.encoding=UTF-8
\ No newline at end of file
1.22 +1 -0 maven-plugins/ear/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/maven-plugins/ear/xdocs/changes.xml,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- changes.xml 21 Jul 2004 08:03:22 -0000 1.21
+++ changes.xml 15 Oct 2004 05:07:35 -0000 1.22
@@ -25,6 +25,7 @@
</properties>
<body>
<release version="1.6-SNAPSHOT" date="in CVS">
+ <action dev="felipeal" type="add" issue="MPEAR-21">Added property <code>maven.ear.appxml.encoding</code>.</action>
<action dev="vmassol" type="update" issue="MPEAR-19">
The plugin now displays the version of the bundled artifacts on the
console.
1.14 +18 -8 maven-plugins/ear/xdocs/properties.xml
Index: properties.xml
===================================================================
RCS file: /home/cvs/maven-plugins/ear/xdocs/properties.xml,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- properties.xml 12 Apr 2004 22:53:01 -0000 1.13
+++ properties.xml 15 Oct 2004 05:07:35 -0000 1.14
@@ -25,7 +25,7 @@
</properties>
<body>
- <section name="ejb jar settings">
+ <section name="ear settings">
<table>
<tr><th>Property</th><th>Optional?</th><th>Description</th><th>Default</th></tr>
<tr>
@@ -42,7 +42,7 @@
<td>maven.ear.appxml</td>
<td>Yes</td>
<td>
- Location of the application.xml file
+ Location of the <code>application.xml</code> file
to be used within the ear file.
</td>
<td>
@@ -53,7 +53,7 @@
<td>maven.ear.appxml.generate</td>
<td>Yes</td>
<td>
- Indicates if application.xml files should
+ Indicates if <code>application.xml</code> files should
be autogenerated
</td>
<td>
@@ -64,10 +64,10 @@
<td>maven.ear.appxml.version</td>
<td>Yes</td>
<td>
- Inserts the doctype header depending on the specified version. Default is 1.3
+ Inserts the doctype header depending on the specified version.
</td>
<td>
- false
+ 1.3
</td>
</tr>
<tr>
@@ -75,7 +75,7 @@
<td>Yes</td>
<td>
Display name of the application to be used
- when application.xml file is autogenerated
+ when <code>application.xml</code> file is autogenerated
</td>
<td>
${pom.id}
@@ -101,6 +101,16 @@
${maven.src.dir}/application
</td>
</tr>
+ <tr>
+ <td>maven.ear.appxml.encoding</td>
+ <td>Yes</td>
+ <td>
+ Character encoding for the auto-generated <code>application.xml</code> file.
+ </td>
+ <td>
+ UTF-8
+ </td>
+ </tr>
</table>
</section>
<section name="other settings">
@@ -146,8 +156,8 @@
<p>
Those artifact will be also "visible" during generation
- of application.xml file. In case of war artifacts you can also
- specify context root which will be set in application.xml file:
+ of <code>application.xml</code> file. In case of war artifacts you can also
+ specify context root which will be set in <code>application.xml</code> file:
</p>
<source><![CDATA[
<dependency>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org