etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

api_refactor: move cfg admin apis 

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
This commit is contained in:
Rohit Yadav 2012-12-06 10:50:26 -08:00
parent ab4fac54e5
commit ecc8249365
11 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/src/com/cloud/configuration/ConfigurationService.java
View File

@ -34,7 +34,7 @@ import org.apache.cloudstack.api.admin.zone.command.DeleteZoneCmd;
import com.cloud.api.commands.LDAPConfigCmd;
import com.cloud.api.commands.LDAPRemoveCmd;
import org.apache.cloudstack.api.user.network.command.ListNetworkOfferingsCmd;
import com.cloud.api.commands.UpdateCfgCmd;
import org.apache.cloudstack.api.admin.config.command.UpdateCfgCmd;
import com.cloud.api.commands.UpdateDiskOfferingCmd;
import org.apache.cloudstack.api.admin.network.command.UpdateNetworkOfferingCmd;
import com.cloud.api.commands.UpdatePodCmd;

4
api/src/com/cloud/server/ManagementService.java
View File

@ -28,7 +28,7 @@ import org.apache.cloudstack.api.admin.host.command.ListHostsCmd;
import org.apache.cloudstack.api.admin.host.command.UpdateHostPasswordCmd;
import org.apache.cloudstack.api.admin.router.command.ListRoutersCmd;
import org.apache.cloudstack.api.user.address.command.ListPublicIpAddressesCmd;
import org.apache.cloudstack.api.user.resource.command.ListCapabilitiesCmd;
import org.apache.cloudstack.api.user.config.command.ListCapabilitiesCmd;
import org.apache.cloudstack.api.user.guest.command.ListGuestOsCmd;
import org.apache.cloudstack.api.user.offering.command.ListDiskOfferingsCmd;
import org.apache.cloudstack.api.user.offering.command.ListServiceOfferingsCmd;
@ -42,7 +42,7 @@ import org.apache.cloudstack.api.user.vm.command.GetVMPasswordCmd;
import com.cloud.api.commands.ListAlertsCmd;
import org.apache.cloudstack.api.user.job.command.ListAsyncJobsCmd;
import com.cloud.api.commands.ListCapacityCmd;
import com.cloud.api.commands.ListCfgsByCmd;
import org.apache.cloudstack.api.admin.config.command.ListCfgsByCmd;
import com.cloud.api.commands.ListClustersCmd;
import org.apache.cloudstack.api.user.event.command.ListEventsCmd;
import org.apache.cloudstack.api.user.guest.command.ListGuestOsCategoriesCmd;

2
api/src/com/cloud/api/commands/ListCfgsByCmd.java → api/src/org/apache/cloudstack/api/admin/config/command/ListCfgsByCmd.java
View File

@ -14,7 +14,7 @@
// KIND, either express or implied. See the License for the
// specific language governing permissions and limitations
// under the License.
package com.cloud.api.commands;
package org.apache.cloudstack.api.admin.config.command;
import java.util.ArrayList;
import java.util.List;

2
api/src/com/cloud/api/commands/ListHypervisorCapabilitiesCmd.java → api/src/org/apache/cloudstack/api/admin/config/command/ListHypervisorCapabilitiesCmd.java
View File

@ -14,7 +14,7 @@
// KIND, either express or implied. See the License for the
// specific language governing permissions and limitations
// under the License.
package com.cloud.api.commands;
package org.apache.cloudstack.api.admin.config.command;
import java.util.ArrayList;
import java.util.List;

2
api/src/com/cloud/api/commands/UpdateCfgCmd.java → api/src/org/apache/cloudstack/api/admin/config/command/UpdateCfgCmd.java
View File

@ -14,7 +14,7 @@
// KIND, either express or implied. See the License for the
// specific language governing permissions and limitations
// under the License.
package com.cloud.api.commands;
package org.apache.cloudstack.api.admin.config.command;
import org.apache.log4j.Logger;

2
api/src/com/cloud/api/commands/UpdateHypervisorCapabilitiesCmd.java → api/src/org/apache/cloudstack/api/admin/config/command/UpdateHypervisorCapabilitiesCmd.java
View File

@ -14,7 +14,7 @@
// KIND, either express or implied. See the License for the
// specific language governing permissions and limitations
// under the License.
package com.cloud.api.commands;
package org.apache.cloudstack.api.admin.config.command;
import org.apache.log4j.Logger;

2
api/src/org/apache/cloudstack/api/user/resource/command/ListCapabilitiesCmd.java → api/src/org/apache/cloudstack/api/user/config/command/ListCapabilitiesCmd.java
View File

@ -14,7 +14,7 @@
// KIND, either express or implied. See the License for the
// specific language governing permissions and limitations
// under the License.
package org.apache.cloudstack.api.user.resource.command;
package org.apache.cloudstack.api.user.config.command;
import java.util.Map;

10
client/tomcatconf/commands.properties.in
View File

@ -196,11 +196,11 @@ migrateSystemVm=org.apache.cloudstack.api.admin.systemvm.command.MigrateSystemVM
changeServiceForSystemVm=org.apache.cloudstack.api.admin.systemvm.command.UpgradeSystemVMCmd;1
#### configuration commands
updateConfiguration=com.cloud.api.commands.UpdateCfgCmd;1
listConfigurations=com.cloud.api.commands.ListCfgsByCmd;1
updateConfiguration=org.apache.cloudstack.api.admin.config.command.UpdateCfgCmd;1
listConfigurations=org.apache.cloudstack.api.admin.config.command.ListCfgsByCmd;1
ldapConfig=com.cloud.api.commands.LDAPConfigCmd;1
ldapRemove=com.cloud.api.commands.LDAPRemoveCmd;1
listCapabilities=org.apache.cloudstack.api.user.resource.command.ListCapabilitiesCmd;15
listCapabilities=org.apache.cloudstack.api.user.config.command.ListCapabilitiesCmd;15
#### pod commands
createPod=com.cloud.api.commands.CreatePodCmd;1
@ -341,8 +341,8 @@ deleteFirewallRule=org.apache.cloudstack.api.user.firewall.command.DeleteFirewal
listFirewallRules=org.apache.cloudstack.api.user.firewall.command.ListFirewallRulesCmd;15
#### hypervisor capabilities commands
updateHypervisorCapabilities=com.cloud.api.commands.UpdateHypervisorCapabilitiesCmd;1
listHypervisorCapabilities=com.cloud.api.commands.ListHypervisorCapabilitiesCmd;1
updateHypervisorCapabilities=org.apache.cloudstack.api.admin.config.command.UpdateHypervisorCapabilitiesCmd;1
listHypervisorCapabilities=org.apache.cloudstack.api.admin.config.command.ListHypervisorCapabilitiesCmd;1
#### Physical Network commands
createPhysicalNetwork=org.apache.cloudstack.api.admin.network.command.CreatePhysicalNetworkCmd;1

2
server/src/com/cloud/configuration/ConfigurationManagerImpl.java
View File

@ -38,6 +38,7 @@ import javax.naming.NamingException;
import javax.naming.directory.DirContext;
import javax.naming.directory.InitialDirContext;
import org.apache.cloudstack.api.admin.config.command.UpdateCfgCmd;
import org.apache.cloudstack.api.admin.network.command.DeleteNetworkOfferingCmd;
import org.apache.cloudstack.api.admin.network.command.UpdateNetworkOfferingCmd;
import org.apache.cloudstack.api.admin.zone.command.CreateZoneCmd;
@ -60,7 +61,6 @@ import org.apache.cloudstack.api.admin.zone.command.DeleteZoneCmd;
import com.cloud.api.commands.LDAPConfigCmd;
import com.cloud.api.commands.LDAPRemoveCmd;
import org.apache.cloudstack.api.user.network.command.ListNetworkOfferingsCmd;
import com.cloud.api.commands.UpdateCfgCmd;
import com.cloud.api.commands.UpdateDiskOfferingCmd;
import com.cloud.api.commands.UpdatePodCmd;
import com.cloud.api.commands.UpdateServiceOfferingCmd;

4
server/src/com/cloud/server/ManagementServerImpl.java
View File

@ -42,8 +42,9 @@ import java.util.concurrent.TimeUnit;
import javax.crypto.Mac;
import javax.crypto.spec.SecretKeySpec;
import org.apache.cloudstack.api.admin.config.command.ListCfgsByCmd;
import org.apache.cloudstack.api.admin.router.command.ListRoutersCmd;
import org.apache.cloudstack.api.user.resource.command.ListCapabilitiesCmd;
import org.apache.cloudstack.api.user.config.command.ListCapabilitiesCmd;
import org.apache.cloudstack.api.user.guest.command.ListGuestOsCategoriesCmd;
import org.apache.cloudstack.api.user.guest.command.ListGuestOsCmd;
import org.apache.cloudstack.api.user.iso.command.ListIsosCmd;
@ -78,7 +79,6 @@ import org.apache.cloudstack.api.user.volume.command.ExtractVolumeCmd;
import org.apache.cloudstack.api.user.vm.command.GetVMPasswordCmd;
import com.cloud.api.commands.ListAlertsCmd;
import com.cloud.api.commands.ListCapacityCmd;
import com.cloud.api.commands.ListCfgsByCmd;
import com.cloud.api.commands.ListClustersCmd;
import org.apache.cloudstack.api.user.event.command.ListEventsCmd;
import org.apache.cloudstack.api.admin.host.command.ListHostsCmd;

2
server/test/com/cloud/vpc/MockConfigurationManagerImpl.java
View File

@ -25,6 +25,7 @@ import javax.naming.ConfigurationException;
import javax.naming.NamingException;
import com.cloud.api.commands.CreateDiskOfferingCmd;
import org.apache.cloudstack.api.admin.config.command.UpdateCfgCmd;
import org.apache.cloudstack.api.admin.network.command.CreateNetworkOfferingCmd;
import com.cloud.api.commands.CreateServiceOfferingCmd;
import com.cloud.api.commands.CreateVlanIpRangeCmd;
@ -39,7 +40,6 @@ import com.cloud.api.commands.LDAPConfigCmd;
import com.cloud.api.commands.LDAPRemoveCmd;
import org.apache.cloudstack.api.admin.zone.command.UpdateZoneCmd;
import org.apache.cloudstack.api.user.network.command.ListNetworkOfferingsCmd;
import com.cloud.api.commands.UpdateCfgCmd;
import com.cloud.api.commands.UpdateDiskOfferingCmd;
import org.apache.cloudstack.api.admin.network.command.UpdateNetworkOfferingCmd;
import com.cloud.api.commands.UpdatePodCmd;