Merge pull request #42 from gcheng/dev

Dev
Azure · Jun 26, 2013 · 4d4faca · 4d4faca
2 parents aa4c680 + e7f6f49
commit 4d4faca
Show file tree

Hide file tree

Showing 18 changed files with 788 additions and 157 deletions.
diff --git a/ChangeLog.txt b/ChangeLog.txt
@@ -1,3 +1,13 @@
+2013.05.27 Version 0.4.3
+* Added support for updating existing Queue/Topic/Subscription for Service Bus
+* Added support for message lock renewal to support long running message processing for Service Bus
+* Added new properties to Queue/Topic/Subscription/Rule for Service Bus
+* Added support for rebinding content key for Media Services
+
+2013.04.16 Version 0.4.2
+* Fixed a bunch of GB18030 encoding issues
+* Fixed a service bus issue when the locale is not UTC
+
 2013.03.12 Version 0.4.1
  * Added "Azure-SDK-For-Java/<version>" To User-Agent HTTP header
  * Added connection string support for Service Bus

diff --git a/README.md b/README.md
@@ -1,30 +1,41 @@
 #Windows Azure SDK for Java
 
-This SDK allows you to build Windows Azure applications in Java that allow
-you to take advantage of Azure scalable cloud computing resources: table and blob
-storage, messaging through Service Bus.
-
-For documentation please see the [Windows Azure Java Developer Center](http://www.windowsazure.com/en-us/develop/java/)
+This project provides a client library in Java that makes it easy to consume Windows Azure services. For documentation please see the [Windows Azure Java Developer Center](http://www.windowsazure.com/en-us/develop/java/).
 
 #Features
-* Blob
-  * Create/Read/Update/Delete Blobs
-* Queue
-  * Create/Delete Queues
-  * Insert/Peek Queue Messages
-  * Advanced Queue Operations
-* Media Services
-  * Upload Media Files to Media Services
-  * Change the encoding on uploaded Media Services
-  * Provide streaming or download access to uploaded/transformed Media Files
+
+* Storage
+    * Blob
+        * Create/Read/Update/Delete containers
+        * Create/Read/Update/Delete blobs
+    * Queue
+        * Create/Delete Queues
+        * Insert/Peek Queue Messages
+        * Advanced Queue Operations
+    * Table
+        * Create/Read/Update/Delete tables
+        * Create/Read/Update/Delete entities
+        * Batch operation
 * Service Bus
-  * Use either the Queue or Topic/Subscription Model
+    * Queues
+        * Create/Read/Update/Delete queues
+        * Send/Receive/Unlock/Delete messages
+        * Renew message lock
+    * Topics
+        * Create/Read/Update/Delete topics
+        * Create/Read/Update/Delete subscriptions
+        * Create/Read/Update/Delete rules
+        * Send/Receive/Unlock/Delete messages
+        * Renew message lock
+* Media Services
+    * Create/Read/Update/Delete access policies
+    * Create/Read/Update/Delete asset files
+    * Create/Read/Update/Delete assets
+    * Create/Read/Update/Delete/Rebind content keys
+    * Create/Read/Update/Cancel/Delete jobs
 * Service Runtime
-  * Retrieve information about the state of your Azure Compute instances
-* Table
-  * Manage Tables
-  * Table Entity Operations
-  * Entity Group Transactions (Batch)
+    * Retrieve information about the state of your Azure Compute instances
+
 
 #Getting Started
 
@@ -42,11 +53,13 @@ To get the source code of the SDK via git just type:
 To get the binaries of this library as distributed by Microsoft, ready for use
 within your project you can also have them installed by the Java package manager Maven.
 
-    <dependency>
-      <groupId>com.microsoft.windowsazure</groupId>
-      <artifactId>microsoft-windowsazure-api</artifactId>
-      <version>0.4.2</version>
-    </dependency>
+```xml
+<dependency>
+  <groupId>com.microsoft.windowsazure</groupId>
+  <artifactId>microsoft-windowsazure-api</artifactId>
+  <version>0.4.2</version>
+</dependency>
+```
 
 ##Minimum Requirements
 
@@ -61,67 +74,62 @@ account.  To host your Java code in Windows Azure, you additionally need to down
 the full Windows Azure SDK for Java - which includes packaging, emulation, and
 deployment tools.
 
-##Code Samples
+##Code Sample
 
 The following is a quick example on how to set up a Azure blob using the API
 and uploading a file to it.  For additional information on using the client libraries to access Azure services see the How To guides listed [here](http://www.windowsazure.com/en-us/develop/java/).
 
+```java
+import java.io.*;
+
+import com.microsoft.windowsazure.services.core.storage.*;
+import com.microsoft.windowsazure.services.blob.client.*;
+
+public class BlobSample {
+	public static final String storageConnectionString =
+			"DefaultEndpointsProtocol=http;"
+			+ "AccountName=your_account_name;"
+			+ "AccountKey= your_account_key";
+
+	public static void main(String[] args) {
+		try {
+			CloudStorageAccount account;
+			CloudBlobClient serviceClient;
+			CloudBlobContainer container;
+			CloudBlockBlob blob;
+
+			account = CloudStorageAccount.parse(storageConnectionString);
+			serviceClient = account.createCloudBlobClient();
+			// Container name must be lower case.
+			container = serviceClient.getContainerReference("blobsample");
+			container.createIfNotExist();
+
+			// Set anonymous access on the container.
+			BlobContainerPermissions containerPermissions;
+			containerPermissions = new BlobContainerPermissions();
+			container.uploadPermissions(containerPermissions);
+
+			// Upload an image file.
+			blob = container.getBlockBlobReference("image1.jpg");
+			File fileReference = new File("c:\\myimages\\image1.jpg");
+			blob.upload(new FileInputStream(fileReference), fileReference.length());
+		} catch (FileNotFoundException fileNotFoundException) {
+			System.out.print("FileNotFoundException encountered: ");
+			System.out.println(fileNotFoundException.getMessage());
+			System.exit(-1);
+		} catch (StorageException storageException) {
+			System.out.print("StorageException encountered: ");
+			System.out.println(storageException.getMessage());
+			System.exit(-1);
+		} catch (Exception e) {
+			System.out.print("Exception encountered: ");
+			System.out.println(e.getMessage());
+			System.exit(-1);
+		}
 
-	import com.microsoft.windowsazure.services.core.storage.*;
-	import com.microsoft.windowsazure.services.blob.client.*;
-
-	public class BlobSample {
-	    public static final String storageConnectionString = 
-            "DefaultEndpointsProtocol=http;" + 
-            "AccountName=your_account_name;" + 
-            "AccountKey= your_account_name"; 
-
-    	public static void main(String[] args) 
-    	{
-        	try
-        	{
-            	CloudStorageAccount account;
-            	CloudBlobClient serviceClient;
-            	CloudBlobContainer container;
-            	CloudBlockBlob blob;
-        
-            	account = CloudStorageAccount.parse(storageConnectionString);
-            	serviceClient = account.createCloudBlobClient();
-            	// Container name must be lower case.
-            	container = serviceClient.getContainerReference("blobsample");
-            	container.createIfNotExist();
-        
-            	// Set anonymous access on the container.
-            	BlobContainerPermissions containerPermissions;
-            	containerPermissions = new BlobContainerPermissions();
-
-            	// Upload an image file.
-            	blob = container.getBlockBlobReference("image1.jpg");
-            	File fileReference = new File ("c:\\myimages\\image1.jpg");
-            	blob.upload(new FileInputStream(fileReference), fileReference.length());
-        	} 
-        	catch (FileNotFoundException fileNotFoundException)
-        	{
-            	System.out.print("FileNotFoundException encountered: ");
-            	System.out.println(fileNotFoundException.getMessage());
-            	System.exit(-1);
-        	}
-        	catch (StorageException storageException)
-        	{
-            	System.out.print("StorageException encountered: ");
-            	System.out.println(storageException.getMessage());
-            	System.exit(-1);
-        	}
-        	catch (Exception e)
-        	{
-            	System.out.print("Exception encountered: ");
-            	System.out.println(e.getMessage());
-            	System.exit(-1);
-        	}
-
-    	}
 	}
-
+}
+```
 
 #Need Help?
 

diff --git a/microsoft-azure-api/pom.xml b/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.2</version>
+  <version>0.4.3</version>
   <packaging>jar</packaging>
 
   <name>Microsoft Windows Azure Client API</name>
@@ -143,7 +143,7 @@
       <plugin>
         <groupId>org.jvnet.jaxb2.maven2</groupId>
         <artifactId>maven-jaxb2-plugin</artifactId>
-        <version>0.8.0</version>
+        <version>0.8.3</version>
         <executions>
           <execution>
             <phase>generate-sources</phase>
@@ -154,16 +154,18 @@
         </executions>
         <configuration>
           <extension>true</extension>
+          <debug>true</debug>
+          <verbose>true</verbose>
           <plugins>
             <plugin>
               <groupId>org.jvnet.jaxb2_commons</groupId>
               <artifactId>jaxb2-basics</artifactId>
-              <version>0.6.0</version>
+              <version>0.6.4</version>
             </plugin>
             <plugin>
               <groupId>org.jvnet.jaxb2_commons</groupId>
               <artifactId>jaxb2-basics-annotate</artifactId>
-              <version>0.6.0</version>
+              <version>0.6.4</version>
             </plugin>
           </plugins>
 

diff --git a/...-api/src/main/java/com/microsoft/windowsazure/services/serviceBus/ServiceBusContract.java b/...-api/src/main/java/com/microsoft/windowsazure/services/serviceBus/ServiceBusContract.java
@@ -195,13 +195,13 @@ ReceiveSubscriptionMessageResult receiveSubscriptionMessage(String topicPath, St
     /**
      * Creates a queue.
      * 
-     * @param queue
-     *            A <code>Queue</code> object that represents the queue to create.
+     * @param queueInfo
+     *            A <code>QueueInfo</code> object that represents the queue to create.
      * @return A <code>CreateQueueResult</code> object that represents the result.
      * @throws ServiceException
      *             If a service exception is encountered.
      */
-    CreateQueueResult createQueue(QueueInfo queue) throws ServiceException;
+    CreateQueueResult createQueue(QueueInfo queueInfo) throws ServiceException;
 
     /**
      * Deletes a queue.

diff --git a/...c/main/java/com/microsoft/windowsazure/services/serviceBus/implementation/EntryModel.java b/...c/main/java/com/microsoft/windowsazure/services/serviceBus/implementation/EntryModel.java
@@ -2,15 +2,15 @@
  * 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.serviceBus.implementation;
 

diff --git a/...crosoft/windowsazure/services/serviceBus/implementation/ServiceBusConnectionSettings.java b/...crosoft/windowsazure/services/serviceBus/implementation/ServiceBusConnectionSettings.java
@@ -1,11 +1,11 @@
 /**
  * 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
- *
+ * 
  * 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.
@@ -15,29 +15,30 @@
 
 package com.microsoft.windowsazure.services.serviceBus.implementation;
 
-import com.microsoft.windowsazure.services.core.utils.ConnectionStringSyntaxException;
-
 import java.net.URI;
 import java.net.URISyntaxException;
 
+import com.microsoft.windowsazure.services.core.utils.ConnectionStringSyntaxException;
+
 /**
  * Class that encapsulates all the various settings needed
  * to connect to Service Bus, provided via either a
  * connection string or via separate configuration variables.
  * <p/>
- * The connection string is looked for first, falling back
- * to separate config values if not found.
+ * The connection string is looked for first, falling back to separate config values if not found.
  */
 class ServiceBusConnectionSettings {
     private String uri;
     private String wrapUri;
     private String wrapName;
     private String wrapPassword;
 
-    public ServiceBusConnectionSettings(String connectionString, String uri, String wrapUri, String wrapName, String wrapPassword) throws ConnectionStringSyntaxException, URISyntaxException {
+    public ServiceBusConnectionSettings(String connectionString, String uri, String wrapUri, String wrapName,
+            String wrapPassword) throws ConnectionStringSyntaxException, URISyntaxException {
         if (connectionString != null) {
             parseConnectionString(connectionString);
-        } else {
+        }
+        else {
             this.uri = uri;
             this.wrapUri = wrapUri;
             this.wrapName = wrapName;
@@ -61,7 +62,8 @@ public String getWrapPassword() {
         return wrapPassword;
     }
 
-    private boolean parseConnectionString(String connectionString) throws URISyntaxException, ConnectionStringSyntaxException {
+    private boolean parseConnectionString(String connectionString) throws URISyntaxException,
+            ConnectionStringSyntaxException {
         ServiceBusConnectionString cs = new ServiceBusConnectionString(connectionString);
         setUri(cs);
         setWrapUri(cs);
@@ -79,8 +81,9 @@ private void setWrapUri(ServiceBusConnectionString connectionString) throws URIS
             URI hostUri = new URI(uri);
             String namespace = hostUri.getHost().split("\\.")[0];
             wrapUri = "https://" + namespace + "-sb.accesscontrol.windows.net/WRAPv0.9";
-        } else {
-            wrapUri = connectionString.getStsEndpoint();
+        }
+        else {
+            wrapUri = connectionString.getStsEndpoint().replaceAll("\\/$", "") + "/WRAPv0.9";
         }
     }
 }