updated ec2 schema from v2009_08_15 to v2010_06_15

nimbusproject · Aug 4, 2010 · efa8d13 · efa8d13
1 parent 4faef89
commit efa8d13
Show file tree

Hide file tree

Showing 30 changed files with 4,174 additions and 96 deletions.
diff --git a/lib/generated/nimbus-messaging-stubs-gt4.0-elastic.jar b/lib/generated/nimbus-messaging-stubs-gt4.0-elastic.jar
diff --git a/.../msgbridge/src/org/nimbustools/messaging/gt4_0_elastic/v2008_05_05/ServiceBlockStore.java b/.../msgbridge/src/org/nimbustools/messaging/gt4_0_elastic/v2008_05_05/ServiceBlockStore.java
@@ -16,7 +16,7 @@
 
 package org.nimbustools.messaging.gt4_0_elastic.v2008_05_05;
 
-import org.nimbustools.messaging.gt4_0_elastic.generated.v2009_08_15.*;
+import org.nimbustools.messaging.gt4_0_elastic.generated.v2010_06_15.*;
 
 import java.rmi.RemoteException;
 

diff --git a/...ava/msgbridge/src/org/nimbustools/messaging/gt4_0_elastic/v2008_05_05/ServiceGeneral.java b/...ava/msgbridge/src/org/nimbustools/messaging/gt4_0_elastic/v2008_05_05/ServiceGeneral.java
@@ -16,7 +16,7 @@
 
 package org.nimbustools.messaging.gt4_0_elastic.v2008_05_05;
 
-import org.nimbustools.messaging.gt4_0_elastic.generated.v2009_08_15.*;
+import org.nimbustools.messaging.gt4_0_elastic.generated.v2010_06_15.*;
 
 import java.rmi.RemoteException;
 

diff --git a/.../java/msgbridge/src/org/nimbustools/messaging/gt4_0_elastic/v2008_05_05/ServiceImage.java b/.../java/msgbridge/src/org/nimbustools/messaging/gt4_0_elastic/v2008_05_05/ServiceImage.java
@@ -16,7 +16,7 @@
 
 package org.nimbustools.messaging.gt4_0_elastic.v2008_05_05;
 
-import org.nimbustools.messaging.gt4_0_elastic.generated.v2009_08_15.*;
+import org.nimbustools.messaging.gt4_0_elastic.generated.v2010_06_15.*;
 
 import java.rmi.RemoteException;
 

diff --git a/...ava/msgbridge/src/org/nimbustools/messaging/gt4_0_elastic/v2008_05_05/ServiceNetwork.java b/...ava/msgbridge/src/org/nimbustools/messaging/gt4_0_elastic/v2008_05_05/ServiceNetwork.java
@@ -16,7 +16,7 @@
 
 package org.nimbustools.messaging.gt4_0_elastic.v2008_05_05;
 
-import org.nimbustools.messaging.gt4_0_elastic.generated.v2009_08_15.*;
+import org.nimbustools.messaging.gt4_0_elastic.generated.v2010_06_15.*;
 
 import java.rmi.RemoteException;
 

diff --git a/...tic/java/msgbridge/src/org/nimbustools/messaging/gt4_0_elastic/v2008_05_05/ServiceRM.java b/...tic/java/msgbridge/src/org/nimbustools/messaging/gt4_0_elastic/v2008_05_05/ServiceRM.java
@@ -16,7 +16,7 @@
 
 package org.nimbustools.messaging.gt4_0_elastic.v2008_05_05;
 
-import org.nimbustools.messaging.gt4_0_elastic.generated.v2009_08_15.*;
+import org.nimbustools.messaging.gt4_0_elastic.generated.v2010_06_15.*;
 
 import java.rmi.RemoteException;
 

diff --git a/...va/msgbridge/src/org/nimbustools/messaging/gt4_0_elastic/v2008_05_05/ServiceSecurity.java b/...va/msgbridge/src/org/nimbustools/messaging/gt4_0_elastic/v2008_05_05/ServiceSecurity.java
@@ -16,22 +16,22 @@
 
 package org.nimbustools.messaging.gt4_0_elastic.v2008_05_05;
 
-import org.nimbustools.messaging.gt4_0_elastic.generated.v2009_08_15.CreateKeyPairResponseType;
-import org.nimbustools.messaging.gt4_0_elastic.generated.v2009_08_15.CreateKeyPairType;
-import org.nimbustools.messaging.gt4_0_elastic.generated.v2009_08_15.DescribeKeyPairsResponseType;
-import org.nimbustools.messaging.gt4_0_elastic.generated.v2009_08_15.DescribeKeyPairsType;
-import org.nimbustools.messaging.gt4_0_elastic.generated.v2009_08_15.DeleteKeyPairResponseType;
-import org.nimbustools.messaging.gt4_0_elastic.generated.v2009_08_15.DeleteKeyPairType;
-import org.nimbustools.messaging.gt4_0_elastic.generated.v2009_08_15.CreateSecurityGroupResponseType;
-import org.nimbustools.messaging.gt4_0_elastic.generated.v2009_08_15.CreateSecurityGroupType;
-import org.nimbustools.messaging.gt4_0_elastic.generated.v2009_08_15.DeleteSecurityGroupResponseType;
-import org.nimbustools.messaging.gt4_0_elastic.generated.v2009_08_15.DeleteSecurityGroupType;
-import org.nimbustools.messaging.gt4_0_elastic.generated.v2009_08_15.DescribeSecurityGroupsResponseType;
-import org.nimbustools.messaging.gt4_0_elastic.generated.v2009_08_15.DescribeSecurityGroupsType;
-import org.nimbustools.messaging.gt4_0_elastic.generated.v2009_08_15.AuthorizeSecurityGroupIngressResponseType;
-import org.nimbustools.messaging.gt4_0_elastic.generated.v2009_08_15.AuthorizeSecurityGroupIngressType;
-import org.nimbustools.messaging.gt4_0_elastic.generated.v2009_08_15.RevokeSecurityGroupIngressResponseType;
-import org.nimbustools.messaging.gt4_0_elastic.generated.v2009_08_15.RevokeSecurityGroupIngressType;
+import org.nimbustools.messaging.gt4_0_elastic.generated.v2010_06_15.CreateKeyPairResponseType;
+import org.nimbustools.messaging.gt4_0_elastic.generated.v2010_06_15.CreateKeyPairType;
+import org.nimbustools.messaging.gt4_0_elastic.generated.v2010_06_15.DescribeKeyPairsResponseType;
+import org.nimbustools.messaging.gt4_0_elastic.generated.v2010_06_15.DescribeKeyPairsType;
+import org.nimbustools.messaging.gt4_0_elastic.generated.v2010_06_15.DeleteKeyPairResponseType;
+import org.nimbustools.messaging.gt4_0_elastic.generated.v2010_06_15.DeleteKeyPairType;
+import org.nimbustools.messaging.gt4_0_elastic.generated.v2010_06_15.CreateSecurityGroupResponseType;
+import org.nimbustools.messaging.gt4_0_elastic.generated.v2010_06_15.CreateSecurityGroupType;
+import org.nimbustools.messaging.gt4_0_elastic.generated.v2010_06_15.DeleteSecurityGroupResponseType;
+import org.nimbustools.messaging.gt4_0_elastic.generated.v2010_06_15.DeleteSecurityGroupType;
+import org.nimbustools.messaging.gt4_0_elastic.generated.v2010_06_15.DescribeSecurityGroupsResponseType;
+import org.nimbustools.messaging.gt4_0_elastic.generated.v2010_06_15.DescribeSecurityGroupsType;
+import org.nimbustools.messaging.gt4_0_elastic.generated.v2010_06_15.AuthorizeSecurityGroupIngressResponseType;
+import org.nimbustools.messaging.gt4_0_elastic.generated.v2010_06_15.AuthorizeSecurityGroupIngressType;
+import org.nimbustools.messaging.gt4_0_elastic.generated.v2010_06_15.RevokeSecurityGroupIngressResponseType;
+import org.nimbustools.messaging.gt4_0_elastic.generated.v2010_06_15.RevokeSecurityGroupIngressType;
 
 import java.rmi.RemoteException;
 

diff --git a/...e/src/org/nimbustools/messaging/gt4_0_elastic/v2008_05_05/general/ServiceGeneralImpl.java b/...e/src/org/nimbustools/messaging/gt4_0_elastic/v2008_05_05/general/ServiceGeneralImpl.java
@@ -18,12 +18,12 @@
 
 import org.nimbustools.messaging.gt4_0_elastic.v2008_05_05.ServiceGeneral;
 import org.nimbustools.messaging.gt4_0_elastic.v2008_05_05.service.UnimplementedOperations;
-import org.nimbustools.messaging.gt4_0_elastic.generated.v2009_08_15.DescribeAvailabilityZonesResponseType;
-import org.nimbustools.messaging.gt4_0_elastic.generated.v2009_08_15.DescribeAvailabilityZonesType;
-import org.nimbustools.messaging.gt4_0_elastic.generated.v2009_08_15.DescribeAvailabilityZonesSetType;
-import org.nimbustools.messaging.gt4_0_elastic.generated.v2009_08_15.DescribeAvailabilityZonesSetItemType;
-import org.nimbustools.messaging.gt4_0_elastic.generated.v2009_08_15.AvailabilityZoneSetType;
-import org.nimbustools.messaging.gt4_0_elastic.generated.v2009_08_15.AvailabilityZoneItemType;
+import org.nimbustools.messaging.gt4_0_elastic.generated.v2010_06_15.DescribeAvailabilityZonesResponseType;
+import org.nimbustools.messaging.gt4_0_elastic.generated.v2010_06_15.DescribeAvailabilityZonesType;
+import org.nimbustools.messaging.gt4_0_elastic.generated.v2010_06_15.DescribeAvailabilityZonesSetType;
+import org.nimbustools.messaging.gt4_0_elastic.generated.v2010_06_15.DescribeAvailabilityZonesSetItemType;
+import org.nimbustools.messaging.gt4_0_elastic.generated.v2010_06_15.AvailabilityZoneSetType;
+import org.nimbustools.messaging.gt4_0_elastic.generated.v2010_06_15.AvailabilityZoneItemType;
 
 import java.rmi.RemoteException;
 import java.util.List;

diff --git a/...ridge/src/org/nimbustools/messaging/gt4_0_elastic/v2008_05_05/image/ServiceImageImpl.java b/...ridge/src/org/nimbustools/messaging/gt4_0_elastic/v2008_05_05/image/ServiceImageImpl.java
@@ -16,14 +16,14 @@
 
 package org.nimbustools.messaging.gt4_0_elastic.v2008_05_05.image;
 
-import org.nimbustools.messaging.gt4_0_elastic.generated.v2009_08_15.DescribeImagesResponseType;
-import org.nimbustools.messaging.gt4_0_elastic.generated.v2009_08_15.DescribeImagesType;
-import org.nimbustools.messaging.gt4_0_elastic.generated.v2009_08_15.DescribeImagesOwnersType;
-import org.nimbustools.messaging.gt4_0_elastic.generated.v2009_08_15.DescribeImagesOwnerType;
-import org.nimbustools.messaging.gt4_0_elastic.generated.v2009_08_15.DescribeImagesInfoType;
-import org.nimbustools.messaging.gt4_0_elastic.generated.v2009_08_15.DescribeImagesItemType;
-import org.nimbustools.messaging.gt4_0_elastic.generated.v2009_08_15.DescribeImagesResponseInfoType;
-import org.nimbustools.messaging.gt4_0_elastic.generated.v2009_08_15.DescribeImagesResponseItemType;
+import org.nimbustools.messaging.gt4_0_elastic.generated.v2010_06_15.DescribeImagesResponseType;
+import org.nimbustools.messaging.gt4_0_elastic.generated.v2010_06_15.DescribeImagesType;
+import org.nimbustools.messaging.gt4_0_elastic.generated.v2010_06_15.DescribeImagesOwnersType;
+import org.nimbustools.messaging.gt4_0_elastic.generated.v2010_06_15.DescribeImagesOwnerType;
+import org.nimbustools.messaging.gt4_0_elastic.generated.v2010_06_15.DescribeImagesInfoType;
+import org.nimbustools.messaging.gt4_0_elastic.generated.v2010_06_15.DescribeImagesItemType;
+import org.nimbustools.messaging.gt4_0_elastic.generated.v2010_06_15.DescribeImagesResponseInfoType;
+import org.nimbustools.messaging.gt4_0_elastic.generated.v2010_06_15.DescribeImagesResponseItemType;
 import org.nimbustools.messaging.gt4_0_elastic.v2008_05_05.rm.ContainerInterface;
 import org.nimbustools.messaging.gt4_0_elastic.v2008_05_05.service.UnimplementedOperations;
 import org.nimbustools.messaging.gt4_0_elastic.v2008_05_05.ServiceImage;

diff --git a/...c/java/msgbridge/src/org/nimbustools/messaging/gt4_0_elastic/v2008_05_05/rm/Describe.java b/...c/java/msgbridge/src/org/nimbustools/messaging/gt4_0_elastic/v2008_05_05/rm/Describe.java
@@ -18,10 +18,10 @@
 
 import org.nimbustools.api.repr.CannotTranslateException;
 import org.nimbustools.api.repr.vm.VM;
-import org.nimbustools.messaging.gt4_0_elastic.generated.v2009_08_15.DescribeInstancesResponseType;
-import org.nimbustools.messaging.gt4_0_elastic.generated.v2009_08_15.DescribeInstancesType;
-import org.nimbustools.messaging.gt4_0_elastic.generated.v2009_08_15.PlacementResponseType;
-import org.nimbustools.messaging.gt4_0_elastic.generated.v2009_08_15.InstanceStateType;
+import org.nimbustools.messaging.gt4_0_elastic.generated.v2010_06_15.DescribeInstancesResponseType;
+import org.nimbustools.messaging.gt4_0_elastic.generated.v2010_06_15.DescribeInstancesType;
+import org.nimbustools.messaging.gt4_0_elastic.generated.v2010_06_15.PlacementResponseType;
+import org.nimbustools.messaging.gt4_0_elastic.generated.v2010_06_15.InstanceStateType;
 
 import java.util.Calendar;
 

diff --git a/...tic/java/msgbridge/src/org/nimbustools/messaging/gt4_0_elastic/v2008_05_05/rm/Reboot.java b/...tic/java/msgbridge/src/org/nimbustools/messaging/gt4_0_elastic/v2008_05_05/rm/Reboot.java
@@ -16,7 +16,7 @@
 
 package org.nimbustools.messaging.gt4_0_elastic.v2008_05_05.rm;
 
-import org.nimbustools.messaging.gt4_0_elastic.generated.v2009_08_15.RebootInstancesType;
+import org.nimbustools.messaging.gt4_0_elastic.generated.v2010_06_15.RebootInstancesType;
 import org.nimbustools.api.repr.Caller;
 import org.nimbustools.api.services.rm.Manager;
 

diff --git a/...lastic/java/msgbridge/src/org/nimbustools/messaging/gt4_0_elastic/v2008_05_05/rm/Run.java b/...lastic/java/msgbridge/src/org/nimbustools/messaging/gt4_0_elastic/v2008_05_05/rm/Run.java
@@ -20,9 +20,9 @@
 import org.nimbustools.api.repr.CreateRequest;
 import org.nimbustools.api.repr.CannotTranslateException;
 import org.nimbustools.api.repr.CreateResult;
-import org.nimbustools.messaging.gt4_0_elastic.generated.v2009_08_15.RunInstancesType;
-import org.nimbustools.messaging.gt4_0_elastic.generated.v2009_08_15.ReservationInfoType;
-import org.nimbustools.messaging.gt4_0_elastic.generated.v2009_08_15.RunInstancesResponseType;
+import org.nimbustools.messaging.gt4_0_elastic.generated.v2010_06_15.RunInstancesType;
+import org.nimbustools.messaging.gt4_0_elastic.generated.v2010_06_15.ReservationInfoType;
+import org.nimbustools.messaging.gt4_0_elastic.generated.v2010_06_15.RunInstancesResponseType;
 
 import java.rmi.RemoteException;
 

diff --git a/...a/msgbridge/src/org/nimbustools/messaging/gt4_0_elastic/v2008_05_05/rm/ServiceRMImpl.java b/...a/msgbridge/src/org/nimbustools/messaging/gt4_0_elastic/v2008_05_05/rm/ServiceRMImpl.java
@@ -30,7 +30,7 @@
 import org.nimbustools.api.services.rm.ManageException;
 import org.nimbustools.api.services.rm.Manager;
 import org.nimbustools.messaging.gt4_0.common.AddCustomizations;
-import org.nimbustools.messaging.gt4_0_elastic.generated.v2009_08_15.*;
+import org.nimbustools.messaging.gt4_0_elastic.generated.v2010_06_15.*;
 import org.nimbustools.messaging.gt4_0_elastic.v2008_05_05.ServiceRM;
 import org.nimbustools.messaging.gt4_0_elastic.v2008_05_05.service.UnimplementedOperations;
 

diff --git a/.../java/msgbridge/src/org/nimbustools/messaging/gt4_0_elastic/v2008_05_05/rm/Terminate.java b/.../java/msgbridge/src/org/nimbustools/messaging/gt4_0_elastic/v2008_05_05/rm/Terminate.java
@@ -19,8 +19,8 @@
 import org.nimbustools.api.repr.CreateResult;
 import org.nimbustools.api.repr.Caller;
 import org.nimbustools.api.services.rm.Manager;
-import org.nimbustools.messaging.gt4_0_elastic.generated.v2009_08_15.TerminateInstancesType;
-import org.nimbustools.messaging.gt4_0_elastic.generated.v2009_08_15.TerminateInstancesResponseType;
+import org.nimbustools.messaging.gt4_0_elastic.generated.v2010_06_15.TerminateInstancesType;
+import org.nimbustools.messaging.gt4_0_elastic.generated.v2010_06_15.TerminateInstancesResponseType;
 
 import java.rmi.RemoteException;
 

diff --git a/.../src/org/nimbustools/messaging/gt4_0_elastic/v2008_05_05/rm/defaults/DefaultDescribe.java b/.../src/org/nimbustools/messaging/gt4_0_elastic/v2008_05_05/rm/defaults/DefaultDescribe.java
@@ -25,7 +25,7 @@
 import org.nimbustools.api.repr.vm.State;
 import org.nimbustools.api.repr.vm.ResourceAllocation;
 import org.nimbustools.api.repr.vm.Schedule;
-import org.nimbustools.messaging.gt4_0_elastic.generated.v2009_08_15.*;
+import org.nimbustools.messaging.gt4_0_elastic.generated.v2010_06_15.*;
 import org.nimbustools.messaging.gt4_0_elastic.v2008_05_05.general.Validity;
 import org.nimbustools.messaging.gt4_0_elastic.v2008_05_05.general.Networks;
 import org.nimbustools.messaging.gt4_0_elastic.v2008_05_05.general.ResourceAllocations;

diff --git a/...ge/src/org/nimbustools/messaging/gt4_0_elastic/v2008_05_05/rm/defaults/DefaultReboot.java b/...ge/src/org/nimbustools/messaging/gt4_0_elastic/v2008_05_05/rm/defaults/DefaultReboot.java
@@ -20,9 +20,9 @@
 import org.apache.commons.logging.LogFactory;
 import org.nimbustools.api.repr.Caller;
 import org.nimbustools.api.services.rm.Manager;
-import org.nimbustools.messaging.gt4_0_elastic.generated.v2009_08_15.RebootInstancesInfoType;
-import org.nimbustools.messaging.gt4_0_elastic.generated.v2009_08_15.RebootInstancesItemType;
-import org.nimbustools.messaging.gt4_0_elastic.generated.v2009_08_15.RebootInstancesType;
+import org.nimbustools.messaging.gt4_0_elastic.generated.v2010_06_15.RebootInstancesInfoType;
+import org.nimbustools.messaging.gt4_0_elastic.generated.v2010_06_15.RebootInstancesItemType;
+import org.nimbustools.messaging.gt4_0_elastic.generated.v2010_06_15.RebootInstancesType;
 import org.nimbustools.messaging.gt4_0_elastic.v2008_05_05.rm.IDMappings;
 import org.nimbustools.messaging.gt4_0_elastic.v2008_05_05.rm.Reboot;
 

diff --git a/...ridge/src/org/nimbustools/messaging/gt4_0_elastic/v2008_05_05/rm/defaults/DefaultRun.java b/...ridge/src/org/nimbustools/messaging/gt4_0_elastic/v2008_05_05/rm/defaults/DefaultRun.java
@@ -35,7 +35,7 @@
 import org.nimbustools.api.repr.vm.State;
 import org.nimbustools.api.repr.vm.VM;
 import org.nimbustools.api.repr.vm.VMFile;
-import org.nimbustools.messaging.gt4_0_elastic.generated.v2009_08_15.*;
+import org.nimbustools.messaging.gt4_0_elastic.generated.v2010_06_15.*;
 import org.nimbustools.messaging.gt4_0_elastic.v2008_05_05.general.Networks;
 import org.nimbustools.messaging.gt4_0_elastic.v2008_05_05.general.ResourceAllocations;
 import org.nimbustools.messaging.gt4_0_elastic.v2008_05_05.image.Repository;

diff --git a/...src/org/nimbustools/messaging/gt4_0_elastic/v2008_05_05/rm/defaults/DefaultTerminate.java b/...src/org/nimbustools/messaging/gt4_0_elastic/v2008_05_05/rm/defaults/DefaultTerminate.java
@@ -25,13 +25,13 @@
 import org.nimbustools.api.services.rm.Manager;
 import org.nimbustools.api.services.rm.DoesNotExistException;
 import org.nimbustools.api.services.rm.ManageException;
-import org.nimbustools.messaging.gt4_0_elastic.generated.v2009_08_15.TerminateInstancesInfoType;
-import org.nimbustools.messaging.gt4_0_elastic.generated.v2009_08_15.TerminateInstancesItemType;
-import org.nimbustools.messaging.gt4_0_elastic.generated.v2009_08_15.TerminateInstancesType;
-import org.nimbustools.messaging.gt4_0_elastic.generated.v2009_08_15.TerminateInstancesResponseType;
-import org.nimbustools.messaging.gt4_0_elastic.generated.v2009_08_15.InstanceStateType;
-import org.nimbustools.messaging.gt4_0_elastic.generated.v2009_08_15.TerminateInstancesResponseItemType;
-import org.nimbustools.messaging.gt4_0_elastic.generated.v2009_08_15.TerminateInstancesResponseInfoType;
+import org.nimbustools.messaging.gt4_0_elastic.generated.v2010_06_15.InstanceIdSetType;
+import org.nimbustools.messaging.gt4_0_elastic.generated.v2010_06_15.InstanceIdType;
+import org.nimbustools.messaging.gt4_0_elastic.generated.v2010_06_15.InstanceStateChangeSetType;
+import org.nimbustools.messaging.gt4_0_elastic.generated.v2010_06_15.InstanceStateChangeType;
+import org.nimbustools.messaging.gt4_0_elastic.generated.v2010_06_15.TerminateInstancesType;
+import org.nimbustools.messaging.gt4_0_elastic.generated.v2010_06_15.TerminateInstancesResponseType;
+import org.nimbustools.messaging.gt4_0_elastic.generated.v2010_06_15.InstanceStateType;
 import org.nimbustools.messaging.gt4_0_elastic.v2008_05_05.rm.IDMappings;
 import org.nimbustools.messaging.gt4_0_elastic.v2008_05_05.rm.Terminate;
 import org.nimbustools.messaging.gt4_0_elastic.v2008_05_05.general.StateMap;
@@ -228,28 +228,28 @@ public TerminateInstancesResponseType terminate(TerminateInstancesType req,
             }
         }
 
-        final List retList = new LinkedList();
+        final List<InstanceStateChangeType> retList = 
+                            new LinkedList<InstanceStateChangeType>();
 
         for (int i = 0; i < newStates.length; i++) {
 
             if (currentStates[i] == null) {
                 continue;
             }
-
+            
             retList.add(
-                    new TerminateInstancesResponseItemType(elasticInstIDs[i],
-                                                           currentStates[i],
-                                                           newStates[i]));
+                    new InstanceStateChangeType(currentStates[i], 
+                                                elasticInstIDs[i], 
+                                                newStates[i]));
         }
 
 
-        final TerminateInstancesResponseItemType[] tirits =
-                (TerminateInstancesResponseItemType[])
-                    retList.toArray(
-                            new TerminateInstancesResponseItemType[retList.size()]);
+        final InstanceStateChangeType[] tirits =
+                retList.toArray(
+                            new InstanceStateChangeType[retList.size()]);
 
-        final TerminateInstancesResponseInfoType tirtSet =
-                                new TerminateInstancesResponseInfoType();
+        final InstanceStateChangeSetType tirtSet =
+                                new InstanceStateChangeSetType();
         tirtSet.setItem(tirits);
         final TerminateInstancesResponseType tirt =
                                 new TerminateInstancesResponseType();
@@ -268,19 +268,19 @@ protected String[] getElasticIDs(TerminateInstancesType req) {
             throw new IllegalArgumentException("req may not be null");
         }
 
-        final List elasticIDs = new LinkedList();
+        final List<String> elasticIDs = new LinkedList<String>();
 
-        final TerminateInstancesInfoType tiitSet = req.getInstancesSet();
+        final InstanceIdSetType tiitSet = req.getInstancesSet();
         if (tiitSet != null) {
 
-            final TerminateInstancesItemType[] tiits = tiitSet.getItem();
+            final InstanceIdType[] tiits = tiitSet.getItem();
 
             if (tiits == null || tiits.length == 0) {
                 return EMPTY_STRING_ARRAY; // *** EARLY RETURN ***
             }
 
             for (int i = 0; i < tiits.length; i++) {
-                final TerminateInstancesItemType tiit = tiits[i];
+                final InstanceIdType tiit = tiits[i];
                 if (tiit != null) {
                     final String idUntrimmed = tiit.getInstanceId();
                     if (idUntrimmed != null) {

diff --git a/...va/msgbridge/src/org/nimbustools/messaging/gt4_0_elastic/v2008_05_05/security/KeyGen.java b/...va/msgbridge/src/org/nimbustools/messaging/gt4_0_elastic/v2008_05_05/security/KeyGen.java
@@ -16,7 +16,7 @@
 
 package org.nimbustools.messaging.gt4_0_elastic.v2008_05_05.security;
 
-import org.nimbustools.messaging.gt4_0_elastic.generated.v2009_08_15.CreateKeyPairResponseType;
+import org.nimbustools.messaging.gt4_0_elastic.generated.v2010_06_15.CreateKeyPairResponseType;
 import org.nimbustools.messaging.gt4_0_elastic.DisabledException;
 import org.nimbustools.api.repr.Caller;
 

diff --git a/...e/src/org/nimbustools/messaging/gt4_0_elastic/v2008_05_05/security/RMServiceSecurity.java b/...e/src/org/nimbustools/messaging/gt4_0_elastic/v2008_05_05/security/RMServiceSecurity.java
@@ -18,7 +18,7 @@
 import org.nimbustools.messaging.gt4_0_elastic.v2008_05_05.ServiceSecurity;
 import org.nimbustools.messaging.gt4_0_elastic.v2008_05_05.rm.ContainerInterface;
 import org.nimbustools.messaging.gt4_0_elastic.v2008_05_05.service.UnimplementedOperations;
-import org.nimbustools.messaging.gt4_0_elastic.generated.v2009_08_15.*;
+import org.nimbustools.messaging.gt4_0_elastic.generated.v2010_06_15.*;
 import org.nimbustools.api.brain.ModuleLocator;
 import org.nimbustools.api.services.security.KeyManager;
 import org.nimbustools.api.services.security.KeyExistsException;