Menu
▾
▴
[Maven-plugins-cvs] cvs commit: maven-plugins/was5/xdocs changes.xml
|
From: dion g. <dio...@us...> - 2005-11-04 02:36:39
|
diongillard 05/11/03 18:36:34
Modified: was5 plugin.jelly project.xml
was5/xdocs changes.xml
Log:
Start on 2.0.2 - use ws_ant if found, else use ws_ant.sh or .bat
Revision Changes Path
1.17 +6 -3 maven-plugins/was5/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /cvsroot/maven-plugins/maven-plugins/was5/plugin.jelly,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- plugin.jelly 24 Jun 2005 03:24:24 -0000 1.16
+++ plugin.jelly 4 Nov 2005 02:36:33 -0000 1.17
@@ -18,14 +18,17 @@
<!-- find .bat or .sh based on os -->
<j:choose>
<j:when test="${systemScope['os.name'].startsWith('Windows')}">
- <j:set var="extension" value="bat"/>
+ <j:set var="extension" value=".bat"/>
</j:when>
<j:otherwise>
- <j:set var="extension" value="sh"/>
+ <j:set var="extension" value=".sh"/>
+ <u:available file="${maven.was5.home}/bin/ws_ant">
+ <j:set var="extension" value=""/>
+ </u:available>
</j:otherwise>
</j:choose>
- <exec executable="${maven.was5.home}/bin/ws_ant.${extension}">
+ <exec executable="${maven.was5.home}/bin/ws_ant${extension}">
<arg value="-f"/>
<arg value="${maven.build.dir}/was5/build.xml"/>
<arg value="${target}"/>
1.19 +11 -1 maven-plugins/was5/project.xml
Index: project.xml
===================================================================
RCS file: /cvsroot/maven-plugins/maven-plugins/was5/project.xml,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- project.xml 3 Nov 2005 01:02:16 -0000 1.18
+++ project.xml 4 Nov 2005 02:36:33 -0000 1.19
@@ -6,7 +6,7 @@
<id>maven-was5-plugin</id>
<name>WebSphere 5 (5.0/5.1) Plugin</name>
<!-- groupId is in parent -->
- <currentVersion>2.0.1</currentVersion>
+ <currentVersion>2.0.2-SNAPSHOT</currentVersion>
<!-- organization is in parent -->
<inceptionYear>2004</inceptionYear>
<!-- package, logo are in parent. no gumpRepositoryId -->
@@ -60,8 +60,18 @@
<email>dio...@us...</email>
</developer>
</developers>
+
<!-- no contributors -->
<!-- licenses section not done yet -->
+ <dependencies>
+ <dependency>
+ <groupId>commons-jelly</groupId>
+ <artifactId>commons-jelly-tags-util</artifactId>
+ <version>1.1.1</version>
+ <url>http://jakarta.apache.org/commons/jelly/libs/util/</url>
+ </dependency>
+ </dependencies>
+
<!-- build is in the parent -->
<!-- reports is in the parent -->
</project>
1.19 +3 -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.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- changes.xml 3 Nov 2005 01:02:16 -0000 1.18
+++ changes.xml 4 Nov 2005 02:36:34 -0000 1.19
@@ -6,6 +6,9 @@
<author email="dio...@us...">dIon Gillard</author>
</properties>
<body>
+ <release version="2.0.2-SNAPSHOT" date="in CVS">
+ <action dev="diongillard" type="fix" due-to="Jason Dillon">Check for ws_ant and use it if found when running the build files.</action>
+ </release>
<release version="2.0.1" date="2005-11-03">
<action dev="diongillard" type="fix">host is not a valid option for the ant task to stop a server.</action>
</release>
|
