Menu
▾
▴
maven-plugins-cvs
|
From: dion g. <dio...@us...> - 2004-07-30 03:51:07
|
diongillard 04/07/29 20:50:57
Modified: was5 plugin.jelly
Log:
Add reminder
Revision Changes Path
1.3 +2 -0 maven-plugins/was5/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /cvsroot/maven-plugins/maven-plugins/was5/plugin.jelly,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- plugin.jelly 28 Jul 2004 15:01:50 -0000 1.2
+++ plugin.jelly 30 Jul 2004 03:50:57 -0000 1.3
@@ -1,6 +1,8 @@
<project default="serverStatus" xmlns:j="jelly:core"
xmlns:ant="jelly:ant">
+ <!-- TODO: Add a check to make sure maven.was5.home is a valid directory -->
+
<!-- generate deployment and rmic code for an ejb jar -->
<goal name="was5:ejbDeploy" description="Generate deployment and RMIC code for an ejb jar">
<!-- clean up working dir -->
|
|
From: dion g. <dio...@us...> - 2004-08-04 07:15:24
|
diongillard 04/08/04 00:15:17
Modified: was5 plugin.jelly
Log:
Fix typo for maven.was5.ejbDeploy
Revision Changes Path
1.8 +2 -1 maven-plugins/was5/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /cvsroot/maven-plugins/maven-plugins/was5/plugin.jelly,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- plugin.jelly 4 Aug 2004 06:30:38 -0000 1.7
+++ plugin.jelly 4 Aug 2004 07:15:16 -0000 1.8
@@ -40,7 +40,7 @@
<!-- "auto-deploy" the ejb jar after the ejb has been created -->
<postGoal name="ejb:ejb">
- <j:set var="generate" value="${maven.was5.ejbdeploy}"/>
+ <j:set var="generate" value="${maven.was5.ejbDeploy}"/>
<j:if test="${!empty(generate)}">
<attainGoal name="was5:ejbDeploy"/>
<!-- copy jar with deployed code over original -->
@@ -135,6 +135,7 @@
<goal name="was5:installApp" description="Install an application on a WebSphere Appserver">
<ant:fail unless="maven.was5.installApp.ear">maven.was5.installApp.ear must be specified</ant:fail>
+ <assert:assertFileExists file="${maven.was5.installApp.ear}" msg=" ERROR: maven.was5.installApp.ear (${maven.was5.installApp.ear}) doesn't exist."/>
<maven:paramCheck fail="yes" value="${maven.was5.home}" message="ERROR: maven.was5.home is not set"/>
<assert:assertFileExists file="${maven.was5.home}" msg=" ERROR: maven.was5.home is not a valid directory"/>
|
|
From: dion g. <dio...@us...> - 2004-08-26 02:15:46
|
diongillard 04/08/25 19:15:38
Modified: was5 plugin.jelly
Log:
Fix property to correct value
Revision Changes Path
1.10 +1 -1 maven-plugins/was5/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /cvsroot/maven-plugins/maven-plugins/was5/plugin.jelly,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- plugin.jelly 11 Aug 2004 05:37:10 -0000 1.9
+++ plugin.jelly 26 Aug 2004 02:15:38 -0000 1.10
@@ -242,7 +242,7 @@
<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="username" value="${maven.was5.script.username}"/>
+ <ant:setProperty name="user" value="${maven.was5.script.username}"/>
<ant:setProperty name="wasHome" value="${maven.was5.home}"/>
<!-- set args -->
<j:if test="${!empty(args)}">
|
|
From: dion g. <dio...@us...> - 2005-06-23 18:07:50
|
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
|
|
From: dion g. <dio...@us...> - 2005-06-23 23:28:44
|
diongillard 05/06/23 16:28:36
Modified: was5 plugin.jelly
Log:
Deprecate was5:run-script for was5:runScript
Revision Changes Path
1.14 +4 -0 maven-plugins/was5/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /cvsroot/maven-plugins/maven-plugins/was5/plugin.jelly,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- plugin.jelly 23 Jun 2005 18:07:43 -0000 1.13
+++ plugin.jelly 23 Jun 2005 23:28:36 -0000 1.14
@@ -125,6 +125,10 @@
<!-- run a script -->
<goal name="was5:run-script">
+ <echo>WARNING: was5:run-script is DEPRECATED. Please use was5:runScript</echo>
+ <attainGoal name="was5:runScript"/>
+ </goal>
+ <goal name="was5:runScript">
<maven:paramCheck fail="yes" value="${script}" message="ERROR: the 'script' variable is not set"/>
<maven:paramCheck fail="yes" value="${maven.was5.home}" message="ERROR: maven.was5.home is not set"/>
<assert:assertFileExists file="${maven.was5.home}" msg=" ERROR: maven.was5.home is not a valid directory"/>
|
|
From: dion g. <dio...@us...> - 2005-06-24 02:09:43
|
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 -->
|
|
From: dion g. <dio...@us...> - 2005-06-24 03:24:36
|
diongillard 05/06/23 20:24:24
Modified: was5 plugin.jelly
Log:
Remove useless comment
Revision Changes Path
1.16 +0 -1 maven-plugins/was5/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /cvsroot/maven-plugins/maven-plugins/was5/plugin.jelly,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- plugin.jelly 24 Jun 2005 02:09:29 -0000 1.15
+++ plugin.jelly 24 Jun 2005 03:24:24 -0000 1.16
@@ -14,7 +14,6 @@
!-->
<define:tag name="run-build-file-target">
<ant:mkdir dir="${maven.build.dir}/was5"/>
- <!-- 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>
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X