Skip to content

Commit d17e6f3

Browse files
tallevami-hometallevami-home
committed
Merge branch 'globalize'
2 parents 501e237 + 8a91cf8 commit d17e6f3

File tree

80 files changed

+7128
-1288
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

80 files changed

+7128
-1288
lines changed

‎.gitignore‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,6 @@ test-output/
1414

1515
*.iml
1616

17-
appengine-web.xml
17+
appengine-web.xml
18+
19+
cloudinary-android-test/src/main/AndroidManifest.xml

‎CHANGES.txt‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,5 @@
11
1.0.11 - 2014-03-04 - new update method. add listing by moderation kind and status. add moderation status in listing. add moderation flag in upload. add moderation_status in update. add ocr, raw_conversion, categorization, detection, similarity_search and auto_tagging parameters in update and upload. add support for uploading large raw files
22
1.0.12 - 2014-03-04 - Fix handling of Booleans in uploader API
3+
1.0.13 - 2014-04-29 - Allow passing ClientConnectionManager. Add support for opacity. Support upload_presets. Support unsigned uploads. Support start_at for resource listing. Support phash for upload and resource details. Support rate limit header in Api calls.
4+
1.0.14 - 2014-07-29 - Add background_removal. Support return_delete_token in upload/update params. Support responsive and hidpi. Support custom coordinates.
5+
1.1.0 - 2014-11-17 - Support folder listing API. Consolidate Android and Java client libraries.

‎README.md‎

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,23 +13,25 @@ Cloudinary provides URL and HTTP based APIs that can be easily integrated with a
1313

1414
For Java, Cloudinary provides a library for simplifying the integration even further.
1515

16-
**Note:** This Java library is intended mainly for Web applications. For **Android** integration, there is a dedicated library with a similar interface: https://github.com/cloudinary/cloudinary_android
16+
**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.
17+
18+
**Note:** This readme intended mainly for Web applications. For **Android** specific instructions, see: https://github.com/cloudinary/cloudinary_java/cloudinary-android
1719

1820
## Getting started guide
1921
![](http://res.cloudinary.com/cloudinary/image/upload/see_more_bullet.png) **Take a look at our [Getting started guide for Java](http://cloudinary.com/documentation/java_integration#getting_started_guide)**.
2022

2123
## Setup ######################################################################
2224

23-
The cloudinary_java library is available in [Maven Central](http://repo1.maven.org/maven/). To use it, add the following dependency to your pom.xml:
25+
The cloudinary_java library is available in [Maven Central](http://repo1.maven.org/maven/). To use it, add the following dependency to your pom.xml :
2426

2527
<dependency>
2628
<groupId>com.cloudinary</groupId>
27-
<artifactId>cloudinary</artifactId>
28-
<version>1.0.14</version>
29+
<artifactId>cloudinary-http42</artifactId>
30+
<version>1.1.0</version>
2931
</dependency>
3032

31-
Alternatively, download cloudinary_java from [here](https://github.com/cloudinary/cloudinary_java/tarball/master)
32-
and see [pom.xml](https://github.com/cloudinary/cloudinary_java/blob/master/pom.xml) for library dependencies.
33+
Alternatively, download cloudinary_java from [here](https://github.com/cloudinary/cloudinary_java/cloudinary-http42/tarball/master)
34+
and see [pom.xml](https://github.com/cloudinary/cloudinary_java/cloudinary-http42/blob/master/pom.xml) for library dependencies.
3335

3436
## Try it right away
3537

@@ -156,8 +158,8 @@ Returns an html input field for direct image upload, to be used in conjunction w
156158

157159
Usage:
158160

159-
Map options = Cloudinary.asMap("resource_type", "auto");
160-
Map htmlOptions = Cloudinary.asMap("alt", "sample");
161+
Map options = ObjectUtils.asMap("resource_type", "auto");
162+
Map htmlOptions = ObjectUtils.asMap("alt", "sample");
161163
String html = cloudinary.uploader().imageUploadTag("image_id", options, htmlOptions);
162164

163165
![](http://res.cloudinary.com/cloudinary/image/upload/see_more_bullet.png) **See [our documentation](http://cloudinary.com/documentation/java_image_upload#direct_uploading_from_the_browser) for plenty more options of uploading directly from the browser**.
@@ -182,3 +184,4 @@ Or via Twitter: [@cloudinary](https://twitter.com/#!/cloudinary)
182184
## License #######################################################################
183185

184186
Released under the MIT license.
187+

‎cloudinary-android-test/pom.xml‎

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
3+
<modelVersion>4.0.0</modelVersion>
4+
5+
<parent>
6+
<groupId>com.cloudinary</groupId>
7+
<artifactId>cloudinary-parent</artifactId>
8+
<version>1.1.0-SNAPSHOT</version>
9+
</parent>
10+
11+
<groupId>com.cloudinary</groupId>
12+
<artifactId>cloudinary-android-test</artifactId>
13+
<version>1.1.0-SNAPSHOT</version>
14+
<packaging>apk</packaging>
15+
<name>Cloudinary Android Test Project</name>
16+
17+
<dependencies>
18+
<dependency>
19+
<groupId>com.google.android</groupId>
20+
<artifactId>android</artifactId>
21+
<version>4.1.1.4</version>
22+
<scope>provided</scope>
23+
</dependency>
24+
<dependency>
25+
<groupId>com.google.android</groupId>
26+
<artifactId>android-test</artifactId>
27+
<version>2.3.1</version>
28+
<scope>provided</scope>
29+
</dependency>
30+
<dependency>
31+
<groupId>com.cloudinary</groupId>
32+
<artifactId>cloudinary-core</artifactId>
33+
<type>jar</type>
34+
<version>1.1.0-SNAPSHOT</version>
35+
</dependency>
36+
<dependency>
37+
<groupId>com.cloudinary</groupId>
38+
<artifactId>cloudinary-android</artifactId>
39+
<type>jar</type>
40+
<version>1.1.0-SNAPSHOT</version>
41+
</dependency>
42+
<dependency>
43+
<groupId>junit</groupId>
44+
<artifactId>junit</artifactId>
45+
<version>4.8.1</version>
46+
</dependency>
47+
</dependencies>
48+
<build>
49+
<finalName>${project.artifactId}</finalName>
50+
<plugins>
51+
<plugin>
52+
<groupId>com.jayway.maven.plugins.android.generation2</groupId>
53+
<artifactId>android-maven-plugin</artifactId>
54+
<version>4.0.0-rc.2</version>
55+
<configuration>
56+
<test>
57+
<createReport>true</createReport>
58+
</test>
59+
</configuration>
60+
<extensions>true</extensions>
61+
</plugin>
62+
</plugins>
63+
</build>
64+
</project>

‎cloudinary-android-test/project.properties‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
# This file is automatically generated by Android Tools.
2+
# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
3+
#
4+
# This file must be checked in Version Control Systems.
5+
#
6+
# To customize properties used by the Ant build system edit
7+
# "ant.properties", and override values to adapt the script to your
8+
# project structure.
9+
#
10+
# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home):
11+
#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
12+
13+
# Project target.
14+
target=android-7

‎cloudinary-android-test/src/main/AndroidManifest.xml.sample‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3+
package="com.cloudinary.test"
4+
android:versionCode="1"
5+
android:versionName="1.0" >
6+
7+
<uses-sdk android:minSdkVersion="9" />
8+
9+
<instrumentation
10+
android:name="android.test.InstrumentationTestRunner"
11+
android:targetPackage="com.cloudinary.test" />
12+
13+
<uses-permission android:name="android.permission.INTERNET" />
14+
15+
<application>
16+
<uses-library android:name="android.test.runner" />
17+
<meta-data android:name="CLOUDINARY_URL" android:value="cloudinary://123456789:abcdefg@hijklmnop"/>
18+
</application>
19+
20+
</manifest>

cloudinary-core/src/test/resources/docx.docx renamed to cloudinary-android-test/src/main/assets/docx.docx

File renamed without changes.

cloudinary-core/src/test/resources/favicon.ico renamed to cloudinary-android-test/src/main/assets/images/favicon.ico

File renamed without changes.

cloudinary-core/src/test/resources/logo.png renamed to cloudinary-android-test/src/main/assets/images/logo.png

File renamed without changes.

0 commit comments

Comments
 (0)