You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by al...@apache.org on 2014/01/30 20:06:42 UTC
git commit: updated refs/heads/master to 13e6c2f
Updated Branches:
refs/heads/master 06f79a881 -> 13e6c2fe7
Fixed API doc that got broken by adding new commands for stratosphere ssp plugin
Conflicts:
tools/apidoc/gen_toc.py
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/13e6c2fe
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/13e6c2fe
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/13e6c2fe
Branch: refs/heads/master
Commit: 13e6c2fe72f591fbfb224e660b1e98421d9ae084
Parents: 06f79a8
Author: Alena Prokharchyk <al...@citrix.com>
Authored: Thu Jan 30 10:42:52 2014 -0800
Committer: Alena Prokharchyk <al...@citrix.com>
Committed: Thu Jan 30 11:01:03 2014 -0800
----------------------------------------------------------------------
tools/apidoc/gen_toc.py | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/13e6c2fe/tools/apidoc/gen_toc.py
----------------------------------------------------------------------
diff --git a/tools/apidoc/gen_toc.py b/tools/apidoc/gen_toc.py
index 0126151..29ff3bf 100644
--- a/tools/apidoc/gen_toc.py
+++ b/tools/apidoc/gen_toc.py
@@ -6,9 +6,9 @@
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
-#
+#
# http://www.apache.org/licenses/LICENSE-2.0
-#
+#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -126,7 +126,7 @@ known_categories = {
'Project': 'Project',
'Lun': 'Storage',
'Pool': 'Pool',
- 'VPC': 'VPC',
+ 'VPC': 'VPC',
'PrivateGateway': 'VPC',
'Simulator': 'simulator',
'StaticRoute': 'VPC',
@@ -160,7 +160,8 @@ known_categories = {
'Ucs' : 'UCS',
'CacheStores' : 'Cache Stores',
'CacheStore' : 'Cache Store',
- 'OvsElement' : 'Ovs Element'
+ 'OvsElement' : 'Ovs Element',
+ 'StratosphereSsp' : ' Stratosphere SSP'
}
@@ -205,7 +206,7 @@ for f in sys.argv:
pass
except IndexError, e:
print fn
-
+
def xml_for(command):
name = command['name']
@@ -220,7 +221,7 @@ def xml_for(command):
def write_xml(out, user):
with file(out, 'w') as f:
cat_strings = []
-
+
for category in categories.keys():
strings = []
for command in categories[category]:
@@ -242,7 +243,7 @@ def write_xml(out, user):
<xsl:for-each select="commands/command">
%(all_strings)s
</xsl:for-each>
-</ul>
+</ul>
</div>
''' % locals()
@@ -268,7 +269,7 @@ def java_for_user(user):
for command in categories[category]:
if command['user'] == user:
strings.append(java_for(command, user))
- func = user_to_func[user]
+ func = user_to_func[user]
all_strings = ''.join(strings)
return '''
public void %(func)s() {