[dokujclient] 02/05: Imported Upstream version 3.8.1
Guillaume Turri
gturri-guest at moszumanska.debian.org
Thu Apr 14 06:02:16 UTC 2016
This is an automated email from the git hooks/post-receive script.
gturri-guest pushed a commit to annotated tag debian/3.8.1-1
in repository dokujclient.
commit b879c737f2361734b0d12a90a08fe0b3ed9916f2
Author: Guillaume Turri <guillaume.turri at gmail.com>
Date: Thu Apr 14 07:39:55 2016 +0200
Imported Upstream version 3.8.1
---
Changelog | 13 ++++++
README.md | 13 ++++--
man/man.header.txt | 3 ++
pom.xml | 50 ++++++++++++----------
src/main/java/dw/cli/CliOptions.java | 2 +
src/main/java/dw/cli/OptionParser.java | 7 ++-
src/main/java/dw/cli/Program.java | 1 +
src/main/java/dw/xmlrpc/Attacher.java | 10 +++--
src/main/java/dw/xmlrpc/AttachmentDetails.java | 27 +++++++++++-
src/main/java/dw/xmlrpc/CoreClientFactory.java | 5 ++-
src/main/java/dw/xmlrpc/DokuJClient.java | 2 +-
src/main/java/dw/xmlrpc/DokuJClientConfig.java | 9 ++++
src/test/java/dw/cli/utest/Test_OptionParser.java | 12 ++++++
src/test/java/dw/xmlrpc/itest/Test_Attacher.java | 4 +-
.../dw/xmlrpc/utest/Test_AttachmentDetails.java | 2 +-
src/test/java/dw/xmlrpc/utest/Test_LinkInfo.java | 2 +-
16 files changed, 124 insertions(+), 38 deletions(-)
diff --git a/Changelog b/Changelog
index f2a583e..4c0c232 100644
--- a/Changelog
+++ b/Changelog
@@ -1,3 +1,16 @@
+3.8.1
+* Add --debug option in man page
+
+3.8.0
+* Add debug mode
+
+3.7.0
+* Fix compatibility with android
+* getAttachments also returns the filename and upload time
+
+3.6.0
+* Use aXMLRPC from fr.turri instead of de.timroes to be able to publish to maven central again
+
3.5.2
* fix Java 6 compatibility
diff --git a/README.md b/README.md
index 0480067..7bf1c92 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,6 @@
Dokujclient is both a command line tool to interact with instances of Dokwiki,
-and a Java library for [Dokuwiki xmlrpc interface](https://www.dokuwiki.org/devel:xmlrpc).
+and a Java library for [Dokuwiki xmlrpc interface](https://www.dokuwiki.org/devel:xmlrpc)
+which is also compatible with Android.
Currently tested with:
* Detritus (dokuwiki-2015-08-10)
@@ -51,6 +52,11 @@ Just make sure that your wiki is configured so that the xmlrpc interface is enab
Installation
------------
+It may be installed from the packages on debian testing:
+
+ sudo apt-get install dokujclient
+
+On other platforms you may:
* Download the [binaries](http://turri.fr/dokujclient).
* Extract it, and add the extracted directoy to your path
* Ensure it's correctly installed, typing e.g.:
@@ -70,7 +76,7 @@ and put some or all of this info in it.
dokuJClient.jar
==========
-If you want to build your own application, if you don't want to deal with xmlrpc request yourself,
+If you want to build your own application, if you don't want to deal with xmlrpc requests yourself,
or if you don't want to handle the different versions of Dokuwiki, you may use this library.
Getting started
@@ -108,7 +114,7 @@ JAR files are available via [Maven Central](http://repo1.maven.org/maven2/fr/tur
<dependency>
<groupId>fr.turri</groupId>
<artifactId>dokujclient</artifactId>
- <version>3.2.0</version>
+ <version>3.6.0</version>
</dependency>
```
@@ -195,4 +201,3 @@ After subscribing, messages can be sent to dokujclient at freelists.org
Donate
======
Dokujclient is a personal open source project started in 2012. I have put hundreds of hours to maintain and enhance it. Donations to Dokujclient will help support bugfix, keeping up to date with the evolutions of Dokuwiki xmlrpc interface, and adding new features. If you have found this tool useful, consider [donating](https://pledgie.com/campaigns/29371), to help for its development.
-
diff --git a/man/man.header.txt b/man/man.header.txt
index 2bad7b4..bd70f76 100644
--- a/man/man.header.txt
+++ b/man/man.header.txt
@@ -42,6 +42,9 @@ Prints the version of dokujclient
.TP
\fB\-h\fR \fB\-\-help\fR
Prints the general help
+.TP
+\fB\-\-debug\fR
+Enable debug mode, which will print more information
.SH COMMANDS
.TP
diff --git a/pom.xml b/pom.xml
index 00bb972..1b67445 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
<groupId>fr.turri</groupId>
<artifactId>dokujclient</artifactId>
<packaging>jar</packaging>
- <version>3.5.2</version>
+ <version>3.8.1</version>
<name>${project.groupId}:${project.artifactId}</name>
<description>Library to use the xmlrpc interface of Dokuwiki</description>
<url>http://turri.fr/dokujclient</url>
@@ -24,7 +24,7 @@
<connection>scm:git:https://github.com/gturri/dokuJClient.git</connection>
<developerConnection>scm:git:git at github.com:gturri/dokuJClient.git</developerConnection>
<url>https://github.com/gturri/DokuJClient</url>
- <tag>dokujclient-3.5.2</tag>
+ <tag>dokujclient-3.8.0</tag>
</scm>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -35,7 +35,7 @@
<dependency>
<groupId>com.github.tomakehurst</groupId>
<artifactId>wiremock</artifactId>
- <version>1.54</version>
+ <version>1.58</version>
<scope>test</scope>
<classifier>standalone</classifier>
<exclusions>
@@ -84,17 +84,17 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
- <version>15.0</version>
+ <version>19.0</version>
</dependency>
<dependency>
- <groupId>de.timroes</groupId>
+ <groupId>fr.turri</groupId>
<artifactId>aXMLRPC</artifactId>
- <version>1.8.1</version>
+ <version>1.9.0</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.10</version>
+ <version>4.12</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -106,7 +106,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-all</artifactId>
- <version>1.9.5</version>
+ <version>1.10.19</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -120,17 +120,17 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-report-plugin</artifactId>
- <version>2.16</version>
+ <version>2.19.1</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>cobertura-maven-plugin</artifactId>
- <version>2.6</version>
+ <version>2.7</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.9.1</version>
+ <version>2.10.3</version>
<reportSets>
<reportSet>
<reports>
@@ -145,7 +145,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
- <version>2.5.3</version>
+ <version>3.0.3</version>
</plugin>
</plugins>
</reporting>
@@ -155,7 +155,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
- <version>2.5</version>
+ <version>2.5.3</version>
<configuration>
<useReleaseProfile>false</useReleaseProfile>
<releaseProfiles>release</releaseProfiles>
@@ -168,6 +168,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
+ <version>2.6</version>
<configuration>
<archive>
<manifest>
@@ -179,7 +180,7 @@
<plugin>
<groupId>org.pitest</groupId>
<artifactId>pitest-maven</artifactId>
- <version>1.1.4</version>
+ <version>1.1.9</version>
<configuration>
<targetClasses>
<param>dw*</param>
@@ -187,12 +188,15 @@
<targetTests>
<param>dw*</param>
</targetTests>
+ <excludedClasses>
+ <excludedClass>dw.cli.PasswordReader</excludedClass>
+ </excludedClasses>
</configuration>
</plugin>
<plugin>
<groupId>org.sonatype.plugins</groupId>
<artifactId>nexus-staging-maven-plugin</artifactId>
- <version>1.6.3</version>
+ <version>1.6.7</version>
<extensions>true</extensions>
<configuration>
<serverId>ossrh</serverId>
@@ -203,7 +207,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.9.1</version>
+ <version>2.10.3</version>
<executions>
<execution>
<id>attach-javadocs</id>
@@ -216,7 +220,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <version>2.4</version>
+ <version>2.6</version>
<configuration>
<descriptors>
<descriptor>scripts/descriptorRef.xml</descriptor>
@@ -234,7 +238,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
- <version>2.8</version>
+ <version>2.10</version>
<executions>
<execution>
<goals>
@@ -252,7 +256,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
- <version>1.6</version>
+ <version>1.8</version>
<executions>
<execution>
<id>process-test-classes</id>
@@ -271,7 +275,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.16</version>
+ <version>2.19.1</version>
<executions>
<execution>
<id>skip-tests-pre-warning</id>
@@ -304,7 +308,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
- <version>2.2.1</version>
+ <version>3.0.0</version>
<executions>
<execution>
<id>attach-sources</id>
@@ -317,7 +321,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.9.1</version>
+ <version>2.10.3</version>
<executions>
<execution>
<id>attach-javadocs</id>
@@ -330,7 +334,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
- <version>1.5</version>
+ <version>1.6</version>
<executions>
<execution>
<id>sign-artifacts</id>
diff --git a/src/main/java/dw/cli/CliOptions.java b/src/main/java/dw/cli/CliOptions.java
index 571f602..99a6d07 100644
--- a/src/main/java/dw/cli/CliOptions.java
+++ b/src/main/java/dw/cli/CliOptions.java
@@ -8,11 +8,13 @@ public class CliOptions {
public String password;
public String command;
public String[] commandArguments;
+ public boolean debug;
@Override
public String toString(){
return "user: " + user
+ ", password: " + password
+ + ", debug: " + debug
+ ", url: " + (url == null ? "null" : url.toString()
+ ", command: " + command);
}
diff --git a/src/main/java/dw/cli/OptionParser.java b/src/main/java/dw/cli/OptionParser.java
index c82433b..8e1c665 100644
--- a/src/main/java/dw/cli/OptionParser.java
+++ b/src/main/java/dw/cli/OptionParser.java
@@ -26,6 +26,7 @@ public class OptionParser {
private static final String PASSWORD_OPTION = "password";
private static final String PASSWORD_INTERACTIVE_OPTION = "password-interactive";
+ private static final String DEBUG_OPTION = "debug";
private JSAP _genericOptionsJSAP = buildJsap();
@@ -67,6 +68,7 @@ public class OptionParser {
cliOptions.password = getPassword(config);
cliOptions.user = config.getString("user");
cliOptions.url = config.getURL("url");
+ cliOptions.debug = config.getBoolean("debug");
cliOptions.command = _command;
cliOptions.commandArguments = _commandArguments.toArray(new String[]{});
}
@@ -86,7 +88,7 @@ public class OptionParser {
} else {
if ( arg.startsWith("-") ){
_genericArguments.add(arg);
- if ( ! arg.equals("--" + PASSWORD_INTERACTIVE_OPTION)){
+ if ( ! arg.equals("--" + PASSWORD_INTERACTIVE_OPTION) && !arg.equals("--" + DEBUG_OPTION)){
i++;
if ( i < args.length ){
_genericArguments.add(args[i]);
@@ -141,6 +143,9 @@ public class OptionParser {
jsap.registerParameter(new Switch(PASSWORD_INTERACTIVE_OPTION)
.setLongFlag(PASSWORD_INTERACTIVE_OPTION));
+ jsap.registerParameter(new Switch("debug")
+ .setLongFlag(DEBUG_OPTION));
+
registerHelpParameter(jsap);
} catch (JSAPException e){
throw new RuntimeException("Something went really wrong", e);
diff --git a/src/main/java/dw/cli/Program.java b/src/main/java/dw/cli/Program.java
index 68a8e2e..4228c18 100644
--- a/src/main/java/dw/cli/Program.java
+++ b/src/main/java/dw/cli/Program.java
@@ -60,6 +60,7 @@ public class Program {
if ( options.user != null ){
clientConfig.setUser(options.user, options.password);
}
+ clientConfig.setDebug(options.debug);
DokuJClient dokuClient = new DokuJClient(clientConfig);
dokuClient.setLogger(null);
return dokuClient;
diff --git a/src/main/java/dw/xmlrpc/Attacher.java b/src/main/java/dw/xmlrpc/Attacher.java
index b08a59e..feea055 100644
--- a/src/main/java/dw/xmlrpc/Attacher.java
+++ b/src/main/java/dw/xmlrpc/Attacher.java
@@ -10,8 +10,10 @@ import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import javax.xml.bind.DatatypeConverter;
+//import javax.xml.bind.DatatypeConverter;
+
+import de.timroes.base64.Base64;
import dw.xmlrpc.exception.DokuException;
//! @cond
@@ -99,12 +101,14 @@ class Attacher {
Date lastModified = (Date) m.get("lastModified");
Boolean isImg = (Boolean) m.get("isimg");
Boolean writable = (Boolean) m.get("writable");
+ String file = (String) m.get("file");
+ Integer mtime = (Integer) m.get("mtime");
Integer perms = (Integer) m.get("perm");
if ( perms == null ){
//Because it has been renamed in API v8
perms = (Integer) m.get("perms");
}
- return new AttachmentDetails(id, size, lastModified, isImg, writable, perms);
+ return new AttachmentDetails(id, size, lastModified, isImg, writable, perms, file, mtime);
}
public AttachmentInfo getAttachmentInfo(String fileId) throws DokuException{
@@ -147,7 +151,7 @@ class Attacher {
} catch (ClassCastException e){
//for DW up to 2012-01-25b
String base64Encoded = (String) result;
- return DatatypeConverter.parseBase64Binary(base64Encoded);
+ return Base64.decode(base64Encoded);
}
}
//! @endcond
diff --git a/src/main/java/dw/xmlrpc/AttachmentDetails.java b/src/main/java/dw/xmlrpc/AttachmentDetails.java
index 2b9e69a..d3980b6 100644
--- a/src/main/java/dw/xmlrpc/AttachmentDetails.java
+++ b/src/main/java/dw/xmlrpc/AttachmentDetails.java
@@ -60,13 +60,34 @@ public class AttachmentDetails {
return _lastModified;
}
- public AttachmentDetails(String id, Integer size, Date lastModified, Boolean isImg, Boolean writable, Integer perms){
+ private final String _file;
+
+ /**
+ * name of the file
+ */
+ public final String file(){
+ return _file;
+ }
+
+ private final Integer _mtime;
+
+ /**
+ * upload date
+ */
+ public final Integer mtime(){
+ return _mtime;
+ }
+
+
+ public AttachmentDetails(String id, Integer size, Date lastModified, Boolean isImg, Boolean writable, Integer perms, String file, Integer mtime){
_id = id;
_size = size;
_lastModified = lastModified;
_isImg = isImg;
_writable = writable;
_perms = perms;
+ _file = file;
+ _mtime = mtime;
}
@Override
@@ -76,6 +97,8 @@ public class AttachmentDetails {
+ ", lastModified:" + (_lastModified == null ? "null" : _lastModified.toString())
+ ", isImg: " + _isImg
+ ", writable: " + _writable
- + ", perms:" + _perms;
+ + ", perms:" + _perms
+ + ", file: " + _file
+ + ", mtime: " + _mtime;
}
}
diff --git a/src/main/java/dw/xmlrpc/CoreClientFactory.java b/src/main/java/dw/xmlrpc/CoreClientFactory.java
index cbe9085..c5e8d5b 100644
--- a/src/main/java/dw/xmlrpc/CoreClientFactory.java
+++ b/src/main/java/dw/xmlrpc/CoreClientFactory.java
@@ -15,7 +15,10 @@ class CoreClientFactory {
}
public static CoreClient Build(DokuJClientConfig dokuConfig){
- return Build(dokuConfig.url(), dokuConfig.userAgent(), dokuConfig.timeoutInSeconds(), dokuConfig.xmlRpcClientFlags());
+ int xmlRpcClientFlags = dokuConfig.getDebug()
+ ? dokuConfig.xmlRpcClientFlags() | XMLRPCClient.FLAGS_DEBUG
+ : dokuConfig.xmlRpcClientFlags();
+ return Build(dokuConfig.url(), dokuConfig.userAgent(), dokuConfig.timeoutInSeconds(), xmlRpcClientFlags);
}
public static CoreClient Build(URL url, String userAgent) {
diff --git a/src/main/java/dw/xmlrpc/DokuJClient.java b/src/main/java/dw/xmlrpc/DokuJClient.java
index d127675..53af867 100644
--- a/src/main/java/dw/xmlrpc/DokuJClient.java
+++ b/src/main/java/dw/xmlrpc/DokuJClient.java
@@ -236,7 +236,7 @@ public class DokuJClient {
/**
* Wrapper around {@link #getRecentMediaChanges(Integer)}
- * @param date Do not return chances older than this date
+ * @param date Do not return changes older than this date
*/
public List<MediaChange> getRecentMediaChanges(Date date) throws DokuException {
return getRecentMediaChanges((int)(date.getTime() / 1000));
diff --git a/src/main/java/dw/xmlrpc/DokuJClientConfig.java b/src/main/java/dw/xmlrpc/DokuJClientConfig.java
index 311200d..b4a2214 100644
--- a/src/main/java/dw/xmlrpc/DokuJClientConfig.java
+++ b/src/main/java/dw/xmlrpc/DokuJClientConfig.java
@@ -64,4 +64,13 @@ public class DokuJClientConfig {
public int xmlRpcClientFlags(){
return _xmlRpcClientFlags;
}
+
+ private boolean _debug = false;
+ public void setDebug(boolean debug){
+ _debug = debug;
+ }
+
+ public boolean getDebug(){
+ return _debug;
+ }
}
diff --git a/src/test/java/dw/cli/utest/Test_OptionParser.java b/src/test/java/dw/cli/utest/Test_OptionParser.java
index 84376b4..906c2b2 100644
--- a/src/test/java/dw/cli/utest/Test_OptionParser.java
+++ b/src/test/java/dw/cli/utest/Test_OptionParser.java
@@ -26,6 +26,7 @@ public class Test_OptionParser {
assertEquals("toto", options.user);
assertEquals("123456", options.password);
assertEquals(new URL("http://myUrl"), options.url);
+ assertFalse(options.debug);
assertEquals("getTitle", options.command);
assertEquals(1, options.commandArguments.length);
assertEquals("arg0", options.commandArguments[0]);
@@ -48,6 +49,17 @@ public class Test_OptionParser {
}
@org.junit.Test
+ public void canParseDebugSwitch() throws Exception {
+ String[] args = new String[]{"--url", "http://myUrl", "--debug", "someCommand", "arg0", "-l", "3"};
+
+ OptionParser parser = new OptionParser(args);
+ parser.parse();
+
+ assertTrue(parser.success());
+ assertTrue(parser.getCliOptions().debug);
+ }
+
+ @org.junit.Test
public void failsIfAnArgumentIsMissingItsValue() throws Exception{
String[] args = new String[]{"-u", "toto", "-p", "123456", "--url"};
OptionParser parser = new OptionParser(args);
diff --git a/src/test/java/dw/xmlrpc/itest/Test_Attacher.java b/src/test/java/dw/xmlrpc/itest/Test_Attacher.java
index 47c9d05..ad5ab7b 100644
--- a/src/test/java/dw/xmlrpc/itest/Test_Attacher.java
+++ b/src/test/java/dw/xmlrpc/itest/Test_Attacher.java
@@ -110,6 +110,8 @@ public class Test_Attacher extends TestHelper {
assertEquals(true, details.isImg());
assertEquals(true, details.writable());
assertEquals((Integer) 255, details.perms());
+ assertEquals("img1.gif", details.file());
+ assertEquals((Integer) 1356379860, details.mtime());
}
@org.junit.Test
@@ -194,7 +196,7 @@ public class Test_Attacher extends TestHelper {
File file2 = new File(TestParams.localFile2ToUpload);
_client.putAttachment(fileId, file1, true);
- assertEquals(file1.length(), _client.getAttachment(fileId, _localDownloadedFile).length());
+ assertBinaryEquals(file1, _client.getAttachment(fileId, _localDownloadedFile));
boolean expectedExceptionCaught = false;
try {
diff --git a/src/test/java/dw/xmlrpc/utest/Test_AttachmentDetails.java b/src/test/java/dw/xmlrpc/utest/Test_AttachmentDetails.java
index b6e33a4..1450240 100644
--- a/src/test/java/dw/xmlrpc/utest/Test_AttachmentDetails.java
+++ b/src/test/java/dw/xmlrpc/utest/Test_AttachmentDetails.java
@@ -6,7 +6,7 @@ import dw.xmlrpc.AttachmentDetails;
public class Test_AttachmentDetails {
@org.junit.Test
public void toStringShouldntThrowNullRef(){
- AttachmentDetails details = new AttachmentDetails(null, null, null, null, null, null);
+ AttachmentDetails details = new AttachmentDetails(null, null, null, null, null, null, null, null);
assertNotNull(details.toString());
}
}
diff --git a/src/test/java/dw/xmlrpc/utest/Test_LinkInfo.java b/src/test/java/dw/xmlrpc/utest/Test_LinkInfo.java
index cb1c7f7..96d4ce1 100644
--- a/src/test/java/dw/xmlrpc/utest/Test_LinkInfo.java
+++ b/src/test/java/dw/xmlrpc/utest/Test_LinkInfo.java
@@ -21,7 +21,7 @@ public class Test_LinkInfo {
assertFalse(link2.equals(link1bis));
assertFalse(link1.equals(null)); //case null
- assertFalse(link1.equals(new AttachmentDetails(null, null, null, null, null, null))); //Other kind of object
+ assertFalse(link1.equals(new AttachmentDetails(null, null, null, null, null, null, null, null))); //Other kind of object
}
@org.junit.Test
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/dokujclient.git
More information about the pkg-java-commits
mailing list