diff --git a/api/src/com/cloud/network/VirtualNetworkApplianceService.java b/api/src/com/cloud/network/VirtualNetworkApplianceService.java index fc636155ee3..088fcc2e327 100644 --- a/api/src/com/cloud/network/VirtualNetworkApplianceService.java +++ b/api/src/com/cloud/network/VirtualNetworkApplianceService.java @@ -16,7 +16,7 @@ // under the License. package com.cloud.network; -import com.cloud.api.commands.UpgradeRouterCmd; +import org.apache.cloudstack.api.admin.router.command.UpgradeRouterCmd; import com.cloud.exception.ConcurrentOperationException; import com.cloud.exception.InsufficientCapacityException; import com.cloud.exception.ResourceUnavailableException; diff --git a/api/src/com/cloud/network/element/VirtualRouterElementService.java b/api/src/com/cloud/network/element/VirtualRouterElementService.java index bf8cad27946..05707e8fe88 100644 --- a/api/src/com/cloud/network/element/VirtualRouterElementService.java +++ b/api/src/com/cloud/network/element/VirtualRouterElementService.java @@ -18,8 +18,8 @@ package com.cloud.network.element; import java.util.List; -import com.cloud.api.commands.ConfigureVirtualRouterElementCmd; -import com.cloud.api.commands.ListVirtualRouterElementsCmd; +import org.apache.cloudstack.api.admin.router.command.ConfigureVirtualRouterElementCmd; +import org.apache.cloudstack.api.admin.router.command.ListVirtualRouterElementsCmd; import com.cloud.network.VirtualRouterProvider; import com.cloud.network.VirtualRouterProvider.VirtualRouterProviderType; import com.cloud.utils.component.PluggableService; diff --git a/api/src/com/cloud/server/ManagementService.java b/api/src/com/cloud/server/ManagementService.java index e2bc4844d4e..78f2cb5e168 100755 --- a/api/src/com/cloud/server/ManagementService.java +++ b/api/src/com/cloud/server/ManagementService.java @@ -24,6 +24,7 @@ import java.util.Set; import com.cloud.alert.Alert; import org.apache.cloudstack.api.ServerApiException; +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.guest.command.ListGuestOsCmd; @@ -46,7 +47,6 @@ import org.apache.cloudstack.api.user.guest.command.ListGuestOsCategoriesCmd; import com.cloud.api.commands.ListHostsCmd; import org.apache.cloudstack.api.user.iso.command.ListIsosCmd; import com.cloud.api.commands.ListPodsByCmd; -import com.cloud.api.commands.ListRoutersCmd; import org.apache.cloudstack.api.user.ssh.command.ListSSHKeyPairsCmd; import com.cloud.api.commands.ListStoragePoolsCmd; import com.cloud.api.commands.ListSystemVMsCmd; diff --git a/api/src/com/cloud/api/commands/ConfigureVirtualRouterElementCmd.java b/api/src/org/apache/cloudstack/api/admin/router/command/ConfigureVirtualRouterElementCmd.java similarity index 98% rename from api/src/com/cloud/api/commands/ConfigureVirtualRouterElementCmd.java rename to api/src/org/apache/cloudstack/api/admin/router/command/ConfigureVirtualRouterElementCmd.java index c130637df2a..e17a9881690 100644 --- a/api/src/com/cloud/api/commands/ConfigureVirtualRouterElementCmd.java +++ b/api/src/org/apache/cloudstack/api/admin/router/command/ConfigureVirtualRouterElementCmd.java @@ -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.router.command; import org.apache.log4j.Logger; diff --git a/api/src/com/cloud/api/commands/CreateVirtualRouterElementCmd.java b/api/src/org/apache/cloudstack/api/admin/router/command/CreateVirtualRouterElementCmd.java similarity index 98% rename from api/src/com/cloud/api/commands/CreateVirtualRouterElementCmd.java rename to api/src/org/apache/cloudstack/api/admin/router/command/CreateVirtualRouterElementCmd.java index bdeedbee3f8..5c88c2d182d 100644 --- a/api/src/com/cloud/api/commands/CreateVirtualRouterElementCmd.java +++ b/api/src/org/apache/cloudstack/api/admin/router/command/CreateVirtualRouterElementCmd.java @@ -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.router.command; import org.apache.log4j.Logger; diff --git a/api/src/com/cloud/api/commands/DestroyRouterCmd.java b/api/src/org/apache/cloudstack/api/admin/router/command/DestroyRouterCmd.java similarity index 98% rename from api/src/com/cloud/api/commands/DestroyRouterCmd.java rename to api/src/org/apache/cloudstack/api/admin/router/command/DestroyRouterCmd.java index 7c52479baf0..1408a576406 100644 --- a/api/src/com/cloud/api/commands/DestroyRouterCmd.java +++ b/api/src/org/apache/cloudstack/api/admin/router/command/DestroyRouterCmd.java @@ -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.router.command; import org.apache.log4j.Logger; diff --git a/api/src/com/cloud/api/commands/ListRoutersCmd.java b/api/src/org/apache/cloudstack/api/admin/router/command/ListRoutersCmd.java similarity index 98% rename from api/src/com/cloud/api/commands/ListRoutersCmd.java rename to api/src/org/apache/cloudstack/api/admin/router/command/ListRoutersCmd.java index d4c41fce82b..1659bea7827 100644 --- a/api/src/com/cloud/api/commands/ListRoutersCmd.java +++ b/api/src/org/apache/cloudstack/api/admin/router/command/ListRoutersCmd.java @@ -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.router.command; import java.util.ArrayList; import java.util.List; diff --git a/api/src/com/cloud/api/commands/ListVirtualRouterElementsCmd.java b/api/src/org/apache/cloudstack/api/admin/router/command/ListVirtualRouterElementsCmd.java similarity index 98% rename from api/src/com/cloud/api/commands/ListVirtualRouterElementsCmd.java rename to api/src/org/apache/cloudstack/api/admin/router/command/ListVirtualRouterElementsCmd.java index aa24467cb33..6206de5ac1c 100644 --- a/api/src/com/cloud/api/commands/ListVirtualRouterElementsCmd.java +++ b/api/src/org/apache/cloudstack/api/admin/router/command/ListVirtualRouterElementsCmd.java @@ -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.router.command; import java.util.ArrayList; import java.util.List; diff --git a/api/src/com/cloud/api/commands/RebootRouterCmd.java b/api/src/org/apache/cloudstack/api/admin/router/command/RebootRouterCmd.java similarity index 98% rename from api/src/com/cloud/api/commands/RebootRouterCmd.java rename to api/src/org/apache/cloudstack/api/admin/router/command/RebootRouterCmd.java index 5e3e87fc131..be1ef24afb2 100644 --- a/api/src/com/cloud/api/commands/RebootRouterCmd.java +++ b/api/src/org/apache/cloudstack/api/admin/router/command/RebootRouterCmd.java @@ -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.router.command; import org.apache.log4j.Logger; diff --git a/api/src/com/cloud/api/commands/StartRouterCmd.java b/api/src/org/apache/cloudstack/api/admin/router/command/StartRouterCmd.java similarity index 98% rename from api/src/com/cloud/api/commands/StartRouterCmd.java rename to api/src/org/apache/cloudstack/api/admin/router/command/StartRouterCmd.java index d4b12e86f88..cf3b5f1551f 100644 --- a/api/src/com/cloud/api/commands/StartRouterCmd.java +++ b/api/src/org/apache/cloudstack/api/admin/router/command/StartRouterCmd.java @@ -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.router.command; import org.apache.log4j.Logger; diff --git a/api/src/com/cloud/api/commands/StopRouterCmd.java b/api/src/org/apache/cloudstack/api/admin/router/command/StopRouterCmd.java similarity index 98% rename from api/src/com/cloud/api/commands/StopRouterCmd.java rename to api/src/org/apache/cloudstack/api/admin/router/command/StopRouterCmd.java index eb93bb6f107..593b4c6dcc4 100644 --- a/api/src/com/cloud/api/commands/StopRouterCmd.java +++ b/api/src/org/apache/cloudstack/api/admin/router/command/StopRouterCmd.java @@ -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.router.command; import org.apache.log4j.Logger; diff --git a/api/src/com/cloud/api/commands/UpgradeRouterCmd.java b/api/src/org/apache/cloudstack/api/admin/router/command/UpgradeRouterCmd.java similarity index 98% rename from api/src/com/cloud/api/commands/UpgradeRouterCmd.java rename to api/src/org/apache/cloudstack/api/admin/router/command/UpgradeRouterCmd.java index c916a5c73f3..11633bd930a 100644 --- a/api/src/com/cloud/api/commands/UpgradeRouterCmd.java +++ b/api/src/org/apache/cloudstack/api/admin/router/command/UpgradeRouterCmd.java @@ -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.router.command; import org.apache.log4j.Logger; diff --git a/api/src/org/apache/cloudstack/api/user/datacenter/command/ListHypervisorsCmd.java b/api/src/org/apache/cloudstack/api/user/datacenter/command/ListHypervisorsCmd.java index 4b5a60faad9..ac7ababc59a 100644 --- a/api/src/org/apache/cloudstack/api/user/datacenter/command/ListHypervisorsCmd.java +++ b/api/src/org/apache/cloudstack/api/user/datacenter/command/ListHypervisorsCmd.java @@ -19,7 +19,7 @@ package org.apache.cloudstack.api.user.datacenter.command; import java.util.ArrayList; import java.util.List; -import com.cloud.api.commands.UpgradeRouterCmd; +import org.apache.cloudstack.api.admin.router.command.UpgradeRouterCmd; import org.apache.log4j.Logger; import org.apache.cloudstack.api.ApiConstants; diff --git a/client/tomcatconf/commands.properties.in b/client/tomcatconf/commands.properties.in index ca7321c7673..441271bb3aa 100755 --- a/client/tomcatconf/commands.properties.in +++ b/client/tomcatconf/commands.properties.in @@ -176,14 +176,15 @@ updateAutoScaleVmProfile=org.apache.cloudstack.api.user.autoscale.command.Update updateAutoScaleVmGroup=org.apache.cloudstack.api.user.autoscale.command.UpdateAutoScaleVmGroupCmd;15 #### router commands -startRouter=com.cloud.api.commands.StartRouterCmd;7 -rebootRouter=com.cloud.api.commands.RebootRouterCmd;7 -stopRouter=com.cloud.api.commands.StopRouterCmd;7 -destroyRouter=com.cloud.api.commands.DestroyRouterCmd;7 -changeServiceForRouter=com.cloud.api.commands.UpgradeRouterCmd;7 -listRouters=com.cloud.api.commands.ListRoutersCmd;7 -listVirtualRouterElements=com.cloud.api.commands.ListVirtualRouterElementsCmd;7 -configureVirtualRouterElement=com.cloud.api.commands.ConfigureVirtualRouterElementCmd;7 +startRouter=org.apache.cloudstack.api.admin.router.command.StartRouterCmd;7 +rebootRouter=org.apache.cloudstack.api.admin.router.command.RebootRouterCmd;7 +stopRouter=org.apache.cloudstack.api.admin.router.command.StopRouterCmd;7 +destroyRouter=org.apache.cloudstack.api.admin.router.command.DestroyRouterCmd;7 +changeServiceForRouter=org.apache.cloudstack.api.admin.router.command.UpgradeRouterCmd;7 +listRouters=org.apache.cloudstack.api.admin.router.command.ListRoutersCmd;7 +listVirtualRouterElements=org.apache.cloudstack.api.admin.router.command.ListVirtualRouterElementsCmd;7 +configureVirtualRouterElement=org.apache.cloudstack.api.admin.router.command.ConfigureVirtualRouterElementCmd;7 +createVirtualRouterElement=org.apache.cloudstack.api.admin.router.command.CreateVirtualRouterElementCmd;7 #### system vm commands startSystemVm=com.cloud.api.commands.StartSystemVMCmd;1 diff --git a/server/src/com/cloud/network/element/VirtualRouterElement.java b/server/src/com/cloud/network/element/VirtualRouterElement.java index 4ff10820ec7..5339b3f50a4 100755 --- a/server/src/com/cloud/network/element/VirtualRouterElement.java +++ b/server/src/com/cloud/network/element/VirtualRouterElement.java @@ -24,10 +24,10 @@ import java.util.Set; import javax.ejb.Local; +import org.apache.cloudstack.api.admin.router.command.ConfigureVirtualRouterElementCmd; +import org.apache.cloudstack.api.admin.router.command.ListVirtualRouterElementsCmd; import org.apache.log4j.Logger; -import com.cloud.api.commands.ConfigureVirtualRouterElementCmd; -import com.cloud.api.commands.ListVirtualRouterElementsCmd; import com.cloud.configuration.ConfigurationManager; import com.cloud.configuration.dao.ConfigurationDao; import com.cloud.dc.DataCenter; diff --git a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java index 5d0892ab60a..d06c3263f0f 100755 --- a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java +++ b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java @@ -36,6 +36,7 @@ import java.util.concurrent.TimeUnit; import javax.ejb.Local; import javax.naming.ConfigurationException; +import org.apache.cloudstack.api.admin.router.command.UpgradeRouterCmd; import org.apache.log4j.Logger; import com.cloud.agent.AgentManager; @@ -80,7 +81,6 @@ import com.cloud.agent.api.to.StaticNatRuleTO; import com.cloud.agent.api.to.VirtualMachineTO; import com.cloud.agent.manager.Commands; import com.cloud.alert.AlertManager; -import com.cloud.api.commands.UpgradeRouterCmd; import com.cloud.cluster.ManagementServerHostVO; import com.cloud.cluster.ManagementServerNode; import com.cloud.cluster.dao.ManagementServerHostDao; diff --git a/server/src/com/cloud/server/ManagementServerImpl.java b/server/src/com/cloud/server/ManagementServerImpl.java index f6e9207940f..7a8d5623c28 100755 --- a/server/src/com/cloud/server/ManagementServerImpl.java +++ b/server/src/com/cloud/server/ManagementServerImpl.java @@ -42,6 +42,7 @@ import java.util.concurrent.TimeUnit; import javax.crypto.Mac; import javax.crypto.spec.SecretKeySpec; +import org.apache.cloudstack.api.admin.router.command.ListRoutersCmd; import org.apache.cloudstack.api.user.resource.command.ListCapabilitiesCmd; import org.apache.cloudstack.api.user.guest.command.ListGuestOsCategoriesCmd; import org.apache.cloudstack.api.user.guest.command.ListGuestOsCmd; @@ -82,7 +83,6 @@ import org.apache.cloudstack.api.user.event.command.ListEventsCmd; import com.cloud.api.commands.ListHostsCmd; import com.cloud.api.commands.ListPodsByCmd; import org.apache.cloudstack.api.user.address.command.ListPublicIpAddressesCmd; -import com.cloud.api.commands.ListRoutersCmd; import org.apache.cloudstack.api.user.ssh.command.ListSSHKeyPairsCmd; import com.cloud.api.commands.ListStoragePoolsCmd; import com.cloud.api.commands.ListSystemVMsCmd;