cvs commit: maven-plugins/ear/xdocs changes.xml properties.xml

2004-11-15 Thread felipeal
felipeal2004/11/15 21:24:39

  Modified:ear  plugin.jelly
   ear/xdocs changes.xml properties.xml
  Added:   ear/src/plugin-test/test05 .cvsignore maven.xml
project.properties project.xml
  Log:
  MPEAR-24: makes sure maven.ear.src and maven.ear.resources are not set with 
the same value
  
  Revision  ChangesPath
  1.28  +5 -0  maven-plugins/ear/plugin.jelly
  
  Index: plugin.jelly
  ===
  RCS file: /home/cvs/maven-plugins/ear/plugin.jelly,v
  retrieving revision 1.27
  retrieving revision 1.28
  diff -u -r1.27 -r1.28
  --- plugin.jelly  16 Nov 2004 05:04:56 -  1.27
  +++ plugin.jelly  16 Nov 2004 05:24:39 -  1.28
  @@ -46,6 +46,11 @@
 
 
   
  +
  +
  +   Properties maven.ear.src and maven.ear.resources cannot 
have the same value
  +
  +
   
   
   
  
  
  
  1.1  maven-plugins/ear/src/plugin-test/test05/.cvsignore
  
  Index: .cvsignore
  ===
  src
  
  
  
  1.1  maven-plugins/ear/src/plugin-test/test05/maven.xml
  
  Index: maven.xml
  ===
  
  
  

  



  

   
  Properties maven.ear.src and maven.ear.resources must be 
set with the same value
   
   
   
  
  
   
   
 ear goal should have failed
   
  
  

  
  
  
  
  
  1.1  
maven-plugins/ear/src/plugin-test/test05/project.properties
  
  Index: project.properties
  ===
  # ---
  # Copyright 2001-2004 The Apache Software Foundation.
  # 
  # Licensed under the Apache License, Version 2.0 (the "License");
  # you may not use this file except in compliance with the License.
  # You may obtain a copy of the License at
  # 
  #  http://www.apache.org/licenses/LICENSE-2.0
  #  
  # Unless required by applicable law or agreed to in writing, software
  # distributed under the License is distributed on an "AS IS" BASIS,
  # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  # See the License for the specific language governing permissions and
  # limitations under the License.
  # ---
  maven.ear.src=${maven.ear.resources}
  
  
  
  1.1  maven-plugins/ear/src/plugin-test/test05/project.xml
  
  Index: project.xml
  ===
  
  
  
  
3
Test project for Maven Ear Plugin 05
test-maven-ear-plugin-05
2004
Makes sure maven.src.dir and maven.ear.resources are not 
the same
Makes sure the maven.src.dir and maven.ear.resources 
properties do not have the same value (see issue MPEAR-24)


  
Felipe Leme
felipeal
Jelly Developer
  

  
  
  
  
  1.29  +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.28
  retrieving revision 1.29
  diff -u -r1.28 -r1.29
  --- changes.xml   16 Nov 2004 05:04:56 -  1.28
  +++ changes.xml   16 Nov 2004 05:24:39 -  1.29
  @@ -25,6 +25,7 @@
 
 
   
  +  Properties 
maven.ear.src and maven.ear.resources now cannot have 
the same value.
 application.xml is now generated at 
maven.build.dir
 Add new property 
dependency (ear.bundle.name) to define the name a dependency 
should have the EAR.
 Changed the default 
value of maven.ear.displayname.
  
  
  
  1.20  +2 -2  maven-plugins/ear/xdocs/properties.xml
  
  Index: properties.xml
  ===
  RCS file: /home/cvs/maven-plugins/ear/xdocs/properties.xml,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- properties.xml16 Nov 2004 05:04:56 -  1.19
  +++ properties.xml16 Nov 2004 05:24:39 -  1.20
  @@ -85,7 +85,7 @@
 maven.ear.resources
 Yes
 
  -Directory that resources are copied to during the build
  +Directory that resources are copied to during the 
build.NOTE: cannot have the same value of ${maven.ear.src}!
 
 
   ${maven.build.dir}/ear
  @@ -95,7 +95,7 @@
 maven.ear.src
 Yes
 
  -Single directory for extra files to include in the EAR
  +Single directory for extra files to include in the EAR. 
NOTE: cannot have the same value of ${maven.ear.resources}!
  

cvs commit: maven-plugins/ear/xdocs changes.xml properties.xml

2004-11-15 Thread felipeal
felipeal2004/11/15 21:04:56

  Modified:ear  plugin.jelly plugin.properties
   ear/xdocs changes.xml properties.xml
  Added:   ear/src/plugin-test/test03 maven.xml project.properties
project.xml
   ear/src/plugin-test/test03/src/application bogus.jar
   ear/src/plugin-test/test04 maven.xml project.properties
project.xml
   ear/src/plugin-test/test04/src/application bogus.jar
   ear/src/plugin-test/test04/src/application/META-INF
application.xml
  Log:
  MPEAR-7: application.xml is now generated at maven.build.dir
  
  Revision  ChangesPath
  1.27  +20 -11maven-plugins/ear/plugin.jelly
  
  Index: plugin.jelly
  ===
  RCS file: /home/cvs/maven-plugins/ear/plugin.jelly,v
  retrieving revision 1.26
  retrieving revision 1.27
  diff -u -r1.26 -r1.27
  --- plugin.jelly  16 Nov 2004 03:51:39 -  1.26
  +++ plugin.jelly  16 Nov 2004 05:04:56 -  1.27
  @@ -48,21 +48,30 @@
   
   
   
  - 
  - 
  -  
  -   
  -   
  - 
  +
  +
  +   
  +
  +
  +   
  +  
  +   
  +   
  +  
  + 
  +  
  +   
  +
  +
   
  -Building EAR ${maven.final.name} with appxml 
"${maven.ear.appxml}"
  +Building EAR ${maven.final.name} with appxml 
"${finalAppxml}"
   
   
   
   
  + appxml="${finalAppxml}">
   
 
 
  @@ -161,9 +170,9 @@
 
 

  - Generating appxml file:"${maven.ear.appxml} version 
${maven.ear.appxml.version} encoding: ${maven.ear.appxml.encoding}"
  + Generating appxml file:"${finalAppxml} version 
${maven.ear.appxml.version} encoding: ${maven.ear.appxml.encoding}"

  - http://www.apache.org/licenses/LICENSE-2.0
   * 
   * Unless required by applicable law or agreed to in writing, software
   * distributed under the License is distributed on an "AS IS" BASIS,
   * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   * See the License for the specific language governing permissions and
   * limitations under the License.
   */
   -->
  
  

  



  
  
  
Testcase should not have file 
${maven.ear.src}/META-INF/application.xml. Please remove it first.
  
  
  
  
  
  
Plugin should not have created file 
${maven.ear.src}/META-INF/application.xml.
  
  
  
  
  
  
  
  
  
  
  

  
  
  
  
  
  1.1  
maven-plugins/ear/src/plugin-test/test03/project.properties
  
  Index: project.properties
  ===
  # ---
  # Copyright 2001-2004 The Apache Software Foundation.
  # 
  # Licensed under the Apache License, Version 2.0 (the "License");
  # you may not use this file except in compliance with the License.
  # You may obtain a copy of the License at
  # 
  #  http://www.apache.org/licenses/LICENSE-2.0
  #  
  # Unless required by applicable law or agreed to in writing, software
  # distributed under the License is distributed on an "AS IS" BASIS,
  # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  # See the License for the specific language governing permissions and
  # limitations under the License.
  # ---
  maven.ear.appxml.generate=true
  
  
  
  1.1  maven-plugins/ear/src/plugin-test/test03/project.xml
  
  Index: project.xml
  ===
  
  
  
  
3
Test project for Maven Ear Plugin 03
test-maven-ear-plugin-03
2004
Tests that application.xml is not generated at 
maven.ear.src
Tests that application.xml is not generated at 
maven.ear.src (see issue MPEAR-7)


  
Felipe Leme
felipeal
Jelly Developer
  

  
  
  
  
  1.1  
maven-plugins/ear/src/plugin-test/test03/src/application/bogus.jar
  
<>
  
  
  1.1  maven-plugins/ear/src/plugin-test/test04/maven.xml
  
  Index: maven.xml
  ===
  
  
  

  



  
  SRC: ${maven.ear.src}
  
  
  
  
  
  
  
  
  
  
  
  
  
  
  
  
  
  
  
  
  
  

  
  
  
  
  
  1.1  
maven-plugins/ear/src/plugin-test/test04/project.properties
  
  Index: project.properties
  ===
  # ---
  # Copyright 2001-2004 The Apache Software F

cvs commit: maven-plugins/ear/xdocs changes.xml properties.xml

2004-11-15 Thread felipeal
felipeal2004/11/15 19:22:59

  Modified:ear  plugin.jelly
   ear/src/plugin-test/test02 maven.xml project.xml
   ear/xdocs changes.xml properties.xml
  Log:
  MPEAR-26: added new dependency property ear.bundle.name
  
  Revision  ChangesPath
  1.25  +23 -14maven-plugins/ear/plugin.jelly
  
  Index: plugin.jelly
  ===
  RCS file: /home/cvs/maven-plugins/ear/plugin.jelly,v
  retrieving revision 1.24
  retrieving revision 1.25
  diff -u -r1.24 -r1.25
  --- plugin.jelly  16 Nov 2004 02:45:56 -  1.24
  +++ plugin.jelly  16 Nov 2004 03:22:59 -  1.25
  @@ -71,6 +71,7 @@
 
 
 
  +  
 
 
   
  @@ -85,23 +86,26 @@
 
   
 Bundling: ${dep.type} - ${dep.id} - 
${dep.version}
  -   
  -  
  -  
  - 
  -   
  - 
  -   
  - 
  - 
  -   
  - 
  -   
  -
  -  
  +  
  +  
  +   
  +  
  +   
  +  
  + 
  +  
  +
  +  
  +
  +  Dependency ${lib.file.name} will be bundled as 
${bundlePath}
  +
  +  
  +  
   
 
 
  +  
  +  
   
 
 
  @@ -139,6 +143,11 @@
 
 
   
  +
  +
  +
  +  
  +
   
 
   
  
  
  
  1.3   +10 -2 maven-plugins/ear/src/plugin-test/test02/maven.xml
  
  Index: maven.xml
  ===
  RCS file: /home/cvs/maven-plugins/ear/src/plugin-test/test02/maven.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- maven.xml 12 Nov 2004 02:10:32 -  1.2
  +++ maven.xml 16 Nov 2004 03:22:59 -  1.3
  @@ -38,11 +38,19 @@
   
   
   
  +  msg="commons-logging was not bundled"/>
   
   
   
  +  msg="commons-collections was bundled incorrectly"/>
  +
  +
  +
  +
  +
  +
   
   
 
  
  
  
  1.4   +26 -2 maven-plugins/ear/src/plugin-test/test02/project.xml
  
  Index: project.xml
  ===
  RCS file: /home/cvs/maven-plugins/ear/src/plugin-test/test02/project.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- project.xml   16 Nov 2004 02:45:56 -  1.3
  +++ project.xml   16 Nov 2004 03:22:59 -  1.4
  @@ -28,8 +28,8 @@
 
 2004
 au.gov.qld
  -  Test for Jar paths in Ears
  -  Test that a jar is packaged in the path specified in the 
project file
  +  Test for new properties ear.bundle.name and 
ear.bundle.dir
  +  Tests if a dependency which has the properties 
ear.bundle.name or ear.bundle.dir it is properly bundled in the EAR (see issues 
MPEAR-26 and MPEAR-23)
 
 
   
  @@ -39,6 +39,11 @@
 Queensland Government
 Java Developer
   
  +
  +  Felipe Leme
  +  felipeal
  +  Jelly Developer
  +
 
 
   
  @@ -56,6 +61,25 @@
 2.1
 
   true
  +  
  +
  +
  +  commons-digester
  +  commons-digester
  +  1.6
  +  
  +true
  +commons-digester.jar
  +  
  +
  +
  +  log4j
  +  log4j
  +  1.2.8
  +  
  +true
  +LOG4J.JAR
  +/APP-INF/lib
 
   
 
  
  
  
  1.27  +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.26
  retrieving revision 1.27
  diff -u -r1.26 -r1.27
  --- changes.xml   16 Nov 2004 02:45:56 -  1.26
  +++ changes.xml   16 Nov 2004 03:22:59 -  1.27
  @@ -25,6 +25,7 @@
 
 
   
  +  Add new property 
dependency (ear.bundle.name) to define the name a dependency 
should have the EAR.
 Changed the default 
value of maven.ear.displayname.
 Add new property dependency(ear.bundle.dir) to define 
where a dependency should be added in the EAR.
 Build now fails in some cases were the dependencies are copied with wrong 
case.
  
  
  
  1.18  +31 -0 maven-plugins/ear/xdocs/properties.xml
  
  Index: properties.xml
  ===
  RCS file: /home/cvs/maven-plugins/ear/xdocs/properties.xml,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- properties.xml16 Nov 2004 02:45:56 -  1.17
  +++ properties.xml16 Nov 2004 03:22:59 -  1.18
  @@ -187,6 +187,37 @@
 
   
 ]]>
  +(it does not matter if the value of ear.bundle.dir starts

cvs commit: maven-plugins/ear/xdocs changes.xml properties.xml

2004-11-15 Thread felipeal
felipeal2004/11/15 18:45:56

  Modified:ear  plugin.jelly
   ear/src/plugin-test/test02 project.xml
   ear/xdocs changes.xml properties.xml
  Log:
  changed property ear.target.path (introduced by MPEAR-23) to ear.bundle.dir, 
which is more coherent to property ear.bundle.name (which will be added by 
MPEAR-26)
  
  Revision  ChangesPath
  1.24  +1 -1  maven-plugins/ear/plugin.jelly
  
  Index: plugin.jelly
  ===
  RCS file: /home/cvs/maven-plugins/ear/plugin.jelly,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- plugin.jelly  11 Nov 2004 03:28:41 -  1.23
  +++ plugin.jelly  16 Nov 2004 02:45:56 -  1.24
  @@ -85,7 +85,7 @@
 
   
 Bundling: ${dep.type} - ${dep.id} - 
${dep.version}
  -   
  +   
 
 

  
  
  
  1.3   +1 -1  maven-plugins/ear/src/plugin-test/test02/project.xml
  
  Index: project.xml
  ===
  RCS file: /home/cvs/maven-plugins/ear/src/plugin-test/test02/project.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- project.xml   12 Nov 2004 02:10:32 -  1.2
  +++ project.xml   16 Nov 2004 02:45:56 -  1.3
  @@ -46,7 +46,7 @@
 commons-logging
 1.0.3
 
  -APP-INF/lib
  +APP-INF/lib
   true
 
   
  
  
  
  1.26  +1 -1  maven-plugins/ear/xdocs/changes.xml
  
  Index: changes.xml
  ===
  RCS file: /home/cvs/maven-plugins/ear/xdocs/changes.xml,v
  retrieving revision 1.25
  retrieving revision 1.26
  diff -u -r1.25 -r1.26
  --- changes.xml   11 Nov 2004 11:55:45 -  1.25
  +++ changes.xml   16 Nov 2004 02:45:56 -  1.26
  @@ -26,7 +26,7 @@
 
   
 Changed the default 
value of maven.ear.displayname.
  -  Add new property dependency(ear.target.path) to define 
where a dependency should be added in the EAR.
  +  Add new property dependency(ear.bundle.dir) to define 
where a dependency should be added in the EAR.
 Build now fails in some cases were the dependencies are copied with wrong 
case.
 Added property 
maven.ear.appxml.encoding.
 
  
  
  
  1.17  +2 -2  maven-plugins/ear/xdocs/properties.xml
  
  Index: properties.xml
  ===
  RCS file: /home/cvs/maven-plugins/ear/xdocs/properties.xml,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- properties.xml11 Nov 2004 11:55:45 -  1.16
  +++ properties.xml16 Nov 2004 02:45:56 -  1.17
  @@ -173,7 +173,7 @@
 ]]>
 
  
  - Note that by default the artifacts will be bundled in the EAR's 
root directory. To change the location where an artifact is bundled, please use 
the ear.target.path property:
  + Note that by default the artifacts will be bundled in the EAR's 
root directory. To change the location where an artifact is bundled, please use 
the ear.bundle.dir property:
  
 
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



cvs commit: maven-plugins/ear/xdocs changes.xml properties.xml

2004-11-11 Thread felipeal
felipeal2004/11/11 03:55:45

  Modified:ear  plugin.properties
   ear/xdocs changes.xml properties.xml
  Log:
  fix for MPEAR-20: changed the default value of the maven.ear.displayname
  
  Revision  ChangesPath
  1.8   +2 -2  maven-plugins/ear/plugin.properties
  
  Index: plugin.properties
  ===
  RCS file: /home/cvs/maven-plugins/ear/plugin.properties,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- plugin.properties 15 Oct 2004 05:07:35 -  1.7
  +++ plugin.properties 11 Nov 2004 11:55:45 -  1.8
  @@ -28,7 +28,7 @@
   maven.ear.appxml=${maven.ear.descriptordir}/application.xml
   maven.ear.manifest=${maven.ear.descriptordir}/MANIFEST.MF
   maven.ear.appxml.generate=false
  -maven.ear.displayname=${pom.id}
  +maven.ear.displayname=${pom.artifactId}
   maven.ear.appxml.version=1.3
   maven.ear.resources=${maven.build.dir}/ear
  -maven.ear.appxml.encoding=UTF-8
  \ No newline at end of file
  +maven.ear.appxml.encoding=UTF-8
  
  
  
  1.25  +2 -1  maven-plugins/ear/xdocs/changes.xml
  
  Index: changes.xml
  ===
  RCS file: /home/cvs/maven-plugins/ear/xdocs/changes.xml,v
  retrieving revision 1.24
  retrieving revision 1.25
  diff -u -r1.24 -r1.25
  --- changes.xml   11 Nov 2004 03:28:41 -  1.24
  +++ changes.xml   11 Nov 2004 11:55:45 -  1.25
  @@ -25,7 +25,8 @@
 
 
   
  -  Add new property dependency(ear.target.path) to define 
where a dependency should be added in the EAR.
  +  Changed the default 
value of maven.ear.displayname.
  +  Add new property dependency(ear.target.path) to define 
where a dependency should be added in the EAR.
 Build now fails in some cases were the dependencies are copied with wrong 
case.
 Added property 
maven.ear.appxml.encoding.
 
  
  
  
  1.16  +1 -1  maven-plugins/ear/xdocs/properties.xml
  
  Index: properties.xml
  ===
  RCS file: /home/cvs/maven-plugins/ear/xdocs/properties.xml,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- properties.xml11 Nov 2004 03:28:41 -  1.15
  +++ properties.xml11 Nov 2004 11:55:45 -  1.16
  @@ -78,7 +78,7 @@
   when application.xml file is autogenerated
 
 
  -${pom.id}
  +${pom.artifactId}
 
   
   
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



cvs commit: maven-plugins/ear/xdocs changes.xml properties.xml

2004-11-10 Thread felipeal
felipeal2004/11/10 19:28:41

  Modified:ear  plugin.jelly
   ear/xdocs changes.xml properties.xml
  Added:   ear/src/plugin-test/test02 maven.xml project.xml
  Log:
  MPEAR-23: added new property (ear.target.path) that sets where a dependency 
is located inside the ear
  
  Revision  ChangesPath
  1.23  +15 -4 maven-plugins/ear/plugin.jelly
  
  Index: plugin.jelly
  ===
  RCS file: /home/cvs/maven-plugins/ear/plugin.jelly,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- plugin.jelly  7 Nov 2004 00:45:00 -   1.22
  +++ plugin.jelly  11 Nov 2004 03:28:41 -  1.23
  @@ -85,10 +85,21 @@
 
   
 Bundling: ${dep.type} - ${dep.id} - 
${dep.version}
  -  
  -
  -  
  -
  +   
  +  
  +  
  + 
  +   
  + 
  +   
  + 
  + 
  +   
  + 
  +   
  +
  +  
  +
 
 
   
  
  
  
  1.1  maven-plugins/ear/src/plugin-test/test02/maven.xml
  
  Index: maven.xml
  ===
  
  
  

  



  
  
  
  
  
  
  
  
  
  
  
  
  
  
  
  
  
  

  
  
  
  
  1.1  maven-plugins/ear/src/plugin-test/test02/project.xml
  
  Index: project.xml
  ===
  
  
  
  
  
3
Test project for Maven Ear Plugin 02
test-maven-ear-plugin-02

  Queensland Government
  www.qld.gov.au

2004
au.gov.qld
Test for Jar paths in Ears
Test that a jar is packaged in the path specified in the 
project file


  
Wiley Fuller
wfuller
[EMAIL PROTECTED]
Queensland Government
Java Developer
  


  
commons-logging
commons-logging
1.0.3
http://jakarta.apache.org/commons/logging.html

  true
  APP-INF/lib

  


  ${basedir}/src
  ${basedir}/src/test

  
  
  
  
  1.24  +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.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- changes.xml   7 Nov 2004 00:45:00 -   1.23
  +++ changes.xml   11 Nov 2004 03:28:41 -  1.24
  @@ -25,6 +25,7 @@
 
 
   
  +  Add new property dependency(ear.target.path) to define 
where a dependency should be added in the EAR.
 Build now fails in some cases were the dependencies are copied with wrong 
case.
 Added property 
maven.ear.appxml.encoding.
 
  
  
  
  1.15  +18 -3 maven-plugins/ear/xdocs/properties.xml
  
  Index: properties.xml
  ===
  RCS file: /home/cvs/maven-plugins/ear/xdocs/properties.xml,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- properties.xml15 Oct 2004 05:07:35 -  1.14
  +++ properties.xml11 Nov 2004 03:28:41 -  1.15
  @@ -153,9 +153,9 @@
 
   
 ]]>
  -
  +   
 
  -  Those artifact will be also "visible" during generation
  +  Those artifacts 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:
 
  @@ -173,7 +173,22 @@
 ]]>
 
  
  - Please note that if a jar is a java client module, you will need to 
declare
  + Note that by default the artifacts will be bundled in the EAR's 
root directory. To change the location where an artifact is bundled, please use 
the ear.target.path property:
  +   
  +  
  +   
  + Finally, please note that if a jar is a java client module, you 
will need to declare
it using the ear.module property, rather than 
ear.bundle:
  
 

cvs commit: maven-plugins/ear/xdocs changes.xml properties.xml

2004-10-14 Thread felipeal
felipeal2004/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  ChangesPath
  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 -  1.20
  +++ plugin.jelly  15 Oct 2004 05:07:35 -  1.21
  @@ -133,12 +133,12 @@
 
 

  - Generating appxml file:"${maven.ear.appxml} version 
${maven.ear.appxml.version}"
  + Generating appxml file:"${maven.ear.appxml} version 
${maven.ear.appxml.version} encoding: ${maven.ear.appxml.encoding}"


   
   
  
  
  
  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 -  1.6
  +++ plugin.properties 15 Oct 2004 05:07:35 -  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 -  1.21
  +++ changes.xml   15 Oct 2004 05:07:35 -  1.22
  @@ -25,6 +25,7 @@
 
 
   
  +  Added property 
maven.ear.appxml.encoding.
 
   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.xml12 Apr 2004 22:53:01 -  1.13
  +++ properties.xml15 Oct 2004 05:07:35 -  1.14
  @@ -25,7 +25,7 @@
 
   
 
  -
  +
 
   
PropertyOptional?DescriptionDefault
   
  @@ -42,7 +42,7 @@
 maven.ear.appxml
 Yes
 
  -Location of the application.xml file 
  +Location of the application.xml file 
   to be used within the ear file.
 
 
  @@ -53,7 +53,7 @@
 maven.ear.appxml.generate
 Yes
 
  -Indicates if application.xml files should
  +Indicates if application.xml files should
   be autogenerated 
 
 
  @@ -64,10 +64,10 @@
 maven.ear.appxml.version
 Yes
 
  -Inserts the doctype header depending on the specified version. Default 
is 1.3
  +Inserts the doctype header depending on the specified version.
 
 
  -false
  +1.3
 
   
   
  @@ -75,7 +75,7 @@
 Yes
 
   Display name of the application to be used
  -when application.xml file is autogenerated
  +when application.xml file is autogenerated
 
 
   ${pom.id}
  @@ -101,6 +101,16 @@
   ${maven.src.dir}/application
 
   
  +
  +  maven.ear.appxml.encoding
  +  Yes
  +  
  +Character encoding for the auto-generated application.xml 
file.
  +  
  +  
  +UTF-8
  +  
  +
 
   
   
  @@ -146,8 +156,8 @@
   
 
 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 application.xml file. In case of war artifacts you can also
  +  specify context root which will be set in application.xml file: