This is an automated email from the ASF dual-hosted git repository. bhaisaab pushed a commit to branch CLOUDSTACK-10012 in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit a4482417c637a5263209b10d4e07c56a617c9735 Author: Rohit Yadav <[email protected]> AuthorDate: Mon Aug 7 13:24:08 2017 +0200 apidoc: Fix regressions, use fatjar instead of path Signed-off-by: Rohit Yadav <[email protected]> --- pom.xml | 3 +-- tools/apidoc/build-apidoc.sh | 2 +- tools/apidoc/gen_toc.py | 3 ++- tools/apidoc/pom.xml | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pom.xml b/pom.xml index b3fea69..0a7b5a8 100644 --- a/pom.xml +++ b/pom.xml @@ -120,11 +120,10 @@ <cs.joda-time.version>2.8.1</cs.joda-time.version> <cs.batik.version>1.8</cs.batik.version> <cs.servicemix.version>2.3.4_1</cs.servicemix.version> - <cs.jetty.version>9.2.20.v20161216</cs.jetty.version> <cs.cxf.version>3.1.4</cs.cxf.version> <cs.groovy.version>2.4.7</cs.groovy.version> <cs.nitro.version>10.1</cs.nitro.version> - <cs.jetty.version>9.2.22.v20170606</cs.jetty.version><!-- Java 7+ --> + <cs.jetty.version>9.2.22.v20170606</cs.jetty.version> </properties> <distributionManagement> diff --git a/tools/apidoc/build-apidoc.sh b/tools/apidoc/build-apidoc.sh index 8ab69c8..4e1f9a6 100755 --- a/tools/apidoc/build-apidoc.sh +++ b/tools/apidoc/build-apidoc.sh @@ -47,7 +47,7 @@ fi CP=$PATHSEP/ -java -cp $CP$PATHSEP$TARGETJARDIR/*$PATHSEP$DEPSDIR/* com.cloud.api.doc.ApiXmlDocWriter -d "$DISTDIR" $* +java -cp $CP$PATHSEP$TARGETJARDIR$PATHSEP$DEPSDIR com.cloud.api.doc.ApiXmlDocWriter -d "$DISTDIR" $* if [ $? -ne 0 ] then diff --git a/tools/apidoc/gen_toc.py b/tools/apidoc/gen_toc.py index a261037..39e1576 100644 --- a/tools/apidoc/gen_toc.py +++ b/tools/apidoc/gen_toc.py @@ -180,7 +180,8 @@ known_categories = { 'stopNetScalerVpx' : 'Load Balancer', 'deleteServicePackageOffering' : 'Load Balancer', 'destroyNsVpx' : 'Load Balancer', - 'startNsVpx' : 'Load Balancer' + 'startNsVpx' : 'Load Balancer', + 'listElastistorInterface': 'Misc' } diff --git a/tools/apidoc/pom.xml b/tools/apidoc/pom.xml index e6804a0..61c1ccd 100644 --- a/tools/apidoc/pom.xml +++ b/tools/apidoc/pom.xml @@ -21,8 +21,8 @@ <relativePath>../pom.xml</relativePath> </parent> <properties> - <client.config.base>../../client/target/cloud-client-ui-${project.version}/WEB-INF/</client.config.base> - <client.config.jars>${client.config.base}/lib</client.config.jars> + <client.config.base>../../client/target/</client.config.base> + <client.config.jars>${client.config.base}/cloud-client-ui-${project.version}.jar</client.config.jars> <client.config.conf>${client.config.base}/classes</client.config.conf> </properties> -- To stop receiving notification emails like this one, please contact "[email protected]" <[email protected]>.
