Return-Path: X-Original-To: apmail-allura-commits-archive@www.apache.org Delivered-To: apmail-allura-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id DD35418F30 for ; Wed, 27 Jan 2016 20:22:16 +0000 (UTC) Received: (qmail 98444 invoked by uid 500); 27 Jan 2016 20:22:16 -0000 Delivered-To: apmail-allura-commits-archive@allura.apache.org Received: (qmail 98391 invoked by uid 500); 27 Jan 2016 20:22:16 -0000 Mailing-List: contact commits-help@allura.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@allura.apache.org Delivered-To: mailing list commits@allura.apache.org Received: (qmail 97820 invoked by uid 99); 27 Jan 2016 20:22:16 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 27 Jan 2016 20:22:16 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 3FFD7E00DC; Wed, 27 Jan 2016 20:22:16 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: heiths@apache.org To: commits@allura.apache.org Date: Wed, 27 Jan 2016 20:22:35 -0000 Message-Id: <84c195d854d44a35b1e932d8a27cd4c5@git.apache.org> In-Reply-To: <17bf6e07ce0a4b519e8fbfb3ef002407@git.apache.org> References: <17bf6e07ce0a4b519e8fbfb3ef002407@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [21/50] allura git commit: [#8054] edit few files for Google Code importer removal [#8054] edit few files for Google Code importer removal Project: http://git-wip-us.apache.org/repos/asf/allura/repo Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/d4dda577 Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/d4dda577 Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/d4dda577 Branch: refs/heads/hs/8035 Commit: d4dda57713baa3525ef6efb089688a1597a4c78f Parents: b956fe3 Author: Dave Brondsema Authored: Tue Jan 26 13:59:03 2016 -0500 Committer: Heith Seewald Committed: Wed Jan 27 13:42:50 2016 -0500 ---------------------------------------------------------------------- Allura/development.ini | 6 +++--- Allura/docs/development/extending.rst | 6 +++--- ForgeImporters/setup.py | 3 --- rat-excludes.txt | 4 ---- 4 files changed, 6 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/allura/blob/d4dda577/Allura/development.ini ---------------------------------------------------------------------- diff --git a/Allura/development.ini b/Allura/development.ini index 930f7f3..e890cd7 100644 --- a/Allura/development.ini +++ b/Allura/development.ini @@ -357,8 +357,8 @@ importer_upload_path = /tmp/importer_upload/{nbhd}/{project} ; To disable any plugin, tool, importer, etc from being available, you can use the disable_entry_points config option. ; Specify the keys and values as they are declared in the tool's "setup.py" file. ; Examples: -;disable_entry_points.importers = google-code-tracker, google-code-repo -;disable_entry_points.allura.project_importers = google-code +;disable_entry_points.allura.importers = github-tracker, github-wiki, github-repo +;disable_entry_points.allura.project_importers = github ; Importers specifically, can be left enabled but not linked to. You have to know the URL to use it. Example: ;hidden_importers = trac-tickets @@ -371,7 +371,7 @@ importer_upload_path = /tmp/importer_upload/{nbhd}/{project} ; If your site has docs about specific importers, you can add them here and ; they'll appear on the import forms -;doc.url.importers.Google Code = http://... +;doc.url.importers.GitHub = http://... ; List of oauth API keys permitted to use special forum import API ; (should be converted to newer importer system) http://git-wip-us.apache.org/repos/asf/allura/blob/d4dda577/Allura/docs/development/extending.rst ---------------------------------------------------------------------- diff --git a/Allura/docs/development/extending.rst b/Allura/docs/development/extending.rst index e45b1c2..3132838 100644 --- a/Allura/docs/development/extending.rst +++ b/Allura/docs/development/extending.rst @@ -50,12 +50,12 @@ A listing of available 3rd-party extensions is at https://forge-allura.apache.or To disable any Allura entry point, simply add an entry in your ``.ini`` config file with names and values corresponding to entry points defined in any ``setup.py`` file. -For example if you have ForgeImporter set up, but want to disable the google code importers: +For example if you have ForgeImporter set up, but want to disable the GitHub importers: .. code-block:: ini - disable_entry_points.allura.project_importers = google-code - disable_entry_points.allura.importers = google-code-tracker, google-code-repo + disable_entry_points.allura.project_importers = github + disable_entry_points.allura.importers = github-tracker, github-wiki, github-repo Other entry points are used to provide ``paster`` commands and ``easy_widget`` configuration, which are not part of Allura but are used by Allura. http://git-wip-us.apache.org/repos/asf/allura/blob/d4dda577/ForgeImporters/setup.py ---------------------------------------------------------------------- diff --git a/ForgeImporters/setup.py b/ForgeImporters/setup.py index 4d5f866..2ad2726 100644 --- a/ForgeImporters/setup.py +++ b/ForgeImporters/setup.py @@ -34,14 +34,11 @@ setup(name='ForgeImporters', entry_points=""" # -*- Entry points: -*- [allura.project_importers] - google-code = forgeimporters.google.project:GoogleCodeProjectImporter trac = forgeimporters.trac.project:TracProjectImporter github = forgeimporters.github.project:GitHubProjectImporter [allura.importers] github-tracker = forgeimporters.github.tracker:GitHubTrackerImporter - google-code-tracker = forgeimporters.google.tracker:GoogleCodeTrackerImporter - google-code-repo = forgeimporters.google.code:GoogleRepoImporter github-wiki = forgeimporters.github.wiki:GitHubWikiImporter github-repo = forgeimporters.github.code:GitHubRepoImporter trac-tickets = forgeimporters.trac.tickets:TracTicketImporter http://git-wip-us.apache.org/repos/asf/allura/blob/d4dda577/rat-excludes.txt ---------------------------------------------------------------------- diff --git a/rat-excludes.txt b/rat-excludes.txt index 2771188..2e0d026 100644 --- a/rat-excludes.txt +++ b/rat-excludes.txt @@ -58,10 +58,6 @@ CHANGES ForgeGit/forgegit/data/post-receive_tmpl ForgeImporters/docs/make.bat ForgeImporters/docs/Makefile -ForgeImporters/forgeimporters/tests/data/google/empty-issue.html -ForgeImporters/forgeimporters/tests/data/google/test-issue-first-page.html -ForgeImporters/forgeimporters/tests/data/google/test-issue-prev-page.html -ForgeImporters/forgeimporters/tests/data/google/test-issue.html ForgeImporters/forgeimporters/trac/tests/data/test-list.csv ForgeImporters/forgeimporters/trac/tests/data/test-list.html ForgeSVN/forgesvn/tests/data/