CLOUDSTACK-50 build-apidocs ClassNotFoundException: com.cloud.api.commands.DeleteCiscoNexusVSMCmd
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/0ae1d58c Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/0ae1d58c Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/0ae1d58c Branch: refs/heads/4.0 Commit: 0ae1d58c190e01d8066e94f1e9fdc15f0468bdc3 Parents: dd41bed Author: Mice Xia <[email protected]> Authored: Sat Sep 8 10:55:34 2012 +0800 Committer: Mice Xia <[email protected]> Committed: Sat Sep 8 10:56:32 2012 +0800 ---------------------------------------------------------------------- build/developer.xml | 14 +++----- client/tomcatconf/commands-ext.properties.in | 22 +----------- client/tomcatconf/netapp_commands.properties.in | 33 ++++++++++++++++++ 3 files changed, 39 insertions(+), 30 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/0ae1d58c/build/developer.xml ---------------------------------------------------------------------- diff --git a/build/developer.xml b/build/developer.xml index 62f4433..69e4929 100755 --- a/build/developer.xml +++ b/build/developer.xml @@ -398,21 +398,17 @@ <target name="build-apidocs" description="Generate api documentation" depends="build-all"> - <property name="commands.file" location="${dist.dir}/client/conf/commands.properties" /> - <property name="commands.ext.file" location="${dist.dir}/client/conf/commands-ext.properties" /> - <property name="commands.f5.file" location="${dist.dir}/client/conf/f5bigip_commands.properties" /> - <property name="commands.juniper.file" location="${dist.dir}/client/conf/junipersrx_commands.properties" /> - <property name="commands.cisco.file" location="${dist.dir}/client/conf/cisconexusvsm_commands.properties" /> - <property name="commands.netscaler.file" location="${dist.dir}/client/conf/netscalerloadbalancer_commands.properties" /> - <property name="commands.vr.file" location="${dist.dir}/client/conf/virtualrouter_commands.properties" /> + <property name="commands.file" location="${dist.dir}/client/conf/commands.properties" /> + <property name="commands.ext.file" location="${dist.dir}/client/conf/commands-ext.properties" /> + <property name="commands.vr.file" location="${dist.dir}/client/conf/virtualrouter_commands.properties" /> - <echo message="build-apidocs" /> + <echo message="build-apidocs" /> <exec dir="${apidoc.scripts.dir}" executable="bash" failonerror="true"> <arg value="build-apidoc.sh" /> <arg value="${target.dir}/jar" /> <arg value="${deps.dir}" /> <arg value="${dist.dir}" /> - <arg value="-f ${commands.cisco.file},${commands.file},${commands.ext.file},${commands.f5.file},${commands.juniper.file},${commands.netscaler.file},${commands.vr.file}" /> + <arg value="-f ${commands.file},${commands.ext.file},${commands.vr.file}" /> </exec> <echo message="Result locates at ${dist.dir}/commands.xml" /> http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/0ae1d58c/client/tomcatconf/commands-ext.properties.in ---------------------------------------------------------------------- diff --git a/client/tomcatconf/commands-ext.properties.in b/client/tomcatconf/commands-ext.properties.in index 7e009e6..f172067 100644 --- a/client/tomcatconf/commands-ext.properties.in +++ b/client/tomcatconf/commands-ext.properties.in @@ -20,15 +20,7 @@ generateUsageRecords=com.cloud.api.commands.GenerateUsageRecordsCmd;1 listUsageRecords=com.cloud.api.commands.GetUsageRecordsCmd;1 listUsageTypes=com.cloud.api.commands.ListUsageTypesCmd;1 -#### external firewall commands -addExternalFirewall=com.cloud.api.commands.AddExternalFirewallCmd;1 -deleteExternalFirewall=com.cloud.api.commands.DeleteExternalFirewallCmd;1 -listExternalFirewalls=com.cloud.api.commands.ListExternalFirewallsCmd;1 -#### external loadbalancer commands -addExternalLoadBalancer=com.cloud.api.commands.AddExternalLoadBalancerCmd;1 -deleteExternalLoadBalancer=com.cloud.api.commands.DeleteExternalLoadBalancerCmd;1 -listExternalLoadBalancers=com.cloud.api.commands.ListExternalLoadBalancersCmd;1 ### Network Devices commands addNetworkDevice=com.cloud.api.commands.AddNetworkDeviceCmd;1 @@ -40,16 +32,4 @@ addTrafficMonitor=com.cloud.api.commands.AddTrafficMonitorCmd;1 deleteTrafficMonitor=com.cloud.api.commands.DeleteTrafficMonitorCmd;1 listTrafficMonitors=com.cloud.api.commands.ListTrafficMonitorsCmd;1 -####Netapp integration commands -createVolumeOnFiler=com.cloud.api.commands.netapp.CreateVolumeOnFilerCmd;15 -destroyVolumeOnFiler=com.cloud.api.commands.netapp.DestroyVolumeOnFilerCmd;15 -listVolumesOnFiler=com.cloud.api.commands.netapp.ListVolumesOnFilerCmd;15 -createLunOnFiler=com.cloud.api.commands.netapp.CreateLunCmd;15 -destroyLunOnFiler=com.cloud.api.commands.netapp.DestroyLunCmd;15 -listLunsOnFiler=com.cloud.api.commands.netapp.ListLunsCmd;15 -associateLun=com.cloud.api.commands.netapp.AssociateLunCmd;15 -dissociateLun=com.cloud.api.commands.netapp.DissociateLunCmd;15 -createPool=com.cloud.api.commands.netapp.CreateVolumePoolCmd;15 -deletePool=com.cloud.api.commands.netapp.DeleteVolumePoolCmd;15 -modifyPool=com.cloud.api.commands.netapp.ModifyVolumePoolCmd;15 -listPools=com.cloud.api.commands.netapp.ListVolumePoolsCmd;15 + http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/0ae1d58c/client/tomcatconf/netapp_commands.properties.in ---------------------------------------------------------------------- diff --git a/client/tomcatconf/netapp_commands.properties.in b/client/tomcatconf/netapp_commands.properties.in new file mode 100644 index 0000000..2184403 --- /dev/null +++ b/client/tomcatconf/netapp_commands.properties.in @@ -0,0 +1,33 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# 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 +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + +### bitmap of permissions at the end of each classname, 1 = ADMIN, 2 = RESOURCE_DOMAIN_ADMIN, 4 = DOMAIN_ADMIN, 8 = USER +### Please standardize naming conventions to camel-case (even for acronyms). + +####Netapp integration commands +createVolumeOnFiler=com.cloud.api.commands.netapp.CreateVolumeOnFilerCmd;15 +destroyVolumeOnFiler=com.cloud.api.commands.netapp.DestroyVolumeOnFilerCmd;15 +listVolumesOnFiler=com.cloud.api.commands.netapp.ListVolumesOnFilerCmd;15 +createLunOnFiler=com.cloud.api.commands.netapp.CreateLunCmd;15 +destroyLunOnFiler=com.cloud.api.commands.netapp.DestroyLunCmd;15 +listLunsOnFiler=com.cloud.api.commands.netapp.ListLunsCmd;15 +associateLun=com.cloud.api.commands.netapp.AssociateLunCmd;15 +dissociateLun=com.cloud.api.commands.netapp.DissociateLunCmd;15 +createPool=com.cloud.api.commands.netapp.CreateVolumePoolCmd;15 +deletePool=com.cloud.api.commands.netapp.DeleteVolumePoolCmd;15 +modifyPool=com.cloud.api.commands.netapp.ModifyVolumePoolCmd;15 +listPools=com.cloud.api.commands.netapp.ListVolumePoolsCmd;15
