[jboss-cvs] JBossAS SVN: r105675 - branches/JBPAPP_5_1/main/src/bin.

[jboss-cvs-commits at lists.jboss.org]

Author: permaine
Date: 2010-06-03 13:10:14 -0400 (Thu, 03 Jun 2010)
New Revision: 105675

Modified:
   branches/JBPAPP_5_1/main/src/bin/run.bat
   branches/JBPAPP_5_1/main/src/bin/run.sh
Log:
JBPAPP-4399 Consolidate the location of native zips for EAP and EWP

Modified: branches/JBPAPP_5_1/main/src/bin/run.bat
===================================================================
--- branches/JBPAPP_5_1/main/src/bin/run.bat	2010-06-03 17:00:05 UTC (rev 105674)
+++ branches/JBPAPP_5_1/main/src/bin/run.bat	2010-06-03 17:10:14 UTC (rev 105675)
@@ -68,6 +68,8 @@
   set "CHECK_NATIVE_HOME=%JBOSS_HOME%\..\native\bin"
 ) else if exist "%JBOSS_HOME%\bin\native\bin" (
   set "CHECK_NATIVE_HOME=%JBOSS_HOME%\bin\native\bin"
+) else if exist "%JBOSS_HOME%\..\..\jboss-ep-5.1\native\bin" (
+  set "CHECK_NATIVE_HOME=%JBOSS_HOME%\..\..\jboss-ep-5.1\native\bin"
 )
 if "x%CHECK_NATIVE_HOME%" == "x" goto WITHOUT_JBOSS_NATIVE
 

Modified: branches/JBPAPP_5_1/main/src/bin/run.sh
===================================================================
--- branches/JBPAPP_5_1/main/src/bin/run.sh	2010-06-03 17:00:05 UTC (rev 105674)
+++ branches/JBPAPP_5_1/main/src/bin/run.sh	2010-06-03 17:10:14 UTC (rev 105675)
@@ -210,6 +210,8 @@
     JBOSS_NATIVE_DIR=`cd "$JBOSS_HOME/../native" && pwd`
 elif [ -d "$JBOSS_HOME/native/lib64" ]; then
     JBOSS_NATIVE_DIR=`cd "$JBOSS_HOME/native" && pwd`
+elif [ -d "$JBOSS_HOME/../../jboss-ep-5.1/native" ]; then
+    JBOSS_NATIVE_DIR=`cd "$JBOSS_HOME/../../jboss-ep-5.1/native" && pwd`
 fi
 if [ -d "$JBOSS_NATIVE_DIR" ]; then
     if $cygwin; then