diff --git a/api/src/com/cloud/network/security/SecurityGroupService.java b/api/src/com/cloud/network/security/SecurityGroupService.java index 55b6e78a815..270047f5713 100644 --- a/api/src/com/cloud/network/security/SecurityGroupService.java +++ b/api/src/com/cloud/network/security/SecurityGroupService.java @@ -18,13 +18,10 @@ package com.cloud.network.security; import java.util.List; -import com.cloud.api.commands.AuthorizeSecurityGroupEgressCmd; -import com.cloud.api.commands.AuthorizeSecurityGroupIngressCmd; -import com.cloud.api.commands.CreateSecurityGroupCmd; -import com.cloud.api.commands.DeleteSecurityGroupCmd; -import com.cloud.api.commands.ListSecurityGroupsCmd; -import com.cloud.api.commands.RevokeSecurityGroupEgressCmd; -import com.cloud.api.commands.RevokeSecurityGroupIngressCmd; +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 com.cloud.exception.InvalidParameterValueException; import com.cloud.exception.PermissionDeniedException; import com.cloud.exception.ResourceInUseException; diff --git a/api/src/com/cloud/api/commands/AuthorizeSecurityGroupEgressCmd.java b/api/src/org/apache/cloudstack/api/user/sg/command/AuthorizeSecurityGroupEgressCmd.java similarity index 99% rename from api/src/com/cloud/api/commands/AuthorizeSecurityGroupEgressCmd.java rename to api/src/org/apache/cloudstack/api/user/sg/command/AuthorizeSecurityGroupEgressCmd.java index 3abed2af7e8..658f03a73a8 100644 --- a/api/src/com/cloud/api/commands/AuthorizeSecurityGroupEgressCmd.java +++ b/api/src/org/apache/cloudstack/api/user/sg/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 com.cloud.api.commands; +package org.apache.cloudstack.api.user.sg.command; import java.util.Collection; import java.util.HashMap; diff --git a/api/src/com/cloud/api/commands/AuthorizeSecurityGroupIngressCmd.java b/api/src/org/apache/cloudstack/api/user/sg/command/AuthorizeSecurityGroupIngressCmd.java similarity index 99% rename from api/src/com/cloud/api/commands/AuthorizeSecurityGroupIngressCmd.java rename to api/src/org/apache/cloudstack/api/user/sg/command/AuthorizeSecurityGroupIngressCmd.java index dc8e6055bce..38a4f49e532 100644 --- a/api/src/com/cloud/api/commands/AuthorizeSecurityGroupIngressCmd.java +++ b/api/src/org/apache/cloudstack/api/user/sg/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 com.cloud.api.commands; +package org.apache.cloudstack.api.user.sg.command; import java.util.Collection; import java.util.HashMap; diff --git a/api/src/com/cloud/api/commands/CreateSecurityGroupCmd.java b/api/src/org/apache/cloudstack/api/user/sg/command/CreateSecurityGroupCmd.java similarity index 98% rename from api/src/com/cloud/api/commands/CreateSecurityGroupCmd.java rename to api/src/org/apache/cloudstack/api/user/sg/command/CreateSecurityGroupCmd.java index ddd4bfb000d..71a1ee60d3a 100644 --- a/api/src/com/cloud/api/commands/CreateSecurityGroupCmd.java +++ b/api/src/org/apache/cloudstack/api/user/sg/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 com.cloud.api.commands; +package org.apache.cloudstack.api.user.sg.command; import org.apache.log4j.Logger; diff --git a/api/src/com/cloud/api/commands/DeleteSecurityGroupCmd.java b/api/src/org/apache/cloudstack/api/user/sg/command/DeleteSecurityGroupCmd.java similarity index 98% rename from api/src/com/cloud/api/commands/DeleteSecurityGroupCmd.java rename to api/src/org/apache/cloudstack/api/user/sg/command/DeleteSecurityGroupCmd.java index 27d1270c252..92e1b83ee65 100644 --- a/api/src/com/cloud/api/commands/DeleteSecurityGroupCmd.java +++ b/api/src/org/apache/cloudstack/api/user/sg/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 com.cloud.api.commands; +package org.apache.cloudstack.api.user.sg.command; import org.apache.log4j.Logger; diff --git a/api/src/com/cloud/api/commands/ListSecurityGroupsCmd.java b/api/src/org/apache/cloudstack/api/user/sg/command/ListSecurityGroupsCmd.java similarity index 98% rename from api/src/com/cloud/api/commands/ListSecurityGroupsCmd.java rename to api/src/org/apache/cloudstack/api/user/sg/command/ListSecurityGroupsCmd.java index 92117414dc8..db6e3e7ef35 100644 --- a/api/src/com/cloud/api/commands/ListSecurityGroupsCmd.java +++ b/api/src/org/apache/cloudstack/api/user/sg/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 com.cloud.api.commands; +package org.apache.cloudstack.api.user.sg.command; import java.util.List; diff --git a/api/src/com/cloud/api/commands/RevokeSecurityGroupEgressCmd.java b/api/src/org/apache/cloudstack/api/user/sg/command/RevokeSecurityGroupEgressCmd.java similarity index 98% rename from api/src/com/cloud/api/commands/RevokeSecurityGroupEgressCmd.java rename to api/src/org/apache/cloudstack/api/user/sg/command/RevokeSecurityGroupEgressCmd.java index d6b6f6cc20d..f806e2f34f8 100644 --- a/api/src/com/cloud/api/commands/RevokeSecurityGroupEgressCmd.java +++ b/api/src/org/apache/cloudstack/api/user/sg/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 com.cloud.api.commands; +package org.apache.cloudstack.api.user.sg.command; import org.apache.log4j.Logger; diff --git a/api/src/com/cloud/api/commands/RevokeSecurityGroupIngressCmd.java b/api/src/org/apache/cloudstack/api/user/sg/command/RevokeSecurityGroupIngressCmd.java similarity index 98% rename from api/src/com/cloud/api/commands/RevokeSecurityGroupIngressCmd.java rename to api/src/org/apache/cloudstack/api/user/sg/command/RevokeSecurityGroupIngressCmd.java index 5818580e3f7..668b9e218a7 100644 --- a/api/src/com/cloud/api/commands/RevokeSecurityGroupIngressCmd.java +++ b/api/src/org/apache/cloudstack/api/user/sg/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 com.cloud.api.commands; +package org.apache.cloudstack.api.user.sg.command; import org.apache.log4j.Logger; diff --git a/client/tomcatconf/commands.properties.in b/client/tomcatconf/commands.properties.in index c6f540924cd..6bff53df320 100755 --- a/client/tomcatconf/commands.properties.in +++ b/client/tomcatconf/commands.properties.in @@ -273,13 +273,13 @@ enableStorageMaintenance=com.cloud.api.commands.PreparePrimaryStorageForMaintena cancelStorageMaintenance=com.cloud.api.commands.CancelPrimaryStorageMaintenanceCmd;1 #### security group commands -createSecurityGroup=com.cloud.api.commands.CreateSecurityGroupCmd;15 -deleteSecurityGroup=com.cloud.api.commands.DeleteSecurityGroupCmd;15 -authorizeSecurityGroupIngress=com.cloud.api.commands.AuthorizeSecurityGroupIngressCmd;15 -revokeSecurityGroupIngress=com.cloud.api.commands.RevokeSecurityGroupIngressCmd;15 -authorizeSecurityGroupEgress=com.cloud.api.commands.AuthorizeSecurityGroupEgressCmd;15 -revokeSecurityGroupEgress=com.cloud.api.commands.RevokeSecurityGroupEgressCmd;15 -listSecurityGroups=com.cloud.api.commands.ListSecurityGroupsCmd;15 +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 #### vm group commands createInstanceGroup=com.cloud.api.commands.CreateVMGroupCmd;15 diff --git a/server/src/com/cloud/network/security/SecurityGroupManagerImpl.java b/server/src/com/cloud/network/security/SecurityGroupManagerImpl.java index a1ed6d73e42..40826c9c8b8 100755 --- a/server/src/com/cloud/network/security/SecurityGroupManagerImpl.java +++ b/server/src/com/cloud/network/security/SecurityGroupManagerImpl.java @@ -36,6 +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.commons.codec.digest.DigestUtils; import org.apache.log4j.Logger; @@ -44,13 +45,11 @@ 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 com.cloud.api.commands.AuthorizeSecurityGroupEgressCmd; -import com.cloud.api.commands.AuthorizeSecurityGroupIngressCmd; -import com.cloud.api.commands.CreateSecurityGroupCmd; -import com.cloud.api.commands.DeleteSecurityGroupCmd; -import com.cloud.api.commands.ListSecurityGroupsCmd; -import com.cloud.api.commands.RevokeSecurityGroupEgressCmd; -import com.cloud.api.commands.RevokeSecurityGroupIngressCmd; +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 com.cloud.configuration.Config; import com.cloud.configuration.dao.ConfigurationDao; import com.cloud.domain.dao.DomainDao;