From d4c68e7936e4b83362ac04cc7c90ad96ad329092 Mon Sep 17 00:00:00 2001
From: thc202 <thc202@gmail.com>
Date: Tue, 14 Jan 2020 14:54:14 +0000
Subject: [PATCH] Update add-on plugin and help links, tweak HelpSet

Update add-on plugin to 0.3.0:
 - Specify the repo URL in the add-on manifest.
 - Change info URL to the help page.
 - Remove wiki gen configuration, no longer needed.

Update help links to the new location.
Change HelpSet to link to the main help page and change the title to use
"add-on" instead of "extension".

Signed-off-by: thc202 <thc202@gmail.com>
---
 CHANGELOG.md                                           |  2 ++
 README.md                                              |  2 +-
 build.gradle.kts                                       | 10 +++-------
 .../resources/help/contents/communityScripts.html      |  2 +-
 .../communityScripts/resources/help/helpset.hs         |  4 ++--
 5 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fef59ace..527b49b2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 ## Unreleased
 
 ### Added
+- Add repo URL, shown in the marketplace and Manage Add-ons dialogue.
 - active/cve-2019-5418.js > An active scanner for Ruby on Rails Accept header content disclosure issue.
 - active/JWT None Exploit.js > Checks if the application's JWT implementation allows the usage of the 'none' algorithm.
 - authentication/DjangoAuthentication.js > Django authentication script.
@@ -28,6 +29,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 ### Changed
 - Maintenance changes to target ZAP 2.8.
+- Change info URL to link to the online help page.
 
 ### Removed
 - The following scripts were merged into a new script `HUNT.py`:
diff --git a/README.md b/README.md
index 2973ccdb..670a24fb 100644
--- a/README.md
+++ b/README.md
@@ -10,7 +10,7 @@ If you might want to contribute to the repo then you can also clone it to a loca
 Please upload your scripts via pull requests!
 
 For more information on ZAP scripts see:
-* https://github.com/zaproxy/zap-core-help/wiki/HelpAddonsScriptsScripts
+* https://www.zaproxy.org/docs/desktop/addons/script-console/
 * https://github.com/zaproxy/zaproxy/wiki/InternalScripting
  
 To discuss any aspect of ZAP scripting please join the zaproxy-scripts group: http://groups.google.com/group/zaproxy-scripts
diff --git a/build.gradle.kts b/build.gradle.kts
index f5b0e9d2..f6009676 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -6,7 +6,7 @@ import org.zaproxy.gradle.addon.misc.ExtractLatestChangesFromChangelog
 
 plugins {
     `java-library`
-    id("org.zaproxy.add-on") version "0.2.0"
+    id("org.zaproxy.add-on") version "0.3.0"
     id("com.diffplug.gradle.spotless") version "3.15.0"
 }
 
@@ -30,15 +30,11 @@ zapAddOn {
 
     manifest {
         author.set("ZAP Community")
-        url.set("https://github.com/zaproxy/community-scripts")
+        url.set("https://www.zaproxy.org/docs/desktop/addons/community-scripts/")
+        repo.set("https://github.com/zaproxy/community-scripts/")
         changesFile.set(tasks.named<ConvertMarkdownToHtml>("generateManifestChanges").flatMap { it.html })
         files.from(scriptsDir)
     }
-
-    wikiGen {
-        wikiFilesPrefix.set("HelpAddons${zapAddOn.addOnId.get().capitalize()}")
-        wikiDir.set(file("$rootDir/../zap-extensions-wiki/"))
-    }
 }
 
 val jupiterVersion = "5.2.0"
diff --git a/src/main/javahelp/org/zaproxy/zap/extension/communityScripts/resources/help/contents/communityScripts.html b/src/main/javahelp/org/zaproxy/zap/extension/communityScripts/resources/help/contents/communityScripts.html
index 2c958316..6bfa6a69 100644
--- a/src/main/javahelp/org/zaproxy/zap/extension/communityScripts/resources/help/contents/communityScripts.html
+++ b/src/main/javahelp/org/zaproxy/zap/extension/communityScripts/resources/help/contents/communityScripts.html
@@ -15,7 +15,7 @@ <H1>Community Scripts</H1>
 <br><br>
 For more information on ZAP scripts see:
 <ul>
-<li><a href="https://github.com/zaproxy/zap-core-help/wiki/HelpAddonsScriptsScripts">https://github.com/zaproxy/zap-core-help/wiki/HelpAddonsScriptsScripts</a></li>
+<li><a href="https://www.zaproxy.org/docs/desktop/addons/script-console/">Script Console add-on</a></li>
 <li><a href="https://github.com/zaproxy/zaproxy/wiki/InternalScripting">https://github.com/zaproxy/zaproxy/wiki/InternalScripting</a></li>
 </ul>
  
diff --git a/src/main/javahelp/org/zaproxy/zap/extension/communityScripts/resources/help/helpset.hs b/src/main/javahelp/org/zaproxy/zap/extension/communityScripts/resources/help/helpset.hs
index b13bd9cf..bfbf00a8 100644
--- a/src/main/javahelp/org/zaproxy/zap/extension/communityScripts/resources/help/helpset.hs
+++ b/src/main/javahelp/org/zaproxy/zap/extension/communityScripts/resources/help/helpset.hs
@@ -3,10 +3,10 @@
   PUBLIC "-//Sun Microsystems Inc.//DTD JavaHelp HelpSet Version 2.0//EN"
          "http://java.sun.com/products/javahelp/helpset_2_0.dtd">
 <helpset version="2.0" xml:lang="en-GB">
-  <title>Community Scripts | ZAP Extension</title>
+  <title>Community Scripts Add-on</title>
 
   <maps>
-     <homeID>top</homeID>
+     <homeID>communityScripts</homeID>
      <mapref location="map.jhm"/>
   </maps>