[Fix]Update Multi-cloud studio project design and interoperability pr…

…ojects

plugins/org.eclipse.cmf.occi.multicloud.all.edit/META-INF/MANIFEST.MF

@@ -20,8 +20,6 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.cmf.occi.monitoring.edit;visibility:=reexport,
  org.eclipse.cmf.occi.multicloud.regions;visibility:=reexport,
  org.eclipse.cmf.occi.multicloud.regions.edit;visibility:=reexport,
- xscalibur.multicloud.aws.accounts;visibility:=reexport,
- xscalibur.multicloud.aws.accounts.edit;visibility:=reexport,
  org.eclipse.cmf.occi.multicloud.regions.aws;visibility:=reexport,
  org.eclipse.cmf.occi.multicloud.regions.aws.edit;visibility:=reexport,
  org.eclipse.cmf.occi.multicloud.accounts;visibility:=reexport,
@@ -32,10 +30,6 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.cmf.occi.multicloud.vmware.edit;visibility:=reexport,
  org.eclipse.cmf.occi.multicloud.interoperability;visibility:=reexport,
  org.eclipse.cmf.occi.multicloud.interoperability.edit;visibility:=reexport,
- xscalibur.multicloud.openstack.core;visibility:=reexport,
- xscalibur.multicloud.openstack.core.edit;visibility:=reexport,
- xscalibur.multicloud.openstack.security;visibility:=reexport,
- xscalibur.multicloud.openstack.security.edit;visibility:=reexport,
  org.eclipse.cmf.occi.core;visibility:=reexport,
  org.eclipse.cmf.occi.core.edit;visibility:=reexport
 Bundle-ActivationPolicy: lazy

plugins/org.eclipse.cmf.occi.multicloud.all.edit/src-gen/org/eclipse/cmf/occi/multicloud/all/provider/AllEditPlugin.java

@@ -12,14 +12,10 @@
  */
 package org.eclipse.cmf.occi.multicloud.all.provider;
 
-import awsaccounts.provider.AwsaccountsEditPlugin;
 import awsregions.provider.AwsregionsEditPlugin;
 
-import identity.provider.IdentityEditPlugin;
 import org.eclipse.cmf.occi.core.provider.OCCIEditPlugin;
 
-import org.eclipse.cmf.occi.crtp.provider.CrtpEditPlugin;
-
 import org.eclipse.cmf.occi.infrastructure.provider.InfrastructureEditPlugin;
 
 import org.eclipse.cmf.occi.monitoring.provider.MonitoringEditPlugin;
@@ -37,7 +33,6 @@
 import org.eclipse.emf.common.EMFPlugin;
 
 import org.eclipse.emf.common.util.ResourceLocator;
-import oscore.provider.OscoreEditPlugin;
 
 /**
  * This is the central singleton for the All edit plugin.
@@ -75,13 +70,10 @@ public AllEditPlugin() {
 		     MonitoringEditPlugin.INSTANCE,
 		     AccountsEditPlugin.INSTANCE,
 		     RegionsEditPlugin.INSTANCE,
-		     AwsaccountsEditPlugin.INSTANCE,
 		     AwsregionsEditPlugin.INSTANCE,
 		     Ec2EditPlugin.INSTANCE,
 		     VmwareEditPlugin.INSTANCE,
 		     InteroperabilityEditPlugin.INSTANCE,
-		     OscoreEditPlugin.INSTANCE,
-		     IdentityEditPlugin.INSTANCE,
 		     OCCIEditPlugin.INSTANCE,
 		   });
 	}

plugins/org.eclipse.cmf.occi.multicloud.all/META-INF/MANIFEST.MF

@@ -14,14 +14,11 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.cmf.occi.infrastructure;visibility:=reexport,
  org.eclipse.cmf.occi.monitoring;visibility:=reexport,
  org.eclipse.cmf.occi.multicloud.regions;visibility:=reexport,
- xscalibur.multicloud.aws.accounts;visibility:=reexport,
  org.eclipse.cmf.occi.multicloud.regions.aws;visibility:=reexport,
  org.eclipse.cmf.occi.multicloud.accounts;visibility:=reexport,
  org.eclipse.cmf.occi.multicloud.aws.ec2;visibility:=reexport,
  org.eclipse.cmf.occi.multicloud.vmware;visibility:=reexport,
  org.eclipse.cmf.occi.multicloud.interoperability;visibility:=reexport,
  org.eclipse.cmf.occi.core;visibility:=reexport,
  org.eclipse.cmf.occi.core.ui,
- org.eclipse.cmf.occi.core.gen.emf.ui,
- xscalibur.multicloud.openstack.core;bundle-version="1.0.0";visibility:=reexport,
- xscalibur.multicloud.openstack.security;bundle-version="1.0.0";visibility:=reexport
+ org.eclipse.cmf.occi.core.gen.emf.ui

plugins/org.eclipse.cmf.occi.multicloud.all/model/all.ecore

@@ -12,12 +12,9 @@
     <details key="monitoring" value="http://schemas.ogf.org/occi/monitoring/ecore"/>
     <details key="accounts" value="http://occiware.org/occi/infrastructure/security/ecore"/>
     <details key="regions" value="http://occiware.org/occi/infrastructure/locations/ecore"/>
-    <details key="awsaccounts" value="http://occiware.org/occi/aws/security/ecore"/>
     <details key="awsregions" value="http://occiware.org/occi/infrastructure/locations/aws/ecore"/>
     <details key="ec2" value="http://occiware.org/occi/infrastructure/aws/ecore"/>
     <details key="vmware" value="http://occiware.org/occi/infrastructure/vmware/ecore"/>
     <details key="interoperability" value="http://occiware.org/occi/multicloud/specialfeatures/ecore"/>
-    <details key="oscore" value="http://occiware.org/occi/infrastructure/openstack/ecore"/>
-    <details key="identity" value="http://occiware.org/occi/infrastructure/openstack/security/ecore"/>
   </eAnnotations>
 </ecore:EPackage>

plugins/org.eclipse.cmf.occi.multicloud.all/model/all.genmodel

@@ -8,12 +8,9 @@
   <usedGenPackages href="platform:/plugin/org.eclipse.cmf.occi.monitoring/model/monitoring.genmodel#//monitoring"/>
   <usedGenPackages href="platform:/resource/org.eclipse.cmf.occi.multicloud.accounts/model/accounts.genmodel#//accounts"/>
   <usedGenPackages href="platform:/resource/org.eclipse.cmf.occi.multicloud.regions/model/regions.genmodel#//regions"/>
-  <usedGenPackages href="platform:/resource/xscalibur.multicloud.aws.accounts/model/awsaccounts.genmodel#//awsaccounts"/>
   <usedGenPackages href="platform:/resource/org.eclipse.cmf.occi.multicloud.regions.aws/model/awsregions.genmodel#//awsregions"/>
   <usedGenPackages href="platform:/resource/org.eclipse.cmf.occi.multicloud.aws.ec2/model/ec2.genmodel#//ec2"/>
   <usedGenPackages href="platform:/resource/org.eclipse.cmf.occi.multicloud.vmware/model/vmware.genmodel#//vmware"/>
   <usedGenPackages href="platform:/resource/org.eclipse.cmf.occi.multicloud.interoperability/model/interoperability.genmodel#//interoperability"/>
-  <usedGenPackages href="platform:/resource/xscalibur.multicloud.openstack.core/model/oscore.genmodel#//oscore"/>
-  <usedGenPackages href="platform:/resource/xscalibur.multicloud.openstack.security/model/identity.genmodel#//identity"/>
   <usedGenPackages href="platform:/plugin/org.eclipse.cmf.occi.core/model/OCCI.genmodel#//occi"/>
 </genmodel:GenModel>

plugins/org.eclipse.cmf.occi.multicloud.all/model/all.occie

@@ -5,11 +5,8 @@
   <import href="http://schemas.ogf.org/occi/monitoring#/"/>
   <import href="http://occiware.org/occi/infrastructure/security#/"/>
   <import href="http://occiware.org/occi/infrastructure/locations#/"/>
-  <import href="http://occiware.org/occi/aws/security#/"/>
   <import href="http://occiware.org/occi/infrastructure/locations/aws#/"/>
   <import href="http://occiware.org/occi/infrastructure/aws#/"/>
   <import href="http://occiware.org/occi/infrastructure/vmware#/"/>
   <import href="http://occiware.org/occi/multicloud/specialfeatures#/"/>
-  <import href="http://occiware.org/occi/infrastructure/openstack#/"/>
-  <import href="http://occiware.org/occi/infrastructure/openstack/security#/"/>
 </occi:Extension>