From a6ed2846a0f3fc1b2ccc8513eefad4659711eb3f Mon Sep 17 00:00:00 2001
From: Carlos Ruiz <carg67@gmail.com>
Date: Thu, 20 Dec 2012 12:14:59 -0500
Subject: [PATCH] IDEMPIERE-206 Integrate fitnesse with iDempiere / Make root
 page use env variables

---
 fitnesse/FitNesseRoot/RecentChanges/content.txt | 2 +-
 fitnesse/FitNesseRoot/content.txt               | 6 ++----
 fitnesse/iDempiereFitNesse.launch               | 4 ++++
 fitnesse/run.sh                                 | 6 ++++--
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/fitnesse/FitNesseRoot/RecentChanges/content.txt b/fitnesse/FitNesseRoot/RecentChanges/content.txt
index 02b70e328a..ea72a69fd5 100644
--- a/fitnesse/FitNesseRoot/RecentChanges/content.txt
+++ b/fitnesse/FitNesseRoot/RecentChanges/content.txt
@@ -1,10 +1,10 @@
+|||12:04:00 jue, dic 20, 2012|
 |FitLibraryWeb||01:41:13 Thu, Dec 13, 2012|
 |FitLibrary||01:40:51 Thu, Dec 13, 2012|
 |FrontPage||01:40:10 Thu, Dec 13, 2012|
 |FrontPage.ZkMultiClientLogin||01:36:38 Thu, Dec 13, 2012|
 |FrontPage.ZkSingleClientLogin||01:32:27 Thu, Dec 13, 2012|
 |FrontPage.ZkLogin||24:39:17 Thu, Dec 13, 2012|
-|||14:45:31 Wed, Dec 12, 2012|
 |CommonTests.CreateMaterialReceipt||01:36:56 mar, abr 03, 2012|
 |CommonTests.CreateProductPrice||01:29:57 mar, abr 03, 2012|
 |AvgCostSuite.BasicTest||01:18:34 mar, abr 03, 2012|
diff --git a/fitnesse/FitNesseRoot/content.txt b/fitnesse/FitNesseRoot/content.txt
index 9a43736a3f..01c45bbb9d 100644
--- a/fitnesse/FitNesseRoot/content.txt
+++ b/fitnesse/FitNesseRoot/content.txt
@@ -2,8 +2,6 @@ Define the global path:
 
 Where to find the fixtures classes: ( i.e. /home/hengsin/workspace/idempiere-trekglobal/fitnesse/bin )
 
-!define fitnesse_home {/home/hengsin/workspace/idempiere-trekglobal/fitnesse}
-
 !path ${fitnesse_home}/fitnesse.jar:${fitnesse_home}/lib/*.jar:${fitnesse_home}/bin
 
 Define the command to access iDempiere fitnesse servlet
@@ -16,10 +14,10 @@ There are some important variables here:
 This variables can be redefined specifically at page level.
 
 !define TEST_RUNNER {fitnesse.client.FitServerServletInvoker}
-!define COMMAND_PATTERN {java -Xms32m -Xmx512m -DLOG4J_LEVEL=CONFIG -cp %p %m http://localhost:8080/fitnesse/FitServlet}
+!define COMMAND_PATTERN {java -Xms32m -Xmx512m -DLOG4J_LEVEL=CONFIG -cp %p %m http://localhost:${ADEMPIERE_WEB_PORT}/fitnesse/FitServlet}
 
 To enable remote debugging the tests will stop until you connect remotely via eclipse using RemoteADempiereFitnesse.launch
 
 You must add this to the URL ?responder=test&remote_debug=true
 
-!define REMOTE_DEBUG_COMMAND {java -Xms32m -Xmx512m -DLOG4J_LEVEL=ALL -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=1044 -cp %p %m http://localhost:8080/fitnesse/FitServlet}
+!define REMOTE_DEBUG_COMMAND {java -Xms32m -Xmx512m -DLOG4J_LEVEL=ALL -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=1044 -cp %p %m http://localhost:${ADEMPIERE_WEB_PORT}/fitnesse/FitServlet}
diff --git a/fitnesse/iDempiereFitNesse.launch b/fitnesse/iDempiereFitNesse.launch
index 1bf891a78d..aa560c71d9 100644
--- a/fitnesse/iDempiereFitNesse.launch
+++ b/fitnesse/iDempiereFitNesse.launch
@@ -6,6 +6,10 @@
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
 <listEntry value="1"/>
 </listAttribute>
+<mapAttribute key="org.eclipse.debug.core.environmentVariables">
+<mapEntry key="ADEMPIERE_WEB_PORT" value="${ADEMPIERE_WEB_PORT}"/>
+<mapEntry key="fitnesse_home" value="${workspace_loc}/fitnesse"/>
+</mapAttribute>
 <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="fitnesseMain.FitNesseMain"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-p 8089 -l log"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="fitnesse"/>
diff --git a/fitnesse/run.sh b/fitnesse/run.sh
index 1f88c30eaa..2999ddd949 100755
--- a/fitnesse/run.sh
+++ b/fitnesse/run.sh
@@ -38,10 +38,12 @@ do
 	esac
 	shift
 done
+
+export fitnesse_home=`dirname $0`
+eval "export `grep ADEMPIERE_WEB_PORT $fitnesse_home/../idempiereEnv.properties`"
+
 jvm_args[${#jvm_args[*]}]="-jar"
 jvm_args[${#jvm_args[*]}]="fitnesse.jar"
 
 echo java ${jvm_args[*]} ${fitnesse_args[*]}
 java -Xmx100M ${jvm_args[*]} -p 8089 -l log ${fitnesse_args[*]}
-
-