Tue Feb 28 14:55:48 UTC 2012 Johnny Willemsen <jwillemsen@remedy.nl>

        * dance/Deployment/Deployment_Core.mpc:
          Removed obsolete argument

        * dance/Deployment/Deployment_Data.idl:
        * dance/Deployment/Deployment_DeploymentPlan.idl:
        * dance/Deployment/Deployment_Packaging_Data.idl:
        * dance/Deployment/Deployment_RepositoryManager.idl:
        * dance/Deployment/Deployment_ResourceCommitmentManager.idl:
        * dance/Deployment/Deployment_TargetData.idl:
        * dance/Deployment/Deployment_TargetManager.idl:
          Don't fully scope CORBA

9 files changed, 45 insertions, 32 deletions

diff --git a/DAnCE/ChangeLog b/DAnCE/ChangeLog
index 5a2fd1f3270..a8d0d7fc794 100644
--- a/DAnCE/ChangeLog
+++ b/DAnCE/ChangeLog
@@ -1,3 +1,17 @@
+Tue Feb 28 14:55:48 UTC 2012  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * dance/Deployment/Deployment_Core.mpc:
+          Removed obsolete argument
+
+        * dance/Deployment/Deployment_Data.idl:
+        * dance/Deployment/Deployment_DeploymentPlan.idl:
+        * dance/Deployment/Deployment_Packaging_Data.idl:
+        * dance/Deployment/Deployment_RepositoryManager.idl:
+        * dance/Deployment/Deployment_ResourceCommitmentManager.idl:
+        * dance/Deployment/Deployment_TargetData.idl:
+        * dance/Deployment/Deployment_TargetManager.idl:
+          Don't fully scope CORBA
+
 Tue Feb 28 10:48:18 UTC 2012  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * dance/Deployment/Deployment_DeploymentPlan.idl:
diff --git a/DAnCE/dance/Deployment/Deployment_Core.mpc b/DAnCE/dance/Deployment/Deployment_Core.mpc
index 897998903cb..02d8c01e7a2 100644
--- a/DAnCE/dance/Deployment/Deployment_Core.mpc
+++ b/DAnCE/dance/Deployment/Deployment_Core.mpc
@@ -38,7 +38,6 @@ project(Deployment_IDL) : install, dancelib_with_idl, dance_output, valuetype, g
   }
 
   IDL_Files {
-    idlflags += -Ssi
     Deployment_ResourceCommitmentManager.idl
   }
   specific {
diff --git a/DAnCE/dance/Deployment/Deployment_Data.idl b/DAnCE/dance/Deployment/Deployment_Data.idl
index 907a6be5836..5d3fba4ab7b 100644
--- a/DAnCE/dance/Deployment/Deployment_Data.idl
+++ b/DAnCE/dance/Deployment/Deployment_Data.idl
@@ -29,7 +29,7 @@ module Deployment {
 
   struct Capability {
     string name;
-    ::CORBA::StringSeq resourceType;
+    CORBA::StringSeq resourceType;
     SatisfierProperties property;
   };
 
diff --git a/DAnCE/dance/Deployment/Deployment_DeploymentPlan.idl b/DAnCE/dance/Deployment/Deployment_DeploymentPlan.idl
index 8fd04a03033..bb0cd8f75cd 100644
--- a/DAnCE/dance/Deployment/Deployment_DeploymentPlan.idl
+++ b/DAnCE/dance/Deployment/Deployment_DeploymentPlan.idl
@@ -21,13 +21,13 @@ module Deployment {
         struct ComponentPortDescription {
                 string name;
                 string specificType;
-                ::CORBA::StringSeq supportedType;
+                CORBA::StringSeq supportedType;
                 boolean provider;
                 boolean exclusiveProvider;
                 boolean exclusiveUser;
                 boolean optional;
                 CCMComponentPortKind kind;
-               ::CORBA::StringSeq templateParam; // New from DDS4CCM
+                CORBA::StringSeq templateParam; // New from DDS4CCM
         };
 
         typedef sequence < ComponentPortDescription > ComponentPortDescriptions;
@@ -43,8 +43,8 @@ module Deployment {
                 string label;
                 string UUID;
                 string specificType;
-                ::CORBA::StringSeq supportedType;
-                ::CORBA::StringSeq idlFile;
+                CORBA::StringSeq supportedType;
+                CORBA::StringSeq idlFile;
                 Properties configProperty;
                 ComponentPortDescriptions _port;
                 ComponentPropertyDescriptions property;
@@ -53,8 +53,8 @@ module Deployment {
 
         struct MonolithicDeploymentDescription {
                 string name;
-                ::CORBA::StringSeq source;
-                ::CORBA::ULongSeq artifactRef;
+                CORBA::StringSeq source;
+                CORBA::ULongSeq artifactRef;
                 Properties execParameter;
                 Requirements deployRequirement;
         };
@@ -81,7 +81,7 @@ module Deployment {
         struct InstanceDeploymentDescription {
                 string name;
                 string node;
-                ::CORBA::StringSeq source;
+                CORBA::StringSeq source;
                 unsigned long implementationRef;
                 Properties configProperty;
                 InstanceResourceDeploymentDescriptions deployedResource;
@@ -109,7 +109,7 @@ module Deployment {
                 string location;
                 boolean provider;
                 string portName;
-                ::CORBA::StringSeq supportedType;
+                CORBA::StringSeq supportedType;
         };
 
         typedef sequence < ExternalReferenceEndpoint > ExternalReferenceEndpoints;
@@ -125,7 +125,7 @@ module Deployment {
 
         struct PlanConnectionDescription {
                 string name;
-                ::CORBA::StringSeq source;
+                CORBA::StringSeq source;
                 Requirements deployRequirement;
                 ComponentExternalPortEndpoints externalEndpoint;
                 PlanSubcomponentPortEndpoints internalEndpoint;
@@ -144,7 +144,7 @@ module Deployment {
 
         struct PlanPropertyMapping {
                 string name;
-                ::CORBA::StringSeq source;
+                CORBA::StringSeq source;
                 string externalName;
                 PlanSubcomponentPropertyReferences delegatesTo;
         };
@@ -167,9 +167,9 @@ module Deployment {
 
         struct ArtifactDeploymentDescription {
                 string name;
-                ::CORBA::StringSeq location;
+                CORBA::StringSeq location;
                 string node;
-                ::CORBA::StringSeq source;
+                CORBA::StringSeq source;
                 Properties execParameter;
                 Requirements deployRequirement;
                 ResourceDeploymentDescriptions deployedResource;
@@ -187,7 +187,7 @@ module Deployment {
 
         struct PlanLocality {
                 PlanLocalityKind constraint;
-                ::CORBA::ULongSeq constrainedInstanceRef;
+                CORBA::ULongSeq constrainedInstanceRef;
         };
 
         typedef sequence < PlanLocality > PlanLocalities;
diff --git a/DAnCE/dance/Deployment/Deployment_Packaging_Data.idl b/DAnCE/dance/Deployment/Deployment_Packaging_Data.idl
index 777e9a84351..d973d486d9e 100644
--- a/DAnCE/dance/Deployment/Deployment_Packaging_Data.idl
+++ b/DAnCE/dance/Deployment/Deployment_Packaging_Data.idl
@@ -16,7 +16,7 @@ module Deployment {
         typedef sequence < PackageConfiguration > PackageConfigurations;
 
         struct ComponentPackageImport {
-                ::CORBA::StringSeq location;
+                CORBA::StringSeq location;
         };
 
         typedef sequence < ComponentPackageImport > ComponentPackageImports;
@@ -72,7 +72,7 @@ module Deployment {
         struct ImplementationArtifactDescription {
                 string label;
                 string UUID;
-                ::CORBA::StringSeq location;
+                CORBA::StringSeq location;
                 Properties execParameter;
                 Requirements deployRequirement;
                 NamedImplementationArtifacts dependsOn;
@@ -104,7 +104,7 @@ module Deployment {
 
         struct Locality {
                 LocalityKind constraint;
-                ::CORBA::ULongSeq constrainedInstanceRef;
+                CORBA::ULongSeq constrainedInstanceRef;
         };
 
         typedef sequence < Locality > Localities;
@@ -192,7 +192,7 @@ module Deployment {
 
         struct RequirementSatisfier {
                 string name;
-                ::CORBA::StringSeq resourceType;
+                CORBA::StringSeq resourceType;
                 SatisfierProperties property;
         };
 
diff --git a/DAnCE/dance/Deployment/Deployment_RepositoryManager.idl b/DAnCE/dance/Deployment/Deployment_RepositoryManager.idl
index 5ace466689a..b2f711b2521 100644
--- a/DAnCE/dance/Deployment/Deployment_RepositoryManager.idl
+++ b/DAnCE/dance/Deployment/Deployment_RepositoryManager.idl
@@ -36,11 +36,11 @@ module Deployment {
     PackageConfiguration findPackageByUUID (in string UUID)
       raises (NoSuchName);
 
-    ::CORBA::StringSeq findNamesByType (in string type);
+    CORBA::StringSeq findNamesByType (in string type);
 
-    ::CORBA::StringSeq getAllNames ();
+    CORBA::StringSeq getAllNames ();
 
-    ::CORBA::StringSeq getAllTypes ();
+    CORBA::StringSeq getAllTypes ();
 
     void deletePackage (in string installationName)
       raises (NoSuchName);
diff --git a/DAnCE/dance/Deployment/Deployment_ResourceCommitmentManager.idl b/DAnCE/dance/Deployment/Deployment_ResourceCommitmentManager.idl
index dcfca2967b7..a08154afc1b 100644
--- a/DAnCE/dance/Deployment/Deployment_ResourceCommitmentManager.idl
+++ b/DAnCE/dance/Deployment/Deployment_ResourceCommitmentManager.idl
@@ -19,7 +19,7 @@ module Deployment {
     string reason;
     long index;
     string propertyName;
-    ::CORBA::AnySeq propertyValue;
+    CORBA::AnySeq propertyValue;
   };
 
   interface ResourceCommitmentManager {
diff --git a/DAnCE/dance/Deployment/Deployment_TargetData.idl b/DAnCE/dance/Deployment/Deployment_TargetData.idl
index c5aa46db9a0..ca8060ce195 100644
--- a/DAnCE/dance/Deployment/Deployment_TargetData.idl
+++ b/DAnCE/dance/Deployment/Deployment_TargetData.idl
@@ -10,7 +10,7 @@
 module Deployment {
   struct Resource {
     string name;
-    ::CORBA::StringSeq resourceType;
+    CORBA::StringSeq resourceType;
     SatisfierProperties property;
   };
 
@@ -18,8 +18,8 @@ module Deployment {
 
   struct SharedResource {
     string name;
-    ::CORBA::StringSeq resourceType;
-    ::CORBA::ULongSeq nodeRef;
+    CORBA::StringSeq resourceType;
+    CORBA::ULongSeq nodeRef;
     SatisfierProperties property;
   };
 
@@ -28,8 +28,8 @@ module Deployment {
   struct Node {
     string name;
     string label;
-    ::CORBA::ULongSeq sharedResourceRef;
-    ::CORBA::ULongSeq connectionRef;
+    CORBA::ULongSeq sharedResourceRef;
+    CORBA::ULongSeq connectionRef;
     Resources resource;
   };
 
@@ -38,8 +38,8 @@ module Deployment {
   struct Interconnect {
     string name;
     string label;
-    ::CORBA::ULongSeq connectionRef;
-    ::CORBA::ULongSeq connectRef;
+    CORBA::ULongSeq connectionRef;
+    CORBA::ULongSeq connectRef;
     Resources resource;
   };
 
@@ -48,7 +48,7 @@ module Deployment {
   struct Bridge {
     string name;
     string label;
-    ::CORBA::ULongSeq connectRef;
+    CORBA::ULongSeq connectRef;
     Resources resource;
   };
 
diff --git a/DAnCE/dance/Deployment/Deployment_TargetManager.idl b/DAnCE/dance/Deployment/Deployment_TargetManager.idl
index e2f732f0625..9862e084bb3 100644
--- a/DAnCE/dance/Deployment/Deployment_TargetManager.idl
+++ b/DAnCE/dance/Deployment/Deployment_TargetManager.idl
@@ -25,7 +25,7 @@ module Deployment {
 
     void destroyResourceCommitment (in ResourceCommitmentManager manager);
 
-    void updateDomain ( in ::CORBA::StringSeq elements,
+    void updateDomain ( in CORBA::StringSeq elements,
                         in Domain domainSubset,
                         in DomainUpdateKind updateKind);
   };