0.4.5 release integrate to master branch

ChangeLog.txt

@@ -1,5 +1,9 @@
+2013.08.26 Version 0.4.5
+ * Added support for managing affinity groups
+ * Added support for Media Services job notification
+
 2013.07.03 Version 0.4.4
- * Windows Azure China environemnt support
+ * Windows Azure China environment support
  * Service Bus metadata support updated to the latest version
  * Rich Odata entity query support for Service Bus Queue/Topic/Subscription
  * Added support for Service Bus message forwarding

README.md

@@ -35,6 +35,10 @@ This project provides a client library in Java that makes it easy to consume Win
     * Create/Read/Update/Delete assets
     * Create/Read/Update/Delete/Rebind content keys
     * Create/Read/Update/Cancel/Delete jobs
+    * Add/Get job notifications
+    * Create/Read/Update/Delete notification endpoints
+* Service Management
+	* Manage affinity groups
 * Service Runtime
     * Retrieve information about the state of your Azure Compute instances
 
@@ -59,7 +63,7 @@ within your project you can also have them installed by the Java package manager
 <dependency>
   <groupId>com.microsoft.windowsazure</groupId>
   <artifactId>microsoft-windowsazure-api</artifactId>
-  <version>0.4.4</version>
+  <version>0.4.5</version>
 </dependency>
 ```
 

microsoft-azure-api/pom.xml

@@ -17,7 +17,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.microsoft.windowsazure</groupId>
   <artifactId>microsoft-windowsazure-api</artifactId>
-  <version>0.4.4</version>
+  <version>0.4.5</version>
   <packaging>jar</packaging>
 
   <name>Microsoft Windows Azure Client API</name>
@@ -134,7 +134,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
-        <version>2.3.2</version>
+        <version>3.1</version>
         <configuration>
           <source>1.6</source>
           <target>1.6</target>
@@ -146,10 +146,38 @@
         <version>0.8.3</version>
         <executions>
           <execution>
+            <id>serviceBus</id>
+            <phase>generate-sources</phase>
+            <goals>
+              <goal>generate</goal>
+            </goals>
+            <configuration>
+                <generateDirectory>target/generated-sources/xjc</generateDirectory>
+                <schemaDirectory>src/main/resources/serviceBus</schemaDirectory>
+                <schemaIncludes> 
+                    <include>servicebus-atom.xsd</include> 
+                </schemaIncludes>
+                <generatePackage>com.microsoft.windowsazure.services.serviceBus.implementation</generatePackage>
+                <removeOldOutput>false</removeOldOutput>
+                <forceRegenerate>true</forceRegenerate>
+            </configuration>
+          </execution>
+          <execution>
+            <id>management</id>
             <phase>generate-sources</phase>
             <goals>
               <goal>generate</goal>
             </goals>
+            <configuration>
+                <generateDirectory>target/generated-sources/xjc</generateDirectory>
+                <schemaDirectory>src/main/resources/management/</schemaDirectory>
+                <schemaIncludes>
+                    <include>schemas.microsoft.com.windowsazure.xsd</include>
+                </schemaIncludes>
+                <generatePackage>com.microsoft.windowsazure.services.management.implementation</generatePackage>
+                <removeOldOutput>false</removeOldOutput>
+                <forceRegenerate>true</forceRegenerate>
+            </configuration> 
           </execution>
         </executions>
         <configuration>

microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/blob/Exports.java

@@ -16,10 +16,10 @@
 
 import com.microsoft.windowsazure.services.blob.implementation.BlobExceptionProcessor;
 import com.microsoft.windowsazure.services.blob.implementation.BlobRestProxy;
-import com.microsoft.windowsazure.services.blob.implementation.ISO8601DateConverter;
 import com.microsoft.windowsazure.services.blob.implementation.SharedKeyFilter;
 import com.microsoft.windowsazure.services.blob.implementation.SharedKeyLiteFilter;
 import com.microsoft.windowsazure.services.core.Builder;
+import com.microsoft.windowsazure.services.core.ISO8601DateConverter;
 import com.microsoft.windowsazure.services.core.UserAgentFilter;
 
 public class Exports implements Builder.Exports {

microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/blob/implementation/BlobOperationRestProxy.java

@@ -67,6 +67,7 @@
 import com.microsoft.windowsazure.services.blob.models.SetBlobPropertiesOptions;
 import com.microsoft.windowsazure.services.blob.models.SetBlobPropertiesResult;
 import com.microsoft.windowsazure.services.blob.models.SetContainerMetadataOptions;
+import com.microsoft.windowsazure.services.core.RFC1123DateConverter;
 import com.microsoft.windowsazure.services.core.ServiceException;
 import com.microsoft.windowsazure.services.core.ServiceFilter;
 import com.microsoft.windowsazure.services.core.utils.CommaStringBuilder;

microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/blob/implementation/BlobRestProxy.java

@@ -21,6 +21,7 @@
 
 import com.microsoft.windowsazure.services.blob.BlobConfiguration;
 import com.microsoft.windowsazure.services.blob.BlobContract;
+import com.microsoft.windowsazure.services.core.RFC1123DateConverter;
 import com.microsoft.windowsazure.services.core.ServiceFilter;
 import com.microsoft.windowsazure.services.core.UserAgentFilter;
 import com.microsoft.windowsazure.services.core.utils.pipeline.HttpURLConnectionClient;

microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/blob/implementation/ContainerACLDateAdapter.java

@@ -2,22 +2,24 @@
  * Copyright Microsoft Corporation
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *    http://www.apache.org/licenses/LICENSE-2.0
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
  * 
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package com.microsoft.windowsazure.services.blob.implementation;
 
 import java.util.Date;
 
 import javax.xml.bind.annotation.adapters.XmlAdapter;
 
+import com.microsoft.windowsazure.services.core.ISO8601DateConverter;
+
 /*
  * JAXB adapter for a "not quite" ISO 8601 date time element
  */

microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/blob/implementation/SharedKeyFilter.java

@@ -26,6 +26,7 @@
 
 import com.microsoft.windowsazure.services.blob.BlobConfiguration;
 import com.microsoft.windowsazure.services.blob.implementation.SharedKeyUtils.QueryParam;
+import com.microsoft.windowsazure.services.core.RFC1123DateConverter;
 import com.microsoft.windowsazure.services.core.utils.pipeline.EntityStreamingListener;
 import com.sun.jersey.api.client.ClientHandlerException;
 import com.sun.jersey.api.client.ClientRequest;

microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/blob/implementation/SharedKeyLiteFilter.java

@@ -24,6 +24,7 @@
 
 import com.microsoft.windowsazure.services.blob.BlobConfiguration;
 import com.microsoft.windowsazure.services.blob.implementation.SharedKeyUtils.QueryParam;
+import com.microsoft.windowsazure.services.core.RFC1123DateConverter;
 import com.microsoft.windowsazure.services.core.utils.pipeline.EntityStreamingListener;
 import com.sun.jersey.api.client.ClientHandlerException;
 import com.sun.jersey.api.client.ClientRequest;

microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/blob/models/AccessCondition.java

@@ -16,7 +16,7 @@
 
 import java.util.Date;
 
-import com.microsoft.windowsazure.services.blob.implementation.RFC1123DateConverter;
+import com.microsoft.windowsazure.services.core.RFC1123DateConverter;
 
 /**
  * Represents a set of access conditions for operations that use storage services.

microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/blob/models/BlobProperties.java

@@ -19,7 +19,7 @@
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 
-import com.microsoft.windowsazure.services.blob.implementation.RFC1123DateAdapter;
+import com.microsoft.windowsazure.services.core.RFC1123DateAdapter;
 
 /**
  * Represents the HTML properties and system properties that may be set on a blob.

microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/blob/models/ListContainersResult.java

@@ -26,7 +26,7 @@
 
 import com.microsoft.windowsazure.services.blob.BlobContract;
 import com.microsoft.windowsazure.services.blob.implementation.MetadataAdapter;
-import com.microsoft.windowsazure.services.blob.implementation.RFC1123DateAdapter;
+import com.microsoft.windowsazure.services.core.RFC1123DateAdapter;
 
 /**
  * A wrapper class for the response returned from a Blob Service REST API List Containers operation. This is returned by

microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/core/Builder.java

@@ -2,30 +2,30 @@
  * Copyright Microsoft Corporation
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *    http://www.apache.org/licenses/LICENSE-2.0
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
  * 
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package com.microsoft.windowsazure.services.core;
 
 import java.util.Map;
 
 public interface Builder {
 
-    public abstract <T> T build(String profile, Class<T> service, Map<String, Object> properties);
+    public abstract <S, T> T build(String profile, Class<S> service, Class<T> instance, Map<String, Object> properties);
 
     public interface Factory<T> {
-        T create(String profile, Builder builder, Map<String, Object> properties);
+        <S> T create(String profile, Class<S> service, Builder builder, Map<String, Object> properties);
     }
 
     public interface Alteration<T> {
-        T alter(T instance, Builder builder, Map<String, Object> properties);
+        T alter(String profile, T instance, Builder builder, Map<String, Object> properties);
     }
 
     public interface Registry {
@@ -35,7 +35,7 @@ public interface Registry {
 
         <T> Registry add(Factory<T> factory);
 
-        <T> void alter(Class<T> service, Alteration<T> alteration);
+        <S, T> void alter(Class<S> service, Class<T> instance, Alteration<T> alteration);
     }
 
     public interface Exports {

microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/core/Configuration.java

@@ -91,11 +91,11 @@ public static Configuration load() throws IOException {
     }
 
     public <T> T create(Class<T> service) {
-        return builder.build("", service, properties);
+        return builder.build("", service, service, properties);
     }
 
     public <T> T create(String profile, Class<T> service) {
-        return builder.build(profile, service, properties);
+        return builder.build(profile, service, service, properties);
     }
 
     public Builder getBuilder() {