vmassol 2003/08/18 05:21:41
Modified: src/plugins-build/jboss Tag: MAVEN_RC1_STABLE plugin.jelly
src/plugins-build/jboss/xdocs Tag: MAVEN_RC1_STABLE
changes.xml
src/plugins-build/jboss/src/plugin-resources Tag:
MAVEN_RC1_STABLE shutdown.3.2 shutdown.3.0 run
Log:
Fixes MAVEN-570 (http://jira.codehaus.org/secure/ViewIssue.jspa?key=MAVEN-570). Make
it work on unix. Thanks to Willie!
Revision Changes Path
No revision
No revision
1.15.4.1 +10 -2 maven/src/plugins-build/jboss/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/jboss/plugin.jelly,v
retrieving revision 1.15
retrieving revision 1.15.4.1
diff -u -r1.15 -r1.15.4.1
--- plugin.jelly 9 Jul 2003 10:14:01 -0000 1.15
+++ plugin.jelly 18 Aug 2003 12:21:41 -0000 1.15.4.1
@@ -163,8 +163,10 @@
</j:when>
<j:otherwise>
<ant:copy todir="${maven.jboss.build.bin.dir}" filtering="on">
- <ant:exclude name="*.bat"/>
- <ant:exclude name="shutdown*"/>
+ <ant:fileset dir="${maven.jboss.script.dir}">
+ <ant:exclude name="*.bat"/>
+ <ant:exclude name="shutdown*"/>
+ </ant:fileset>
</ant:copy>
<ant:copy tofile="${maven.jboss.build.bin.dir}/shutdown"
file="${maven.jboss.script.dir}/shutdown.${maven.jboss.version}"
@@ -244,6 +246,9 @@
</j:when>
<j:otherwise>
+ <ant:exec dir="${maven.jboss.home}/bin" executable="sh">
+ <ant:arg line="${maven.jboss.build.bin.dir}/run"/>
+ </ant:exec>
</j:otherwise>
</j:choose>
@@ -267,6 +272,9 @@
</j:when>
<j:otherwise>
+ <ant:exec dir="${maven.jboss.home}/bin" executable="sh">
+ <ant:arg line="${maven.jboss.build.bin.dir}/shutdown"/>
+ </ant:exec>
</j:otherwise>
</j:choose>
No revision
No revision
1.12.4.3 +6 -0 maven/src/plugins-build/jboss/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/jboss/xdocs/changes.xml,v
retrieving revision 1.12.4.2
retrieving revision 1.12.4.3
diff -u -r1.12.4.2 -r1.12.4.3
--- changes.xml 18 Aug 2003 07:10:19 -0000 1.12.4.2
+++ changes.xml 18 Aug 2003 12:21:41 -0000 1.12.4.3
@@ -8,6 +8,12 @@
<body>
<release version="1.3" date="in CVS">
+ <action dev="vmassol" type="fix" due-to="Willie Vu" due-to-email="[EMAIL
PROTECTED]">
+ Fixes
+ <a
href="http://jira.codehaus.org/secure/ViewIssue.jspa?key=MAVEN-570";>MAVEN-570</a>.
+ Make the JBoss plugin work on unix (JBoss scripts have a sh extension
+ which we were missing).
+ </action>
</release>
<release version="1.2" date="2003-08-18">
No revision
No revision
1.2.4.1 +2 -2 maven/src/plugins-build/jboss/src/plugin-resources/shutdown.3.2
Index: shutdown.3.2
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/jboss/src/plugin-resources/shutdown.3.2,v
retrieving revision 1.2
retrieving revision 1.2.4.1
diff -u -r1.2 -r1.2.4.1
--- shutdown.3.2 21 Jun 2003 10:55:22 -0000 1.2
+++ shutdown.3.2 18 Aug 2003 12:21:41 -0000 1.2.4.1
@@ -1,2 +1,2 @@
-#! /bin/sh
# ----------------------------------------------------------------------------
# Default JBoss shutdown shell script. It calls the default script found
# in JBOSS_HOME/bin.
# ----------------------------------------------------------------------------
[EMAIL PROTECTED]@/bin/shutdown -S
\ No newline at end of file
+#! /bin/sh
# ----------------------------------------------------------------------------
# Default JBoss shutdown shell script. It calls the default script found
# in JBOSS_HOME/bin.
# ----------------------------------------------------------------------------
[EMAIL PROTECTED]@/bin/shutdown.sh -S
\ No newline at end of file
1.2.4.1 +1 -2 maven/src/plugins-build/jboss/src/plugin-resources/shutdown.3.0
Index: shutdown.3.0
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/jboss/src/plugin-resources/shutdown.3.0,v
retrieving revision 1.2
retrieving revision 1.2.4.1
diff -u -r1.2 -r1.2.4.1
--- shutdown.3.0 21 Jun 2003 10:55:22 -0000 1.2
+++ shutdown.3.0 18 Aug 2003 12:21:41 -0000 1.2.4.1
@@ -1,2 +1 @@
-#! /bin/sh
# ----------------------------------------------------------------------------
# Default JBoss shutdown shell script. It calls the default script found
# in JBOSS_HOME/bin.
# ----------------------------------------------------------------------------
[EMAIL PROTECTED]@/bin/shutdown @maven.jboss.hostname@
+#! /bin/sh
# ----------------------------------------------------------------------------
# Default JBoss shutdown shell script. It calls the default script found
# in JBOSS_HOME/bin.
# ----------------------------------------------------------------------------
@maven.jboss.home@/bin/shutdown.sh @maven.jboss.hostname@
\ No newline at end of file
1.2.4.1 +1 -2 maven/src/plugins-build/jboss/src/plugin-resources/run
Index: run
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/jboss/src/plugin-resources/run,v
retrieving revision 1.2
retrieving revision 1.2.4.1
diff -u -r1.2 -r1.2.4.1
--- run 21 Jun 2003 10:55:22 -0000 1.2
+++ run 18 Aug 2003 12:21:41 -0000 1.2.4.1
@@ -1,2 +1 @@
-#! /bin/sh
# ----------------------------------------------------------------------------
# Default JBoss start up shell script. It calls the default script found
# in JBOSS_HOME/bin.
# ----------------------------------------------------------------------------
-JAVA_OPTS="[EMAIL PROTECTED]@ [EMAIL PROTECTED]@"
@maven.jboss.home@/bin/run -c @maven.jboss.conf.name@
+#! /bin/sh
# ----------------------------------------------------------------------------
# Default JBoss start up shell script. It calls the default script found
# in JBOSS_HOME/bin.
# ----------------------------------------------------------------------------
export JAVA_OPTS="[EMAIL PROTECTED]@ [EMAIL PROTECTED]@"
@maven.jboss.home@/bin/run.sh -c @maven.jboss.conf.name@
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
