Menu
▾
▴
[Maven-plugins-cvs] cvs commit: maven-plugins/was5/xdocs changes.xml
|
From: dion g. <dio...@us...> - 2004-07-30 05:28:46
|
diongillard 04/07/29 22:28:40
Modified: was5 plugin.jelly
was5/xdocs changes.xml
Log:
Check maven.was5.home exists before using
Revision Changes Path
1.5 +21 -10 maven-plugins/was5/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /cvsroot/maven-plugins/maven-plugins/was5/plugin.jelly,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- plugin.jelly 30 Jul 2004 05:13:31 -0000 1.4
+++ plugin.jelly 30 Jul 2004 05:28:40 -0000 1.5
@@ -1,11 +1,13 @@
<project default="serverStatus"
xmlns:j="jelly:core"
xmlns:ant="jelly:ant"
- xmlns:assert="assert">
+ xmlns:assert="assert"
+ xmlns:maven="jelly:maven">
<!-- generate deployment and rmic code for an ejb jar -->
<goal name="was5:ejbDeploy" description="Generate deployment and RMIC code for an ejb jar">
- <assert:assertFileExists file="${maven.was5.home}"/>
+ <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"/>
<!-- clean up working dir -->
<delete dir="${maven.was5.ejbDeploy.workingdir}" failonerror="false"/>
<mkdir dir="${maven.was5.ejbDeploy.workingdir}"/>
@@ -48,7 +50,8 @@
<goal name="was5:startServer" description="Start a WebSphere Appserver">
<ant:fail unless="maven.was5.startServer.server">maven.was5.startServer.server must be specified (specifying maven.was5.server is sufficient)</ant:fail>
- <assert:assertFileExists file="${maven.was5.home}"/>
+ <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"/>
<taskdef name="wasStartServer" classname="com.ibm.websphere.ant.tasks.StartServer" classpath="${maven.was5.home}/lib/wsanttasks.jar"/>
<ant:wasStartServer server="${maven.was5.startServer.server}">
@@ -69,8 +72,9 @@
</goal>
<goal name="was5:stopServer" description="Stop a WebSphere Appserver">
+ <maven:paramCheck fail="yes" value="${maven.was5.home}" message="ERROR: maven.was5.home is not set"/>
<ant:fail unless="maven.was5.stopServer.server">maven.was5.stopServer.server must be specified (specifying maven.was5.server is sufficient)</ant:fail>
- <assert:assertFileExists file="${maven.was5.home}"/>
+ <assert:assertFileExists file="${maven.was5.home}" msg=" ERROR: maven.was5.home is not a valid directory"/>
<taskdef name="wasStopServer" classname="com.ibm.websphere.ant.tasks.StopServer" classpath="${maven.was5.home}/lib/wsanttasks.jar"/>
<ant:wasStopServer server="${maven.was5.stopServer.server}">
@@ -94,7 +98,8 @@
<goal name="was5:serverStatus" description="Show the status of a WebSphere Appserver">
<ant:fail unless="maven.was5.serverStatus.server">maven.was5.serverStatus.server must be specified (specifying maven.was5.server is sufficient)</ant:fail>
- <assert:assertFileExists file="${maven.was5.home}"/>
+ <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"/>
<taskdef name="wasServerStatus" classname="com.ibm.websphere.ant.tasks.ServerStatus" classpath="${maven.was5.home}/lib/wsanttasks.jar"/>
<ant:wasServerStatus server="${maven.was5.serverStatus.server}">
@@ -111,7 +116,9 @@
</goal>
<goal name="was5:listApps" description="List applications installed on a WebSphere Appserver">
- <assert:assertFileExists file="${maven.was5.home}"/>
+ <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"/>
+
<taskdef name="wasListApps" classname="com.ibm.websphere.ant.tasks.ListApplications" classpath="${maven.was5.home}/lib/wsanttasks.jar"/>
<ant:wasListApps>
<ant:setProperty name="profile" value="${maven.was5.listApps.profile}"/>
@@ -128,7 +135,8 @@
<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.home}"/>
+ <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"/>
<taskdef name="wasInstallApp" classname="com.ibm.websphere.ant.tasks.InstallApplication" classpath="${maven.was5.home}/lib/wsanttasks.jar"/>
<ant:wasInstallApp ear="${maven.was5.installApp.ear}">
@@ -145,7 +153,8 @@
<goal name="was5:uninstallApp" description="Uninstall an application on a WebSphere Appserver">
<ant:fail unless="maven.was5.uninstallApp.application">maven.was5.uninstallApp.application must be specified</ant:fail>
- <assert:assertFileExists file="${maven.was5.home}"/>
+ <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"/>
<taskdef name="wasUninstallApp" classname="com.ibm.websphere.ant.tasks.UninstallApplication" classpath="${maven.was5.home}/lib/wsanttasks.jar"/>
<ant:wasUninstallApp application="${maven.was5.uninstallApp.application}">
@@ -162,7 +171,8 @@
<goal name="was5:startApp" description="Start an installed application on a WebSphere Appserver">
<ant:fail unless="maven.was5.startApp.application">maven.was5.startApp.application must be specified</ant:fail>
- <assert:assertFileExists file="${maven.was5.home}"/>
+ <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"/>
<taskdef name="wasStartApp" classname="com.ibm.websphere.ant.tasks.StartApplication" classpath="${maven.was5.home}/lib/wsanttasks.jar"/>
<ant:wasStartApp application="${maven.was5.startApp.application}">
@@ -182,7 +192,8 @@
<goal name="was5:stopApp" description="Stop an installed application on a WebSphere Appserver">
<ant:fail unless="maven.was5.stopApp.application">maven.was5.stopApp.application must be specified</ant:fail>
- <assert:assertFileExists file="${maven.was5.home}"/>
+ <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"/>
<taskdef name="wasStopApp" classname="com.ibm.websphere.ant.tasks.StopApplication" classpath="${maven.was5.home}/lib/wsanttasks.jar"/>
<ant:wasStopApp application="${maven.was5.stopApp.application}">
1.4 +1 -0 maven-plugins/was5/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /cvsroot/maven-plugins/maven-plugins/was5/xdocs/changes.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- changes.xml 30 Jul 2004 05:13:31 -0000 1.3
+++ changes.xml 30 Jul 2004 05:28:40 -0000 1.4
@@ -7,6 +7,7 @@
</properties>
<body>
<release version="1.1-SNAPSHOT" date="in CVS">
+ <action dev="diongillard" type="fix">Check ${maven.was5.home} is specified before using</action>
<action dev="diongillard" type="fix">Check ${maven.was5.home} exists before using</action>
</release>
<release version="1.0" date="2004-07-28">
|
