[Maven-plugins-cvs] cvs commit: maven-plugins/was5 plugin.jelly

[dion g. <dio...@us...>]

diongillard    05/06/23 19:09:29

  Modified:    was5/src/plugin-resources build.xml.jelly
               was5     plugin.jelly
  Log:
  - pick up dependency classpath using pom property rather than futzing with Ant
  - choose extension of .bat or .sh based on os
  
  Revision  Changes    Path
  1.3       +1 -1      maven-plugins/was5/src/plugin-resources/build.xml.jelly
  
  Index: build.xml.jelly
  ===================================================================
  RCS file: /cvsroot/maven-plugins/maven-plugins/was5/src/plugin-resources/build.xml.jelly,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- build.xml.jelly	23 Jun 2005 18:07:42 -0000	1.2
  +++ build.xml.jelly	24 Jun 2005 02:09:28 -0000	1.3
  @@ -27,7 +27,7 @@
       <wasEjbDeploy inputJar="${maven.was5.ejbDeploy.file}"
         workingDirectory="${maven.was5.ejbDeploy.workingdir}"
         outputJar="${maven.was5.ejbDeploy.file.out}"
  -      classpath="${mavenDependencyClasspath}"
  +      classpath="${pom.dependencyClasspath}"
         codegen="${maven.was5.ejbDeploy.codegen}"
         dbname="${maven.was5.ejbDeploy.dbname}"
         dbschema="${maven.was5.ejbDeploy.dbschema}"
  
  
  
  1.15      +21 -12    maven-plugins/was5/plugin.jelly
  
  Index: plugin.jelly
  ===================================================================
  RCS file: /cvsroot/maven-plugins/maven-plugins/was5/plugin.jelly,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- plugin.jelly	23 Jun 2005 23:28:36 -0000	1.14
  +++ plugin.jelly	24 Jun 2005 02:09:29 -0000	1.15
  @@ -14,10 +14,19 @@
        !-->
       <define:tag name="run-build-file-target">
         <ant:mkdir dir="${maven.build.dir}/was5"/>
  -      <property name="mavenDependencyClasspath" refid="maven.dependency.classpath"/>
  -      <j:file name="${maven.build.dir}/was5/build.xml"><j:include file="${plugin.resources}/build.xml.jelly"/></j:file>
  -      <!-- TODO find .bat or .sh based on os -->
  -      <exec executable="${maven.was5.home}/bin/ws_ant.bat">
  +      <!-- convert path to string - is there a better way? -->
  +      <j:file name="${maven.build.dir}/was5/build.xml" prettyPrint="true"><j:include file="${plugin.resources}/build.xml.jelly"/></j:file>
  +      <!-- find .bat or .sh based on os -->
  +      <j:choose>
  +        <j:when test="${systemScope['os.name'].startsWith('Windows')}">
  +          <j:set var="extension" value="bat"/>
  +        </j:when>
  +        <j:otherwise>
  +          <j:set var="extension" value="sh"/>
  +        </j:otherwise>
  +      </j:choose>
  +
  +      <exec executable="${maven.was5.home}/bin/ws_ant.${extension}">
           <arg value="-f"/>
           <arg value="${maven.build.dir}/was5/build.xml"/>
           <arg value="${target}"/>
  @@ -113,14 +122,14 @@
   
     <!-- reinstall an app -->
     <goal name="was5:reinstallApp" description="Reinstall an application on a WebSphere Appserver">
  -	  <attainGoal name="was5:stopApp"/>
  -	  <sleep seconds="${maven.was5.sleep.stop}"/>
  -	  <attainGoal name="was5:uninstallApp"/>
  -	  <sleep seconds="${maven.was5.sleep.stop}"/>
  -	  <attainGoal name="was5:installApp"/>
  -	  <sleep seconds="${maven.was5.sleep.start}"/>
  -	  <attainGoal name="was5:startApp"/>
  -	  <sleep seconds="${maven.was5.sleep.start}"/>
  +      <attainGoal name="was5:stopApp"/>
  +      <sleep seconds="${maven.was5.sleep.stop}"/>
  +      <attainGoal name="was5:uninstallApp"/>
  +      <sleep seconds="${maven.was5.sleep.stop}"/>
  +      <attainGoal name="was5:installApp"/>
  +      <sleep seconds="${maven.was5.sleep.start}"/>
  +      <attainGoal name="was5:startApp"/>
  +      <sleep seconds="${maven.was5.sleep.start}"/>
     </goal>
     
     <!-- run a script -->