diff --git a/api/src/com/cloud/network/security/SecurityGroupService.java b/api/src/com/cloud/network/security/SecurityGroupService.java index 270047f5713..51d26829667 100644 --- a/api/src/com/cloud/network/security/SecurityGroupService.java +++ b/api/src/com/cloud/network/security/SecurityGroupService.java @@ -18,10 +18,9 @@ package com.cloud.network.security; import java.util.List; -import org.apache.cloudstack.api.user.sg.command.*; -import org.apache.cloudstack.api.user.sg.command.AuthorizeSecurityGroupIngressCmd; -import org.apache.cloudstack.api.user.sg.command.CreateSecurityGroupCmd; -import org.apache.cloudstack.api.user.sg.command.RevokeSecurityGroupEgressCmd; +import org.apache.cloudstack.api.user.securitygroup.command.*; +import org.apache.cloudstack.api.user.securitygroup.command.AuthorizeSecurityGroupIngressCmd; +import org.apache.cloudstack.api.user.securitygroup.command.CreateSecurityGroupCmd; import com.cloud.exception.InvalidParameterValueException; import com.cloud.exception.PermissionDeniedException; import com.cloud.exception.ResourceInUseException; diff --git a/api/src/org/apache/cloudstack/api/user/sg/command/AuthorizeSecurityGroupEgressCmd.java b/api/src/org/apache/cloudstack/api/user/securitygroup/command/AuthorizeSecurityGroupEgressCmd.java similarity index 99% rename from api/src/org/apache/cloudstack/api/user/sg/command/AuthorizeSecurityGroupEgressCmd.java rename to api/src/org/apache/cloudstack/api/user/securitygroup/command/AuthorizeSecurityGroupEgressCmd.java index 658f03a73a8..207eb7d0cd2 100644 --- a/api/src/org/apache/cloudstack/api/user/sg/command/AuthorizeSecurityGroupEgressCmd.java +++ b/api/src/org/apache/cloudstack/api/user/securitygroup/command/AuthorizeSecurityGroupEgressCmd.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 org.apache.cloudstack.api.user.sg.command; +package org.apache.cloudstack.api.user.securitygroup.command; import java.util.Collection; import java.util.HashMap; diff --git a/api/src/org/apache/cloudstack/api/user/sg/command/AuthorizeSecurityGroupIngressCmd.java b/api/src/org/apache/cloudstack/api/user/securitygroup/command/AuthorizeSecurityGroupIngressCmd.java similarity index 99% rename from api/src/org/apache/cloudstack/api/user/sg/command/AuthorizeSecurityGroupIngressCmd.java rename to api/src/org/apache/cloudstack/api/user/securitygroup/command/AuthorizeSecurityGroupIngressCmd.java index 38a4f49e532..3ea5216f086 100644 --- a/api/src/org/apache/cloudstack/api/user/sg/command/AuthorizeSecurityGroupIngressCmd.java +++ b/api/src/org/apache/cloudstack/api/user/securitygroup/command/AuthorizeSecurityGroupIngressCmd.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 org.apache.cloudstack.api.user.sg.command; +package org.apache.cloudstack.api.user.securitygroup.command; import java.util.Collection; import java.util.HashMap; diff --git a/api/src/org/apache/cloudstack/api/user/sg/command/CreateSecurityGroupCmd.java b/api/src/org/apache/cloudstack/api/user/securitygroup/command/CreateSecurityGroupCmd.java similarity index 98% rename from api/src/org/apache/cloudstack/api/user/sg/command/CreateSecurityGroupCmd.java rename to api/src/org/apache/cloudstack/api/user/securitygroup/command/CreateSecurityGroupCmd.java index 71a1ee60d3a..a66ee5a8e1b 100644 --- a/api/src/org/apache/cloudstack/api/user/sg/command/CreateSecurityGroupCmd.java +++ b/api/src/org/apache/cloudstack/api/user/securitygroup/command/CreateSecurityGroupCmd.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 org.apache.cloudstack.api.user.sg.command; +package org.apache.cloudstack.api.user.securitygroup.command; import org.apache.log4j.Logger; diff --git a/api/src/org/apache/cloudstack/api/user/sg/command/DeleteSecurityGroupCmd.java b/api/src/org/apache/cloudstack/api/user/securitygroup/command/DeleteSecurityGroupCmd.java similarity index 98% rename from api/src/org/apache/cloudstack/api/user/sg/command/DeleteSecurityGroupCmd.java rename to api/src/org/apache/cloudstack/api/user/securitygroup/command/DeleteSecurityGroupCmd.java index 92e1b83ee65..c48644f82ed 100644 --- a/api/src/org/apache/cloudstack/api/user/sg/command/DeleteSecurityGroupCmd.java +++ b/api/src/org/apache/cloudstack/api/user/securitygroup/command/DeleteSecurityGroupCmd.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 org.apache.cloudstack.api.user.sg.command; +package org.apache.cloudstack.api.user.securitygroup.command; import org.apache.log4j.Logger; diff --git a/api/src/org/apache/cloudstack/api/user/sg/command/ListSecurityGroupsCmd.java b/api/src/org/apache/cloudstack/api/user/securitygroup/command/ListSecurityGroupsCmd.java similarity index 98% rename from api/src/org/apache/cloudstack/api/user/sg/command/ListSecurityGroupsCmd.java rename to api/src/org/apache/cloudstack/api/user/securitygroup/command/ListSecurityGroupsCmd.java index db6e3e7ef35..7b1be825f93 100644 --- a/api/src/org/apache/cloudstack/api/user/sg/command/ListSecurityGroupsCmd.java +++ b/api/src/org/apache/cloudstack/api/user/securitygroup/command/ListSecurityGroupsCmd.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 org.apache.cloudstack.api.user.sg.command; +package org.apache.cloudstack.api.user.securitygroup.command; import java.util.List; diff --git a/api/src/org/apache/cloudstack/api/user/sg/command/RevokeSecurityGroupEgressCmd.java b/api/src/org/apache/cloudstack/api/user/securitygroup/command/RevokeSecurityGroupEgressCmd.java similarity index 98% rename from api/src/org/apache/cloudstack/api/user/sg/command/RevokeSecurityGroupEgressCmd.java rename to api/src/org/apache/cloudstack/api/user/securitygroup/command/RevokeSecurityGroupEgressCmd.java index f806e2f34f8..8da03170aaa 100644 --- a/api/src/org/apache/cloudstack/api/user/sg/command/RevokeSecurityGroupEgressCmd.java +++ b/api/src/org/apache/cloudstack/api/user/securitygroup/command/RevokeSecurityGroupEgressCmd.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 org.apache.cloudstack.api.user.sg.command; +package org.apache.cloudstack.api.user.securitygroup.command; import org.apache.log4j.Logger; diff --git a/api/src/org/apache/cloudstack/api/user/sg/command/RevokeSecurityGroupIngressCmd.java b/api/src/org/apache/cloudstack/api/user/securitygroup/command/RevokeSecurityGroupIngressCmd.java similarity index 98% rename from api/src/org/apache/cloudstack/api/user/sg/command/RevokeSecurityGroupIngressCmd.java rename to api/src/org/apache/cloudstack/api/user/securitygroup/command/RevokeSecurityGroupIngressCmd.java index 668b9e218a7..b9ddc8632c5 100644 --- a/api/src/org/apache/cloudstack/api/user/sg/command/RevokeSecurityGroupIngressCmd.java +++ b/api/src/org/apache/cloudstack/api/user/securitygroup/command/RevokeSecurityGroupIngressCmd.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 org.apache.cloudstack.api.user.sg.command; +package org.apache.cloudstack.api.user.securitygroup.command; import org.apache.log4j.Logger; diff --git a/client/tomcatconf/commands.properties.in b/client/tomcatconf/commands.properties.in index eb006516557..f7ce43b2dc5 100755 --- a/client/tomcatconf/commands.properties.in +++ b/client/tomcatconf/commands.properties.in @@ -272,13 +272,13 @@ enableStorageMaintenance=com.cloud.api.commands.PreparePrimaryStorageForMaintena cancelStorageMaintenance=com.cloud.api.commands.CancelPrimaryStorageMaintenanceCmd;1 #### security group commands -createSecurityGroup=org.apache.cloudstack.api.user.sg.command.CreateSecurityGroupCmd;15 -deleteSecurityGroup=org.apache.cloudstack.api.user.sg.command.DeleteSecurityGroupCmd;15 -authorizeSecurityGroupIngress=org.apache.cloudstack.api.user.sg.command.AuthorizeSecurityGroupIngressCmd;15 -revokeSecurityGroupIngress=org.apache.cloudstack.api.user.sg.command.RevokeSecurityGroupIngressCmd;15 -authorizeSecurityGroupEgress=org.apache.cloudstack.api.user.sg.command.AuthorizeSecurityGroupEgressCmd;15 -revokeSecurityGroupEgress=org.apache.cloudstack.api.user.sg.command.RevokeSecurityGroupEgressCmd;15 -listSecurityGroups=org.apache.cloudstack.api.user.sg.command.ListSecurityGroupsCmd;15 +createSecurityGroup=org.apache.cloudstack.api.user.securitygroup.command.CreateSecurityGroupCmd;15 +deleteSecurityGroup=org.apache.cloudstack.api.user.securitygroup.command.DeleteSecurityGroupCmd;15 +authorizeSecurityGroupIngress=org.apache.cloudstack.api.user.securitygroup.command.AuthorizeSecurityGroupIngressCmd;15 +revokeSecurityGroupIngress=org.apache.cloudstack.api.user.securitygroup.command.RevokeSecurityGroupIngressCmd;15 +authorizeSecurityGroupEgress=org.apache.cloudstack.api.user.securitygroup.command.AuthorizeSecurityGroupEgressCmd;15 +revokeSecurityGroupEgress=org.apache.cloudstack.api.user.securitygroup.command.RevokeSecurityGroupEgressCmd;15 +listSecurityGroups=org.apache.cloudstack.api.user.securitygroup.command.ListSecurityGroupsCmd;15 #### vm group commands createInstanceGroup=org.apache.cloudstack.api.user.vmgroup.command.CreateVMGroupCmd;15 diff --git a/server/src/com/cloud/network/security/SecurityGroupManagerImpl.java b/server/src/com/cloud/network/security/SecurityGroupManagerImpl.java index 40826c9c8b8..be8635c63e1 100755 --- a/server/src/com/cloud/network/security/SecurityGroupManagerImpl.java +++ b/server/src/com/cloud/network/security/SecurityGroupManagerImpl.java @@ -36,7 +36,7 @@ import java.util.concurrent.TimeUnit; import javax.ejb.Local; import javax.naming.ConfigurationException; -import org.apache.cloudstack.api.user.sg.command.*; +import org.apache.cloudstack.api.user.securitygroup.command.*; import org.apache.commons.codec.digest.DigestUtils; import org.apache.log4j.Logger; @@ -45,11 +45,7 @@ import com.cloud.agent.api.NetworkRulesSystemVmCommand; import com.cloud.agent.api.SecurityGroupRulesCmd; import com.cloud.agent.api.SecurityGroupRulesCmd.IpPortAndProto; import com.cloud.agent.manager.Commands; -import org.apache.cloudstack.api.user.sg.command.AuthorizeSecurityGroupEgressCmd; -import org.apache.cloudstack.api.user.sg.command.CreateSecurityGroupCmd; -import org.apache.cloudstack.api.user.sg.command.DeleteSecurityGroupCmd; -import org.apache.cloudstack.api.user.sg.command.ListSecurityGroupsCmd; -import org.apache.cloudstack.api.user.sg.command.RevokeSecurityGroupEgressCmd; +import org.apache.cloudstack.api.user.securitygroup.command.RevokeSecurityGroupEgressCmd; import com.cloud.configuration.Config; import com.cloud.configuration.dao.ConfigurationDao; import com.cloud.domain.dao.DomainDao;