cvs commit: maven/src/plugins-build/jboss/xdocs changes.xml

2003-07-04 Thread dion 
dion2003/07/03 23:35:25

  Modified:src/plugins-build/jboss plugin.jelly
   src/plugins-build/jboss/xdocs changes.xml
  Log:
  use artifacts for path, not dependencies
  
  Revision  ChangesPath
  1.13  +3 -3  maven/src/plugins-build/jboss/plugin.jelly
  
  Index: plugin.jelly
  ===
  RCS file: /home/cvs/maven/src/plugins-build/jboss/plugin.jelly,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- plugin.jelly  21 Jun 2003 14:02:28 -  1.12
  +++ plugin.jelly  4 Jul 2003 06:35:24 -   1.13
  @@ -184,14 +184,14 @@
   description=Creates a specific JBoss server configuration
   prereqs=jboss:init,jboss:configure
   
  -j:forEach var=dep items=${pom.dependencies}
  +j:forEach var=lib items=${pom.artifacts}
  +  j:set var=dep value=${lib.dependency}/
 j:if test=${dep.getProperty('jboss.bundle')=='true'}
   ant:echoBundling: (${dep.groupId}, ${dep.artifactId}, 
${dep.type})/ant:echo
   
   !-- TODO: Use getDependencyPath() once it supports artifacts other 
 than jars --
  -ant:copy todir=${maven.jboss.build.deploy.dir}
  -  
file=${maven.repo.local}/${dep.artifactDirectory}/${dep.type}s/${dep.artifact}/
  +ant:copy todir=${maven.jboss.build.deploy.dir} file=${lib.path}/
 /j:if
   /j:forEach
   
  
  
  
  1.11  +3 -0  maven/src/plugins-build/jboss/xdocs/changes.xml
  
  Index: changes.xml
  ===
  RCS file: /home/cvs/maven/src/plugins-build/jboss/xdocs/changes.xml,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- changes.xml   21 Jun 2003 10:55:22 -  1.10
  +++ changes.xml   4 Jul 2003 06:35:25 -   1.11
  @@ -8,6 +8,9 @@
 body
   
   release version=1.2 date=in CVS
  +  action dev=dion type=fix
  +Copy dependencies using artifact path to allow jar overrides to work
  +  /action
 action dev=vmassol type=add
   The plugin now supports JBoss 3.2.x by default. Support for
   JBoss 3.0.x is still available by setting the 
  
  
  

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

cvs commit: maven/src/plugins-build/jboss/xdocs changes.xml goals.xml

2003-06-19 Thread vmassol 
vmassol 2003/06/19 07:06:20

  Modified:src/plugins-build/jboss plugin.jelly
   src/plugins-build/jboss/xdocs changes.xml goals.xml
  Log:
action dev=vmassol type=fix
  When generating the JBoss server configuration zip, exclude
  JBoss tmp and log directories from the zip.
/action
action dev=vmassol type=update
  Change strategy for bunding J2EE modules in the jboss server
  configuration. This is now achieved through dependencies in
  codeproject.xml/code. for any J2EE module you want to incude
  add a codejboss.bundle/code property in the said dependency
  definition.
/action
  
  Revision  ChangesPath
  1.9   +50 -58maven/src/plugins-build/jboss/plugin.jelly
  
  Index: plugin.jelly
  ===
  RCS file: /home/cvs/maven/src/plugins-build/jboss/plugin.jelly,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- plugin.jelly  24 Apr 2003 10:01:27 -  1.8
  +++ plugin.jelly  19 Jun 2003 14:06:20 -  1.9
  @@ -7,10 +7,12 @@
 =
   --
   project 
  +  xmlns:ant=jelly:ant
 xmlns:j=jelly:core
 xmlns:util=jelly:util
 xmlns:jmx=jmx
  -  xmlns:define=jelly:define
  +  xmlns:define=jelly:define
  +  xmlns:artifact=artifact
   
 !--

  @@ -28,11 +30,18 @@
 --
 goal name=jboss:init
   
  -!-- Check if the maven.jboss.home mandatory property is set --
  -j:set var=jbosshomeX value=${maven.jboss.home}X/
  +!-- Check if the maven.jboss.home mandatory property is set and point
  + to a valid location --
  +ant:condition property=jbosshomepresent value=true
  +  ant:and
  +ant:isset property=maven.jboss.home/
  +ant:available file=${maven.jboss.home} type=dir/
  +  /ant:and 
  +/ant:condition
  +j:set var=jbosshomepresentX value=${jbosshomepresent}X/
   j:choose
  -  j:when test=${jbosshomeX == 'X'}
  -failYou need to set the maven.jboss.home property/fail
  +  j:when test=${jbosshomepresentX == 'X'}
  +failYou need to set the maven.jboss.home property and make it point to a 
valid location. It currently points to [${maven.jboss.home}]./fail
 /j:when
 j:otherwise
   echoUsing JBoss from ${maven.jboss.home} .../echo
  @@ -50,7 +59,8 @@
   
 !--

  -   Creates a custom JBoss server configuration directory structure.
  +   Creates a custom JBoss server configuration directory structure
  +   (with no J2EE modules deployed).

 --
 goal name=jboss:configure 
  @@ -112,79 +122,61 @@
   
 !--

  -   Generates the zipped distributable. This goal is called automatically
  -   by the jboss:package-* goals.
  +   Package J2EE modules in the custom JBoss server configuration 
  +   directory structure.

 --
  -  goal name=jboss:dist
  -
  -!-- Generate the distributable --
  -zip destfile=${maven.build.dir}/${pom.artifactId}-${pom.currentVersion}.zip
  -  zipfileset dir=${maven.jboss.build.dir}/${maven.jboss.conf.name} 
  -prefix=${maven.jboss.conf.name}/
  -/zip
  -
  -  /goal
  -
  -  !--
  - 
  -   Creates a custom JBoss server configuration directory structure,
  -   packaging an EAR in it.
  - 
  -  --
  -  goal name=jboss:package-ear 
  -description=Creates a specific JBoss server configuration (with EAR)
  -prereqs=jboss:init,ear:ear,jboss:configure
  -
  -!-- Copy the EAR to install to the JBoss deploy dir. --
  -copy file=${maven.build.dir}/${maven.final.name}.ear
  -  todir=${maven.jboss.build.deploy.dir}/
  +  goal name=jboss:package 
  +description=Creates a specific JBoss server configuration
  +prereqs=jboss:init,jboss:configure
   
  -attainGoal name=jboss:dist/
  +j:forEach var=dep items=${pom.dependencies}
  +  j:if test=${dep.getProperty('jboss.bundle')=='true'}
  +ant:echoBundling: (${dep.groupId}, ${dep.artifactId}, 
${dep.type})/ant:echo
  +
  +!-- TODO: Use getDependencyPath() once it supports artifacts other 
  +  than jars --
  +copy todir=${maven.jboss.build.deploy.dir}
  +  
file=${maven.repo.local}/${dep.artifactDirectory}/${dep.type}s/${dep.artifact}/
  +  /j:if

cvs commit: maven/src/plugins-build/jboss/xdocs changes.xml

2003-06-17 Thread vmassol 
vmassol 2003/06/17 05:38:52

  Modified:src/plugins-build/jboss project.xml
   src/plugins-build/jboss/xdocs changes.xml
  Log:
  Starting release 1.2... Will be finished before Thursday...
  
  Revision  ChangesPath
  1.8   +6 -1  maven/src/plugins-build/jboss/project.xml
  
  Index: project.xml
  ===
  RCS file: /home/cvs/maven/src/plugins-build/jboss/project.xml,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- project.xml   17 Jun 2003 12:32:02 -  1.7
  +++ project.xml   17 Jun 2003 12:38:52 -  1.8
  @@ -5,7 +5,7 @@
 pomVersion3/pomVersion
 idmaven-jboss-plugin/id
 nameMaven JBoss Plug-in/name
  -  currentVersion1.1/currentVersion
  +  currentVersion1.2-SNAPSHOT/currentVersion
 descriptionPlugin for JBoss./description
 shortDescriptionJBoss plugin/shortDescription
 urlhttp://maven.apache.org/reference/plugins/jboss//url
  @@ -27,6 +27,11 @@
 id1.1/id
 name1.1/name
 tagMAVEN_JBOSS_1_1/tag
  +/version
  +version
  +  id1.2/id
  +  name1.2/name
  +  tagHEAD/tag
   /version
 /versions
   
  
  
  
  1.8   +3 -0  maven/src/plugins-build/jboss/xdocs/changes.xml
  
  Index: changes.xml
  ===
  RCS file: /home/cvs/maven/src/plugins-build/jboss/xdocs/changes.xml,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- changes.xml   17 Jun 2003 12:04:29 -  1.7
  +++ changes.xml   17 Jun 2003 12:38:52 -  1.8
  @@ -7,6 +7,9 @@
   
 body
   
  +release version=1.2 date=in CVS
  +/release
  +
   release version=1.1 date=2003-06-17
 action dev=vmassol type=fix due-to=Willie Vu due-to-email=[EMAIL 
PROTECTED]
   Application-specific JBoss configuration files now correctly overwrite
  
  
  

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