Skip to content

Commit e855f0e

Browse files
tallevami-hometallevami-home
committed
Preparation for Maven repository submission
1 parent 4df4b61 commit e855f0e

File tree

8 files changed

+38
-38
lines changed

8 files changed

+38
-38
lines changed

‎.classpath‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<classpath>
3-
<classpathentry including="**/*.java" kind="src" path="src/main/java"/>
4-
<classpathentry excluding="**/*.java" kind="src" path="src/main/resources"/>
5-
<classpathentry including="**/*.java" kind="src" output="target/test-classes" path="src/test/java"/>
6-
<classpathentry excluding="**/*.java" kind="src" output="target/test-classes" path="src/test/resources"/>
7-
<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
8-
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
9-
<classpathentry kind="output" path="target/classes"/>
3+
<classpathentry including="**/*.java" kind="src" path="src/main/java"/>
4+
<classpathentry excluding="**/*.java" kind="src" path="src/main/resources"/>
5+
<classpathentry including="**/*.java" kind="src" output="target/test-classes" path="src/test/java"/>
6+
<classpathentry excluding="**/*.java" kind="src" output="target/test-classes" path="src/test/resources"/>
7+
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"/>
8+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
9+
<classpathentry kind="output" path="target/classes"/>
1010
</classpath>

‎pom.xml‎

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,27 +10,30 @@
1010

1111
<groupId>com.cloudinary</groupId>
1212
<artifactId>cloudinary</artifactId>
13-
<version>0.1-SNAPSHOT</version>
13+
<version>1.0.1</version>
1414
<packaging>jar</packaging>
1515
<name>Cloudinary Java Client Library</name>
16-
<description></description>
16+
<description>
17+
Cloudinary is a cloud service that offers a solution to a web application's entire image management pipeline.
18+
Easily upload images to the cloud. Automatically perform smart image resizing, cropping and conversion without installing any complex software.
19+
Integrate Facebook or Twitter profile image extraction in a snap, in any dimension and style to match your website’s graphics requirements.
20+
Images are seamlessly delivered through a fast CDN, and much much more. This Java library allows to easily integrate with Cloudinary in Java applications.
21+
</description>
1722
<url>http://github.com/cloudinary/cloudinary_java</url>
1823

1924
<licenses>
20-
<!-- TODO -->
2125
<license>
22-
<name>The Apache Software License, Version 2.0</name>
23-
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
26+
<name>MIT</name>
27+
<url>http://opensource.org/licenses/MIT</url>
2428
<distribution>repo</distribution>
2529
</license>
2630
</licenses>
2731

2832
<developers>
2933
<developer>
30-
<!-- TODO -->
31-
<id>jsmith</id>
32-
<name>John Smith</name>
33-
<email>john@cloudinary.com</email>
34+
<id>cloudinary</id>
35+
<name>Cloudinary</name>
36+
<email>info@cloudinary.com</email>
3437
</developer>
3538
</developers>
3639

@@ -127,6 +130,7 @@
127130
<groupId>junit</groupId>
128131
<artifactId>junit</artifactId>
129132
<version>4.10</version>
133+
<scope>test</scope>
130134
</dependency>
131135
</dependencies>
132136

‎src/main/java/com/cloudinary/Api.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@
1212
import org.apache.commons.codec.binary.Base64;
1313
import org.apache.commons.lang.StringUtils;
1414
import org.apache.http.HttpResponse;
15-
import org.apache.http.auth.AuthScope;
16-
import org.apache.http.auth.UsernamePasswordCredentials;
1715
import org.apache.http.client.methods.HttpDelete;
1816
import org.apache.http.client.methods.HttpGet;
1917
import org.apache.http.client.methods.HttpPost;

‎src/main/java/com/cloudinary/Cloudinary.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
import org.apache.commons.codec.binary.Hex;
2121
import org.apache.commons.lang.StringUtils;
2222
import org.apache.http.client.utils.URIBuilder;
23-
import org.apache.http.client.utils.URLEncodedUtils;
2423

2524
@SuppressWarnings({"rawtypes", "unchecked"})
2625
public class Cloudinary {

‎src/main/java/com/cloudinary/Url.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package com.cloudinary;
22

3-
import java.util.HashMap;
43
import java.util.Map;
54
import java.util.TreeMap;
65
import java.util.zip.CRC32;

‎src/test/java/com/cloudinary/test/ApiTest.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,9 @@ public static void setUpClass() throws IOException {
5454
"public_id", "api_test",
5555
"tags", "api_test_tag",
5656
"eager", Collections.singletonList(new Transformation().width(100).crop("scale")));
57-
cloudinary.uploader().upload("tests/logo.png", options);
57+
cloudinary.uploader().upload("src/test/resources/logo.png", options);
5858
options.put("public_id", "api_test1");
59-
cloudinary.uploader().upload("tests/logo.png", options);
59+
cloudinary.uploader().upload("src/test/resources/logo.png", options);
6060
}
6161

6262
@Before
@@ -147,7 +147,7 @@ public void test07ResourceMetadata() throws Exception {
147147
@Test
148148
public void test08DeleteDerived() throws Exception {
149149
// should allow deleting derived resource
150-
cloudinary.uploader().upload("tests/logo.png", Cloudinary.asMap(
150+
cloudinary.uploader().upload("src/test/resources/logo.png", Cloudinary.asMap(
151151
"public_id", "api_test3",
152152
"eager", Collections.singletonList(new Transformation().width(101).crop("scale"))
153153
));
@@ -166,7 +166,7 @@ public void test08DeleteDerived() throws Exception {
166166
@Test(expected = Api.NotFound.class)
167167
public void test09DeleteResources() throws Exception {
168168
// should allow deleting resources
169-
cloudinary.uploader().upload("tests/logo.png", Cloudinary.asMap("public_id", "api_test3"));
169+
cloudinary.uploader().upload("src/test/resources/logo.png", Cloudinary.asMap("public_id", "api_test3"));
170170
Map resource = api.resource("api_test3", Cloudinary.emptyMap());
171171
assertNotNull(resource);
172172
api.deleteResources(Arrays.asList("apit_test", "api_test2", "api_test3"), Cloudinary.emptyMap());
@@ -176,7 +176,7 @@ public void test09DeleteResources() throws Exception {
176176
@Test(expected = Api.NotFound.class)
177177
public void test09aDeleteResourcesByPrefix() throws Exception {
178178
// should allow deleting resources
179-
cloudinary.uploader().upload("tests/logo.png", Cloudinary.asMap("public_id", "api_test_by_prefix"));
179+
cloudinary.uploader().upload("src/test/resources/logo.png", Cloudinary.asMap("public_id", "api_test_by_prefix"));
180180
Map resource = api.resource("api_test_by_prefix", Cloudinary.emptyMap());
181181
assertNotNull(resource);
182182
api.deleteResourcesByPrefix("api_test_by", Cloudinary.emptyMap());
@@ -186,7 +186,7 @@ public void test09aDeleteResourcesByPrefix() throws Exception {
186186
@Test(expected = Api.NotFound.class)
187187
public void test09aDeleteResourcesByTags() throws Exception {
188188
// should allow deleting resources
189-
cloudinary.uploader().upload("tests/logo.png", Cloudinary.asMap("public_id", "api_test4", "tags", Arrays.asList("api_test_tag_for_delete")));
189+
cloudinary.uploader().upload("src/test/resources/logo.png", Cloudinary.asMap("public_id", "api_test4", "tags", Arrays.asList("api_test_tag_for_delete")));
190190
Map resource = api.resource("api_test4", Cloudinary.emptyMap());
191191
assertNotNull(resource);
192192
api.deleteResourcesByTag("api_test_tag_for_delete", Cloudinary.emptyMap());

‎src/test/java/com/cloudinary/test/UploaderTest.java‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public void setUp() {
3939

4040
@Test
4141
public void testUpload() throws IOException {
42-
Map result = cloudinary.uploader().upload("tests/logo.png", Cloudinary.emptyMap());
42+
Map result = cloudinary.uploader().upload("src/test/resources/logo.png", Cloudinary.emptyMap());
4343
assertEquals(result.get("width"), 241L);
4444
assertEquals(result.get("height"), 51L);
4545
Map<String, Object> to_sign = new HashMap<String, Object>();
@@ -51,12 +51,12 @@ public void testUpload() throws IOException {
5151

5252
@Test
5353
public void testRename() throws Exception {
54-
Map result = cloudinary.uploader().upload("tests/logo.png", Cloudinary.emptyMap());
54+
Map result = cloudinary.uploader().upload("src/test/resources/logo.png", Cloudinary.emptyMap());
5555

5656
cloudinary.uploader().rename((String) result.get("public_id"), result.get("public_id")+"2", Cloudinary.emptyMap());
5757
assertNotNull(cloudinary.api().resource(result.get("public_id")+"2", Cloudinary.emptyMap()));
5858

59-
Map result2 = cloudinary.uploader().upload("tests/favicon.ico", Cloudinary.emptyMap());
59+
Map result2 = cloudinary.uploader().upload("src/test/resources/favicon.ico", Cloudinary.emptyMap());
6060
boolean error_found=false;
6161
try {
6262
cloudinary.uploader().rename((String) result2.get("public_id"), result.get("public_id")+"2", Cloudinary.emptyMap());
@@ -77,13 +77,13 @@ public void testExplicit() throws IOException {
7777

7878
@Test
7979
public void testEager() throws IOException {
80-
cloudinary.uploader().upload("tests/logo.png", Cloudinary.asMap("eager", Collections.singletonList(new Transformation().crop("scale").width(2.0))));
80+
cloudinary.uploader().upload("src/test/resources/logo.png", Cloudinary.asMap("eager", Collections.singletonList(new Transformation().crop("scale").width(2.0))));
8181
}
8282

8383
@Test
8484
public void testHeaders() throws IOException {
85-
cloudinary.uploader().upload("tests/logo.png", Cloudinary.asMap("headers", new String[]{"Link: 1"}));
86-
cloudinary.uploader().upload("tests/logo.png", Cloudinary.asMap("headers", Cloudinary.asMap("Link", "1")));
85+
cloudinary.uploader().upload("src/test/resources/logo.png", Cloudinary.asMap("headers", new String[]{"Link: 1"}));
86+
cloudinary.uploader().upload("src/test/resources/logo.png", Cloudinary.asMap("headers", Cloudinary.asMap("Link", "1")));
8787
}
8888

8989
@Test
@@ -106,8 +106,8 @@ public void testImageUploadTag() {
106106

107107
@Test
108108
public void testSprite() throws IOException {
109-
cloudinary.uploader().upload("tests/logo.png", Cloudinary.asMap("tags", "sprite_test_tag", "public_id", "sprite_test_tag_1"));
110-
cloudinary.uploader().upload("tests/logo.png", Cloudinary.asMap("tags", "sprite_test_tag", "public_id", "sprite_test_tag_2"));
109+
cloudinary.uploader().upload("src/test/resources/logo.png", Cloudinary.asMap("tags", "sprite_test_tag", "public_id", "sprite_test_tag_1"));
110+
cloudinary.uploader().upload("src/test/resources/logo.png", Cloudinary.asMap("tags", "sprite_test_tag", "public_id", "sprite_test_tag_2"));
111111
Map result = cloudinary.uploader().generate_sprite("sprite_test_tag", Cloudinary.emptyMap());
112112
assertEquals(2, ((Map) result.get("image_infos")).size());
113113
result = cloudinary.uploader().generate_sprite("sprite_test_tag", Cloudinary.asMap("transformation", "w_100"));
@@ -118,8 +118,8 @@ public void testSprite() throws IOException {
118118

119119
@Test
120120
public void testMulti() throws IOException {
121-
cloudinary.uploader().upload("tests/logo.png", Cloudinary.asMap("tags", "multi_test_tag", "public_id", "multi_test_tag_1"));
122-
cloudinary.uploader().upload("tests/logo.png", Cloudinary.asMap("tags", "multi_test_tag", "public_id", "multi_test_tag_2"));
121+
cloudinary.uploader().upload("src/test/resources/logo.png", Cloudinary.asMap("tags", "multi_test_tag", "public_id", "multi_test_tag_1"));
122+
cloudinary.uploader().upload("src/test/resources/logo.png", Cloudinary.asMap("tags", "multi_test_tag", "public_id", "multi_test_tag_2"));
123123
Map result = cloudinary.uploader().multi("multi_test_tag", Cloudinary.emptyMap());
124124
assertTrue(((String) result.get("url")).endsWith(".gif"));
125125
result = cloudinary.uploader().multi("multi_test_tag", Cloudinary.asMap("transformation", "w_100"));
@@ -131,9 +131,9 @@ public void testMulti() throws IOException {
131131

132132
@Test
133133
public void testTags() throws Exception {
134-
Map result = cloudinary.uploader().upload("tests/logo.png", Cloudinary.emptyMap());
134+
Map result = cloudinary.uploader().upload("src/test/resources/logo.png", Cloudinary.emptyMap());
135135
String public_id = (String)result.get("public_id");
136-
Map result2 = cloudinary.uploader().upload("tests/logo.png", Cloudinary.emptyMap());
136+
Map result2 = cloudinary.uploader().upload("src/test/resources/logo.png", Cloudinary.emptyMap());
137137
String public_id2 = (String)result2.get("public_id");
138138
cloudinary.uploader().addTag("tag1", new String[]{public_id, public_id2}, Cloudinary.emptyMap());
139139
cloudinary.uploader().addTag("tag2", new String[]{public_id}, Cloudinary.emptyMap());

tests/favicon.ico renamed to src/test/resources/favicon.ico

File renamed without changes.

0 commit comments

Comments
 (0)