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

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

diongillard    05/06/23 11:07:43

  Modified:    was5/src/plugin-resources build.xml.jelly
               was5     plugin.jelly
  Log:
  Update runScript goal to use build file
  
  Revision  Changes    Path
  1.2       +24 -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.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- build.xml.jelly	23 Jun 2005 18:03:09 -0000	1.1
  +++ build.xml.jelly	23 Jun 2005 18:07:42 -0000	1.2
  @@ -1,4 +1,4 @@
  -<j:jelly xmlns:j="jelly:core" xmlns="dummy">
  +<j:jelly xmlns:j="jelly:core" xmlns:u="jelly:util" xmlns="dummy">
   <project name="was5plugin" default="wasListApps">
     
     <taskdef name="wasListApps" classname="com.ibm.websphere.ant.tasks.ListApplications" classpath="${maven.was5.home}/lib/wsanttasks.jar"/>
  @@ -10,6 +10,7 @@
     <taskdef name="wasUninstallApp" classname="com.ibm.websphere.ant.tasks.UninstallApplication" classpath="${maven.was5.home}/lib/wsanttasks.jar"/>
     <taskdef name="wasStartApp" classname="com.ibm.websphere.ant.tasks.StartApplication" classpath="${maven.was5.home}/lib/wsanttasks.jar"/>
     <taskdef name="wasStopApp" classname="com.ibm.websphere.ant.tasks.StopApplication" classpath="${maven.was5.home}/lib/wsanttasks.jar"/>
  +  <taskdef name="wsAdmin" classname="com.ibm.websphere.ant.tasks.WsAdmin" classpath="${maven.was5.home}/lib/wsanttasks.jar"/>
   
     <target name="wasListApps">
       <wasListApps profile="${maven.was5.listApps.profile}"
  @@ -147,5 +148,27 @@
         wasHome="${maven.was5.home}">
       </wasStopApp>
     </target>
  +  
  +  <target name="wasRunScript">
  +    <wsAdmin
  +      conntype="${maven.was5.script.conntype}"
  +      host="${maven.was5.script.host}"
  +      lang="${maven.was5.script.lang}"
  +      password="${maven.was5.script.password}"
  +      port="${maven.was5.script.port}"
  +      profile="${maven.was5.script.profile}"
  +      properties="${maven.was5.script.properties}"
  +      script="${script}"
  +      user="${maven.was5.script.username}"
  +      wasHome="${maven.was5.home}">
  +      <!-- set args -->
  +      <j:if test="${!empty(args)}">
  +        <u:tokenize var="argList" delim=" ">${args}</u:tokenize>
  +        <j:forEach var="arg" items="${argList}">
  +          <arg value="${context.getVariable(arg)}"/>
  +        </j:forEach>
  +      </j:if>
  +    </wsAdmin>
  +  </target>
   </project>
   </j:jelly>
  \ No newline at end of file
  
  
  
  1.13      +1 -20     maven-plugins/was5/plugin.jelly
  
  Index: plugin.jelly
  ===================================================================
  RCS file: /cvsroot/maven-plugins/maven-plugins/was5/plugin.jelly,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- plugin.jelly	23 Jun 2005 18:03:09 -0000	1.12
  +++ plugin.jelly	23 Jun 2005 18:07:43 -0000	1.13
  @@ -130,25 +130,6 @@
       <assert:assertFileExists file="${maven.was5.home}" msg=" ERROR: maven.was5.home is not a valid directory"/>
       <!-- grab args into a non dotted variable -->
       <j:set var="args" value="${maven.was5.script.args}"/>
  -    <ant:taskdef name="wsAdmin" classname="com.ibm.websphere.ant.tasks.WsAdmin" classpath="${maven.was5.home}/lib/wsanttasks.jar"/>
  -    <ant:wsAdmin>
  -      <ant:setProperty name="conntype" value="${maven.was5.script.conntype}"/>
  -      <ant:setProperty name="host" value="${maven.was5.script.host}"/>
  -      <ant:setProperty name="lang" value="${maven.was5.script.lang}"/>
  -      <ant:setProperty name="password" value="${maven.was5.script.password}"/>
  -      <ant:setProperty name="port" value="${maven.was5.script.port}"/>
  -      <ant:setProperty name="profile" value="${maven.was5.script.profile}"/>
  -      <ant:setProperty name="properties" value="${maven.was5.script.properties}"/>
  -      <ant:setProperty name="script" value="${script}"/>
  -      <ant:setProperty name="user" value="${maven.was5.script.username}"/>
  -      <ant:setProperty name="wasHome" value="${maven.was5.home}"/>
  -      <!-- set args -->
  -      <j:if test="${!empty(args)}">
  -        <u:tokenize var="argList" delim=" ">${args}</u:tokenize>
  -        <j:forEach var="arg" items="${argList}">
  -          <ant:arg value="${context.getVariable(arg)}"/>
  -        </j:forEach>
  -      </j:if>
  -    </ant:wsAdmin>
  +    <was5:run-build-file-target target="wasRunScript"/>
     </goal>
   </project>
  \ No newline at end of file