Merge branch 'master' of github.com:cloudinary/cloudinary_java

Conflicts:
	README.md
	cloudinary-http42/src/main/java/com/cloudinary/http42/UrlBuilderStrategy.java
	cloudinary-http42/src/test/java/com/cloudinary/test/ApiTest.java
	cloudinary-http42/src/test/java/com/cloudinary/test/UploaderTest.java

Author: tocker

CHANGES.txt

@@ -5,4 +5,5 @@
 1.1.0 - 2014-11-17 - Support folder listing API. Consolidate Android and Java client libraries. Support signed urls in tag helpers (image and url)
 1.1.1 - 2014-12-18 - Support secure domain sharding. Don't sign version component. Support url suffix and use root path. Support tags in upload large.
 1.1.2 - 2015-01-15 - fix support for string eager parameters
-1.1.3 - 2015-02-24 - Added timeout parameter to admin api and Fixed test and configuration
+1.1.3 - 2015-02-24 - Added timeout parameter to admin api and Fixed test and configuration
+1.2.0 - 2015-04-13 - Support httpcomponents 4.4. Support for video tag and transformations. support ftp url upload. support eager_async in explicit. Fix UTF-8 issues in API. Improved parameter support for upload_large.

README.md

@@ -9,11 +9,12 @@ Images are seamlessly delivered through a fast CDN, and much much more.
 
 Cloudinary offers comprehensive APIs and administration capabilities and is easy to integrate with any web application, existing or new.
 
+
 Cloudinary provides URL and HTTP based APIs that can be easily integrated with any Web development framework. 
 
 For Java, Cloudinary provides a library for simplifying the integration even further.
 
-**Note:** Starting from version 1.1.0, you should depend on cloudinary-http42 for Java and cloudinary-android for Android. The artifact cloudinary is deprecated.
+**Note:** Starting from version 1.1.0, you should depend on cloudinary-http42 for Java and cloudinary-android for Android. The artifact cloudinary is deprecated. From version 1.2.0 cloudinary-http44 is available.
 
 **Note:** This readme intended mainly for Web applications. For **Android** specific instructions, see: https://github.com/cloudinary/cloudinary_java/tree/master/cloudinary-android
 
@@ -26,12 +27,12 @@ The cloudinary_java library is available in [Maven Central](https://repo1.maven.
 
     <dependency>
         <groupId>com.cloudinary</groupId>
-        <artifactId>cloudinary-http42</artifactId>
-        <version>1.1.0</version>
+        <artifactId>cloudinary-http44</artifactId>
+        <version>1.2.0</version>
     </dependency>
 
-Alternatively, download cloudinary_java from [here](https://repo1.maven.org/maven2/com/cloudinary/cloudinary-core/1.1.0/cloudinary-core-1.1.0.jar) and [here](https://repo1.maven.org/maven2/com/cloudinary/cloudinary-http42/1.1.0/cloudinary-http42-1.1.0.jar)
-and see [pom.xml](https://github.com/cloudinary/cloudinary_java/cloudinary-http42/blob/master/pom.xml) for library dependencies.
+Alternatively, download cloudinary_java from [here](https://repo1.maven.org/maven2/com/cloudinary/cloudinary-core/1.2.0/cloudinary-core-1.2.0.jar) and [here](https://repo1.maven.org/maven2/com/cloudinary/cloudinary-http44/1.2.0/cloudinary-http44-1.2.0.jar)
+and see [pom.xml](https://github.com/cloudinary/cloudinary_java/blob/master/cloudinary-http44/pom.xml) for library dependencies.
 
 ## Try it right away
 
@@ -100,21 +101,21 @@ Any image uploaded to Cloudinary can be transformed and embedded using powerful
 
 The following example generates the url for accessing an uploaded `sample` image while transforming it to fill a 100x150 rectangle:
 
-    cloudinary.url().transformation(new Transformation().width(100).height(150).crop("fill")).generate("sample.jpg")
+    cloudinary.url().transformation(new Transformation().width(100).height(150).crop("fill")).generate("sample.jpg");
 
 Another example, emedding a smaller version of an uploaded image while generating a 90x90 face detection based thumbnail: 
 
-    cloudinary.url().transformation(new Transformation().width(90).height(90).crop("thumb").gravity("face")).generate("woman.jpg")
+    cloudinary.url().transformation(new Transformation().width(90).height(90).crop("thumb").gravity("face")).generate("woman.jpg");
 
 You can provide either a Facebook name or a numeric ID of a Facebook profile or a fan page.  
 
 Embedding a Facebook profile to match your graphic design is very simple:
 
-    cloudinary.url().type("facebook").transformation(new Transformation().width(130).height(130).crop("fill").gravity("north_west")).generate("billclinton.jpg")
+    cloudinary.url().type("facebook").transformation(new Transformation().width(130).height(130).crop("fill").gravity("north_west")).generate("billclinton.jpg");
                            
 Same goes for Twitter:
 
-    cloudinary.url().type("twitter_name").generate("billclinton.jpg")
+    cloudinary.url().type("twitter_name").generate("billclinton.jpg");
 
 ![](http://res.cloudinary.com/cloudinary/image/upload/see_more_bullet.png) **See [our documentation](http://cloudinary.com/documentation/java_image_manipulation) for more information about displaying and transforming images in Java**.
 
@@ -124,21 +125,21 @@ Assuming you have your Cloudinary configuration parameters defined (`cloud_name`
 
 The following example uploads a local JPG to the cloud: 
 
-    cloudinary.uploader().upload("my_picture.jpg", ObjectUtils.emptyMap())
+    cloudinary.uploader().upload("my_picture.jpg", Cloudinary.emptyMap());
 
 The uploaded image is assigned a randomly generated public ID. The image is immediately available for download through a CDN:
 
-    cloudinary.url().generate("abcfrmo8zul1mafopawefg.jpg")
+    cloudinary.url().generate("abcfrmo8zul1mafopawefg.jpg");
         
-    http://res.cloudinary.com/demo/image/upload/abcfrmo8zul1mafopawefg.jpg
+    # http://res.cloudinary.com/demo/image/upload/abcfrmo8zul1mafopawefg.jpg
 
 You can also specify your own public ID:    
 
-    cloudinary.uploader().upload("http://www.example.com/image.jpg", Cloudinary.asMap("public_id", "sample_remote"))
+    cloudinary.uploader().upload("http://www.example.com/image.jpg", ObjectUtils.asMap("public_id", "sample_remote"));
 
-    cloudinary.url().generate("sample_remote.jpg")
+    cloudinary.url().generate("sample_remote.jpg");
 
-    http://res.cloudinary.com/demo/image/upload/sample_remote.jpg
+    # http://res.cloudinary.com/demo/image/upload/sample_remote.jpg
 
 ![](http://res.cloudinary.com/cloudinary/image/upload/see_more_bullet.png) **See [our documentation](http://cloudinary.com/documentation/java_image_upload) for plenty more options of uploading to the cloud from your Java code**.        
 
@@ -148,7 +149,7 @@ Returns an html image tag pointing to Cloudinary.
 
 Usage:
 
-    cloudinary.url().format("png").transformation(new Transformation().width(100).height(100).crop("fill")).imageTag("sample")
+    cloudinary.url().format("png").transformation(new Transformation().width(100).height(100).crop("fill")).imageTag("sample");
 
     # <img src='http://res.cloudinary.com/cloud_name/image/upload/c_fill,h_100,w_100/sample.png' height='100' width='100'/>
 

cloudinary-android-test/pom.xml

@@ -5,12 +5,12 @@
   <parent>
     <groupId>com.cloudinary</groupId>
     <artifactId>cloudinary-parent</artifactId>
-    <version>1.1.4-SNAPSHOT</version>
+    <version>1.2.1-SNAPSHOT</version>
   </parent>
 
   <groupId>com.cloudinary</groupId>
   <artifactId>cloudinary-android-test</artifactId>
-  <version>1.1.4-SNAPSHOT</version>
+  <version>1.2.1-SNAPSHOT</version>
   <packaging>apk</packaging>
   <name>Cloudinary Android Test Project</name>
 
@@ -19,7 +19,7 @@
       <groupId>com.cloudinary</groupId>
       <artifactId>cloudinary-android</artifactId>
       <type>jar</type>
-      <version>1.1.4-SNAPSHOT</version>
+      <version>1.2.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>com.google.android</groupId>

cloudinary-android-test/project.properties

@@ -11,5 +11,5 @@
 #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
 
 # Project target.
-target=android-7
+target=android-19
 android.library.reference.1=../cloudinary-android