You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by br...@apache.org on 2013/12/18 22:05:46 UTC

[02/16] git commit: [#5502] ticket:462 Increase default max instances for apps that could have multiple instances

[#5502] ticket:462 Increase default max instances for apps that could have multiple instances


Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/89ade3a8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/89ade3a8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/89ade3a8

Branch: refs/heads/master
Commit: 89ade3a8e33c7f083e3c83cdb834d597c4a85f78
Parents: f2afd1f
Author: Igor Bondarenko <je...@gmail.com>
Authored: Thu Nov 28 12:24:34 2013 +0000
Committer: Dave Brondsema <db...@slashdotmedia.com>
Committed: Wed Dec 18 20:38:57 2013 +0000

----------------------------------------------------------------------
 Allura/allura/app.py                           | 4 ++--
 Allura/allura/ext/project_home/project_main.py | 1 +
 Allura/allura/ext/search/search_main.py        | 1 +
 Allura/allura/ext/user_profile/user_main.py    | 1 +
 ForgeActivity/forgeactivity/main.py            | 1 +
 ForgeBlog/forgeblog/main.py                    | 1 -
 ForgeChat/forgechat/main.py                    | 1 -
 ForgeDiscussion/forgediscussion/forum_main.py  | 1 -
 ForgeGit/forgegit/git_main.py                  | 1 -
 ForgeLink/forgelink/link_main.py               | 1 -
 ForgeSVN/forgesvn/svn_main.py                  | 1 -
 ForgeShortUrl/forgeshorturl/main.py            | 1 +
 ForgeTracker/forgetracker/tracker_main.py      | 1 -
 ForgeUserStats/forgeuserstats/main.py          | 1 +
 ForgeWiki/forgewiki/wiki_main.py               | 1 -
 15 files changed, 8 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/89ade3a8/Allura/allura/app.py
----------------------------------------------------------------------
diff --git a/Allura/allura/app.py b/Allura/allura/app.py
index dede4e2..800f200 100644
--- a/Allura/allura/app.py
+++ b/Allura/allura/app.py
@@ -187,7 +187,7 @@ class Application(object):
     :cvar dict permissions_desc: Descriptions of the named permissions.
     :cvar int max_instances: Specifies the number of tools of this type
         that can be added to the project. Zero indicates the system tool or one that
-        can not be added to the project by the user. Default value is 0.
+        can not be added to the project by the user. Default value is 30 (sane 'unlimited' value).
     :cvar bool hidden: Default is False, Application is not hidden from the
         list of a project's installed tools.
     :cvar str tool_description: Text description of this Application.
@@ -225,7 +225,7 @@ class Application(object):
         'configure': 'Set label and options. Requires admin permission.',
         'admin': 'Set permissions.',
     }
-    max_instances = 0
+    max_instances = 30
     searchable = False
     exportable = False
     DiscussionClass = model.Discussion

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/89ade3a8/Allura/allura/ext/project_home/project_main.py
----------------------------------------------------------------------
diff --git a/Allura/allura/ext/project_home/project_main.py b/Allura/allura/ext/project_home/project_main.py
index d04e234..76ec1d2 100644
--- a/Allura/allura/ext/project_home/project_main.py
+++ b/Allura/allura/ext/project_home/project_main.py
@@ -36,6 +36,7 @@ class ProjectHomeApp(Application):
     __version__ = version.__version__
     tool_label = 'home'
     default_mount_label='Project Home'
+    max_instances = 0
     icons={
         24:'images/home_24.png',
         32:'images/home_32.png',

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/89ade3a8/Allura/allura/ext/search/search_main.py
----------------------------------------------------------------------
diff --git a/Allura/allura/ext/search/search_main.py b/Allura/allura/ext/search/search_main.py
index de38b80..920c29f 100644
--- a/Allura/allura/ext/search/search_main.py
+++ b/Allura/allura/ext/search/search_main.py
@@ -36,6 +36,7 @@ class SearchApp(Application):
     all the rich, creamy goodness that is installable apps.
     '''
     __version__ = version.__version__
+    max_instances = 0
     hidden = True
     sitemap=[]
 

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/89ade3a8/Allura/allura/ext/user_profile/user_main.py
----------------------------------------------------------------------
diff --git a/Allura/allura/ext/user_profile/user_main.py b/Allura/allura/ext/user_profile/user_main.py
index 4ea734b..a668430 100644
--- a/Allura/allura/ext/user_profile/user_main.py
+++ b/Allura/allura/ext/user_profile/user_main.py
@@ -48,6 +48,7 @@ class F(object):
 class UserProfileApp(Application):
     __version__ = version.__version__
     tool_label = 'Profile'
+    max_instances = 0
     icons={
         24:'images/home_24.png',
         32:'images/home_32.png',

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/89ade3a8/ForgeActivity/forgeactivity/main.py
----------------------------------------------------------------------
diff --git a/ForgeActivity/forgeactivity/main.py b/ForgeActivity/forgeactivity/main.py
index 2e355b9..3a60190 100644
--- a/ForgeActivity/forgeactivity/main.py
+++ b/ForgeActivity/forgeactivity/main.py
@@ -41,6 +41,7 @@ class ForgeActivityApp(Application):
     """Project Activity page for projects."""
     __version__ = version.__version__
     default_mount_point = 'activity'
+    max_instances = 0
     searchable = False
 
     def __init__(self, project, config):

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/89ade3a8/ForgeBlog/forgeblog/main.py
----------------------------------------------------------------------
diff --git a/ForgeBlog/forgeblog/main.py b/ForgeBlog/forgeblog/main.py
index 775c78e..bd0f821 100644
--- a/ForgeBlog/forgeblog/main.py
+++ b/ForgeBlog/forgeblog/main.py
@@ -90,7 +90,6 @@ class ForgeBlogApp(Application):
         'admin': 'Set permissions. Enable/disable commenting.',
     }
     ordinal=14
-    max_instances = 1
     exportable = True
     config_options = Application.config_options
     default_external_feeds = []

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/89ade3a8/ForgeChat/forgechat/main.py
----------------------------------------------------------------------
diff --git a/ForgeChat/forgechat/main.py b/ForgeChat/forgechat/main.py
index 4c34bd0..1e7fb7b 100644
--- a/ForgeChat/forgechat/main.py
+++ b/ForgeChat/forgechat/main.py
@@ -50,7 +50,6 @@ class ForgeChatApp(Application):
     default_mount_label='Chat'
     default_mount_point='chat'
     ordinal=13
-    max_instances = 1
     permissions = ['configure', 'read' ]
     permissions_desc = {
         'configure': 'Set monitored IRC channel. Requires admin permission.',

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/89ade3a8/ForgeDiscussion/forgediscussion/forum_main.py
----------------------------------------------------------------------
diff --git a/ForgeDiscussion/forgediscussion/forum_main.py b/ForgeDiscussion/forgediscussion/forum_main.py
index 9332215..1e55a2b 100644
--- a/ForgeDiscussion/forgediscussion/forum_main.py
+++ b/ForgeDiscussion/forgediscussion/forum_main.py
@@ -54,7 +54,6 @@ class W:
 
 class ForgeDiscussionApp(Application):
     __version__ = version.__version__
-    max_instances = 1
     permissions = ['configure', 'read', 'unmoderated_post', 'post', 'moderate', 'admin']
     permissions_desc = {
         'configure': 'Create new forums.',

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/89ade3a8/ForgeGit/forgegit/git_main.py
----------------------------------------------------------------------
diff --git a/ForgeGit/forgegit/git_main.py b/ForgeGit/forgegit/git_main.py
index 12c3578..1d11e41 100644
--- a/ForgeGit/forgegit/git_main.py
+++ b/ForgeGit/forgegit/git_main.py
@@ -51,7 +51,6 @@ class ForgeGitApp(RepositoryApp):
         handle everything from small to very large projects with speed
         and efficiency.
     """
-    max_instances = 1
     ordinal=2
     forkable=True
 

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/89ade3a8/ForgeLink/forgelink/link_main.py
----------------------------------------------------------------------
diff --git a/ForgeLink/forgelink/link_main.py b/ForgeLink/forgelink/link_main.py
index f9d636e..d37db1b 100644
--- a/ForgeLink/forgelink/link_main.py
+++ b/ForgeLink/forgelink/link_main.py
@@ -54,7 +54,6 @@ class ForgeLinkApp(Application):
     tool_label='External Link'
     default_mount_label='Link name'
     default_mount_point='link'
-    max_instances = 1
     ordinal=1
     icons={
         24:'images/ext_24.png',

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/89ade3a8/ForgeSVN/forgesvn/svn_main.py
----------------------------------------------------------------------
diff --git a/ForgeSVN/forgesvn/svn_main.py b/ForgeSVN/forgesvn/svn_main.py
index 6581a9c..bee61b3 100644
--- a/ForgeSVN/forgesvn/svn_main.py
+++ b/ForgeSVN/forgesvn/svn_main.py
@@ -59,7 +59,6 @@ class ForgeSVNApp(RepositoryApp):
     tool_description="""
         Enterprise-class centralized version control for the masses.
     """
-    max_instances = 1
     ordinal=4
     forkable=False
     default_branch_name='HEAD'

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/89ade3a8/ForgeShortUrl/forgeshorturl/main.py
----------------------------------------------------------------------
diff --git a/ForgeShortUrl/forgeshorturl/main.py b/ForgeShortUrl/forgeshorturl/main.py
index 2081586..691d25d 100644
--- a/ForgeShortUrl/forgeshorturl/main.py
+++ b/ForgeShortUrl/forgeshorturl/main.py
@@ -58,6 +58,7 @@ class ForgeShortUrlApp(Application):
         'update': 'Edit/remove existing short url. Requires admin permission.',
         'view_private': 'View private short urls.',
     }
+    max_instances = 0
     searchable = True
     tool_label = 'URL shortener'
     default_mount_label = 'URL shortener'

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/89ade3a8/ForgeTracker/forgetracker/tracker_main.py
----------------------------------------------------------------------
diff --git a/ForgeTracker/forgetracker/tracker_main.py b/ForgeTracker/forgetracker/tracker_main.py
index 11493aa..71f7d64 100644
--- a/ForgeTracker/forgetracker/tracker_main.py
+++ b/ForgeTracker/forgetracker/tracker_main.py
@@ -210,7 +210,6 @@ class ForgeTrackerApp(Application):
             schema.OneOf('NewTicketsOnly', 'AllTicketChanges',
                 'NewPublicTicketsOnly', 'AllPublicTicketChanges'), None)
         ]
-    max_instances = 1
     exportable = True
     searchable=True
     tool_label='Tickets'

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/89ade3a8/ForgeUserStats/forgeuserstats/main.py
----------------------------------------------------------------------
diff --git a/ForgeUserStats/forgeuserstats/main.py b/ForgeUserStats/forgeuserstats/main.py
index dc56640..62aba4b 100644
--- a/ForgeUserStats/forgeuserstats/main.py
+++ b/ForgeUserStats/forgeuserstats/main.py
@@ -97,6 +97,7 @@ class ForgeUserStatsApp(Application):
         'read': 'View user stats.',
         'admin': 'Toggle stats visibility.',
     }
+    max_instances = 0
     ordinal=15
     config_options = Application.config_options
     default_external_feeds = []

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/89ade3a8/ForgeWiki/forgewiki/wiki_main.py
----------------------------------------------------------------------
diff --git a/ForgeWiki/forgewiki/wiki_main.py b/ForgeWiki/forgewiki/wiki_main.py
index 28e104f..55ee9a3 100644
--- a/ForgeWiki/forgewiki/wiki_main.py
+++ b/ForgeWiki/forgewiki/wiki_main.py
@@ -89,7 +89,6 @@ class ForgeWikiApp(Application):
         'delete': 'Delete wiki pages.',
         'admin': 'Set permissions. Configure options. Set wiki home page.',
     }
-    max_instances = 1
     searchable=True
     exportable=True
     tool_label='Wiki'