rhtyd commented on issue #2207: Embedded jetty inside shaded jar URL: https://github.com/apache/cloudstack/pull/2207#issuecomment-320638183 @marcaurele I've found the fix, can you put this commit in your branch as I cannot push changes: ``` diff --git a/tools/apidoc/build-apidoc.sh b/tools/apidoc/build-apidoc.sh index 8ab69c8373..4e1f9a639d 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 a261037d80..39e1576422 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 e6804a0e78..61c1ccd593 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> ``` ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: [email protected]
With regards, Apache Git Services
