Title: [2509] trunk/openejb1: Should work on windows now
- Revision
- 2509
- Author
- dblevins
- Date
- 2006-02-25 19:30:21 -0500 (Sat, 25 Feb 2006)
Log Message
Should work on windows now
Modified Paths
Diff
Modified: trunk/openejb1/README.txt (2508 => 2509)
--- trunk/openejb1/README.txt 2006-02-25 19:45:04 UTC (rev 2508)
+++ trunk/openejb1/README.txt 2006-02-26 00:30:21 UTC (rev 2509)
@@ -9,20 +9,10 @@
If you are reading this, you've already unpacked the OpenEJB release.
In that case, congratulations, you've installed OpenEJB.
-
- If you've unpacked OpenEJB into the directory C:\openejb, for example.
- Than this directory is your OPENEJB_HOME directory. The OPENEJB_HOME
- directory is refered to in various parts of the documentation, so it's
- good to remeber where it is.
- Add OPENEJB_HOME/bin directory to your PATH environment variable:
+ The scripts for starting, stopping, and deploying in openejb are located
+ in the bin directory under where OpenEJB was installed.
- set PATH=%OPENEJB_HOME%/bin;%PATH%
-
- or
-
- export PATH=$OPENEJB_HOME/bin:$PATH
-
___________________
Using OpenEJB
===================
@@ -33,11 +23,11 @@
For Windows users, that looks like this:
- C:\openejb> openejb help
+ C:\openejb\bin> openejb help
For UNIX/Linux/Mac OS X users, that looks like this:
- [EMAIL PROTECTED] openejb]# openejb help
+ [EMAIL PROTECTED] openejb/bin]# openejb help
You really only need to know two commands to use OpenEJB, deploy
and start. Both are completely documented and have examples.
Modified: trunk/openejb1/maven.xml (2508 => 2509)
--- trunk/openejb1/maven.xml 2006-02-25 19:45:04 UTC (rev 2508)
+++ trunk/openejb1/maven.xml 2006-02-26 00:30:21 UTC (rev 2509)
@@ -615,18 +615,46 @@
-->
<goal name="start:tomcat">
- <exec executable="${tomcat.home}/bin/startup.sh">
- </exec>
+ <j:choose>
+ <j:when test="${systemScope['os.name'].startsWith('Windows')}">
+ <exec executable="${tomcat.home}/bin/startup.bat" os="Windows NT,Windows 2000,Windows XP">
+ <env key="CATALINA_HOME" value="${tomcat.home}"/>
+ </exec>
+ </j:when>
+ <j:otherwise>
+ <exec executable="${tomcat.home}/bin/startup.sh"/>
+ </j:otherwise>
+ </j:choose>
</goal>
<goal name="start:tomcat-debug">
- <exec executable="${tomcat.home}/bin/startup.sh">
- <env key="JAVA_OPTS" value="-Dopenejb.home=${openejb.home} -Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005"/>
- </exec>
+ <j:choose>
+ <j:when test="${systemScope['os.name'].startsWith('Windows')}">
+ <exec executable="${tomcat.home}/bin/startup.bat" os="Windows NT,Windows 2000,Windows XP">
+ <env key="JAVA_OPTS" value="-Dopenejb.home=${openejb.home} -Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005"/>
+ <env key="CATALINA_HOME" value="${tomcat.home}"/>
+ </exec>
+ </j:when>
+ <j:otherwise>
+ <exec executable="${tomcat.home}/bin/startup.sh">
+ <env key="JAVA_OPTS" value="-Dopenejb.home=${openejb.home} -Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005"/>
+ </exec>
+ </j:otherwise>
+ </j:choose>
</goal>
<goal name="stop:tomcat">
- <exec executable="${tomcat.home}/bin/shutdown.sh" />
+ <j:choose>
+ <j:when test="${systemScope['os.name'].startsWith('Windows')}">
+ <exec executable="${tomcat.home}/bin/shutdown.bat"
+ os="Windows NT,Windows 2000,Windows XP">
+ <env key="CATALINA_HOME" value="${tomcat.home}"/>
+ </exec>
+ </j:when>
+ <j:otherwise>
+ <exec executable="${tomcat.home}/bin/shutdown.sh" />
+ </j:otherwise>
+ </j:choose>
</goal>
<goal name="tomcat.env">
