[Personalrobots-commit] SF.net SVN: personalrobots:[17639] pkg/trunk

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Revision: 17639
          http://personalrobots.svn.sourceforge.net/personalrobots/?rev=17639&view=rev
Author:   tpratkanis
Date:     2009-06-25 00:26:16 +0000 (Thu, 25 Jun 2009)

Log Message:
-----------
Changing launch scripts for the split.

Modified Paths:
--------------
    pkg/trunk/demos/2dnav_gazebo/manifest.xml
    pkg/trunk/demos/2dnav_gazebo/trex/run_milestone_1_gazebo.xml
    pkg/trunk/demos/2dnav_gazebo/trex/run_milestone_1_gazebo_empty.xml
    pkg/trunk/demos/milestone2/milestone2_executive/door_domain_executive.launch
    pkg/trunk/demos/milestone2/milestone2_executive/manifest.xml
    pkg/trunk/demos/test_2dnav_gazebo/manifest.xml
    pkg/trunk/highlevel/test_executive_trex_pr2/arm.0/launch.xml
    pkg/trunk/highlevel/test_executive_trex_pr2/arm.1/launch.xml
    pkg/trunk/highlevel/test_executive_trex_pr2/arm.2/launch.xml
    pkg/trunk/highlevel/test_executive_trex_pr2/manifest.xml
    pkg/trunk/highlevel/test_executive_trex_pr2/miles.0/test.xml
    pkg/trunk/highlevel/test_executive_trex_pr2/miles.2/run.xml
    pkg/trunk/highlevel/test_executive_trex_pr2/miles.2/test.xml
    pkg/trunk/highlevel/test_executive_trex_pr2/nav.0/test.xml
    pkg/trunk/highlevel/test_executive_trex_pr2/wpc.0/test.xml
    pkg/trunk/highlevel/test_executive_trex_pr2/wpc.1/test.xml
    pkg/trunk/highlevel/test_executive_trex_pr2/wpc.2/test.xml
    pkg/trunk/highlevel/test_executive_trex_pr2/wpc.3/test.xml
    pkg/trunk/highlevel/test_executive_trex_pr2/wpc_gazebo.0/run_gazebo.xml
    pkg/trunk/highlevel/test_executive_trex_pr2/wpc_gazebo.0/run_tables_gazebo.xml
    pkg/trunk/highlevel/test_executive_trex_pr2/wpc_gazebo.0/test_gazebo.xml
    pkg/trunk/highlevel/test_executive_trex_pr2/wpc_gazebo.1/run_tables_gazebo.xml

Modified: pkg/trunk/demos/2dnav_gazebo/manifest.xml
===================================================================

--- pkg/trunk/demos/2dnav_gazebo/manifest.xml	2009-06-25 00:24:08 UTC (rev 17638)
+++ pkg/trunk/demos/2dnav_gazebo/manifest.xml	2009-06-25 00:26:16 UTC (rev 17639)
@@ -14,7 +14,7 @@
   <depend package="fake_localization"/>
   <depend package="teleop_base"/>
   <depend package="teleop_arm_keyboard"/>
-  <depend package="executive_trex_pr2"/>
+  <depend package="trex_pr2"/>
   <depend package="robot_pose_ekf"/>
   <depend package="pr2_gazebo"/>
   <depend package="pr2_prototype1_gazebo"/>

Modified: pkg/trunk/demos/2dnav_gazebo/trex/run_milestone_1_gazebo.xml
===================================================================
--- pkg/trunk/demos/2dnav_gazebo/trex/run_milestone_1_gazebo.xml	2009-06-25 00:24:08 UTC (rev 17638)
+++ pkg/trunk/demos/2dnav_gazebo/trex/run_milestone_1_gazebo.xml	2009-06-25 00:26:16 UTC (rev 17639)
@@ -6,5 +6,5 @@
   <param name="/trex/input_file" value="pr2.cfg"/>
   <param name="/trex/path" value="$(find 2dnav_gazebo)/trex:$(find executive_trex_pr2)/miles_gazebo.3:$(find 2dnav_gazebo)/trex/logs:$(find executive_trex_pr2)"/>
   <param name="/trex/log_dir" value="$(find 2dnav_gazebo)/trex/logs"/>
-  <node pkg="executive_trex_pr2" type="trexfast" output="screen" />
+  <node pkg="trex_pr2" type="trexfast" output="screen" />
 </launch>

Modified: pkg/trunk/demos/2dnav_gazebo/trex/run_milestone_1_gazebo_empty.xml
===================================================================
--- pkg/trunk/demos/2dnav_gazebo/trex/run_milestone_1_gazebo_empty.xml	2009-06-25 00:24:08 UTC (rev 17638)
+++ pkg/trunk/demos/2dnav_gazebo/trex/run_milestone_1_gazebo_empty.xml	2009-06-25 00:26:16 UTC (rev 17639)
@@ -6,5 +6,5 @@
   <param name="/trex/input_file" value="pr2.cfg"/>
   <param name="/trex/path" value="$(find 2dnav_gazebo)/trex:$(find executive_trex_pr2)/miles_gazebo.3:$(find 2dnav_gazebo)/trex/logs:$(find executive_trex_pr2)"/>
   <param name="/trex/log_dir" value="$(find 2dnav_gazebo)/trex/logs"/>
-  <node pkg="executive_trex_pr2" type="trexfast" output="screen" />
+  <node pkg="trex_pr2" type="trexfast" output="screen" />
 </launch>

Modified: pkg/trunk/demos/milestone2/milestone2_executive/door_domain_executive.launch
===================================================================
--- pkg/trunk/demos/milestone2/milestone2_executive/door_domain_executive.launch	2009-06-25 00:24:08 UTC (rev 17638)
+++ pkg/trunk/demos/milestone2/milestone2_executive/door_domain_executive.launch	2009-06-25 00:26:16 UTC (rev 17639)
@@ -1,3 +1,3 @@
 <launch>
-  <include file="$(find executive_trex_pr2)/test/doors/open_door.0/run_real.launch" />
+  <include file="$(find trex_pr2)/test/doors/open_door.0/run_real.launch" />
 </launch>

Modified: pkg/trunk/demos/milestone2/milestone2_executive/manifest.xml
===================================================================
--- pkg/trunk/demos/milestone2/milestone2_executive/manifest.xml	2009-06-25 00:24:08 UTC (rev 17638)
+++ pkg/trunk/demos/milestone2/milestone2_executive/manifest.xml	2009-06-25 00:26:16 UTC (rev 17639)
@@ -5,5 +5,5 @@
   <review status="na" notes=""/>
   <url>http://pr.willowgarage.com/wiki/FIXME</url>
 
-  <depend package="executive_trex_pr2"/>
+  <depend package="trex_pr2"/>
 </package>

Modified: pkg/trunk/demos/test_2dnav_gazebo/manifest.xml
===================================================================
--- pkg/trunk/demos/test_2dnav_gazebo/manifest.xml	2009-06-25 00:24:08 UTC (rev 17638)
+++ pkg/trunk/demos/test_2dnav_gazebo/manifest.xml	2009-06-25 00:26:16 UTC (rev 17639)
@@ -10,7 +10,7 @@
   <depend package="map_server"/>
   <depend package="fake_localization"/>
   <depend package="teleop_arm_keyboard"/>
-  <depend package="executive_trex_pr2"/>
+  <depend package="trex_pr2"/>
   <depend package="robot_pose_ekf"/>
   <depend package="pr2_gazebo"/>
   <depend package="pr2_prototype1_gazebo"/>

Modified: pkg/trunk/highlevel/test_executive_trex_pr2/arm.0/launch.xml
===================================================================
--- pkg/trunk/highlevel/test_executive_trex_pr2/arm.0/launch.xml	2009-06-25 00:24:08 UTC (rev 17638)
+++ pkg/trunk/highlevel/test_executive_trex_pr2/arm.0/launch.xml	2009-06-25 00:26:16 UTC (rev 17639)
@@ -3,14 +3,14 @@
   <group name="wg">
 
     <!-- Launch the node collection for a gazebo sim -->
-    <include file="$(find executive_trex_pr2)/cfg/launch_gazebo.xml"/>
+    <include file="$(find trex_pr2)/cfg/launch_gazebo.xml"/>
 
     <param name="/trex/input_file" value="pr2.cfg"/>
-    <param name="/trex/path" value="$(find executive_trex_pr2)/cfg:$(find test_executive_trex_pr2)/arm.0"/>
+    <param name="/trex/path" value="$(find trex_pr2)/cfg:$(find executive_trex_pr2)/cfg:$(find test_executive_trex_pr2)/arm.0"/>
     <param name="/trex/time_limit" value="20"/>
     <param name="/trex/log_dir" value="$(find test_executive_trex_pr2)/arm.0"/>
     <param name="/trex/play_back" value="0"/>
-    <test test-name="executive_trex_arm.0" pkg="executive_trex_pr2" type="trexdebug" time-limit="200" />
+    <test test-name="executive_trex_arm.0" pkg="trex_pr2" type="trexdebug" time-limit="200" />
 
   </group>
 </launch>

Modified: pkg/trunk/highlevel/test_executive_trex_pr2/arm.1/launch.xml
===================================================================
--- pkg/trunk/highlevel/test_executive_trex_pr2/arm.1/launch.xml	2009-06-25 00:24:08 UTC (rev 17638)
+++ pkg/trunk/highlevel/test_executive_trex_pr2/arm.1/launch.xml	2009-06-25 00:26:16 UTC (rev 17639)
@@ -3,14 +3,14 @@
   <group name="wg">
 
     <!-- Launch the node collection for a gazebo sim -->
-    <include file="$(find executive_trex_pr2)/cfg/launch_gazebo_obstacle.xml"/>
+    <include file="$(find trex_pr2)/cfg/launch_gazebo_obstacle.xml"/>
 
     <param name="/trex/input_file" value="pr2.cfg"/>
-    <param name="/trex/path" value="$(find executive_trex_pr2)/cfg:$(find test_executive_trex_pr2)/arm.1"/>
+    <param name="/trex/path" value="$(find trex_pr2)/cfg:$(find executive_trex_pr2)/cfg:$(find test_executive_trex_pr2)/arm.1"/>
     <param name="/trex/time_limit" value="500"/>
     <param name="/trex/log_dir" value="$(find test_executive_trex_pr2)/arm.1"/>
     <param name="/trex/play_back" value="0"/>
-    <!--node pkg="executive_trex_pr2" type="trexfast" args="$(find executive_trex_pr2)/cfg/pr2.cfg" respawn="false" /-->
+    <!--node pkg="trex_pr2" type="trexfast" args="$(find executive_trex_pr2)/cfg/pr2.cfg" respawn="false" /-->
 
   </group>
 </launch>

Modified: pkg/trunk/highlevel/test_executive_trex_pr2/arm.2/launch.xml
===================================================================
--- pkg/trunk/highlevel/test_executive_trex_pr2/arm.2/launch.xml	2009-06-25 00:24:08 UTC (rev 17638)
+++ pkg/trunk/highlevel/test_executive_trex_pr2/arm.2/launch.xml	2009-06-25 00:26:16 UTC (rev 17639)
@@ -3,15 +3,15 @@
   <group name="wg">
 
     <!-- Launch the node collection for a gazebo sim -->
-    <include file="$(find executive_trex_pr2)/cfg/launch_gazebo.xml"/>
+    <include file="$(find trex_pr2)/cfg/launch_gazebo.xml"/>
     
 
     <param name="/trex/input_file" value="pr2.cfg"/>
-    <param name="/trex/path" value="$(find executive_trex_pr2)/cfg:$(find test_executive_trex_pr2)/arm.2"/>
+    <param name="/trex/path" value="$(find trex_pr2)/cfg:$(find test_executive_trex_pr2)/arm.2"/>
     <param name="/trex/time_limit" value="500"/>
     <param name="/trex/log_dir" value="$(find test_executive_trex_pr2)/arm.2"/>
     <param name="/trex/play_back" value="0"/>
-    <node pkg="executive_trex_pr2" type="trexfast" args="$(find executive_trex_pr2)/cfg/pr2.cfg" respawn="false" />
+    <node pkg="trex_pr2" type="trexfast" args="$(find trex_pr2)/cfg/pr2.cfg" respawn="false" />
 
   </group>
 </launch>

Modified: pkg/trunk/highlevel/test_executive_trex_pr2/manifest.xml
===================================================================
--- pkg/trunk/highlevel/test_executive_trex_pr2/manifest.xml	2009-06-25 00:24:08 UTC (rev 17638)
+++ pkg/trunk/highlevel/test_executive_trex_pr2/manifest.xml	2009-06-25 00:26:16 UTC (rev 17639)
@@ -10,7 +10,7 @@
  <url>http://pr.willowgarage.com</url>
 
  <!--depend package="highlevel_controllers"/ Removed see ticket:1235-->
- <depend package="executive_trex_pr2"/>
+ <depend package="trex_pr2"/>
  <depend package="fake_localization"/>
  <depend package="map_server"/>
  <depend package="nav_view"/>

Modified: pkg/trunk/highlevel/test_executive_trex_pr2/miles.0/test.xml
===================================================================
--- pkg/trunk/highlevel/test_executive_trex_pr2/miles.0/test.xml	2009-06-25 00:24:08 UTC (rev 17638)
+++ pkg/trunk/highlevel/test_executive_trex_pr2/miles.0/test.xml	2009-06-25 00:26:16 UTC (rev 17639)
@@ -2,8 +2,8 @@
   <master auto="start"/>
   <include file="$(find test_executive_trex_pr2)/cfg/launch_stage.xml" />
   <param name="/trex/input_file" value="nav.cfg"/>
-  <param name="/trex/path" value="$(find executive_trex_pr2)/cfg:$(find test_executive_trex_pr2)/miles.0"/>
+  <param name="/trex/path" value="$(find trex_pr2)/cfg:$(find executive_trex_pr2)/cfg:$(find test_executive_trex_pr2)/miles.0"/>
   <param name="/trex/time_limit" value="45"/>
   <param name="/trex/log_dir" value="$(find test_executive_trex_pr2)/miles.0"/>
-  <test test-name="executive_trex_miles.0" pkg="executive_trex_pr2" type="trexdebug" time-limit="60"/>
+  <test test-name="executive_trex_miles.0" pkg="trex_pr2" type="trexdebug" time-limit="60"/>
 </launch>

Modified: pkg/trunk/highlevel/test_executive_trex_pr2/miles.2/run.xml
===================================================================
--- pkg/trunk/highlevel/test_executive_trex_pr2/miles.2/run.xml	2009-06-25 00:24:08 UTC (rev 17638)
+++ pkg/trunk/highlevel/test_executive_trex_pr2/miles.2/run.xml	2009-06-25 00:26:16 UTC (rev 17639)
@@ -1,7 +1,7 @@
 <launch>
   <master auto="start"/>
   <param name="/trex/input_file" value="nav.cfg"/>
-  <param name="/trex/path" value="$(find executive_trex_pr2)/cfg:$(find test_executive_trex_pr2)/miles.2"/>
+  <param name="/trex/path" value="$(find trex_pr2)/cfg:$(find executive_trex_pr2)/cfg:$(find test_executive_trex_pr2)/miles.2"/>
   <param name="/trex/log_dir" value="$(find test_executive_trex_pr2)/miles.2"/>
-  <node pkg="executive_trex_pr2" type="trexfast"/>
+  <node pkg="trex_pr2" type="trexfast"/>
 </launch>

Modified: pkg/trunk/highlevel/test_executive_trex_pr2/miles.2/test.xml
===================================================================
--- pkg/trunk/highlevel/test_executive_trex_pr2/miles.2/test.xml	2009-06-25 00:24:08 UTC (rev 17638)
+++ pkg/trunk/highlevel/test_executive_trex_pr2/miles.2/test.xml	2009-06-25 00:26:16 UTC (rev 17639)
@@ -2,8 +2,8 @@
   <master auto="start"/>
   <include file="$(find test_executive_trex_pr2)/cfg/launch_stage.xml" />
   <param name="/trex/input_file" value="nav.cfg"/>
-  <param name="/trex/path" value="$(find executive_trex_pr2)/cfg:$(find test_executive_trex_pr2)/miles.2"/>
+  <param name="/trex/path" value="$(find trex_pr2)/cfg:$(find executive_trex_pr2)/cfg:$(find test_executive_trex_pr2)/miles.2"/>
   <param name="/trex/time_limit" value="500"/>
   <param name="/trex/log_dir" value="$(find test_executive_trex_pr2)/miles.2"/>
-  <test test-name="executive_trex_miles.2" pkg="executive_trex_pr2" type="trexdebug" time-limit="600"/>
+  <test test-name="executive_trex_miles.2" pkg="trex_pr2" type="trexdebug" time-limit="600"/>
 </launch>

Modified: pkg/trunk/highlevel/test_executive_trex_pr2/nav.0/test.xml
===================================================================
--- pkg/trunk/highlevel/test_executive_trex_pr2/nav.0/test.xml	2009-06-25 00:24:08 UTC (rev 17638)
+++ pkg/trunk/highlevel/test_executive_trex_pr2/nav.0/test.xml	2009-06-25 00:26:16 UTC (rev 17639)
@@ -1,10 +1,10 @@
 <launch>
   <master auto="start"/>
-  <include file="$(find executive_trex_pr2)/cfg/launch_stage.xml" />
+  <include file="$(find trex_pr2)/cfg/launch_stage.xml" />
   <param name="/trex/input_file" value="nav.cfg"/>
-  <param name="/trex/path" value="$(find executive_trex_pr2)/cfg:$(find test_executive_trex_pr2)/nav.0"/>
+  <param name="/trex/path" value="$(find executive_trex_pr2)/cfg:$(find trex_pr2)/cfg:$(find test_executive_trex_pr2)/nav.0"/>
   <param name="/trex/time_limit" value="15"/>
   <param name="/trex/log_dir" value="$(find test_executive_trex_pr2)/nav.0"/>
   <param name="/trex/play_back" value="0"/>
-  <test test-name="executive_trex_nav.0" pkg="executive_trex_pr2" type="trexdebug" time-limit="30"/>
+  <test test-name="executive_trex_nav.0" pkg="trex_pr2" type="trexdebug" time-limit="30"/>
 </launch>

Modified: pkg/trunk/highlevel/test_executive_trex_pr2/wpc.0/test.xml
===================================================================
--- pkg/trunk/highlevel/test_executive_trex_pr2/wpc.0/test.xml	2009-06-25 00:24:08 UTC (rev 17638)
+++ pkg/trunk/highlevel/test_executive_trex_pr2/wpc.0/test.xml	2009-06-25 00:26:16 UTC (rev 17639)
@@ -2,9 +2,9 @@
   <master auto="start"/>
   <include file="$(find test_executive_trex_pr2)/cfg/launch_stage.xml" />
   <param name="/trex/input_file" value="nav.cfg"/>
-  <param name="/trex/path" value="$(find executive_trex_pr2)/cfg:$(find test_executive_trex_pr2)/wpc.0"/>
+  <param name="/trex/path" value="$(find executive_trex_pr2)/cfg:$(find trex_pr2)/cfg:$(find test_executive_trex_pr2)/wpc.0"/>
   <param name="/trex/time_limit" value="20"/>
   <param name="/trex/log_dir" value="$(find test_executive_trex_pr2)/wpc.0"/>
   <param name="/trex/play_back" value="0"/>
-  <test test-name="executive_trex_wpc_0" pkg="executive_trex_pr2" type="trexdebug" time-limit="400"/>
+  <test test-name="executive_trex_wpc_0" pkg="trex_pr2" type="trexdebug" time-limit="400"/>
 </launch>

Modified: pkg/trunk/highlevel/test_executive_trex_pr2/wpc.1/test.xml
===================================================================
--- pkg/trunk/highlevel/test_executive_trex_pr2/wpc.1/test.xml	2009-06-25 00:24:08 UTC (rev 17638)
+++ pkg/trunk/highlevel/test_executive_trex_pr2/wpc.1/test.xml	2009-06-25 00:26:16 UTC (rev 17639)
@@ -2,9 +2,9 @@
   <master auto="start"/>
   <include file="$(find test_executive_trex_pr2)/cfg/launch_stage.xml" />
   <param name="/trex/input_file" value="nav.cfg"/>
-  <param name="/trex/path" value="$(find executive_trex_pr2)/cfg:$(find test_executive_trex_pr2)/wpc.1"/>
+  <param name="/trex/path" value="$(find executive_trex_pr2)/cfg:$(find trex_pr2)/cfg:$(find test_executive_trex_pr2)/wpc.1"/>
   <param name="/trex/time_limit" value="90"/>
   <param name="/trex/log_dir" value="$(find test_executive_trex_pr2)/wpc.1"/>
   <param name="/trex/play_back" value="0"/>
-  <test test-name="executive_trex_wpc_1" pkg="executive_trex_pr2" type="trexdebug" time-limit="400"/>
+  <test test-name="executive_trex_wpc_1" pkg="trex_pr2" type="trexdebug" time-limit="400"/>
 </launch>

Modified: pkg/trunk/highlevel/test_executive_trex_pr2/wpc.2/test.xml
===================================================================
--- pkg/trunk/highlevel/test_executive_trex_pr2/wpc.2/test.xml	2009-06-25 00:24:08 UTC (rev 17638)
+++ pkg/trunk/highlevel/test_executive_trex_pr2/wpc.2/test.xml	2009-06-25 00:26:16 UTC (rev 17639)
@@ -2,8 +2,8 @@
   <master auto="start"/>
   <include file="$(find test_executive_trex_pr2)/cfg/launch_stage.xml" />
   <param name="/trex/input_file" value="nav.cfg"/>
-  <param name="/trex/path" value="$(find executive_trex_pr2)/cfg:$(find test_executive_trex_pr2)/wpc.2"/>
+  <param name="/trex/path" value="$(find executive_trex_pr2)/cfg:$(find trex_pr2)/cfg:$(find test_executive_trex_pr2)/wpc.2"/>
   <param name="/trex/time_limit" value="20"/>
   <param name="/trex/log_dir" value="$(find test_executive_trex_pr2)/wpc.2"/>
-  <test test-name="executive_trex_wpc_2" pkg="executive_trex_pr2" type="trexdebug" time-limit="400"/>
+  <test test-name="executive_trex_wpc_2" pkg="trex_pr2" type="trexdebug" time-limit="400"/>
 </launch>

Modified: pkg/trunk/highlevel/test_executive_trex_pr2/wpc.3/test.xml
===================================================================
--- pkg/trunk/highlevel/test_executive_trex_pr2/wpc.3/test.xml	2009-06-25 00:24:08 UTC (rev 17638)
+++ pkg/trunk/highlevel/test_executive_trex_pr2/wpc.3/test.xml	2009-06-25 00:26:16 UTC (rev 17639)
@@ -2,9 +2,9 @@
   <master auto="start"/>
   <include file="$(find test_executive_trex_pr2)/cfg/launch_stage.xml" />
   <param name="/trex/input_file" value="nav.cfg"/>
-  <param name="/trex/path" value="$(find executive_trex_pr2)/cfg:$(find test_executive_trex_pr2)/wpc.3"/>
+  <param name="/trex/path" value="$(find trex_pr2)/cfg:(find executive_trex_pr2)/cfg:$(find test_executive_trex_pr2)/wpc.3"/>
   <param name="/trex/time_limit" value="45"/>
   <param name="/trex/log_dir" value="$(find test_executive_trex_pr2)/wpc.3"/>
   <param name="/trex/play_back" value="0"/>
-  <test test-name="executive_trex_wpc_3" pkg="executive_trex_pr2" type="trexdebug" time-limit="400"/>
+  <test test-name="executive_trex_wpc_3" pkg="trex_pr2" type="trexdebug" time-limit="400"/>
 </launch>

Modified: pkg/trunk/highlevel/test_executive_trex_pr2/wpc_gazebo.0/run_gazebo.xml
===================================================================
--- pkg/trunk/highlevel/test_executive_trex_pr2/wpc_gazebo.0/run_gazebo.xml	2009-06-25 00:24:08 UTC (rev 17638)
+++ pkg/trunk/highlevel/test_executive_trex_pr2/wpc_gazebo.0/run_gazebo.xml	2009-06-25 00:26:16 UTC (rev 17639)
@@ -2,10 +2,10 @@
   <master auto="start"/>
   <include file="$(find test_executive_trex_pr2)/wpc_gazebo.0/launch_gazebo_prototype1_wg.xml" />
   <param name="/trex/input_file" value="nav_gazebo.cfg"/>
-  <param name="/trex/path" value="$(find test_executive_trex_pr2)/wpc_gazebo.0:$(find executive_trex_pr2)/cfg"/>
+  <param name="/trex/path" value="$(find test_executive_trex_pr2)/wpc_gazebo.0:$(find executive_trex_pr2)/cfg:$(find trex_pr2)/cfg"/>
   <param name="/trex/time_limit" value="20"/>
   <param name="/trex/log_dir" value="$(find test_executive_trex_pr2)/wpc_gazebo.0"/>
   <param name="/trex/play_back" value="0"/>
-  <node pkg="executive_trex_pr2" type="trexfast" />
-  <test test-name="executive_trex_wpc.0" pkg="executive_trex_pr2" type="trexdebug" time-limit="40"/>
+  <node pkg="trex_pr2" type="trexfast" />
+  <test test-name="executive_trex_wpc.0" pkg="trex_pr2" type="trexdebug" time-limit="40"/>
 </launch>

Modified: pkg/trunk/highlevel/test_executive_trex_pr2/wpc_gazebo.0/run_tables_gazebo.xml
===================================================================
--- pkg/trunk/highlevel/test_executive_trex_pr2/wpc_gazebo.0/run_tables_gazebo.xml	2009-06-25 00:24:08 UTC (rev 17638)
+++ pkg/trunk/highlevel/test_executive_trex_pr2/wpc_gazebo.0/run_tables_gazebo.xml	2009-06-25 00:26:16 UTC (rev 17639)
@@ -2,10 +2,10 @@
   <master auto="start"/>
   <include file="$(find test_executive_trex_pr2)/wpc_gazebo.0/launch_gazebo_prototype1_tables_no_x.xml" />
   <param name="/trex/input_file" value="nav_gazebo.cfg"/>
-  <param name="/trex/path" value="$(find test_executive_trex_pr2)/wpc_gazebo.0:$(find executive_trex_pr2)/cfg"/>
+  <param name="/trex/path" value="$(find test_executive_trex_pr2)/wpc_gazebo.0:$(find trex_pr2)/cfg:$(find executive_trex_pr2)/cfg"/>
   <param name="/trex/time_limit" value="20"/>
   <param name="/trex/log_dir" value="$(find test_executive_trex_pr2)/wpc_gazebo.0"/>
   <param name="/trex/play_back" value="0"/>
-  <node pkg="executive_trex_pr2" type="trexfast" />
-  <test test-name="executive_trex_wpc.0" pkg="executive_trex_pr2" type="trexdebug" time-limit="40"/>
+  <node pkg="trex_pr2" type="trexfast" />
+  <test test-name="executive_trex_wpc.0" pkg="trex_pr2" type="trexdebug" time-limit="40"/>
 </launch>

Modified: pkg/trunk/highlevel/test_executive_trex_pr2/wpc_gazebo.0/test_gazebo.xml
===================================================================
--- pkg/trunk/highlevel/test_executive_trex_pr2/wpc_gazebo.0/test_gazebo.xml	2009-06-25 00:24:08 UTC (rev 17638)
+++ pkg/trunk/highlevel/test_executive_trex_pr2/wpc_gazebo.0/test_gazebo.xml	2009-06-25 00:26:16 UTC (rev 17639)
@@ -2,9 +2,9 @@
   <master auto="start"/>
   <include file="$(find test_executive_trex_pr2)/wpc_gazebo.0/launch_gazebo_prototype1_tables_no_x.xml" />
   <param name="/trex/input_file" value="nav_gazebo.cfg"/>
-  <param name="/trex/path" value="$(find test_executive_trex_pr2)/wpc_gazebo.0:$(find executive_trex_pr2)/cfg"/>
+  <param name="/trex/path" value="$(find test_executive_trex_pr2)/wpc_gazebo.0:$(find trex_pr2)/cfg:$(find executive_trex_pr2)/cfg"/>
   <param name="/trex/time_limit" value="20"/>
   <param name="/trex/log_dir" value="$(find test_executive_trex_pr2)/wpc_gazebo.0"/>
   <param name="/trex/play_back" value="0"/>
-  <test test-name="executive_trex_wpc.0" pkg="executive_trex_pr2" type="trexdebug" time-limit="80"/>
+  <test test-name="executive_trex_wpc.0" pkg="trex_pr2" type="trexdebug" time-limit="80"/>
 </launch>

Modified: pkg/trunk/highlevel/test_executive_trex_pr2/wpc_gazebo.1/run_tables_gazebo.xml
===================================================================
--- pkg/trunk/highlevel/test_executive_trex_pr2/wpc_gazebo.1/run_tables_gazebo.xml	2009-06-25 00:24:08 UTC (rev 17638)
+++ pkg/trunk/highlevel/test_executive_trex_pr2/wpc_gazebo.1/run_tables_gazebo.xml	2009-06-25 00:26:16 UTC (rev 17639)
@@ -3,11 +3,11 @@
   <!--include file="$(find executive_trex_pr2)/wpc_gazebo.1/launch_gazebo_prototype1_tables_no_x.xml" /-->
   <include file="$(find test_executive_trex_pr2)/wpc_gazebo.1/launch_gazebo_prototype1_wg_no_x.xml" />
   <param name="/trex/input_file" value="nav_gazebo.cfg"/>
-  <param name="/trex/path" value="$(find test_executive_trex_pr2)/wpc_gazebo.1:$(find executive_trex_pr2)/cfg"/>
+  <param name="/trex/path" value="$(find test_executive_trex_pr2)/wpc_gazebo.1:$(find executive_trex_pr2)/cfg:$(find trex_pr2)/cfg"/>
   <param name="/trex/time_limit" value="2000"/>
   <param name="/trex/log_dir" value="$(find test_executive_trex_pr2)/wpc_gazebo.1"/>
   <param name="/trex/play_back" value="0"/>
-  <node pkg="executive_trex_pr2" type="trexfast" />
+  <node pkg="trex_pr2" type="trexfast" />
   <node pkg="ogre_visualizer" type="standalone_visualizer.py" />
-  <test test-name="executive_trex_wpc.1" pkg="executive_trex_pr2" type="trexdebug" time-limit="40"/>
+  <test test-name="trex_wpc.1" pkg="trex_pr2" type="trexdebug" time-limit="40"/>
 </launch>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


