From 595bbff87be7ff763bfad6fe297703141547710d Mon Sep 17 00:00:00 2001 From: James Moger Date: Mon, 17 Oct 2011 17:42:27 -0400 Subject: [PATCH] Updated to MarkdownPapers 1.2.4. --- .classpath | 4 ++-- docs/00_index.mkd | 2 +- docs/02_rpc.mkd | 27 ++++++++++++++++++--------- docs/04_releases.mkd | 2 +- src/com/gitblit/build/Build.java | 22 ++++++++++++++++------ 5 files changed, 38 insertions(+), 19 deletions(-) diff --git a/.classpath b/.classpath index 6b6984ac..022c1bb4 100644 --- a/.classpath +++ b/.classpath @@ -92,9 +92,9 @@ - + - + diff --git a/docs/00_index.mkd b/docs/00_index.mkd index e323e6ed..746402e7 100644 --- a/docs/00_index.mkd +++ b/docs/00_index.mkd @@ -45,7 +45,7 @@ Gitblit requires a Java 6 Runtime Environment (JRE) or a Java 6 Development Kit - added: IUserService.setup(IStoredSettings) for custom user service implementations - added: setting to control Gitblit GO context path for proxy setups **New:** *server.contextPath = /* -- updated: MarkdownPapers 1.2.3 +- updated: MarkdownPapers 1.2.4 issues, binaries, and sources @ [Google Code][googlecode]
sources @ [Github][gitbltsrc] diff --git a/docs/02_rpc.mkd b/docs/02_rpc.mkd index 017dd7da..fbc5e44a 100644 --- a/docs/02_rpc.mkd +++ b/docs/02_rpc.mkd @@ -16,24 +16,33 @@ The Gitblit RPC mechanism, like the Gitblit JGit servlet, syndication/feed servl - + - + - - - - - - + + + + + +
url parametersrequired
permission		json
req=name=post bodyresponse body
LIST_REPOSITORIES---Map String, RepositoryModel
LIST_REPOSITORIES---Map<String, RepositoryModel>
CREATE_REPOSITORYrepository nameadminRepositoryModel-
EDIT_REPOSITORYrepository nameadminRepositoryModel-
DELETE_REPOSITORYrepository nameadmin--
LIST_USERS-admin-List UserModel
LIST_USERS-admin-List<UserModel>
CREATE_USERuser nameadminUserModel-
EDIT_USERuser nameadminUserModel-
DELETE_USERuser nameadmin--
LIST_REPOSITORY_MEMBERSrepository nameadmin-List String
SET_REPOSITORY_MEMBERSrepository nameadminList String-
LIST_FEDERATION_REGISTRATIONS-admin-List FederationModel
LIST_FEDERATION_RESULTS-admin-List FederationModel
LIST_FEDERATION_PROPOSALS-admin-List FederationProposal
LIST_FEDERATION_SETS-admin-List FederationSet
LIST_REPOSITORY_MEMBERSrepository nameadmin-List<String>
SET_REPOSITORY_MEMBERSrepository nameadminList<String>-
LIST_FEDERATION_REGISTRATIONS-admin-List<FederationModel>
LIST_FEDERATION_RESULTS-admin-List<FederationModel>
LIST_FEDERATION_PROPOSALS-admin-List<FederationProposal>
LIST_FEDERATION_SETS-admin-List<FederationSet>
LIST_SETTINGS-admin-Properties
-### Result Codes +### RPC Response Codes + + + + + + + + +
codenamedescription
200successGitblit processed the request successfully
401unauthorizedGitblit requires user credentials to process the request
403forbiddenGitblit can not process the request for the supplied credentials
405method not allowedGitblit has disallowed the processing the specified request
500server errorGitblit failed to process the request likely because the input object created a conflict
501unknown requestGitblit does not recognize the RPC request type
### Gitblit Manager diff --git a/docs/04_releases.mkd b/docs/04_releases.mkd index d71e5b10..bb238bbe 100644 --- a/docs/04_releases.mkd +++ b/docs/04_releases.mkd @@ -19,7 +19,7 @@ - added: IUserService.setup(IStoredSettings) for custom user service implementations - added: setting to control Gitblit GO context path for proxy setups **New:** *server.contextPath = /* -- updated: MarkdownPapers 1.2.3 +- updated: MarkdownPapers 1.2.4 ### Older Releases diff --git a/src/com/gitblit/build/Build.java b/src/com/gitblit/build/Build.java index 0a449634..7bba526e 100644 --- a/src/com/gitblit/build/Build.java +++ b/src/com/gitblit/build/Build.java @@ -137,9 +137,12 @@ public class Build { public static void manager(DownloadListener listener) { downloadListener = listener; - downloadFromApache(MavenObject.GSON, BuildType.RUNTIME); downloadFromApache(MavenObject.SLF4JAPI, BuildType.RUNTIME); downloadFromApache(MavenObject.SLF4JNOP, BuildType.RUNTIME); + downloadFromApache(MavenObject.GSON, BuildType.RUNTIME); + downloadFromApache(MavenObject.JSCH, BuildType.RUNTIME); + + downloadFromEclipse(MavenObject.JGIT, BuildType.RUNTIME); } /** @@ -287,7 +290,7 @@ public class Build { } } if (downloadListener != null) { - downloadListener.downloading(mo.name); + downloadListener.downloading(mo.name + "..."); } ByteArrayOutputStream buff = new ByteArrayOutputStream(); try { @@ -309,10 +312,17 @@ public class Build { if (progress - lastProgress >= 0.1f) { lastProgress = progress; updateDownload(progress, targetFile); + if (downloadListener != null) { + int percent = Math.round(100 * progress); + downloadListener.downloading(mo.name + " (" + percent + "%)"); + } } } in.close(); updateDownload(1f, targetFile); + if (downloadListener != null) { + downloadListener.downloading(mo.name + " (100%)"); + } } catch (IOException e) { throw new RuntimeException("Error downloading " + mavenURL + " to " + targetFile, e); @@ -433,10 +443,10 @@ public class Build { 237000, 0, 0, "c94f54227b08100974c36170dcb53329435fe5ad", "", ""); public static final MavenObject MARKDOWNPAPERS = new MavenObject("MarkdownPapers", - "org/tautua/markdownpapers", "markdownpapers-core", "1.2.3", 87000, 58000, 278000, - "657ff8e54936a25a6d8a53c2b12213cada10594a", - "1c60eb17b4a4547f87fb13adad2c3f204a54003c", - "760d0dac5b3529c5fcd13075f2097bf81ad0e6ce"); + "org/tautua/markdownpapers", "markdownpapers-core", "1.2.4", 87000, 58000, 268000, + "cc45684d12399487e49bd1e9eee0af6ab58f3ddc", + "5c6f0e5ad6ef00b8c9a06e822eb88893cd07ec1b", + "1d4c843cb6f44c9ed776ba7ccaa95ffcaf521061"); public static final MavenObject BOUNCYCASTLE = new MavenObject("BouncyCastle", "org/bouncycastle", "bcprov-jdk16", "1.46", 1900000, 1400000, 4670000, -- 2.39.5