diff --git a/client/tomcatconf/componentContext.xml.in b/client/tomcatconf/componentContext.xml.in index c720155bcf0..d2c2dee83dd 100644 --- a/client/tomcatconf/componentContext.xml.in +++ b/client/tomcatconf/componentContext.xml.in @@ -73,13 +73,13 @@ - - - - + + + + - + diff --git a/plugins/network-elements/stratosphere-ssp/src/com/cloud/api/commands/AddSspCmd.java b/plugins/network-elements/stratosphere-ssp/src/org/apache/cloudstack/api/commands/AddSspCmd.java similarity index 96% rename from plugins/network-elements/stratosphere-ssp/src/com/cloud/api/commands/AddSspCmd.java rename to plugins/network-elements/stratosphere-ssp/src/org/apache/cloudstack/api/commands/AddSspCmd.java index 3034f9bd5fe..d42ee676ac2 100644 --- a/plugins/network-elements/stratosphere-ssp/src/com/cloud/api/commands/AddSspCmd.java +++ b/plugins/network-elements/stratosphere-ssp/src/org/apache/cloudstack/api/commands/AddSspCmd.java @@ -14,17 +14,18 @@ // 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.commands; import javax.inject.Inject; import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseCmd; +import org.apache.cloudstack.api.response.SspResponse; import org.apache.cloudstack.api.response.ZoneResponse; import org.apache.cloudstack.api.Parameter; +import org.apache.cloudstack.network.element.SspService; import org.apache.log4j.Logger; -import com.cloud.api.response.SspResponse; import com.cloud.dc.dao.DataCenterDao; import com.cloud.exception.ConcurrentOperationException; import com.cloud.exception.InsufficientCapacityException; @@ -32,7 +33,6 @@ import com.cloud.exception.NetworkRuleConflictException; import com.cloud.exception.ResourceAllocationException; import com.cloud.exception.ResourceUnavailableException; import com.cloud.host.Host; -import com.cloud.network.element.SspService; import com.cloud.user.UserContext; diff --git a/plugins/network-elements/stratosphere-ssp/src/com/cloud/api/commands/DeleteSspCmd.java b/plugins/network-elements/stratosphere-ssp/src/org/apache/cloudstack/api/commands/DeleteSspCmd.java similarity index 96% rename from plugins/network-elements/stratosphere-ssp/src/com/cloud/api/commands/DeleteSspCmd.java rename to plugins/network-elements/stratosphere-ssp/src/org/apache/cloudstack/api/commands/DeleteSspCmd.java index 1f3bba6b726..bfbd5d9f409 100644 --- a/plugins/network-elements/stratosphere-ssp/src/com/cloud/api/commands/DeleteSspCmd.java +++ b/plugins/network-elements/stratosphere-ssp/src/org/apache/cloudstack/api/commands/DeleteSspCmd.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.commands; import javax.inject.Inject; @@ -24,6 +24,7 @@ import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseCmd; import org.apache.cloudstack.api.Parameter; +import org.apache.cloudstack.network.element.SspService; import org.apache.log4j.Logger; import com.cloud.exception.ConcurrentOperationException; @@ -31,7 +32,6 @@ import com.cloud.exception.InsufficientCapacityException; import com.cloud.exception.NetworkRuleConflictException; import com.cloud.exception.ResourceAllocationException; import com.cloud.exception.ResourceUnavailableException; -import com.cloud.network.element.SspService; import com.cloud.user.UserContext; @APICommand(name="deleteStratosphereSsp", responseObject=SuccessResponse.class, description="Removes stratosphere ssp server") diff --git a/plugins/network-elements/stratosphere-ssp/src/com/cloud/api/response/SspResponse.java b/plugins/network-elements/stratosphere-ssp/src/org/apache/cloudstack/api/response/SspResponse.java similarity index 98% rename from plugins/network-elements/stratosphere-ssp/src/com/cloud/api/response/SspResponse.java rename to plugins/network-elements/stratosphere-ssp/src/org/apache/cloudstack/api/response/SspResponse.java index ac9dee77f25..770ef0f99e3 100644 --- a/plugins/network-elements/stratosphere-ssp/src/com/cloud/api/response/SspResponse.java +++ b/plugins/network-elements/stratosphere-ssp/src/org/apache/cloudstack/api/response/SspResponse.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.response; +package org.apache.cloudstack.api.response; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseResponse; diff --git a/plugins/network-elements/stratosphere-ssp/src/com/cloud/network/dao/SspCredentialDao.java b/plugins/network-elements/stratosphere-ssp/src/org/apache/cloudstack/network/dao/SspCredentialDao.java similarity index 96% rename from plugins/network-elements/stratosphere-ssp/src/com/cloud/network/dao/SspCredentialDao.java rename to plugins/network-elements/stratosphere-ssp/src/org/apache/cloudstack/network/dao/SspCredentialDao.java index 213b817bdd9..4927da1c9d9 100644 --- a/plugins/network-elements/stratosphere-ssp/src/com/cloud/network/dao/SspCredentialDao.java +++ b/plugins/network-elements/stratosphere-ssp/src/org/apache/cloudstack/network/dao/SspCredentialDao.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.network.dao; +package org.apache.cloudstack.network.dao; import com.cloud.utils.db.GenericDao; diff --git a/plugins/network-elements/stratosphere-ssp/src/com/cloud/network/dao/SspCredentialDaoImpl.java b/plugins/network-elements/stratosphere-ssp/src/org/apache/cloudstack/network/dao/SspCredentialDaoImpl.java similarity index 97% rename from plugins/network-elements/stratosphere-ssp/src/com/cloud/network/dao/SspCredentialDaoImpl.java rename to plugins/network-elements/stratosphere-ssp/src/org/apache/cloudstack/network/dao/SspCredentialDaoImpl.java index 0206dee7fa6..035fd56e4a5 100644 --- a/plugins/network-elements/stratosphere-ssp/src/com/cloud/network/dao/SspCredentialDaoImpl.java +++ b/plugins/network-elements/stratosphere-ssp/src/org/apache/cloudstack/network/dao/SspCredentialDaoImpl.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.network.dao; +package org.apache.cloudstack.network.dao; import javax.ejb.Local; diff --git a/plugins/network-elements/stratosphere-ssp/src/com/cloud/network/dao/SspCredentialVO.java b/plugins/network-elements/stratosphere-ssp/src/org/apache/cloudstack/network/dao/SspCredentialVO.java similarity index 97% rename from plugins/network-elements/stratosphere-ssp/src/com/cloud/network/dao/SspCredentialVO.java rename to plugins/network-elements/stratosphere-ssp/src/org/apache/cloudstack/network/dao/SspCredentialVO.java index 9511e84825a..9c6cf14ef7f 100644 --- a/plugins/network-elements/stratosphere-ssp/src/com/cloud/network/dao/SspCredentialVO.java +++ b/plugins/network-elements/stratosphere-ssp/src/org/apache/cloudstack/network/dao/SspCredentialVO.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.network.dao; +package org.apache.cloudstack.network.dao; import javax.persistence.Column; import javax.persistence.Entity; diff --git a/plugins/network-elements/stratosphere-ssp/src/com/cloud/network/dao/SspTenantDao.java b/plugins/network-elements/stratosphere-ssp/src/org/apache/cloudstack/network/dao/SspTenantDao.java similarity index 96% rename from plugins/network-elements/stratosphere-ssp/src/com/cloud/network/dao/SspTenantDao.java rename to plugins/network-elements/stratosphere-ssp/src/org/apache/cloudstack/network/dao/SspTenantDao.java index 2a3bfdcddf8..7bccdaa309a 100644 --- a/plugins/network-elements/stratosphere-ssp/src/com/cloud/network/dao/SspTenantDao.java +++ b/plugins/network-elements/stratosphere-ssp/src/org/apache/cloudstack/network/dao/SspTenantDao.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.network.dao; +package org.apache.cloudstack.network.dao; import com.cloud.utils.db.GenericDao; diff --git a/plugins/network-elements/stratosphere-ssp/src/com/cloud/network/dao/SspTenantDaoImpl.java b/plugins/network-elements/stratosphere-ssp/src/org/apache/cloudstack/network/dao/SspTenantDaoImpl.java similarity index 97% rename from plugins/network-elements/stratosphere-ssp/src/com/cloud/network/dao/SspTenantDaoImpl.java rename to plugins/network-elements/stratosphere-ssp/src/org/apache/cloudstack/network/dao/SspTenantDaoImpl.java index 7018ce594f8..8d40256b493 100644 --- a/plugins/network-elements/stratosphere-ssp/src/com/cloud/network/dao/SspTenantDaoImpl.java +++ b/plugins/network-elements/stratosphere-ssp/src/org/apache/cloudstack/network/dao/SspTenantDaoImpl.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.network.dao; +package org.apache.cloudstack.network.dao; import javax.ejb.Local; diff --git a/plugins/network-elements/stratosphere-ssp/src/com/cloud/network/dao/SspTenantVO.java b/plugins/network-elements/stratosphere-ssp/src/org/apache/cloudstack/network/dao/SspTenantVO.java similarity index 97% rename from plugins/network-elements/stratosphere-ssp/src/com/cloud/network/dao/SspTenantVO.java rename to plugins/network-elements/stratosphere-ssp/src/org/apache/cloudstack/network/dao/SspTenantVO.java index 026d338aecf..b573b626bef 100644 --- a/plugins/network-elements/stratosphere-ssp/src/com/cloud/network/dao/SspTenantVO.java +++ b/plugins/network-elements/stratosphere-ssp/src/org/apache/cloudstack/network/dao/SspTenantVO.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.network.dao; +package org.apache.cloudstack.network.dao; import javax.persistence.Column; import javax.persistence.Entity; diff --git a/plugins/network-elements/stratosphere-ssp/src/com/cloud/network/dao/SspUuidDao.java b/plugins/network-elements/stratosphere-ssp/src/org/apache/cloudstack/network/dao/SspUuidDao.java similarity index 96% rename from plugins/network-elements/stratosphere-ssp/src/com/cloud/network/dao/SspUuidDao.java rename to plugins/network-elements/stratosphere-ssp/src/org/apache/cloudstack/network/dao/SspUuidDao.java index 325ba6623a0..039028a335a 100644 --- a/plugins/network-elements/stratosphere-ssp/src/com/cloud/network/dao/SspUuidDao.java +++ b/plugins/network-elements/stratosphere-ssp/src/org/apache/cloudstack/network/dao/SspUuidDao.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.network.dao; +package org.apache.cloudstack.network.dao; import java.util.List; diff --git a/plugins/network-elements/stratosphere-ssp/src/com/cloud/network/dao/SspUuidDaoImpl.java b/plugins/network-elements/stratosphere-ssp/src/org/apache/cloudstack/network/dao/SspUuidDaoImpl.java similarity index 98% rename from plugins/network-elements/stratosphere-ssp/src/com/cloud/network/dao/SspUuidDaoImpl.java rename to plugins/network-elements/stratosphere-ssp/src/org/apache/cloudstack/network/dao/SspUuidDaoImpl.java index 85c84919c44..e8b93403c6f 100644 --- a/plugins/network-elements/stratosphere-ssp/src/com/cloud/network/dao/SspUuidDaoImpl.java +++ b/plugins/network-elements/stratosphere-ssp/src/org/apache/cloudstack/network/dao/SspUuidDaoImpl.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.network.dao; +package org.apache.cloudstack.network.dao; import java.util.List; diff --git a/plugins/network-elements/stratosphere-ssp/src/com/cloud/network/dao/SspUuidVO.java b/plugins/network-elements/stratosphere-ssp/src/org/apache/cloudstack/network/dao/SspUuidVO.java similarity index 98% rename from plugins/network-elements/stratosphere-ssp/src/com/cloud/network/dao/SspUuidVO.java rename to plugins/network-elements/stratosphere-ssp/src/org/apache/cloudstack/network/dao/SspUuidVO.java index 83c9fea280b..f5dc235b168 100644 --- a/plugins/network-elements/stratosphere-ssp/src/com/cloud/network/dao/SspUuidVO.java +++ b/plugins/network-elements/stratosphere-ssp/src/org/apache/cloudstack/network/dao/SspUuidVO.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.network.dao; +package org.apache.cloudstack.network.dao; import javax.persistence.Column; import javax.persistence.Entity; diff --git a/plugins/network-elements/stratosphere-ssp/src/com/cloud/network/element/SspClient.java b/plugins/network-elements/stratosphere-ssp/src/org/apache/cloudstack/network/element/SspClient.java similarity index 99% rename from plugins/network-elements/stratosphere-ssp/src/com/cloud/network/element/SspClient.java rename to plugins/network-elements/stratosphere-ssp/src/org/apache/cloudstack/network/element/SspClient.java index 5c9c003eaba..ee4d4558bff 100644 --- a/plugins/network-elements/stratosphere-ssp/src/com/cloud/network/element/SspClient.java +++ b/plugins/network-elements/stratosphere-ssp/src/org/apache/cloudstack/network/element/SspClient.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.network.element; +package org.apache.cloudstack.network.element; import java.io.IOException; import java.io.UnsupportedEncodingException; diff --git a/plugins/network-elements/stratosphere-ssp/src/com/cloud/network/element/SspElement.java b/plugins/network-elements/stratosphere-ssp/src/org/apache/cloudstack/network/element/SspElement.java similarity index 93% rename from plugins/network-elements/stratosphere-ssp/src/com/cloud/network/element/SspElement.java rename to plugins/network-elements/stratosphere-ssp/src/org/apache/cloudstack/network/element/SspElement.java index 016ae14f430..823c16b15e8 100644 --- a/plugins/network-elements/stratosphere-ssp/src/com/cloud/network/element/SspElement.java +++ b/plugins/network-elements/stratosphere-ssp/src/org/apache/cloudstack/network/element/SspElement.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.network.element; +package org.apache.cloudstack.network.element; import java.net.MalformedURLException; import java.net.URL; @@ -30,10 +30,16 @@ import javax.ejb.Local; import javax.inject.Inject; import javax.naming.ConfigurationException; +import org.apache.cloudstack.api.commands.AddSspCmd; +import org.apache.cloudstack.api.commands.DeleteSspCmd; +import org.apache.cloudstack.network.dao.SspCredentialDao; +import org.apache.cloudstack.network.dao.SspCredentialVO; +import org.apache.cloudstack.network.dao.SspTenantDao; +import org.apache.cloudstack.network.dao.SspTenantVO; +import org.apache.cloudstack.network.dao.SspUuidDao; +import org.apache.cloudstack.network.dao.SspUuidVO; import org.apache.log4j.Logger; -import com.cloud.api.commands.AddSspCmd; -import com.cloud.api.commands.DeleteSspCmd; import com.cloud.configuration.dao.ConfigurationDao; import com.cloud.dc.dao.DataCenterDao; import com.cloud.deploy.DeployDestination; @@ -59,12 +65,8 @@ import com.cloud.network.dao.NetworkServiceMapDao; import com.cloud.network.dao.PhysicalNetworkDao; import com.cloud.network.dao.PhysicalNetworkServiceProviderDao; import com.cloud.network.dao.PhysicalNetworkServiceProviderVO; -import com.cloud.network.dao.SspCredentialDao; -import com.cloud.network.dao.SspCredentialVO; -import com.cloud.network.dao.SspTenantDao; -import com.cloud.network.dao.SspTenantVO; -import com.cloud.network.dao.SspUuidDao; -import com.cloud.network.dao.SspUuidVO; +import com.cloud.network.element.ConnectivityProvider; +import com.cloud.network.element.NetworkElement; import com.cloud.offering.NetworkOffering; import com.cloud.utils.component.AdapterBase; import com.cloud.utils.exception.CloudRuntimeException; @@ -180,7 +182,7 @@ public class SspElement extends AdapterBase implements ConnectivityProvider, Ssp } /* (non-Javadoc) - * @see com.cloud.network.element.NetworkElement#isReady(com.cloud.network.PhysicalNetworkServiceProvider) + * @see org.apache.cloudstack.network.element.NetworkElement#isReady(com.cloud.network.PhysicalNetworkServiceProvider) */ @Override public boolean isReady(PhysicalNetworkServiceProvider provider) { @@ -199,7 +201,7 @@ public class SspElement extends AdapterBase implements ConnectivityProvider, Ssp /* (non-Javadoc) * If this element is ready, then it can be enabled. - * @see com.cloud.network.element.SspManager#isEnabled(com.cloud.network.PhysicalNetwork) + * @see org.apache.cloudstack.network.element.SspManager#isEnabled(com.cloud.network.PhysicalNetwork) */ @Override public boolean canHandle(PhysicalNetwork physicalNetwork){ @@ -472,7 +474,7 @@ public class SspElement extends AdapterBase implements ConnectivityProvider, Ssp * * This method will be called right after NetworkGuru#implement(). * see also {@link #shutdown(Network, ReservationContext, boolean)} - * @see com.cloud.network.element.NetworkElement#implement(com.cloud.network.Network, com.cloud.offering.NetworkOffering, com.cloud.deploy.DeployDestination, com.cloud.vm.ReservationContext) + * @see org.apache.cloudstack.network.element.NetworkElement#implement(com.cloud.network.Network, com.cloud.offering.NetworkOffering, com.cloud.deploy.DeployDestination, com.cloud.vm.ReservationContext) */ @Override public boolean implement(Network network, NetworkOffering offering, @@ -488,7 +490,7 @@ public class SspElement extends AdapterBase implements ConnectivityProvider, Ssp * * This method will be called right BEFORE NetworkGuru#shutdown(). * The entities was acquired by {@link #implement(Network, NetworkOffering, DeployDestination, ReservationContext)} - * @see com.cloud.network.element.NetworkElement#shutdown(com.cloud.network.Network, com.cloud.vm.ReservationContext, boolean) + * @see org.apache.cloudstack.network.element.NetworkElement#shutdown(com.cloud.network.Network, com.cloud.vm.ReservationContext, boolean) */ @Override public boolean shutdown(Network network, ReservationContext context, @@ -503,7 +505,7 @@ public class SspElement extends AdapterBase implements ConnectivityProvider, Ssp * * This method will be called right after NetworkGuru#reserve(). * The entities will be released by {@link #release(Network, NicProfile, VirtualMachineProfile, ReservationContext)} - * @see com.cloud.network.element.NetworkElement#prepare(com.cloud.network.Network, com.cloud.vm.NicProfile, com.cloud.vm.VirtualMachineProfile, com.cloud.deploy.DeployDestination, com.cloud.vm.ReservationContext) + * @see org.apache.cloudstack.network.element.NetworkElement#prepare(com.cloud.network.Network, com.cloud.vm.NicProfile, com.cloud.vm.VirtualMachineProfile, com.cloud.deploy.DeployDestination, com.cloud.vm.ReservationContext) */ @Override public boolean prepare(Network network, NicProfile nic, @@ -520,7 +522,7 @@ public class SspElement extends AdapterBase implements ConnectivityProvider, Ssp * * This method will be called right AFTER NetworkGuru#release(). * The entities was acquired in {@link #prepare(Network, NicProfile, VirtualMachineProfile, DeployDestination, ReservationContext)} - * @see com.cloud.network.element.NetworkElement#release(com.cloud.network.Network, com.cloud.vm.NicProfile, com.cloud.vm.VirtualMachineProfile, com.cloud.vm.ReservationContext) + * @see org.apache.cloudstack.network.element.NetworkElement#release(com.cloud.network.Network, com.cloud.vm.NicProfile, com.cloud.vm.VirtualMachineProfile, com.cloud.vm.ReservationContext) */ @Override public boolean release(Network network, NicProfile nic, @@ -535,7 +537,7 @@ public class SspElement extends AdapterBase implements ConnectivityProvider, Ssp * Destroy a network implementation. * * This method will be called right BEFORE NetworkGuru#trash() in "Expunge" phase. - * @see com.cloud.network.element.NetworkElement#destroy(com.cloud.network.Network) + * @see org.apache.cloudstack.network.element.NetworkElement#destroy(com.cloud.network.Network) */ @Override public boolean destroy(Network network, ReservationContext context) diff --git a/plugins/network-elements/stratosphere-ssp/src/com/cloud/network/element/SspManager.java b/plugins/network-elements/stratosphere-ssp/src/org/apache/cloudstack/network/element/SspManager.java similarity index 97% rename from plugins/network-elements/stratosphere-ssp/src/com/cloud/network/element/SspManager.java rename to plugins/network-elements/stratosphere-ssp/src/org/apache/cloudstack/network/element/SspManager.java index ab8b1b2b9bf..d96bd7f1de2 100644 --- a/plugins/network-elements/stratosphere-ssp/src/com/cloud/network/element/SspManager.java +++ b/plugins/network-elements/stratosphere-ssp/src/org/apache/cloudstack/network/element/SspManager.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.network.element; +package org.apache.cloudstack.network.element; import com.cloud.deploy.DeployDestination; import com.cloud.network.Network; diff --git a/plugins/network-elements/stratosphere-ssp/src/com/cloud/network/element/SspService.java b/plugins/network-elements/stratosphere-ssp/src/org/apache/cloudstack/network/element/SspService.java similarity index 90% rename from plugins/network-elements/stratosphere-ssp/src/com/cloud/network/element/SspService.java rename to plugins/network-elements/stratosphere-ssp/src/org/apache/cloudstack/network/element/SspService.java index a5f62cba431..3330045e118 100644 --- a/plugins/network-elements/stratosphere-ssp/src/com/cloud/network/element/SspService.java +++ b/plugins/network-elements/stratosphere-ssp/src/org/apache/cloudstack/network/element/SspService.java @@ -14,10 +14,11 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package com.cloud.network.element; +package org.apache.cloudstack.network.element; + +import org.apache.cloudstack.api.commands.AddSspCmd; +import org.apache.cloudstack.api.commands.DeleteSspCmd; -import com.cloud.api.commands.AddSspCmd; -import com.cloud.api.commands.DeleteSspCmd; import com.cloud.host.Host; import com.cloud.utils.component.PluggableService; diff --git a/plugins/network-elements/stratosphere-ssp/src/com/cloud/network/guru/SspGuestNetworkGuru.java b/plugins/network-elements/stratosphere-ssp/src/org/apache/cloudstack/network/guru/SspGuestNetworkGuru.java similarity index 93% rename from plugins/network-elements/stratosphere-ssp/src/com/cloud/network/guru/SspGuestNetworkGuru.java rename to plugins/network-elements/stratosphere-ssp/src/org/apache/cloudstack/network/guru/SspGuestNetworkGuru.java index b504a4bc250..6d5d871eb99 100644 --- a/plugins/network-elements/stratosphere-ssp/src/com/cloud/network/guru/SspGuestNetworkGuru.java +++ b/plugins/network-elements/stratosphere-ssp/src/org/apache/cloudstack/network/guru/SspGuestNetworkGuru.java @@ -14,11 +14,13 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package com.cloud.network.guru; +package org.apache.cloudstack.network.guru; import javax.ejb.Local; import javax.inject.Inject; +import org.apache.cloudstack.network.element.SspElement; +import org.apache.cloudstack.network.element.SspManager; import org.apache.log4j.Logger; import com.cloud.dc.DataCenter.NetworkType; @@ -31,8 +33,8 @@ import com.cloud.network.NetworkProfile; import com.cloud.network.PhysicalNetwork; import com.cloud.network.PhysicalNetwork.IsolationMethod; import com.cloud.network.dao.NetworkDao; -import com.cloud.network.element.SspElement; -import com.cloud.network.element.SspManager; +import com.cloud.network.guru.GuestNetworkGuru; +import com.cloud.network.guru.NetworkGuru; import com.cloud.offering.NetworkOffering; import com.cloud.offerings.dao.NetworkOfferingServiceMapDao; import com.cloud.vm.NicProfile; @@ -95,7 +97,7 @@ public class SspGuestNetworkGuru extends GuestNetworkGuru implements NetworkMigr * Effective return object members are: cidr, broadcastUri, gateway, mode, physicalNetworkId * The other members will be silently ignored. * This method is called at DeployVMCmd#execute (running phase) - NetworkManagerImpl#prepare - * @see com.cloud.network.guru.GuestNetworkGuru#implement(com.cloud.network.Network, com.cloud.offering.NetworkOffering, com.cloud.deploy.DeployDestination, com.cloud.vm.ReservationContext) + * @see org.apache.cloudstack.network.guru.GuestNetworkGuru#implement(com.cloud.network.Network, com.cloud.offering.NetworkOffering, com.cloud.deploy.DeployDestination, com.cloud.vm.ReservationContext) */ @Override public Network implement(Network network, NetworkOffering offering, diff --git a/plugins/network-elements/stratosphere-ssp/test/com/cloud/network/element/SspClientTest.java b/plugins/network-elements/stratosphere-ssp/test/org/apache/cloudstack/network/element/SspClientTest.java similarity index 97% rename from plugins/network-elements/stratosphere-ssp/test/com/cloud/network/element/SspClientTest.java rename to plugins/network-elements/stratosphere-ssp/test/org/apache/cloudstack/network/element/SspClientTest.java index 4a2b352055c..795d1c169ab 100644 --- a/plugins/network-elements/stratosphere-ssp/test/com/cloud/network/element/SspClientTest.java +++ b/plugins/network-elements/stratosphere-ssp/test/org/apache/cloudstack/network/element/SspClientTest.java @@ -14,10 +14,11 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package com.cloud.network.element; +package org.apache.cloudstack.network.element; import java.util.UUID; +import org.apache.cloudstack.network.element.SspClient; import org.apache.commons.httpclient.HttpClient; import org.apache.commons.httpclient.HttpStatus; import org.apache.commons.httpclient.URI; diff --git a/plugins/network-elements/stratosphere-ssp/test/com/cloud/network/element/SspElementTest.java b/plugins/network-elements/stratosphere-ssp/test/org/apache/cloudstack/network/element/SspElementTest.java similarity index 95% rename from plugins/network-elements/stratosphere-ssp/test/com/cloud/network/element/SspElementTest.java rename to plugins/network-elements/stratosphere-ssp/test/org/apache/cloudstack/network/element/SspElementTest.java index 0020e20ed31..950592f1c39 100644 --- a/plugins/network-elements/stratosphere-ssp/test/com/cloud/network/element/SspElementTest.java +++ b/plugins/network-elements/stratosphere-ssp/test/org/apache/cloudstack/network/element/SspElementTest.java @@ -14,11 +14,16 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package com.cloud.network.element; +package org.apache.cloudstack.network.element; import java.util.Arrays; import java.util.HashMap; +import org.apache.cloudstack.network.dao.SspCredentialDao; +import org.apache.cloudstack.network.dao.SspCredentialVO; +import org.apache.cloudstack.network.dao.SspTenantDao; +import org.apache.cloudstack.network.dao.SspUuidDao; +import org.apache.cloudstack.network.element.SspElement; import org.junit.Before; import org.junit.Test; @@ -36,10 +41,6 @@ import com.cloud.network.dao.PhysicalNetworkDao; import com.cloud.network.dao.PhysicalNetworkServiceProviderDao; import com.cloud.network.dao.PhysicalNetworkServiceProviderVO; import com.cloud.network.dao.PhysicalNetworkVO; -import com.cloud.network.dao.SspCredentialDao; -import com.cloud.network.dao.SspCredentialVO; -import com.cloud.network.dao.SspTenantDao; -import com.cloud.network.dao.SspUuidDao; import com.cloud.resource.ResourceManager; import com.cloud.vm.dao.NicDao;