Skip to content

Commit d9b54e3

Browse files
Merge pull request #5 from contentstack/development
Development
2 parents c153e3a + d9888a0 commit d9b54e3

Some content is hidden

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

54 files changed

+2179
-1507
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,3 +20,5 @@ hs_err_pid*
2020
out/
2121
build/
2222
.idea/
23+
*.log
24+
CSLoggerLevel/

CHANGELOG.md

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11

2-
## CHANGELOG
2+
## CHANGELOG
33

4+
## Version 1.3.2
5+
### Date: 13-May-2019
6+
Removed println
7+
Added support for Logger
8+
9+
------------------------------------------------
410

511
## Version 1.3.1
612
### Date: May-02-2019

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,13 @@ To use the Contentstack Java SDK to your existing project, perform the steps giv
2020
<dependency>
2121
<groupId>com.contentstack.sdk</groupId>
2222
<artifactId>java</artifactId>
23-
<version>1.3.1</version>
23+
<version>1.3.2</version>
2424
</dependency>
2525
```
2626

2727
2. **Gradle**
2828
```
29-
implementation 'com.contentstack.sdk:java:1.3.1'
29+
implementation 'com.contentstack.sdk:java:1.3.2'
3030
```
3131

3232
### Key Concepts for using Contentstack

pom.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
# Written manually.
2-
version=1.3.1
2+
version=1.3.2
33
groupId=com.contentstack.sdk
44
artifactId=java

pom.xml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<groupId>com.contentstack.sdk</groupId>
88
<artifactId>java</artifactId>
9-
<version>1.3.1-SNAPSHOT</version>
9+
<version>1.3.2</version>
1010
<packaging>jar</packaging>
1111

1212
<name>contentstack-java</name>
@@ -93,6 +93,12 @@
9393
<version>20090211</version>
9494
</dependency>
9595

96+
<dependency>
97+
<groupId>log4j</groupId>
98+
<artifactId>log4j</artifactId>
99+
<version>1.2.17</version>
100+
</dependency>
101+
96102
</dependencies>
97103

98104
<build>

profiles.xml

Lines changed: 0 additions & 11 deletions
This file was deleted.

src/log4j.properties

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
# This sets the global logging level and specifies the appenders
2+
log4j.rootLogger=DEBUG, theConsoleAppender
3+
4+
# settings for the console appender
5+
log4j.appender.theConsoleAppender=org.apache.log4j.ConsoleAppender
6+
log4j.appender.theConsoleAppender.layout=org.apache.log4j.PatternLayout
7+
log4j.appender.theConsoleAppender.layout.ConversionPattern=%-4r [%t] %-5p %c %x - %m%n

src/main/java/com/contentstack/sdk/Asset.java

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,27 @@
99

1010

1111
/**
12-
* @author Contentstack.com
12+
* MIT License
13+
*
14+
* Copyright (c) 2012 - 2019 Contentstack
15+
*
16+
* Permission is hereby granted, free of charge, to any person obtaining a copy
17+
* of this software and associated documentation files (the "Software"), to deal
18+
* in the Software without restriction, including without limitation the rights
19+
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
20+
* copies of the Software, and to permit persons to whom the Software is
21+
* furnished to do so, subject to the following conditions:
22+
*
23+
* The above copyright notice and this permission notice shall be included in all
24+
* copies or substantial portions of the Software.
25+
*
26+
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
27+
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
28+
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
29+
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
30+
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
31+
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
32+
* SOFTWARE.
1333
*/
1434

1535
public class Asset {

src/main/java/com/contentstack/sdk/AssetLibrary.java

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,29 @@
88
import java.util.*;
99

1010
/**
11-
* @author Contentstack.com
11+
* MIT License
1212
*
13+
* Copyright (c) 2012 - 2019 Contentstack
14+
*
15+
* Permission is hereby granted, free of charge, to any person obtaining a copy
16+
* of this software and associated documentation files (the "Software"), to deal
17+
* in the Software without restriction, including without limitation the rights
18+
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
19+
* copies of the Software, and to permit persons to whom the Software is
20+
* furnished to do so, subject to the following conditions:
21+
*
22+
* The above copyright notice and this permission notice shall be included in all
23+
* copies or substantial portions of the Software.
24+
*
25+
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
26+
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
27+
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
28+
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
29+
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
30+
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
31+
* SOFTWARE.
1332
*/
33+
1434
public class AssetLibrary implements INotifyClass{
1535

1636
private final static String TAG = "AssetLibrary";

src/main/java/com/contentstack/sdk/AssetModel.java

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,31 @@
55
import java.util.Iterator;
66
import java.util.WeakHashMap;
77

8+
89
/**
9-
* AssetLibrary class to fetch all files details on Contentstack server.
10+
* MIT License
11+
*
12+
* Copyright (c) 2012 - 2019 Contentstack
1013
*
11-
* @author Contentstack.com
14+
* Permission is hereby granted, free of charge, to any person obtaining a copy
15+
* of this software and associated documentation files (the "Software"), to deal
16+
* in the Software without restriction, including without limitation the rights
17+
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
18+
* copies of the Software, and to permit persons to whom the Software is
19+
* furnished to do so, subject to the following conditions:
1220
*
21+
* The above copyright notice and this permission notice shall be included in all
22+
* copies or substantial portions of the Software.
23+
*
24+
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
25+
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
26+
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
27+
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
28+
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
29+
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
30+
* SOFTWARE.
1331
*/
32+
1433
class AssetModel {
1534

1635
String uploadedUid;

0 commit comments

Comments
 (0)