summaryrefslogtreecommitdiff
path: root/CIAO/examples
diff options
context:
space:
mode:
authorMarijke Hengstmengel <MHengstmengel@users.noreply.github.com>2011-05-11 07:10:45 +0000
committerMarijke Hengstmengel <MHengstmengel@users.noreply.github.com>2011-05-11 07:10:45 +0000
commitc05ea6b99ea70bd2597f2b7c8bf9b87350875dde (patch)
treef125822c463f2b766607e5e8d8d19f8cef493b8a /CIAO/examples
parente1d47f03267101f0e047565b7e73814009b4ae43 (diff)
downloadATCD-c05ea6b99ea70bd2597f2b7c8bf9b87350875dde.tar.gz
Tue May 11 07:09:37 UTC 2011 Marijke Hengstmengel <mhengstmengel@remedy.nl>
* examples/Display/descriptors/run_test_more.pl: * examples/Display/descriptors/deploymentplanone.cdp: * examples/Display/descriptors/deploymentplanmore.cdp: * examples/Display/descriptors/run_test_more_contr.pl: * examples/Display/descriptors/flattened_deploymentplannat.cdp: * examples/Display/descriptors/run_all_in_one.pl: * examples/Display/descriptors/run_test.pl: * examples/Display/descriptors/run_test_one.pl: Solved Fuzz errors.
Diffstat (limited to 'CIAO/examples')
-rw-r--r--CIAO/examples/Display/descriptors/deploymentplanmore.cdp16
-rw-r--r--CIAO/examples/Display/descriptors/deploymentplanone.cdp5
-rw-r--r--CIAO/examples/Display/descriptors/flattened_deploymentplannat.cdp6
-rwxr-xr-xCIAO/examples/Display/descriptors/run_all_in_one.pl2
-rwxr-xr-xCIAO/examples/Display/descriptors/run_test.pl2
-rwxr-xr-xCIAO/examples/Display/descriptors/run_test_more.pl1
-rwxr-xr-xCIAO/examples/Display/descriptors/run_test_more_contr.pl2
-rwxr-xr-xCIAO/examples/Display/descriptors/run_test_one.pl1
8 files changed, 15 insertions, 20 deletions
diff --git a/CIAO/examples/Display/descriptors/deploymentplanmore.cdp b/CIAO/examples/Display/descriptors/deploymentplanmore.cdp
index 3fbb0dd334b..63469012fca 100644
--- a/CIAO/examples/Display/descriptors/deploymentplanmore.cdp
+++ b/CIAO/examples/Display/descriptors/deploymentplanmore.cdp
@@ -7,7 +7,7 @@
<label>Display-DeploymentPlan</label>
<UUID>Display_Plan_UUID_0001</UUID>
-
+
<implementation xmi:id="HUDisplay-RateGen-mdd">
<name>HUDisplay-RateGen-mdd</name>
<source/>
@@ -77,8 +77,6 @@
</execParameter>
</implementation>
-
-
<implementation xmi:id="HUDisplay-NavDisplay-mdd">
<name>HUDisplay-NavDisplay-mdd</name>
<source/>
@@ -357,7 +355,7 @@
<ushort>10</ushort>
</value>
</value>
- </configProperty>
+ </configProperty>
</instance>
<instance xmi:id="HUDisplay-GPS2-comp-idd">
@@ -409,7 +407,7 @@
<ushort>13</ushort>
</value>
</value>
- </configProperty>
+ </configProperty>
</instance>
<instance xmi:id="HUDisplay-GPS3-comp-idd">
@@ -461,7 +459,7 @@
<ushort>5</ushort>
</value>
</value>
- </configProperty>
+ </configProperty>
</instance>
<instance xmi:id="HUDisplay-RateGen-idd">
@@ -493,7 +491,7 @@
</value>
</configProperty>
</instance>
-
+
<instance xmi:id="HUDisplay-RateGen-comp-idd">
<name>HUDisplay-RateGen-comp-idd</name>
<node>RateGenNode</node>
@@ -575,7 +573,7 @@
</value>
</configProperty>
</instance>
-
+
<instance xmi:id="HUDisplay-RateGen2-comp-idd">
<name>HUDisplay-RateGen2-comp-idd</name>
<node>RateGenNode</node>
@@ -659,7 +657,7 @@
</value>
</configProperty>
</instance>
-
+
<instance xmi:id="HUDisplay-RateGen3-comp-idd">
<name>HUDisplay-RateGen3-comp-idd</name>
<node>RateGenNode</node>
diff --git a/CIAO/examples/Display/descriptors/deploymentplanone.cdp b/CIAO/examples/Display/descriptors/deploymentplanone.cdp
index 115f2565f0d..4fa83c6e6b3 100644
--- a/CIAO/examples/Display/descriptors/deploymentplanone.cdp
+++ b/CIAO/examples/Display/descriptors/deploymentplanone.cdp
@@ -7,7 +7,7 @@
<label>Display-DeploymentPlan</label>
<UUID>Display_Plan_UUID_0001</UUID>
-
+
<implementation xmi:id="HUDisplay-RateGen-mdd">
<name>HUDisplay-RateGen-mdd</name>
<source/>
@@ -319,7 +319,7 @@
</value>
</configProperty>
</instance>
-
+
<instance xmi:id="HUDisplay-RateGen-comp-idd">
<name>HUDisplay-RateGen-comp-idd</name>
<node>RateGenNode</node>
@@ -372,7 +372,6 @@
</configProperty>
</instance>
-
<instance xmi:id="HUDisplay-NavDisplay-idd">
<name>HUDisplay-NavDisplay-idd</name>
<node>AirFrameDevice</node>
diff --git a/CIAO/examples/Display/descriptors/flattened_deploymentplannat.cdp b/CIAO/examples/Display/descriptors/flattened_deploymentplannat.cdp
index ea904395af9..921b04be1a1 100644
--- a/CIAO/examples/Display/descriptors/flattened_deploymentplannat.cdp
+++ b/CIAO/examples/Display/descriptors/flattened_deploymentplannat.cdp
@@ -7,7 +7,7 @@
<label>Display-DeploymentPlan</label>
<UUID>Display_Plan_UUID_0001</UUID>
-
+
<implementation xmi:id="HUDisplay-RateGen-mdd">
<name>HUDisplay-RateGen-mdd</name>
<source/>
@@ -295,7 +295,7 @@
<ushort>1</ushort>
</value>
</value>
- </configProperty>
+ </configProperty>
</instance>
<instance xmi:id="HUDisplay-RateGen-idd">
@@ -327,7 +327,7 @@
</value>
</configProperty>
</instance>
-
+
<instance xmi:id="HUDisplay-RateGen-comp-idd">
<name>HUDisplay-RateGen-comp-idd</name>
<node>RateGenNode</node>
diff --git a/CIAO/examples/Display/descriptors/run_all_in_one.pl b/CIAO/examples/Display/descriptors/run_all_in_one.pl
index b34fb051ced..e112d5cca9d 100755
--- a/CIAO/examples/Display/descriptors/run_all_in_one.pl
+++ b/CIAO/examples/Display/descriptors/run_all_in_one.pl
@@ -115,7 +115,7 @@ sub run_node_daemons {
$d_cmd = "$DANCE_ROOT/bin/dance_node_manager";
$d_param = "-s $node_app -n $nodename=$iorfile -t 30 --domain-nc corbaloc:rir:/NameService";
-
+
print "Run dance_node_manager with $d_param\n";
$DEAMONS[$i] = $tg_daemons[$i]->CreateProcess ($d_cmd, $d_param);
diff --git a/CIAO/examples/Display/descriptors/run_test.pl b/CIAO/examples/Display/descriptors/run_test.pl
index 8482df59e1b..9e26bc34968 100755
--- a/CIAO/examples/Display/descriptors/run_test.pl
+++ b/CIAO/examples/Display/descriptors/run_test.pl
@@ -115,7 +115,7 @@ sub run_node_daemons {
$d_cmd = "$DANCE_ROOT/bin/dance_node_manager";
$d_param = "-s $node_app -n $nodename=$iorfile -t 30 --domain-nc corbaloc:rir:/NameService";
-
+
print "Run dance_node_manager with $d_param\n";
$DEAMONS[$i] = $tg_daemons[$i]->CreateProcess ($d_cmd, $d_param);
diff --git a/CIAO/examples/Display/descriptors/run_test_more.pl b/CIAO/examples/Display/descriptors/run_test_more.pl
index 2674eedd679..2b04a317568 100755
--- a/CIAO/examples/Display/descriptors/run_test_more.pl
+++ b/CIAO/examples/Display/descriptors/run_test_more.pl
@@ -119,7 +119,6 @@ sub run_node_daemons {
# $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -t 30 --domain-nc corbaloc:rir:/NameService";
$d_param = "-s $node_app -n $nodename=$iorfile -t 30 --domain-nc corbaloc:rir:/NameService";
-
print "Run dance_node_manager with $d_param\n";
$DEAMONS[$i] = $tg_daemons[$i]->CreateProcess ($d_cmd, $d_param);
diff --git a/CIAO/examples/Display/descriptors/run_test_more_contr.pl b/CIAO/examples/Display/descriptors/run_test_more_contr.pl
index 4565bacd72e..645f868a808 100755
--- a/CIAO/examples/Display/descriptors/run_test_more_contr.pl
+++ b/CIAO/examples/Display/descriptors/run_test_more_contr.pl
@@ -78,4 +78,4 @@ if ($result != 0) {
print STDERR "ERROR: The controller returned $result\n";
$status = 1;
}
-exit $status; \ No newline at end of file
+exit $status;
diff --git a/CIAO/examples/Display/descriptors/run_test_one.pl b/CIAO/examples/Display/descriptors/run_test_one.pl
index 521929a9d0c..8de1b331063 100755
--- a/CIAO/examples/Display/descriptors/run_test_one.pl
+++ b/CIAO/examples/Display/descriptors/run_test_one.pl
@@ -117,7 +117,6 @@ sub run_node_daemons {
# $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -t 30 --domain-nc corbaloc:rir:/NameService";
$d_param = "-s $node_app -n $nodename=$iorfile -t 30 --domain-nc corbaloc:rir:/NameService";
-
print "Run dance_node_manager with $d_param\n";
$DEAMONS[$i] = $tg_daemons[$i]->CreateProcess ($d_cmd, $d_param);