Changeset 21018
- Timestamp:
- 02/09/08 20:58:14 (7 months ago)
- Files:
-
- juggler/trunk/modules/vrjuggler/configure.ac (modified) (1 diff)
- juggler/trunk/modules/vrjuggler/data/configFiles/C4.base.jconf (modified) (1 diff)
- juggler/trunk/modules/vrjuggler/data/configFiles/example.sim.cluster.jconf (modified) (1 diff)
- juggler/trunk/modules/vrjuggler/data/configFiles/powerwall_18x8.jconf (modified) (1 diff)
- juggler/trunk/modules/vrjuggler/data/configFiles/sim.analog.mixin.jconf (modified) (1 diff)
- juggler/trunk/modules/vrjuggler/data/configFiles/sim.base.jconf (modified) (1 diff)
- juggler/trunk/modules/vrjuggler/data/configFiles/simstandalone.jconf (modified) (1 diff)
- juggler/trunk/modules/vrjuggler/data/configFiles/standalone.jconf (modified) (1 diff)
- juggler/trunk/modules/vrjuggler/data/definitions/corba_performance_monitor.jdef (modified) (1 diff)
- juggler/trunk/modules/vrjuggler/data/definitions/corba_remote_reconfig.jdef (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
juggler/trunk/modules/vrjuggler/configure.ac
r20974 r21018 174 174 VPR_PATH([2.1.4], , [AC_MSG_ERROR(*** VPR required for VR Juggler ***)]) 175 175 176 JCCL_PATH_CXX([1. 1.5], ,176 JCCL_PATH_CXX([1.3.5], , 177 177 [AC_MSG_ERROR(*** JCCL C++ API required for VR Juggler ***)]) 178 178 GADGETEER_PATH([1.3.15], , juggler/trunk/modules/vrjuggler/data/configFiles/C4.base.jconf
r20414 r21018 50 50 <sleep_time>75</sleep_time> 51 51 </input_window> 52 <corba_remote_reconfig name="CORBA Remote Run-Time Reconfiguration" version="1"> 53 <naming_service_host>localhost</naming_service_host> 54 <naming_service_port>2809</naming_service_port> 55 <iiop_version>1.0</iiop_version> 52 <corba_remote_reconfig name="CORBA Remote Run-Time Reconfiguration" version="2"> 53 <endpoint_addr /> 54 <endpoint_port>45876</endpoint_port> 56 55 </corba_remote_reconfig> 57 56 </elements> juggler/trunk/modules/vrjuggler/data/configFiles/example.sim.cluster.jconf
r20757 r21018 472 472 </key_pair> 473 473 </simulated_digital_device> 474 <corba_remote_reconfig name="CORBA Remote Run-Time Reconfiguration" version="1"> 475 <naming_service_host>localhost</naming_service_host> 476 <naming_service_port>2809</naming_service_port> 477 <iiop_version>1.0</iiop_version> 474 <corba_remote_reconfig name="CORBA Remote Run-Time Reconfiguration" version="2"> 475 <endpoint_addr /> 476 <endpoint_port>45876</endpoint_port> 478 477 </corba_remote_reconfig> 479 478 <alias name="VJWand" version="1"> juggler/trunk/modules/vrjuggler/data/configFiles/powerwall_18x8.jconf
r20414 r21018 568 568 <sleep_time>75</sleep_time> 569 569 </display_window> 570 <corba_remote_reconfig name="CORBA Remote Run-Time Reconfiguration" version="1"> 571 <naming_service_host>localhost</naming_service_host> 572 <naming_service_port>2809</naming_service_port> 573 <iiop_version>1.0</iiop_version> 570 <corba_remote_reconfig name="CORBA Remote Run-Time Reconfiguration" version="2"> 571 <endpoint_addr /> 572 <endpoint_port>45876</endpoint_port> 574 573 </corba_remote_reconfig> 575 574 </elements> juggler/trunk/modules/vrjuggler/data/configFiles/sim.analog.mixin.jconf
r20414 r21018 31 31 <delta>1.0</delta> 32 32 <min>0.0</min> 33 <max> 255.0</max>34 <initial_value> 0.0</initial_value>33 <max>1023.0</max> 34 <initial_value>512.0</initial_value> 35 35 </simulated_analog_device> 36 36 <keyboard_mouse_device name="Sim Analog Keyboard" version="1"> juggler/trunk/modules/vrjuggler/data/configFiles/sim.base.jconf
r20757 r21018 543 543 <sleep_time>75</sleep_time> 544 544 </display_window> 545 <corba_remote_reconfig name="CORBA Remote Run-Time Reconfiguration" version="1"> 546 <naming_service_host>localhost</naming_service_host> 547 <naming_service_port>2809</naming_service_port> 548 <iiop_version>1.0</iiop_version> 545 <corba_remote_reconfig name="CORBA Remote Run-Time Reconfiguration" version="2"> 546 <endpoint_addr /> 547 <endpoint_port>45876</endpoint_port> 549 548 </corba_remote_reconfig> 550 549 </elements> juggler/trunk/modules/vrjuggler/data/configFiles/simstandalone.jconf
r20757 r21018 545 545 <proxy>VJSystemStopKernelProxy</proxy> 546 546 </alias> 547 <corba_remote_reconfig name="CORBA Remote Run-Time Reconfiguration" version="1"> 548 <naming_service_host>localhost</naming_service_host> 549 <naming_service_port>2809</naming_service_port> 550 <iiop_version>1.0</iiop_version> 547 <corba_remote_reconfig name="CORBA Remote Run-Time Reconfiguration" version="2"> 548 <endpoint_addr /> 549 <endpoint_port>45876</endpoint_port> 551 550 </corba_remote_reconfig> 552 551 </elements> juggler/trunk/modules/vrjuggler/data/configFiles/standalone.jconf
r21017 r21018 666 666 <relative_proxy>RelativeWand Proxy</relative_proxy> 667 667 </simulated_relative_position> 668 <corba_remote_reconfig name="CORBA Remote Run-Time Reconfiguration" version="1"> 669 <naming_service_host>localhost</naming_service_host> 670 <naming_service_port>2809</naming_service_port> 671 <iiop_version>1.0</iiop_version> 668 <corba_remote_reconfig name="CORBA Remote Run-Time Reconfiguration" version="2"> 669 <endpoint_addr /> 670 <endpoint_port>45876</endpoint_port> 672 671 </corba_remote_reconfig> 673 672 <keyboard_mouse_device name="Keyboard/Mouse Device" version="1"> juggler/trunk/modules/vrjuggler/data/definitions/corba_performance_monitor.jdef
r16285 r21018 21 21 <upgrade_transform/> 22 22 </definition_version> 23 <definition_version version="2" label="CORBA Remote Performance Monitoring"> 24 <abstract>false</abstract> 25 <help/> 26 <parent/> 27 <category>/Config</category> 28 <property valuetype="string" variable="false" name="endpoint_addr"> 29 <help>The network interface address on the local computer to which the CORBA endpoint will be bound. Using an empty string will bind to the default interface.</help> 30 <value label="Listen Address" defaultvalue=""/> 31 </property> 32 <property valuetype="integer" variable="false" name="endpoint_port"> 33 <help>The listening port for the CORBA endpiont. This must be a valid port number, generally greater than 1000 and less than 65536.</help> 34 <value label="Listen Port Number" defaultvalue="45877"/> 35 </property> 36 <upgrade_transform> 37 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:jconf="http://www.vrjuggler.org/jccl/xsd/3.0/configuration" version="1.0"> 38 <xsl:output method="xml" version="1.0" encoding="UTF-8" indent="yes"/> 39 <xsl:variable name="jconf">http://www.vrjuggler.org/jccl/xsd/3.0/configuration</xsl:variable> 40 41 <xsl:template match="/"> 42 <xsl:apply-templates/> 43 </xsl:template> 44 45 <xsl:template match="jconf:corba_performance_monitor"> 46 <xsl:element namespace="{$jconf}" name="corba_performance_monitor"> 47 <xsl:attribute name="name"> 48 <xsl:value-of select="@name"/> 49 </xsl:attribute> 50 <xsl:attribute name="version">2</xsl:attribute> 51 <xsl:element namespace="{$jconf}" name="endpoint_addr" /> 52 <xsl:element namespace="{$jconf}" name="endpoint_port"> 53 <xsl:text>45877</xsl:text> 54 </xsl:element> 55 </xsl:element> 56 </xsl:template> 57 </xsl:stylesheet> 58 </upgrade_transform> 59 </definition_version> 23 60 </definition> juggler/trunk/modules/vrjuggler/data/definitions/corba_remote_reconfig.jdef
r20675 r21018 21 21 <upgrade_transform/> 22 22 </definition_version> 23 <definition_version version="2" label="CORBA Remote Run-Time Reconfiguration"> 24 <abstract>false</abstract> 25 <help>Configuration for the CORBA-based remote run-time reconfiguration plug-in to the Configuration Manager. (<a href="http://www.infiscape.com/documentation/vrjuggler-config/3.0/configuring_vr_juggler/ch05.html">more on remote run-time reconfiguration</a>)</help> 26 <parent/> 27 <category>/Config</category> 28 <property valuetype="string" variable="false" name="endpoint_addr"> 29 <help>The network interface address on the local computer to which the CORBA endpoint will be bound. Using an empty string will bind to the default interface. (<a href="http://www.infiscape.com/documentation/vrjuggler-config/3.0/configuring_vr_juggler/ch05.html">more ...</a>)</help> 30 <value label="Listen Address" defaultvalue=""/> 31 </property> 32 <property valuetype="integer" variable="false" name="endpoint_port"> 33 <help>The listening port for the CORBA endpiont. This must be a valid port number, generally greater than 1000 and less than 65536. (<a href="http://www.infiscape.com/documentation/vrjuggler-config/3.0/configuring_vr_juggler/ch05.html">more ...</a>)</help> 34 <value label="Listen Port Number" defaultvalue="45876"/> 35 </property> 36 <upgrade_transform> 37 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:jconf="http://www.vrjuggler.org/jccl/xsd/3.0/configuration" version="1.0"> 38 <xsl:output method="xml" version="1.0" encoding="UTF-8" indent="yes"/> 39 <xsl:variable name="jconf">http://www.vrjuggler.org/jccl/xsd/3.0/configuration</xsl:variable> 40 41 <xsl:template match="/"> 42 <xsl:apply-templates/> 43 </xsl:template> 44 45 <xsl:template match="jconf:corba_remote_reconfig"> 46 <xsl:element namespace="{$jconf}" name="corba_remote_reconfig"> 47 <xsl:attribute name="name"> 48 <xsl:value-of select="@name"/> 49 </xsl:attribute> 50 <xsl:attribute name="version">2</xsl:attribute> 51 <xsl:element namespace="{$jconf}" name="endpoint_addr" /> 52 <xsl:element namespace="{$jconf}" name="endpoint_port"> 53 <xsl:text>45876</xsl:text> 54 </xsl:element> 55 </xsl:element> 56 </xsl:template> 57 </xsl:stylesheet> 58 </upgrade_transform> 59 </definition_version> 23 60 </definition>
