From 407e78d659f5f49e73e1483473ccc7a887a1e33a Mon Sep 17 00:00:00 2001 From: skardani Date: Mon, 3 Jun 2019 15:53:55 +1000 Subject: [PATCH] refactoring plus packages --- .../web/CloudSimWebExample.java | 18 +++++----- .../web/CloudSimWorkloadWebExample.java | 34 +++++++++---------- .../{ex => plus}/CloudSimDisksExample.java | 8 ++--- .../examples/{ex => plus}/DelayExample1.java | 6 ++-- .../geolocation/BaseGeolocationService.java | 4 +-- .../geolocation/BaseIPGenerator.java | 2 +- .../geolocation/GeoDistanceCacheKey.java | 2 +- .../geolocation/IGeolocationService.java | 2 +- .../geolocation/IPGenerator.java | 2 +- .../geolocation/IPMetadata.java | 2 +- .../{ex => geoweb}/geolocation/IPUtil.java | 2 +- .../geolocation/geoip2/GeoIP2IPGenerator.java | 14 ++++---- .../geoip2/GeoIP2PingERService.java | 12 +++---- .../GeolocationServiceWithOverrides.java | 8 ++--- .../geoip2/LookUpGeoLocationService.java | 6 ++-- .../geolocation/geoip2/OverrideRule.java | 2 +- .../geolocation/geoip2/ResourceUtil.java | 4 +-- .../web/BaseDBLoadBalancer.java | 4 +-- .../{ex => geoweb}/web/BaseStatGenerator.java | 14 ++++---- .../web/BaseWebLoadBalancer.java | 8 ++--- .../web/CompositeGenerator.java | 2 +- .../web/CompressLoadBalancer.java | 10 +++--- .../{ex => geoweb}/web/ConstGenerator.java | 2 +- .../{ex => geoweb}/web/IDBBalancer.java | 6 ++-- .../{ex => geoweb}/web/IGenerator.java | 2 +- .../{ex => geoweb}/web/ILoadBalancer.java | 4 +-- .../{ex => geoweb}/web/IterableGenerator.java | 10 +++--- .../web/IterableNumberGenerator.java | 2 +- .../web/RandomListGenerator.java | 2 +- .../web/RoundRobinDBBalancer.java | 10 +++--- .../web/SessionFailedException.java | 2 +- .../{ex => geoweb}/web/SimpleDBBalancer.java | 10 +++--- .../web/SimpleWebLoadBalancer.java | 10 +++--- .../{ex => geoweb}/web/StatGenerator.java | 4 +-- .../{ex => geoweb}/web/WebCloudlet.java | 8 ++--- .../{ex => geoweb}/web/WebSession.java | 12 +++---- .../{ex => geoweb}/web/workload/.gitignore | 0 .../web/workload/IWorkloadGenerator.java | 4 +-- .../web/workload/PeriodTimeGenerator.java | 6 ++-- .../web/workload/PeriodWorkloadGenerator.java | 6 ++-- .../workload/RandomIPWorkloadGenerator.java | 8 ++--- .../web/workload/StatWorkloadGenerator.java | 10 +++--- .../web/workload/brokers/BaseEntryPoint.java | 6 ++-- .../brokers/CompressedAutoscalingPolicy.java | 18 +++++----- .../web/workload/brokers/EntryPoint.java | 16 ++++----- .../web/workload/brokers/IEntryPoint.java | 4 +-- .../brokers/PerformanceLoggingWebBroker.java | 12 +++---- .../brokers/RoundRobinWebLoadBalancer.java | 8 ++--- .../workload/brokers/Route53EntryPoint.java | 10 +++--- .../brokers/SimpleAutoScalingPolicy.java | 16 ++++----- .../web/workload/brokers/WebBroker.java | 22 ++++++------ .../web/workload/freq/CompositeValuedSet.java | 2 +- .../web/workload/freq/ConstFreqFunction.java | 2 +- .../workload/freq/FiniteValuedInterval.java | 2 +- .../web/workload/freq/FrequencyFunction.java | 2 +- .../PeriodicStochasticFrequencyFunction.java | 2 +- .../sessions/ConstSessionGenerator.java | 6 ++-- .../web/workload/sessions/GeneratorsUtil.java | 4 +-- .../workload/sessions/ISessionGenerator.java | 4 +-- .../sessions/StatSessionGenerator.java | 6 ++-- .../{ex/core => plus}/DatacenterBrokerEX.java | 10 +++--- .../{ex/core => plus}/DatacenterEX.java | 6 ++-- .../{ex/core => plus}/IAutoscalingPolicy.java | 2 +- .../{ex/core => plus}/MonitoringBorkerEX.java | 10 +++--- .../core => plus}/VmSchedulerMapVmsToPes.java | 2 +- .../VmSchedulerWithIndependentPes.java | 2 +- .../billing/BaseCustomerVmBillingPolicy.java | 6 ++-- .../billing/EC2OnDemandPolicy.java | 6 ++-- .../core => plus}/billing/ExamplePrices.java | 2 +- .../billing/GoogleOnDemandPolicy.java | 6 ++-- .../billing/IVmBillingPolicy.java | 2 +- .../delay/ConstantVMBootDelay.java | 2 +- .../delay/ExampleGaussianDelaysPerType.java | 2 +- .../delay/GaussianByTypeBootDelay.java | 6 ++-- .../delay/IVMBootDelayDistribution.java | 2 +- .../{ex/core => plus}/disk/DataItem.java | 4 +-- .../{ex/core => plus}/disk/HddCloudlet.java | 6 ++-- .../disk/HddCloudletSchedulerTimeShared.java | 4 +-- .../{ex/core => plus}/disk/HddDataCenter.java | 10 +++--- .../{ex/core => plus}/disk/HddHost.java | 6 ++-- .../{ex/core => plus}/disk/HddPe.java | 4 +-- .../core => plus}/disk/HddResCloudlet.java | 2 +- .../{ex/core => plus}/disk/HddVm.java | 10 +++--- .../core => plus}/disk/VmDiskScheduler.java | 4 +-- .../{ex/core => plus}/util/CustomLog.java | 2 +- .../util/ExperimentDefinition.java | 2 +- .../core => plus}/util/ExperimentsRunner.java | 2 +- .../cloudsim/{ex/core => plus}/util/Id.java | 2 +- .../util/InMemoryBufferredHandler.java | 2 +- .../{ex/core => plus}/util/TextUtil.java | 2 +- .../{ex/core => plus}/util/Textualize.java | 2 +- .../{ex/core => plus}/vm/MonitoredVMex.java | 2 +- .../{ex/core => plus}/vm/VMMetadata.java | 2 +- .../{ex/core => plus}/vm/VMStatus.java | 2 +- .../cloudsim/{ex/core => plus}/vm/VMex.java | 4 +-- 95 files changed, 283 insertions(+), 283 deletions(-) rename modules/cloudsim-examples/src/main/java/org/cloudbus/cloudsim/examples/{ex => geoweb}/web/CloudSimWebExample.java (94%) rename modules/cloudsim-examples/src/main/java/org/cloudbus/cloudsim/examples/{ex => geoweb}/web/CloudSimWorkloadWebExample.java (88%) rename modules/cloudsim-examples/src/main/java/org/cloudbus/cloudsim/examples/{ex => plus}/CloudSimDisksExample.java (97%) rename modules/cloudsim-examples/src/main/java/org/cloudbus/cloudsim/examples/{ex => plus}/DelayExample1.java (97%) rename modules/cloudsim/src/main/java/org/cloudbus/cloudsim/{ex => geoweb}/geolocation/BaseGeolocationService.java (97%) rename modules/cloudsim/src/main/java/org/cloudbus/cloudsim/{ex => geoweb}/geolocation/BaseIPGenerator.java (97%) rename modules/cloudsim/src/main/java/org/cloudbus/cloudsim/{ex => geoweb}/geolocation/GeoDistanceCacheKey.java (98%) rename modules/cloudsim/src/main/java/org/cloudbus/cloudsim/{ex => geoweb}/geolocation/IGeolocationService.java (99%) rename modules/cloudsim/src/main/java/org/cloudbus/cloudsim/{ex => geoweb}/geolocation/IPGenerator.java (97%) rename modules/cloudsim/src/main/java/org/cloudbus/cloudsim/{ex => geoweb}/geolocation/IPMetadata.java (97%) rename modules/cloudsim/src/main/java/org/cloudbus/cloudsim/{ex => geoweb}/geolocation/IPUtil.java (93%) rename modules/cloudsim/src/main/java/org/cloudbus/cloudsim/{ex => geoweb}/geolocation/geoip2/GeoIP2IPGenerator.java (94%) rename modules/cloudsim/src/main/java/org/cloudbus/cloudsim/{ex => geoweb}/geolocation/geoip2/GeoIP2PingERService.java (98%) rename modules/cloudsim/src/main/java/org/cloudbus/cloudsim/{ex => geoweb}/geolocation/geoip2/GeolocationServiceWithOverrides.java (94%) rename modules/cloudsim/src/main/java/org/cloudbus/cloudsim/{ex => geoweb}/geolocation/geoip2/LookUpGeoLocationService.java (91%) rename modules/cloudsim/src/main/java/org/cloudbus/cloudsim/{ex => geoweb}/geolocation/geoip2/OverrideRule.java (97%) rename modules/cloudsim/src/main/java/org/cloudbus/cloudsim/{ex => geoweb}/geolocation/geoip2/ResourceUtil.java (95%) rename modules/cloudsim/src/main/java/org/cloudbus/cloudsim/{ex => geoweb}/web/BaseDBLoadBalancer.java (90%) rename modules/cloudsim/src/main/java/org/cloudbus/cloudsim/{ex => geoweb}/web/BaseStatGenerator.java (94%) rename modules/cloudsim/src/main/java/org/cloudbus/cloudsim/{ex => geoweb}/web/BaseWebLoadBalancer.java (91%) rename modules/cloudsim/src/main/java/org/cloudbus/cloudsim/{ex => geoweb}/web/CompositeGenerator.java (98%) rename modules/cloudsim/src/main/java/org/cloudbus/cloudsim/{ex => geoweb}/web/CompressLoadBalancer.java (96%) rename modules/cloudsim/src/main/java/org/cloudbus/cloudsim/{ex => geoweb}/web/ConstGenerator.java (95%) rename modules/cloudsim/src/main/java/org/cloudbus/cloudsim/{ex => geoweb}/web/IDBBalancer.java (89%) rename modules/cloudsim/src/main/java/org/cloudbus/cloudsim/{ex => geoweb}/web/IGenerator.java (96%) rename modules/cloudsim/src/main/java/org/cloudbus/cloudsim/{ex => geoweb}/web/ILoadBalancer.java (95%) rename modules/cloudsim/src/main/java/org/cloudbus/cloudsim/{ex => geoweb}/web/IterableGenerator.java (83%) rename modules/cloudsim/src/main/java/org/cloudbus/cloudsim/{ex => geoweb}/web/IterableNumberGenerator.java (93%) rename modules/cloudsim/src/main/java/org/cloudbus/cloudsim/{ex => geoweb}/web/RandomListGenerator.java (98%) rename modules/cloudsim/src/main/java/org/cloudbus/cloudsim/{ex => geoweb}/web/RoundRobinDBBalancer.java (92%) rename modules/cloudsim/src/main/java/org/cloudbus/cloudsim/{ex => geoweb}/web/SessionFailedException.java (97%) rename modules/cloudsim/src/main/java/org/cloudbus/cloudsim/{ex => geoweb}/web/SimpleDBBalancer.java (88%) rename modules/cloudsim/src/main/java/org/cloudbus/cloudsim/{ex => geoweb}/web/SimpleWebLoadBalancer.java (95%) rename modules/cloudsim/src/main/java/org/cloudbus/cloudsim/{ex => geoweb}/web/StatGenerator.java (96%) rename modules/cloudsim/src/main/java/org/cloudbus/cloudsim/{ex => geoweb}/web/WebCloudlet.java (94%) rename modules/cloudsim/src/main/java/org/cloudbus/cloudsim/{ex => geoweb}/web/WebSession.java (98%) rename modules/cloudsim/src/main/java/org/cloudbus/cloudsim/{ex => geoweb}/web/workload/.gitignore (100%) rename modules/cloudsim/src/main/java/org/cloudbus/cloudsim/{ex => geoweb}/web/workload/IWorkloadGenerator.java (87%) rename modules/cloudsim/src/main/java/org/cloudbus/cloudsim/{ex => geoweb}/web/workload/PeriodTimeGenerator.java (89%) rename modules/cloudsim/src/main/java/org/cloudbus/cloudsim/{ex => geoweb}/web/workload/PeriodWorkloadGenerator.java (85%) rename modules/cloudsim/src/main/java/org/cloudbus/cloudsim/{ex => geoweb}/web/workload/RandomIPWorkloadGenerator.java (89%) rename modules/cloudsim/src/main/java/org/cloudbus/cloudsim/{ex => geoweb}/web/workload/StatWorkloadGenerator.java (93%) rename modules/cloudsim/src/main/java/org/cloudbus/cloudsim/{ex => geoweb}/web/workload/brokers/BaseEntryPoint.java (92%) rename modules/cloudsim/src/main/java/org/cloudbus/cloudsim/{ex => geoweb}/web/workload/brokers/CompressedAutoscalingPolicy.java (92%) rename modules/cloudsim/src/main/java/org/cloudbus/cloudsim/{ex => geoweb}/web/workload/brokers/EntryPoint.java (95%) rename modules/cloudsim/src/main/java/org/cloudbus/cloudsim/{ex => geoweb}/web/workload/brokers/IEntryPoint.java (94%) rename modules/cloudsim/src/main/java/org/cloudbus/cloudsim/{ex => geoweb}/web/workload/brokers/PerformanceLoggingWebBroker.java (94%) rename modules/cloudsim/src/main/java/org/cloudbus/cloudsim/{ex => geoweb}/web/workload/brokers/RoundRobinWebLoadBalancer.java (66%) rename modules/cloudsim/src/main/java/org/cloudbus/cloudsim/{ex => geoweb}/web/workload/brokers/Route53EntryPoint.java (89%) rename modules/cloudsim/src/main/java/org/cloudbus/cloudsim/{ex => geoweb}/web/workload/brokers/SimpleAutoScalingPolicy.java (88%) rename modules/cloudsim/src/main/java/org/cloudbus/cloudsim/{ex => geoweb}/web/workload/brokers/WebBroker.java (96%) rename modules/cloudsim/src/main/java/org/cloudbus/cloudsim/{ex => geoweb}/web/workload/freq/CompositeValuedSet.java (98%) rename modules/cloudsim/src/main/java/org/cloudbus/cloudsim/{ex => geoweb}/web/workload/freq/ConstFreqFunction.java (91%) rename modules/cloudsim/src/main/java/org/cloudbus/cloudsim/{ex => geoweb}/web/workload/freq/FiniteValuedInterval.java (99%) rename modules/cloudsim/src/main/java/org/cloudbus/cloudsim/{ex => geoweb}/web/workload/freq/FrequencyFunction.java (96%) rename modules/cloudsim/src/main/java/org/cloudbus/cloudsim/{ex => geoweb}/web/workload/freq/PeriodicStochasticFrequencyFunction.java (97%) rename modules/cloudsim/src/main/java/org/cloudbus/cloudsim/{ex => geoweb}/web/workload/sessions/ConstSessionGenerator.java (97%) rename modules/cloudsim/src/main/java/org/cloudbus/cloudsim/{ex => geoweb}/web/workload/sessions/GeneratorsUtil.java (95%) rename modules/cloudsim/src/main/java/org/cloudbus/cloudsim/{ex => geoweb}/web/workload/sessions/ISessionGenerator.java (79%) rename modules/cloudsim/src/main/java/org/cloudbus/cloudsim/{ex => geoweb}/web/workload/sessions/StatSessionGenerator.java (94%) rename modules/cloudsim/src/main/java/org/cloudbus/cloudsim/{ex/core => plus}/DatacenterBrokerEX.java (98%) rename modules/cloudsim/src/main/java/org/cloudbus/cloudsim/{ex/core => plus}/DatacenterEX.java (94%) rename modules/cloudsim/src/main/java/org/cloudbus/cloudsim/{ex/core => plus}/IAutoscalingPolicy.java (91%) rename modules/cloudsim/src/main/java/org/cloudbus/cloudsim/{ex/core => plus}/MonitoringBorkerEX.java (97%) rename modules/cloudsim/src/main/java/org/cloudbus/cloudsim/{ex/core => plus}/VmSchedulerMapVmsToPes.java (96%) rename modules/cloudsim/src/main/java/org/cloudbus/cloudsim/{ex/core => plus}/VmSchedulerWithIndependentPes.java (98%) rename modules/cloudsim/src/main/java/org/cloudbus/cloudsim/{ex/core => plus}/billing/BaseCustomerVmBillingPolicy.java (96%) rename modules/cloudsim/src/main/java/org/cloudbus/cloudsim/{ex/core => plus}/billing/EC2OnDemandPolicy.java (92%) rename modules/cloudsim/src/main/java/org/cloudbus/cloudsim/{ex/core => plus}/billing/ExamplePrices.java (99%) rename modules/cloudsim/src/main/java/org/cloudbus/cloudsim/{ex/core => plus}/billing/GoogleOnDemandPolicy.java (93%) rename modules/cloudsim/src/main/java/org/cloudbus/cloudsim/{ex/core => plus}/billing/IVmBillingPolicy.java (96%) rename modules/cloudsim/src/main/java/org/cloudbus/cloudsim/{ex/core => plus}/delay/ConstantVMBootDelay.java (92%) rename modules/cloudsim/src/main/java/org/cloudbus/cloudsim/{ex/core => plus}/delay/ExampleGaussianDelaysPerType.java (98%) rename modules/cloudsim/src/main/java/org/cloudbus/cloudsim/{ex/core => plus}/delay/GaussianByTypeBootDelay.java (97%) rename modules/cloudsim/src/main/java/org/cloudbus/cloudsim/{ex/core => plus}/delay/IVMBootDelayDistribution.java (90%) rename modules/cloudsim/src/main/java/org/cloudbus/cloudsim/{ex/core => plus}/disk/DataItem.java (91%) rename modules/cloudsim/src/main/java/org/cloudbus/cloudsim/{ex/core => plus}/disk/HddCloudlet.java (97%) rename modules/cloudsim/src/main/java/org/cloudbus/cloudsim/{ex/core => plus}/disk/HddCloudletSchedulerTimeShared.java (99%) rename modules/cloudsim/src/main/java/org/cloudbus/cloudsim/{ex/core => plus}/disk/HddDataCenter.java (94%) rename modules/cloudsim/src/main/java/org/cloudbus/cloudsim/{ex/core => plus}/disk/HddHost.java (97%) rename modules/cloudsim/src/main/java/org/cloudbus/cloudsim/{ex/core => plus}/disk/HddPe.java (95%) rename modules/cloudsim/src/main/java/org/cloudbus/cloudsim/{ex/core => plus}/disk/HddResCloudlet.java (98%) rename modules/cloudsim/src/main/java/org/cloudbus/cloudsim/{ex/core => plus}/disk/HddVm.java (97%) rename modules/cloudsim/src/main/java/org/cloudbus/cloudsim/{ex/core => plus}/disk/VmDiskScheduler.java (88%) rename modules/cloudsim/src/main/java/org/cloudbus/cloudsim/{ex/core => plus}/util/CustomLog.java (99%) rename modules/cloudsim/src/main/java/org/cloudbus/cloudsim/{ex/core => plus}/util/ExperimentDefinition.java (96%) rename modules/cloudsim/src/main/java/org/cloudbus/cloudsim/{ex/core => plus}/util/ExperimentsRunner.java (99%) rename modules/cloudsim/src/main/java/org/cloudbus/cloudsim/{ex/core => plus}/util/Id.java (97%) rename modules/cloudsim/src/main/java/org/cloudbus/cloudsim/{ex/core => plus}/util/InMemoryBufferredHandler.java (98%) rename modules/cloudsim/src/main/java/org/cloudbus/cloudsim/{ex/core => plus}/util/TextUtil.java (99%) rename modules/cloudsim/src/main/java/org/cloudbus/cloudsim/{ex/core => plus}/util/Textualize.java (93%) rename modules/cloudsim/src/main/java/org/cloudbus/cloudsim/{ex/core => plus}/vm/MonitoredVMex.java (99%) rename modules/cloudsim/src/main/java/org/cloudbus/cloudsim/{ex/core => plus}/vm/VMMetadata.java (97%) rename modules/cloudsim/src/main/java/org/cloudbus/cloudsim/{ex/core => plus}/vm/VMStatus.java (95%) rename modules/cloudsim/src/main/java/org/cloudbus/cloudsim/{ex/core => plus}/vm/VMex.java (99%) diff --git a/modules/cloudsim-examples/src/main/java/org/cloudbus/cloudsim/examples/ex/web/CloudSimWebExample.java b/modules/cloudsim-examples/src/main/java/org/cloudbus/cloudsim/examples/geoweb/web/CloudSimWebExample.java similarity index 94% rename from modules/cloudsim-examples/src/main/java/org/cloudbus/cloudsim/examples/ex/web/CloudSimWebExample.java rename to modules/cloudsim-examples/src/main/java/org/cloudbus/cloudsim/examples/geoweb/web/CloudSimWebExample.java index cfae884a5..0bb3f2caa 100644 --- a/modules/cloudsim-examples/src/main/java/org/cloudbus/cloudsim/examples/ex/web/CloudSimWebExample.java +++ b/modules/cloudsim-examples/src/main/java/org/cloudbus/cloudsim/examples/geoweb/web/CloudSimWebExample.java @@ -4,19 +4,19 @@ * of Clouds * Licence: GPL - http://www.gnu.org/copyleft/gpl.html * - * Copyright (c) 2009, The University of Melbourne, Australia + * Copyright (c) 2019, The University of Melbourne, Australia */ -package org.cloudbus.cloudsim.examples.ex.web; +package org.cloudbus.cloudsim.examples.geoweb.web; import org.cloudbus.cloudsim.*; import org.cloudbus.cloudsim.core.CloudSim; -import org.cloudbus.cloudsim.ex.core.DatacenterBrokerEX; -import org.cloudbus.cloudsim.ex.core.disk.*; -import org.cloudbus.cloudsim.ex.core.util.CustomLog; -import org.cloudbus.cloudsim.ex.core.util.TextUtil; -import org.cloudbus.cloudsim.ex.web.*; -import org.cloudbus.cloudsim.ex.web.workload.brokers.WebBroker; +import org.cloudbus.cloudsim.plus.DatacenterBrokerEX; +import org.cloudbus.cloudsim.plus.disk.*; +import org.cloudbus.cloudsim.plus.util.CustomLog; +import org.cloudbus.cloudsim.plus.util.TextUtil; +import org.cloudbus.cloudsim.geoweb.web.*; +import org.cloudbus.cloudsim.geoweb.web.workload.brokers.WebBroker; import org.cloudbus.cloudsim.provisioners.BwProvisionerSimple; import org.cloudbus.cloudsim.provisioners.PeProvisionerSimple; import org.cloudbus.cloudsim.provisioners.RamProvisionerSimple; @@ -156,7 +156,7 @@ private static Datacenter createDatacenter(final String name) { List hostList = new ArrayList(); // 2. A Machine contains one or more PEs or CPUs/Cores. - // In this example, it will have only one core. + // In this example, it will have only one plus. List peList = new ArrayList<>(); List hddList = new ArrayList<>(); diff --git a/modules/cloudsim-examples/src/main/java/org/cloudbus/cloudsim/examples/ex/web/CloudSimWorkloadWebExample.java b/modules/cloudsim-examples/src/main/java/org/cloudbus/cloudsim/examples/geoweb/web/CloudSimWorkloadWebExample.java similarity index 88% rename from modules/cloudsim-examples/src/main/java/org/cloudbus/cloudsim/examples/ex/web/CloudSimWorkloadWebExample.java rename to modules/cloudsim-examples/src/main/java/org/cloudbus/cloudsim/examples/geoweb/web/CloudSimWorkloadWebExample.java index e331e10df..0ff32316a 100644 --- a/modules/cloudsim-examples/src/main/java/org/cloudbus/cloudsim/examples/ex/web/CloudSimWorkloadWebExample.java +++ b/modules/cloudsim-examples/src/main/java/org/cloudbus/cloudsim/examples/geoweb/web/CloudSimWorkloadWebExample.java @@ -4,27 +4,27 @@ * of Clouds * Licence: GPL - http://www.gnu.org/copyleft/gpl.html * - * Copyright (c) 2009, The University of Melbourne, Australia + * Copyright (c) 2019, The University of Melbourne, Australia */ -package org.cloudbus.cloudsim.examples.ex.web; +package org.cloudbus.cloudsim.examples.geoweb.web; import org.cloudbus.cloudsim.*; import org.cloudbus.cloudsim.core.CloudSim; -import org.cloudbus.cloudsim.ex.core.disk.*; -import org.cloudbus.cloudsim.ex.core.util.CustomLog; -import org.cloudbus.cloudsim.ex.core.util.TextUtil; -import org.cloudbus.cloudsim.ex.web.ILoadBalancer; -import org.cloudbus.cloudsim.ex.web.SimpleDBBalancer; -import org.cloudbus.cloudsim.ex.web.SimpleWebLoadBalancer; -import org.cloudbus.cloudsim.ex.web.WebCloudlet; -import org.cloudbus.cloudsim.ex.web.workload.StatWorkloadGenerator; -import org.cloudbus.cloudsim.ex.web.workload.brokers.WebBroker; -import org.cloudbus.cloudsim.ex.web.workload.freq.CompositeValuedSet; -import org.cloudbus.cloudsim.ex.web.workload.freq.FrequencyFunction; -import org.cloudbus.cloudsim.ex.web.workload.freq.PeriodicStochasticFrequencyFunction; -import org.cloudbus.cloudsim.ex.web.workload.sessions.ConstSessionGenerator; -import org.cloudbus.cloudsim.ex.web.workload.sessions.ISessionGenerator; +import org.cloudbus.cloudsim.plus.disk.*; +import org.cloudbus.cloudsim.plus.util.CustomLog; +import org.cloudbus.cloudsim.plus.util.TextUtil; +import org.cloudbus.cloudsim.geoweb.web.ILoadBalancer; +import org.cloudbus.cloudsim.geoweb.web.SimpleDBBalancer; +import org.cloudbus.cloudsim.geoweb.web.SimpleWebLoadBalancer; +import org.cloudbus.cloudsim.geoweb.web.WebCloudlet; +import org.cloudbus.cloudsim.geoweb.web.workload.StatWorkloadGenerator; +import org.cloudbus.cloudsim.geoweb.web.workload.brokers.WebBroker; +import org.cloudbus.cloudsim.geoweb.web.workload.freq.CompositeValuedSet; +import org.cloudbus.cloudsim.geoweb.web.workload.freq.FrequencyFunction; +import org.cloudbus.cloudsim.geoweb.web.workload.freq.PeriodicStochasticFrequencyFunction; +import org.cloudbus.cloudsim.geoweb.web.workload.sessions.ConstSessionGenerator; +import org.cloudbus.cloudsim.geoweb.web.workload.sessions.ISessionGenerator; import org.cloudbus.cloudsim.provisioners.BwProvisionerSimple; import org.cloudbus.cloudsim.provisioners.PeProvisionerSimple; import org.cloudbus.cloudsim.provisioners.RamProvisionerSimple; @@ -176,7 +176,7 @@ private static Datacenter createDatacenter(final String name) { List hostList = new ArrayList(); // 2. A Machine contains one or more PEs or CPUs/Cores. - // In this example, it will have only one core. + // In this example, it will have only one plus. List peList = new ArrayList<>(); List hddList = new ArrayList<>(); diff --git a/modules/cloudsim-examples/src/main/java/org/cloudbus/cloudsim/examples/ex/CloudSimDisksExample.java b/modules/cloudsim-examples/src/main/java/org/cloudbus/cloudsim/examples/plus/CloudSimDisksExample.java similarity index 97% rename from modules/cloudsim-examples/src/main/java/org/cloudbus/cloudsim/examples/ex/CloudSimDisksExample.java rename to modules/cloudsim-examples/src/main/java/org/cloudbus/cloudsim/examples/plus/CloudSimDisksExample.java index 7f8d36092..1a7d3f375 100644 --- a/modules/cloudsim-examples/src/main/java/org/cloudbus/cloudsim/examples/ex/CloudSimDisksExample.java +++ b/modules/cloudsim-examples/src/main/java/org/cloudbus/cloudsim/examples/plus/CloudSimDisksExample.java @@ -1,11 +1,11 @@ -package org.cloudbus.cloudsim.examples.ex; +package org.cloudbus.cloudsim.examples.plus; import org.cloudbus.cloudsim.*; import org.cloudbus.cloudsim.core.CloudSim; -import org.cloudbus.cloudsim.ex.core.disk.*; -import org.cloudbus.cloudsim.ex.core.util.CustomLog; -import org.cloudbus.cloudsim.ex.core.util.Id; +import org.cloudbus.cloudsim.plus.disk.*; +import org.cloudbus.cloudsim.plus.util.CustomLog; +import org.cloudbus.cloudsim.plus.util.Id; import org.cloudbus.cloudsim.provisioners.BwProvisionerSimple; import org.cloudbus.cloudsim.provisioners.PeProvisionerSimple; import org.cloudbus.cloudsim.provisioners.RamProvisionerSimple; diff --git a/modules/cloudsim-examples/src/main/java/org/cloudbus/cloudsim/examples/ex/DelayExample1.java b/modules/cloudsim-examples/src/main/java/org/cloudbus/cloudsim/examples/plus/DelayExample1.java similarity index 97% rename from modules/cloudsim-examples/src/main/java/org/cloudbus/cloudsim/examples/ex/DelayExample1.java rename to modules/cloudsim-examples/src/main/java/org/cloudbus/cloudsim/examples/plus/DelayExample1.java index abe9c249c..029261f17 100644 --- a/modules/cloudsim-examples/src/main/java/org/cloudbus/cloudsim/examples/ex/DelayExample1.java +++ b/modules/cloudsim-examples/src/main/java/org/cloudbus/cloudsim/examples/plus/DelayExample1.java @@ -1,4 +1,4 @@ -package org.cloudbus.cloudsim.examples.ex; +package org.cloudbus.cloudsim.examples.plus; import java.util.ArrayList; @@ -20,7 +20,7 @@ import org.cloudbus.cloudsim.VmAllocationPolicySimple; import org.cloudbus.cloudsim.VmSchedulerTimeShared; import org.cloudbus.cloudsim.core.CloudSim; -import org.cloudbus.cloudsim.ex.core.DatacenterBrokerEX; +import org.cloudbus.cloudsim.plus.DatacenterBrokerEX; import org.cloudbus.cloudsim.examples.CloudSimExample1; import org.cloudbus.cloudsim.provisioners.BwProvisionerSimple; @@ -106,7 +106,7 @@ private static Datacenter createDatacenter(String name) throws Exception { List hostList = new ArrayList(); // 2. A Machine contains one or more PEs or CPUs/Cores. - // In this example, it will have only one core. + // In this example, it will have only one plus. List peList = new ArrayList(); int mips = 1000; diff --git a/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/geolocation/BaseGeolocationService.java b/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/geoweb/geolocation/BaseGeolocationService.java similarity index 97% rename from modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/geolocation/BaseGeolocationService.java rename to modules/cloudsim/src/main/java/org/cloudbus/cloudsim/geoweb/geolocation/BaseGeolocationService.java index cccd94b1d..74b4bb8f7 100644 --- a/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/geolocation/BaseGeolocationService.java +++ b/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/geoweb/geolocation/BaseGeolocationService.java @@ -1,4 +1,4 @@ -package org.cloudbus.cloudsim.ex.geolocation; +package org.cloudbus.cloudsim.geoweb.geolocation; import com.google.common.cache.Cache; import com.google.common.cache.CacheBuilder; @@ -29,7 +29,7 @@ public abstract class BaseGeolocationService implements IGeolocationService { * (non-Javadoc) * * @see - * org.cloudbus.cloudsim.ex.geolocation.IGeolocationService#distance(double, + * org.cloudbus.cloudsim.geoweb.geolocation.IGeolocationService#distance(double, * double, double, double) * * Based on http://www.movable-type.co.uk/scripts/latlong-vincenty.html diff --git a/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/geolocation/BaseIPGenerator.java b/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/geoweb/geolocation/BaseIPGenerator.java similarity index 97% rename from modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/geolocation/BaseIPGenerator.java rename to modules/cloudsim/src/main/java/org/cloudbus/cloudsim/geoweb/geolocation/BaseIPGenerator.java index 50e3a716c..413be0cb3 100644 --- a/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/geolocation/BaseIPGenerator.java +++ b/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/geoweb/geolocation/BaseIPGenerator.java @@ -1,4 +1,4 @@ -package org.cloudbus.cloudsim.ex.geolocation; +package org.cloudbus.cloudsim.geoweb.geolocation; import java.security.SecureRandom; import java.util.Collections; diff --git a/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/geolocation/GeoDistanceCacheKey.java b/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/geoweb/geolocation/GeoDistanceCacheKey.java similarity index 98% rename from modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/geolocation/GeoDistanceCacheKey.java rename to modules/cloudsim/src/main/java/org/cloudbus/cloudsim/geoweb/geolocation/GeoDistanceCacheKey.java index 526b51d72..1a257ac4f 100644 --- a/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/geolocation/GeoDistanceCacheKey.java +++ b/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/geoweb/geolocation/GeoDistanceCacheKey.java @@ -1,4 +1,4 @@ -package org.cloudbus.cloudsim.ex.geolocation; +package org.cloudbus.cloudsim.geoweb.geolocation; import com.google.common.cache.Cache; import com.google.common.cache.CacheBuilder; diff --git a/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/geolocation/IGeolocationService.java b/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/geoweb/geolocation/IGeolocationService.java similarity index 99% rename from modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/geolocation/IGeolocationService.java rename to modules/cloudsim/src/main/java/org/cloudbus/cloudsim/geoweb/geolocation/IGeolocationService.java index dfb0fd6d7..48a00735b 100644 --- a/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/geolocation/IGeolocationService.java +++ b/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/geoweb/geolocation/IGeolocationService.java @@ -1,4 +1,4 @@ -package org.cloudbus.cloudsim.ex.geolocation; +package org.cloudbus.cloudsim.geoweb.geolocation; import java.io.Closeable; diff --git a/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/geolocation/IPGenerator.java b/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/geoweb/geolocation/IPGenerator.java similarity index 97% rename from modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/geolocation/IPGenerator.java rename to modules/cloudsim/src/main/java/org/cloudbus/cloudsim/geoweb/geolocation/IPGenerator.java index 27f956a54..c6d3313d9 100644 --- a/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/geolocation/IPGenerator.java +++ b/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/geoweb/geolocation/IPGenerator.java @@ -1,4 +1,4 @@ -package org.cloudbus.cloudsim.ex.geolocation; +package org.cloudbus.cloudsim.geoweb.geolocation; import java.util.Set; diff --git a/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/geolocation/IPMetadata.java b/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/geoweb/geolocation/IPMetadata.java similarity index 97% rename from modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/geolocation/IPMetadata.java rename to modules/cloudsim/src/main/java/org/cloudbus/cloudsim/geoweb/geolocation/IPMetadata.java index 873eda12c..7fc80d570 100644 --- a/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/geolocation/IPMetadata.java +++ b/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/geoweb/geolocation/IPMetadata.java @@ -1,4 +1,4 @@ -package org.cloudbus.cloudsim.ex.geolocation; +package org.cloudbus.cloudsim.geoweb.geolocation; import com.google.common.base.Objects; import com.google.common.base.Objects.ToStringHelper; diff --git a/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/geolocation/IPUtil.java b/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/geoweb/geolocation/IPUtil.java similarity index 93% rename from modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/geolocation/IPUtil.java rename to modules/cloudsim/src/main/java/org/cloudbus/cloudsim/geoweb/geolocation/IPUtil.java index 2c810d852..66f4165c1 100644 --- a/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/geolocation/IPUtil.java +++ b/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/geoweb/geolocation/IPUtil.java @@ -1,4 +1,4 @@ -package org.cloudbus.cloudsim.ex.geolocation; +package org.cloudbus.cloudsim.geoweb.geolocation; /** * Implements common utility functions for handling IPs. diff --git a/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/geolocation/geoip2/GeoIP2IPGenerator.java b/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/geoweb/geolocation/geoip2/GeoIP2IPGenerator.java similarity index 94% rename from modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/geolocation/geoip2/GeoIP2IPGenerator.java rename to modules/cloudsim/src/main/java/org/cloudbus/cloudsim/geoweb/geolocation/geoip2/GeoIP2IPGenerator.java index 485e0663d..d807533e3 100644 --- a/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/geolocation/geoip2/GeoIP2IPGenerator.java +++ b/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/geoweb/geolocation/geoip2/GeoIP2IPGenerator.java @@ -1,17 +1,17 @@ -package org.cloudbus.cloudsim.ex.geolocation.geoip2; +package org.cloudbus.cloudsim.geoweb.geolocation.geoip2; import au.com.bytecode.opencsv.CSVReader; import com.google.common.base.Preconditions; -import org.cloudbus.cloudsim.ex.geolocation.BaseIPGenerator; -import org.cloudbus.cloudsim.ex.geolocation.IPGenerator; -import org.cloudbus.cloudsim.ex.geolocation.IPUtil; -import org.cloudbus.cloudsim.ex.core.util.CustomLog; +import org.cloudbus.cloudsim.geoweb.geolocation.BaseIPGenerator; +import org.cloudbus.cloudsim.geoweb.geolocation.IPGenerator; +import org.cloudbus.cloudsim.geoweb.geolocation.IPUtil; +import org.cloudbus.cloudsim.plus.util.CustomLog; import java.io.*; import java.util.*; import java.util.logging.Level; -import static org.cloudbus.cloudsim.ex.geolocation.geoip2.ResourceUtil.*; +import static org.cloudbus.cloudsim.geoweb.geolocation.geoip2.ResourceUtil.*; /** * An IP generator that generates IPv4 IPs, based on the IP ranges specified in @@ -149,7 +149,7 @@ public GeoIP2IPGenerator(final Set countryCodes, final File f) { /* * (non-Javadoc) * - * @see org.cloudbus.cloudsim.ex.geolocation.IPGenerator#pollRandomIP() + * @see org.cloudbus.cloudsim.geoweb.geolocation.IPGenerator#pollRandomIP() */ @Override public String pollRandomIP() { diff --git a/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/geolocation/geoip2/GeoIP2PingERService.java b/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/geoweb/geolocation/geoip2/GeoIP2PingERService.java similarity index 98% rename from modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/geolocation/geoip2/GeoIP2PingERService.java rename to modules/cloudsim/src/main/java/org/cloudbus/cloudsim/geoweb/geolocation/geoip2/GeoIP2PingERService.java index d0b5f5b1f..d9f933aac 100644 --- a/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/geolocation/geoip2/GeoIP2PingERService.java +++ b/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/geoweb/geolocation/geoip2/GeoIP2PingERService.java @@ -1,4 +1,4 @@ -package org.cloudbus.cloudsim.ex.geolocation.geoip2; +package org.cloudbus.cloudsim.geoweb.geolocation.geoip2; import au.com.bytecode.opencsv.CSVReader; import com.google.common.base.Preconditions; @@ -11,10 +11,10 @@ import com.maxmind.geoip2.record.Location; import org.apache.commons.lang3.tuple.ImmutablePair; import org.apache.commons.lang3.tuple.Pair; -import org.cloudbus.cloudsim.ex.geolocation.BaseGeolocationService; -import org.cloudbus.cloudsim.ex.geolocation.IGeolocationService; -import org.cloudbus.cloudsim.ex.geolocation.IPMetadata; -import org.cloudbus.cloudsim.ex.core.util.CustomLog; +import org.cloudbus.cloudsim.geoweb.geolocation.BaseGeolocationService; +import org.cloudbus.cloudsim.geoweb.geolocation.IGeolocationService; +import org.cloudbus.cloudsim.geoweb.geolocation.IPMetadata; +import org.cloudbus.cloudsim.plus.util.CustomLog; import java.io.*; import java.net.InetAddress; @@ -24,7 +24,7 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; -import static org.cloudbus.cloudsim.ex.geolocation.geoip2.ResourceUtil.*; +import static org.cloudbus.cloudsim.geoweb.geolocation.geoip2.ResourceUtil.*; /** * diff --git a/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/geolocation/geoip2/GeolocationServiceWithOverrides.java b/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/geoweb/geolocation/geoip2/GeolocationServiceWithOverrides.java similarity index 94% rename from modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/geolocation/geoip2/GeolocationServiceWithOverrides.java rename to modules/cloudsim/src/main/java/org/cloudbus/cloudsim/geoweb/geolocation/geoip2/GeolocationServiceWithOverrides.java index b52a6b828..bb466a5a5 100644 --- a/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/geolocation/geoip2/GeolocationServiceWithOverrides.java +++ b/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/geoweb/geolocation/geoip2/GeolocationServiceWithOverrides.java @@ -1,11 +1,11 @@ -package org.cloudbus.cloudsim.ex.geolocation.geoip2; +package org.cloudbus.cloudsim.geoweb.geolocation.geoip2; import com.google.common.base.Preconditions; import com.google.common.cache.Cache; import com.google.common.cache.CacheBuilder; -import org.cloudbus.cloudsim.ex.geolocation.BaseGeolocationService; -import org.cloudbus.cloudsim.ex.geolocation.IGeolocationService; -import org.cloudbus.cloudsim.ex.geolocation.IPMetadata; +import org.cloudbus.cloudsim.geoweb.geolocation.BaseGeolocationService; +import org.cloudbus.cloudsim.geoweb.geolocation.IGeolocationService; +import org.cloudbus.cloudsim.geoweb.geolocation.IPMetadata; import java.io.IOException; import java.util.Collection; diff --git a/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/geolocation/geoip2/LookUpGeoLocationService.java b/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/geoweb/geolocation/geoip2/LookUpGeoLocationService.java similarity index 91% rename from modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/geolocation/geoip2/LookUpGeoLocationService.java rename to modules/cloudsim/src/main/java/org/cloudbus/cloudsim/geoweb/geolocation/geoip2/LookUpGeoLocationService.java index 78b3a4066..dfc1afa42 100644 --- a/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/geolocation/geoip2/LookUpGeoLocationService.java +++ b/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/geoweb/geolocation/geoip2/LookUpGeoLocationService.java @@ -1,7 +1,7 @@ -package org.cloudbus.cloudsim.ex.geolocation.geoip2; +package org.cloudbus.cloudsim.geoweb.geolocation.geoip2; -import org.cloudbus.cloudsim.ex.geolocation.BaseGeolocationService; -import org.cloudbus.cloudsim.ex.geolocation.IPMetadata; +import org.cloudbus.cloudsim.geoweb.geolocation.BaseGeolocationService; +import org.cloudbus.cloudsim.geoweb.geolocation.IPMetadata; import java.io.IOException; import java.util.Map; diff --git a/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/geolocation/geoip2/OverrideRule.java b/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/geoweb/geolocation/geoip2/OverrideRule.java similarity index 97% rename from modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/geolocation/geoip2/OverrideRule.java rename to modules/cloudsim/src/main/java/org/cloudbus/cloudsim/geoweb/geolocation/geoip2/OverrideRule.java index 016cd6c67..51b9c6aeb 100644 --- a/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/geolocation/geoip2/OverrideRule.java +++ b/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/geoweb/geolocation/geoip2/OverrideRule.java @@ -1,4 +1,4 @@ -package org.cloudbus.cloudsim.ex.geolocation.geoip2; +package org.cloudbus.cloudsim.geoweb.geolocation.geoip2; import com.google.api.client.util.Objects; import com.google.common.base.Preconditions; diff --git a/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/geolocation/geoip2/ResourceUtil.java b/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/geoweb/geolocation/geoip2/ResourceUtil.java similarity index 95% rename from modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/geolocation/geoip2/ResourceUtil.java rename to modules/cloudsim/src/main/java/org/cloudbus/cloudsim/geoweb/geolocation/geoip2/ResourceUtil.java index 869c8b3a6..520680529 100644 --- a/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/geolocation/geoip2/ResourceUtil.java +++ b/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/geoweb/geolocation/geoip2/ResourceUtil.java @@ -1,7 +1,7 @@ -package org.cloudbus.cloudsim.ex.geolocation.geoip2; +package org.cloudbus.cloudsim.geoweb.geolocation.geoip2; import com.google.common.base.Preconditions; -import org.cloudbus.cloudsim.ex.core.util.CustomLog; +import org.cloudbus.cloudsim.plus.util.CustomLog; import java.io.File; import java.io.FileInputStream; diff --git a/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/web/BaseDBLoadBalancer.java b/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/geoweb/web/BaseDBLoadBalancer.java similarity index 90% rename from modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/web/BaseDBLoadBalancer.java rename to modules/cloudsim/src/main/java/org/cloudbus/cloudsim/geoweb/web/BaseDBLoadBalancer.java index 1d69fff62..6a9055ac7 100644 --- a/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/web/BaseDBLoadBalancer.java +++ b/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/geoweb/web/BaseDBLoadBalancer.java @@ -1,6 +1,6 @@ -package org.cloudbus.cloudsim.ex.web; +package org.cloudbus.cloudsim.geoweb.web; -import org.cloudbus.cloudsim.ex.core.disk.HddVm; +import org.cloudbus.cloudsim.plus.disk.HddVm; import java.util.Arrays; import java.util.List; diff --git a/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/web/BaseStatGenerator.java b/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/geoweb/web/BaseStatGenerator.java similarity index 94% rename from modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/web/BaseStatGenerator.java rename to modules/cloudsim/src/main/java/org/cloudbus/cloudsim/geoweb/web/BaseStatGenerator.java index 2870474cd..fcefd6535 100644 --- a/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/web/BaseStatGenerator.java +++ b/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/geoweb/web/BaseStatGenerator.java @@ -1,8 +1,8 @@ -package org.cloudbus.cloudsim.ex.web; +package org.cloudbus.cloudsim.geoweb.web; import org.cloudbus.cloudsim.Cloudlet; -import org.cloudbus.cloudsim.ex.core.disk.DataItem; -import org.cloudbus.cloudsim.ex.core.util.CustomLog; +import org.cloudbus.cloudsim.plus.disk.DataItem; +import org.cloudbus.cloudsim.plus.util.CustomLog; import org.uncommons.maths.number.NumberGenerator; import java.util.LinkedList; @@ -94,7 +94,7 @@ public BaseStatGenerator(final Map collection) { /** * (non-Javadoc) * - * @see org.cloudbus.cloudsim.ex.web.IGenerator#peek() + * @see org.cloudbus.cloudsim.geoweb.web.IGenerator#peek() */ @Override public T peek() { @@ -48,7 +48,7 @@ public T peek() { /** * (non-Javadoc) * - * @see org.cloudbus.cloudsim.ex.web.IGenerator#poll() + * @see org.cloudbus.cloudsim.geoweb.web.IGenerator#poll() */ @Override public T poll() { @@ -64,7 +64,7 @@ public T poll() { /** * (non-Javadoc) * - * @see org.cloudbus.cloudsim.ex.web.IGenerator#isEmpty() + * @see org.cloudbus.cloudsim.geoweb.web.IGenerator#isEmpty() */ @Override public boolean isEmpty() { @@ -74,7 +74,7 @@ public boolean isEmpty() { /** * (non-Javadoc) * - * @see org.cloudbus.cloudsim.ex.web.IGenerator#notifyOfTime(double) + * @see org.cloudbus.cloudsim.geoweb.web.IGenerator#notifyOfTime(double) */ @Override public void notifyOfTime(final double time) { diff --git a/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/web/IterableNumberGenerator.java b/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/geoweb/web/IterableNumberGenerator.java similarity index 93% rename from modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/web/IterableNumberGenerator.java rename to modules/cloudsim/src/main/java/org/cloudbus/cloudsim/geoweb/web/IterableNumberGenerator.java index 593774014..970f4ecf9 100644 --- a/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/web/IterableNumberGenerator.java +++ b/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/geoweb/web/IterableNumberGenerator.java @@ -1,4 +1,4 @@ -package org.cloudbus.cloudsim.ex.web; +package org.cloudbus.cloudsim.geoweb.web; import org.uncommons.maths.number.NumberGenerator; diff --git a/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/web/RandomListGenerator.java b/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/geoweb/web/RandomListGenerator.java similarity index 98% rename from modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/web/RandomListGenerator.java rename to modules/cloudsim/src/main/java/org/cloudbus/cloudsim/geoweb/web/RandomListGenerator.java index 548905a8a..205b8508c 100644 --- a/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/web/RandomListGenerator.java +++ b/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/geoweb/web/RandomListGenerator.java @@ -1,4 +1,4 @@ -package org.cloudbus.cloudsim.ex.web; +package org.cloudbus.cloudsim.geoweb.web; import java.util.LinkedHashMap; import java.util.Map; diff --git a/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/web/RoundRobinDBBalancer.java b/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/geoweb/web/RoundRobinDBBalancer.java similarity index 92% rename from modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/web/RoundRobinDBBalancer.java rename to modules/cloudsim/src/main/java/org/cloudbus/cloudsim/geoweb/web/RoundRobinDBBalancer.java index b54187bea..1a01d9a1d 100644 --- a/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/web/RoundRobinDBBalancer.java +++ b/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/geoweb/web/RoundRobinDBBalancer.java @@ -1,10 +1,10 @@ -package org.cloudbus.cloudsim.ex.web; +package org.cloudbus.cloudsim.geoweb.web; import org.cloudbus.cloudsim.Cloudlet; -import org.cloudbus.cloudsim.ex.core.disk.HddCloudlet; -import org.cloudbus.cloudsim.ex.core.disk.HddPe; -import org.cloudbus.cloudsim.ex.core.disk.HddVm; -import org.cloudbus.cloudsim.ex.core.util.CustomLog; +import org.cloudbus.cloudsim.plus.disk.HddCloudlet; +import org.cloudbus.cloudsim.plus.disk.HddPe; +import org.cloudbus.cloudsim.plus.disk.HddVm; +import org.cloudbus.cloudsim.plus.util.CustomLog; import java.util.*; import java.util.logging.Level; diff --git a/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/web/SessionFailedException.java b/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/geoweb/web/SessionFailedException.java similarity index 97% rename from modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/web/SessionFailedException.java rename to modules/cloudsim/src/main/java/org/cloudbus/cloudsim/geoweb/web/SessionFailedException.java index d8a5d201a..24c5b9d6b 100644 --- a/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/web/SessionFailedException.java +++ b/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/geoweb/web/SessionFailedException.java @@ -1,4 +1,4 @@ -package org.cloudbus.cloudsim.ex.web; +package org.cloudbus.cloudsim.geoweb.web; /** * Indicates that a session has failed. diff --git a/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/web/SimpleDBBalancer.java b/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/geoweb/web/SimpleDBBalancer.java similarity index 88% rename from modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/web/SimpleDBBalancer.java rename to modules/cloudsim/src/main/java/org/cloudbus/cloudsim/geoweb/web/SimpleDBBalancer.java index 33bb8d38c..a4e6cb7e2 100644 --- a/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/web/SimpleDBBalancer.java +++ b/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/geoweb/web/SimpleDBBalancer.java @@ -1,13 +1,13 @@ /** * */ -package org.cloudbus.cloudsim.ex.web; +package org.cloudbus.cloudsim.geoweb.web; import org.cloudbus.cloudsim.Cloudlet; -import org.cloudbus.cloudsim.ex.core.disk.HddCloudlet; -import org.cloudbus.cloudsim.ex.core.disk.HddPe; -import org.cloudbus.cloudsim.ex.core.disk.HddVm; -import org.cloudbus.cloudsim.ex.core.util.CustomLog; +import org.cloudbus.cloudsim.plus.disk.HddCloudlet; +import org.cloudbus.cloudsim.plus.disk.HddPe; +import org.cloudbus.cloudsim.plus.disk.HddVm; +import org.cloudbus.cloudsim.plus.util.CustomLog; import java.util.Arrays; import java.util.List; diff --git a/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/web/SimpleWebLoadBalancer.java b/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/geoweb/web/SimpleWebLoadBalancer.java similarity index 95% rename from modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/web/SimpleWebLoadBalancer.java rename to modules/cloudsim/src/main/java/org/cloudbus/cloudsim/geoweb/web/SimpleWebLoadBalancer.java index 59f3e92f2..a3e68af26 100644 --- a/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/web/SimpleWebLoadBalancer.java +++ b/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/geoweb/web/SimpleWebLoadBalancer.java @@ -1,9 +1,9 @@ -package org.cloudbus.cloudsim.ex.web; +package org.cloudbus.cloudsim.geoweb.web; -import org.cloudbus.cloudsim.ex.core.disk.HddResCloudlet; -import org.cloudbus.cloudsim.ex.core.disk.HddVm; -import org.cloudbus.cloudsim.ex.core.util.CustomLog; -import org.cloudbus.cloudsim.ex.web.workload.brokers.WebBroker; +import org.cloudbus.cloudsim.plus.disk.HddResCloudlet; +import org.cloudbus.cloudsim.plus.disk.HddVm; +import org.cloudbus.cloudsim.plus.util.CustomLog; +import org.cloudbus.cloudsim.geoweb.web.workload.brokers.WebBroker; import java.util.*; import java.util.logging.Level; diff --git a/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/web/StatGenerator.java b/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/geoweb/web/StatGenerator.java similarity index 96% rename from modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/web/StatGenerator.java rename to modules/cloudsim/src/main/java/org/cloudbus/cloudsim/geoweb/web/StatGenerator.java index 2439ece69..3755e0cb1 100644 --- a/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/web/StatGenerator.java +++ b/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/geoweb/web/StatGenerator.java @@ -1,6 +1,6 @@ -package org.cloudbus.cloudsim.ex.web; +package org.cloudbus.cloudsim.geoweb.web; -import org.cloudbus.cloudsim.ex.core.disk.DataItem; +import org.cloudbus.cloudsim.plus.disk.DataItem; import org.uncommons.maths.number.NumberGenerator; import java.util.Map; diff --git a/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/web/WebCloudlet.java b/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/geoweb/web/WebCloudlet.java similarity index 94% rename from modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/web/WebCloudlet.java rename to modules/cloudsim/src/main/java/org/cloudbus/cloudsim/geoweb/web/WebCloudlet.java index 3e98dbdf0..e5e59c727 100644 --- a/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/web/WebCloudlet.java +++ b/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/geoweb/web/WebCloudlet.java @@ -1,8 +1,8 @@ -package org.cloudbus.cloudsim.ex.web; +package org.cloudbus.cloudsim.geoweb.web; -import org.cloudbus.cloudsim.ex.core.disk.DataItem; -import org.cloudbus.cloudsim.ex.core.disk.HddCloudlet; -import org.cloudbus.cloudsim.ex.core.util.Textualize; +import org.cloudbus.cloudsim.plus.disk.DataItem; +import org.cloudbus.cloudsim.plus.disk.HddCloudlet; +import org.cloudbus.cloudsim.plus.util.Textualize; /** * A web cloudlet is a cloudlet, which is a part of a web session. Usually it is diff --git a/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/web/WebSession.java b/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/geoweb/web/WebSession.java similarity index 98% rename from modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/web/WebSession.java rename to modules/cloudsim/src/main/java/org/cloudbus/cloudsim/geoweb/web/WebSession.java index f3b70fb55..9b526f6c7 100644 --- a/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/web/WebSession.java +++ b/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/geoweb/web/WebSession.java @@ -1,11 +1,11 @@ -package org.cloudbus.cloudsim.ex.web; +package org.cloudbus.cloudsim.geoweb.web; import org.cloudbus.cloudsim.Cloudlet; -import org.cloudbus.cloudsim.ex.core.disk.HddVm; -import org.cloudbus.cloudsim.ex.core.util.CustomLog; -import org.cloudbus.cloudsim.ex.core.util.Id; -import org.cloudbus.cloudsim.ex.core.util.TextUtil; -import org.cloudbus.cloudsim.ex.core.util.Textualize; +import org.cloudbus.cloudsim.plus.disk.HddVm; +import org.cloudbus.cloudsim.plus.util.CustomLog; +import org.cloudbus.cloudsim.plus.util.Id; +import org.cloudbus.cloudsim.plus.util.TextUtil; +import org.cloudbus.cloudsim.plus.util.Textualize; import java.util.*; import java.util.logging.Level; diff --git a/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/web/workload/.gitignore b/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/geoweb/web/workload/.gitignore similarity index 100% rename from modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/web/workload/.gitignore rename to modules/cloudsim/src/main/java/org/cloudbus/cloudsim/geoweb/web/workload/.gitignore diff --git a/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/web/workload/IWorkloadGenerator.java b/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/geoweb/web/workload/IWorkloadGenerator.java similarity index 87% rename from modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/web/workload/IWorkloadGenerator.java rename to modules/cloudsim/src/main/java/org/cloudbus/cloudsim/geoweb/web/workload/IWorkloadGenerator.java index 44cf863f0..3a4d91b79 100644 --- a/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/web/workload/IWorkloadGenerator.java +++ b/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/geoweb/web/workload/IWorkloadGenerator.java @@ -1,6 +1,6 @@ -package org.cloudbus.cloudsim.ex.web.workload; +package org.cloudbus.cloudsim.geoweb.web.workload; -import org.cloudbus.cloudsim.ex.web.WebSession; +import org.cloudbus.cloudsim.geoweb.web.WebSession; import java.util.List; import java.util.Map; diff --git a/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/web/workload/PeriodTimeGenerator.java b/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/geoweb/web/workload/PeriodTimeGenerator.java similarity index 89% rename from modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/web/workload/PeriodTimeGenerator.java rename to modules/cloudsim/src/main/java/org/cloudbus/cloudsim/geoweb/web/workload/PeriodTimeGenerator.java index b85fde8a0..40d30894e 100644 --- a/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/web/workload/PeriodTimeGenerator.java +++ b/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/geoweb/web/workload/PeriodTimeGenerator.java @@ -1,7 +1,7 @@ -package org.cloudbus.cloudsim.ex.web.workload; +package org.cloudbus.cloudsim.geoweb.web.workload; -import org.cloudbus.cloudsim.ex.web.WebSession; -import org.cloudbus.cloudsim.ex.web.workload.sessions.ISessionGenerator; +import org.cloudbus.cloudsim.geoweb.web.WebSession; +import org.cloudbus.cloudsim.geoweb.web.workload.sessions.ISessionGenerator; import java.util.Arrays; import java.util.HashMap; diff --git a/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/web/workload/PeriodWorkloadGenerator.java b/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/geoweb/web/workload/PeriodWorkloadGenerator.java similarity index 85% rename from modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/web/workload/PeriodWorkloadGenerator.java rename to modules/cloudsim/src/main/java/org/cloudbus/cloudsim/geoweb/web/workload/PeriodWorkloadGenerator.java index 29e6afd46..6599ce50e 100644 --- a/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/web/workload/PeriodWorkloadGenerator.java +++ b/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/geoweb/web/workload/PeriodWorkloadGenerator.java @@ -1,7 +1,7 @@ -package org.cloudbus.cloudsim.ex.web.workload; +package org.cloudbus.cloudsim.geoweb.web.workload; -import org.cloudbus.cloudsim.ex.web.WebSession; -import org.cloudbus.cloudsim.ex.web.workload.sessions.ISessionGenerator; +import org.cloudbus.cloudsim.geoweb.web.WebSession; +import org.cloudbus.cloudsim.geoweb.web.workload.sessions.ISessionGenerator; import java.util.Arrays; import java.util.HashMap; diff --git a/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/web/workload/RandomIPWorkloadGenerator.java b/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/geoweb/web/workload/RandomIPWorkloadGenerator.java similarity index 89% rename from modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/web/workload/RandomIPWorkloadGenerator.java rename to modules/cloudsim/src/main/java/org/cloudbus/cloudsim/geoweb/web/workload/RandomIPWorkloadGenerator.java index bd23d305d..dd8791662 100644 --- a/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/web/workload/RandomIPWorkloadGenerator.java +++ b/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/geoweb/web/workload/RandomIPWorkloadGenerator.java @@ -1,8 +1,8 @@ -package org.cloudbus.cloudsim.ex.web.workload; +package org.cloudbus.cloudsim.geoweb.web.workload; -import org.cloudbus.cloudsim.ex.geolocation.IGeolocationService; -import org.cloudbus.cloudsim.ex.geolocation.IPGenerator; -import org.cloudbus.cloudsim.ex.web.WebSession; +import org.cloudbus.cloudsim.geoweb.geolocation.IGeolocationService; +import org.cloudbus.cloudsim.geoweb.geolocation.IPGenerator; +import org.cloudbus.cloudsim.geoweb.web.WebSession; import java.util.List; import java.util.Map; diff --git a/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/web/workload/StatWorkloadGenerator.java b/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/geoweb/web/workload/StatWorkloadGenerator.java similarity index 93% rename from modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/web/workload/StatWorkloadGenerator.java rename to modules/cloudsim/src/main/java/org/cloudbus/cloudsim/geoweb/web/workload/StatWorkloadGenerator.java index 4e9bd29bb..15cf65492 100644 --- a/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/web/workload/StatWorkloadGenerator.java +++ b/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/geoweb/web/workload/StatWorkloadGenerator.java @@ -1,9 +1,9 @@ -package org.cloudbus.cloudsim.ex.web.workload; +package org.cloudbus.cloudsim.geoweb.web.workload; -import org.cloudbus.cloudsim.ex.core.util.CustomLog; -import org.cloudbus.cloudsim.ex.web.WebSession; -import org.cloudbus.cloudsim.ex.web.workload.freq.FrequencyFunction; -import org.cloudbus.cloudsim.ex.web.workload.sessions.ISessionGenerator; +import org.cloudbus.cloudsim.plus.util.CustomLog; +import org.cloudbus.cloudsim.geoweb.web.WebSession; +import org.cloudbus.cloudsim.geoweb.web.workload.freq.FrequencyFunction; +import org.cloudbus.cloudsim.geoweb.web.workload.sessions.ISessionGenerator; import org.uncommons.maths.number.NumberGenerator; import org.uncommons.maths.random.MersenneTwisterRNG; import org.uncommons.maths.random.PoissonGenerator; diff --git a/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/web/workload/brokers/BaseEntryPoint.java b/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/geoweb/web/workload/brokers/BaseEntryPoint.java similarity index 92% rename from modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/web/workload/brokers/BaseEntryPoint.java rename to modules/cloudsim/src/main/java/org/cloudbus/cloudsim/geoweb/web/workload/brokers/BaseEntryPoint.java index 84b3a17cd..8175ba7fd 100644 --- a/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/web/workload/brokers/BaseEntryPoint.java +++ b/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/geoweb/web/workload/brokers/BaseEntryPoint.java @@ -1,7 +1,7 @@ -package org.cloudbus.cloudsim.ex.web.workload.brokers; +package org.cloudbus.cloudsim.geoweb.web.workload.brokers; -import org.cloudbus.cloudsim.ex.geolocation.IGeolocationService; -import org.cloudbus.cloudsim.ex.web.WebSession; +import org.cloudbus.cloudsim.geoweb.geolocation.IGeolocationService; +import org.cloudbus.cloudsim.geoweb.web.WebSession; import java.util.ArrayList; import java.util.List; diff --git a/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/web/workload/brokers/CompressedAutoscalingPolicy.java b/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/geoweb/web/workload/brokers/CompressedAutoscalingPolicy.java similarity index 92% rename from modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/web/workload/brokers/CompressedAutoscalingPolicy.java rename to modules/cloudsim/src/main/java/org/cloudbus/cloudsim/geoweb/web/workload/brokers/CompressedAutoscalingPolicy.java index 536ac2549..89505c284 100644 --- a/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/web/workload/brokers/CompressedAutoscalingPolicy.java +++ b/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/geoweb/web/workload/brokers/CompressedAutoscalingPolicy.java @@ -1,14 +1,14 @@ -package org.cloudbus.cloudsim.ex.web.workload.brokers; +package org.cloudbus.cloudsim.geoweb.web.workload.brokers; import org.cloudbus.cloudsim.core.CloudSim; -import org.cloudbus.cloudsim.ex.core.IAutoscalingPolicy; -import org.cloudbus.cloudsim.ex.core.MonitoringBorkerEX; -import org.cloudbus.cloudsim.ex.core.billing.IVmBillingPolicy; -import org.cloudbus.cloudsim.ex.core.disk.HddCloudletSchedulerTimeShared; -import org.cloudbus.cloudsim.ex.core.disk.HddVm; -import org.cloudbus.cloudsim.ex.core.util.CustomLog; -import org.cloudbus.cloudsim.ex.core.vm.VMStatus; -import org.cloudbus.cloudsim.ex.web.ILoadBalancer; +import org.cloudbus.cloudsim.plus.IAutoscalingPolicy; +import org.cloudbus.cloudsim.plus.MonitoringBorkerEX; +import org.cloudbus.cloudsim.plus.billing.IVmBillingPolicy; +import org.cloudbus.cloudsim.plus.disk.HddCloudletSchedulerTimeShared; +import org.cloudbus.cloudsim.plus.disk.HddVm; +import org.cloudbus.cloudsim.plus.util.CustomLog; +import org.cloudbus.cloudsim.plus.vm.VMStatus; +import org.cloudbus.cloudsim.geoweb.web.ILoadBalancer; import java.util.*; diff --git a/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/web/workload/brokers/EntryPoint.java b/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/geoweb/web/workload/brokers/EntryPoint.java similarity index 95% rename from modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/web/workload/brokers/EntryPoint.java rename to modules/cloudsim/src/main/java/org/cloudbus/cloudsim/geoweb/web/workload/brokers/EntryPoint.java index ada951b51..f3a87efdf 100644 --- a/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/web/workload/brokers/EntryPoint.java +++ b/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/geoweb/web/workload/brokers/EntryPoint.java @@ -1,11 +1,11 @@ -package org.cloudbus.cloudsim.ex.web.workload.brokers; +package org.cloudbus.cloudsim.geoweb.web.workload.brokers; -import org.cloudbus.cloudsim.ex.core.disk.HddVm; -import org.cloudbus.cloudsim.ex.geolocation.IGeolocationService; -import org.cloudbus.cloudsim.ex.core.util.CustomLog; -import org.cloudbus.cloudsim.ex.core.vm.VMStatus; -import org.cloudbus.cloudsim.ex.web.ILoadBalancer; -import org.cloudbus.cloudsim.ex.web.WebSession; +import org.cloudbus.cloudsim.plus.disk.HddVm; +import org.cloudbus.cloudsim.geoweb.geolocation.IGeolocationService; +import org.cloudbus.cloudsim.plus.util.CustomLog; +import org.cloudbus.cloudsim.plus.vm.VMStatus; +import org.cloudbus.cloudsim.geoweb.web.ILoadBalancer; +import org.cloudbus.cloudsim.geoweb.web.WebSession; import java.math.BigDecimal; import java.util.*; @@ -47,7 +47,7 @@ public EntryPoint(final IGeolocationService geoService, final long appId, final * (non-Javadoc) * * @see - * org.cloudbus.cloudsim.ex.web.workload.brokers.IEntryPoint#dispatchSessions + * org.cloudbus.cloudsim.geoweb.web.workload.brokers.IEntryPoint#dispatchSessions * (java.util.List) */ @Override diff --git a/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/web/workload/brokers/IEntryPoint.java b/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/geoweb/web/workload/brokers/IEntryPoint.java similarity index 94% rename from modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/web/workload/brokers/IEntryPoint.java rename to modules/cloudsim/src/main/java/org/cloudbus/cloudsim/geoweb/web/workload/brokers/IEntryPoint.java index 482b3fe3e..3bbddbf54 100644 --- a/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/web/workload/brokers/IEntryPoint.java +++ b/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/geoweb/web/workload/brokers/IEntryPoint.java @@ -1,6 +1,6 @@ -package org.cloudbus.cloudsim.ex.web.workload.brokers; +package org.cloudbus.cloudsim.geoweb.web.workload.brokers; -import org.cloudbus.cloudsim.ex.web.WebSession; +import org.cloudbus.cloudsim.geoweb.web.WebSession; import java.util.List; diff --git a/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/web/workload/brokers/PerformanceLoggingWebBroker.java b/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/geoweb/web/workload/brokers/PerformanceLoggingWebBroker.java similarity index 94% rename from modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/web/workload/brokers/PerformanceLoggingWebBroker.java rename to modules/cloudsim/src/main/java/org/cloudbus/cloudsim/geoweb/web/workload/brokers/PerformanceLoggingWebBroker.java index 4f11d7cca..60c966bbd 100644 --- a/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/web/workload/brokers/PerformanceLoggingWebBroker.java +++ b/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/geoweb/web/workload/brokers/PerformanceLoggingWebBroker.java @@ -1,13 +1,13 @@ -package org.cloudbus.cloudsim.ex.web.workload.brokers; +package org.cloudbus.cloudsim.geoweb.web.workload.brokers; import org.cloudbus.cloudsim.ResCloudlet; import org.cloudbus.cloudsim.core.CloudSim; import org.cloudbus.cloudsim.core.SimEvent; -import org.cloudbus.cloudsim.ex.core.disk.HddResCloudlet; -import org.cloudbus.cloudsim.ex.core.disk.HddVm; -import org.cloudbus.cloudsim.ex.core.util.CustomLog; -import org.cloudbus.cloudsim.ex.core.util.TextUtil; -import org.cloudbus.cloudsim.ex.web.ILoadBalancer; +import org.cloudbus.cloudsim.plus.disk.HddResCloudlet; +import org.cloudbus.cloudsim.plus.disk.HddVm; +import org.cloudbus.cloudsim.plus.util.CustomLog; +import org.cloudbus.cloudsim.plus.util.TextUtil; +import org.cloudbus.cloudsim.geoweb.web.ILoadBalancer; import java.util.Arrays; import java.util.List; diff --git a/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/web/workload/brokers/RoundRobinWebLoadBalancer.java b/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/geoweb/web/workload/brokers/RoundRobinWebLoadBalancer.java similarity index 66% rename from modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/web/workload/brokers/RoundRobinWebLoadBalancer.java rename to modules/cloudsim/src/main/java/org/cloudbus/cloudsim/geoweb/web/workload/brokers/RoundRobinWebLoadBalancer.java index 1b2a7a630..2bc862839 100644 --- a/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/web/workload/brokers/RoundRobinWebLoadBalancer.java +++ b/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/geoweb/web/workload/brokers/RoundRobinWebLoadBalancer.java @@ -1,8 +1,8 @@ -package org.cloudbus.cloudsim.ex.web.workload.brokers; +package org.cloudbus.cloudsim.geoweb.web.workload.brokers; -import org.cloudbus.cloudsim.ex.core.disk.HddVm; -import org.cloudbus.cloudsim.ex.web.IDBBalancer; -import org.cloudbus.cloudsim.ex.web.SimpleWebLoadBalancer; +import org.cloudbus.cloudsim.plus.disk.HddVm; +import org.cloudbus.cloudsim.geoweb.web.IDBBalancer; +import org.cloudbus.cloudsim.geoweb.web.SimpleWebLoadBalancer; import java.util.List; diff --git a/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/web/workload/brokers/Route53EntryPoint.java b/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/geoweb/web/workload/brokers/Route53EntryPoint.java similarity index 89% rename from modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/web/workload/brokers/Route53EntryPoint.java rename to modules/cloudsim/src/main/java/org/cloudbus/cloudsim/geoweb/web/workload/brokers/Route53EntryPoint.java index a18f1e16c..c8a7fba96 100644 --- a/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/web/workload/brokers/Route53EntryPoint.java +++ b/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/geoweb/web/workload/brokers/Route53EntryPoint.java @@ -1,9 +1,9 @@ -package org.cloudbus.cloudsim.ex.web.workload.brokers; +package org.cloudbus.cloudsim.geoweb.web.workload.brokers; -import org.cloudbus.cloudsim.ex.geolocation.IGeolocationService; -import org.cloudbus.cloudsim.ex.core.util.CustomLog; -import org.cloudbus.cloudsim.ex.web.ILoadBalancer; -import org.cloudbus.cloudsim.ex.web.WebSession; +import org.cloudbus.cloudsim.geoweb.geolocation.IGeolocationService; +import org.cloudbus.cloudsim.plus.util.CustomLog; +import org.cloudbus.cloudsim.geoweb.web.ILoadBalancer; +import org.cloudbus.cloudsim.geoweb.web.WebSession; import java.util.ArrayList; import java.util.HashMap; diff --git a/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/web/workload/brokers/SimpleAutoScalingPolicy.java b/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/geoweb/web/workload/brokers/SimpleAutoScalingPolicy.java similarity index 88% rename from modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/web/workload/brokers/SimpleAutoScalingPolicy.java rename to modules/cloudsim/src/main/java/org/cloudbus/cloudsim/geoweb/web/workload/brokers/SimpleAutoScalingPolicy.java index 0b0878d2d..cbed08f0a 100644 --- a/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/web/workload/brokers/SimpleAutoScalingPolicy.java +++ b/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/geoweb/web/workload/brokers/SimpleAutoScalingPolicy.java @@ -1,13 +1,13 @@ -package org.cloudbus.cloudsim.ex.web.workload.brokers; +package org.cloudbus.cloudsim.geoweb.web.workload.brokers; import org.cloudbus.cloudsim.core.CloudSim; -import org.cloudbus.cloudsim.ex.core.IAutoscalingPolicy; -import org.cloudbus.cloudsim.ex.core.MonitoringBorkerEX; -import org.cloudbus.cloudsim.ex.core.disk.HddCloudletSchedulerTimeShared; -import org.cloudbus.cloudsim.ex.core.disk.HddVm; -import org.cloudbus.cloudsim.ex.core.util.CustomLog; -import org.cloudbus.cloudsim.ex.core.vm.VMStatus; -import org.cloudbus.cloudsim.ex.web.ILoadBalancer; +import org.cloudbus.cloudsim.plus.IAutoscalingPolicy; +import org.cloudbus.cloudsim.plus.MonitoringBorkerEX; +import org.cloudbus.cloudsim.plus.disk.HddCloudletSchedulerTimeShared; +import org.cloudbus.cloudsim.plus.disk.HddVm; +import org.cloudbus.cloudsim.plus.util.CustomLog; +import org.cloudbus.cloudsim.plus.vm.VMStatus; +import org.cloudbus.cloudsim.geoweb.web.ILoadBalancer; import java.util.Arrays; import java.util.EnumSet; diff --git a/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/web/workload/brokers/WebBroker.java b/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/geoweb/web/workload/brokers/WebBroker.java similarity index 96% rename from modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/web/workload/brokers/WebBroker.java rename to modules/cloudsim/src/main/java/org/cloudbus/cloudsim/geoweb/web/workload/brokers/WebBroker.java index 3e62eb390..0715c279c 100644 --- a/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/web/workload/brokers/WebBroker.java +++ b/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/geoweb/web/workload/brokers/WebBroker.java @@ -1,4 +1,4 @@ -package org.cloudbus.cloudsim.ex.web.workload.brokers; +package org.cloudbus.cloudsim.geoweb.web.workload.brokers; import org.cloudbus.cloudsim.Cloudlet; import org.cloudbus.cloudsim.DatacenterCharacteristics; @@ -6,13 +6,13 @@ import org.cloudbus.cloudsim.core.CloudSim; import org.cloudbus.cloudsim.core.CloudSimTags; import org.cloudbus.cloudsim.core.SimEvent; -import org.cloudbus.cloudsim.ex.core.MonitoringBorkerEX; -import org.cloudbus.cloudsim.ex.core.util.CustomLog; -import org.cloudbus.cloudsim.ex.web.ILoadBalancer; -import org.cloudbus.cloudsim.ex.web.SessionFailedException; -import org.cloudbus.cloudsim.ex.web.WebCloudlet; -import org.cloudbus.cloudsim.ex.web.WebSession; -import org.cloudbus.cloudsim.ex.web.workload.IWorkloadGenerator; +import org.cloudbus.cloudsim.plus.MonitoringBorkerEX; +import org.cloudbus.cloudsim.plus.util.CustomLog; +import org.cloudbus.cloudsim.geoweb.web.ILoadBalancer; +import org.cloudbus.cloudsim.geoweb.web.SessionFailedException; +import org.cloudbus.cloudsim.geoweb.web.WebCloudlet; +import org.cloudbus.cloudsim.geoweb.web.WebSession; +import org.cloudbus.cloudsim.geoweb.web.workload.IWorkloadGenerator; import java.util.*; import java.util.logging.Level; @@ -296,7 +296,7 @@ public void addWorkloadGenerators(final List workl * * @see * org.cloudbus.cloudsim.DatacenterBroker#processOtherEvent(org.cloudbus - * .cloudsim.core.SimEvent) + * .cloudsim.plus.SimEvent) */ @SuppressWarnings("unchecked") @Override @@ -415,7 +415,7 @@ private void logSessionFailure(WebSession sess) { * * @see * org.cloudbus.cloudsim.DatacenterBroker#processCloudletReturn(org.cloudbus - * .cloudsim.core.SimEvent) + * .cloudsim.plus.SimEvent) */ @Override protected void processCloudletReturn(final SimEvent ev) { @@ -432,7 +432,7 @@ protected void processCloudletReturn(final SimEvent ev) { /* * (non-Javadoc) * - * @see cloudsim.core.SimEntity#startEntity() + * @see cloudsim.plus.SimEntity#startEntity() */ @Override public void startEntity() { diff --git a/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/web/workload/freq/CompositeValuedSet.java b/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/geoweb/web/workload/freq/CompositeValuedSet.java similarity index 98% rename from modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/web/workload/freq/CompositeValuedSet.java rename to modules/cloudsim/src/main/java/org/cloudbus/cloudsim/geoweb/web/workload/freq/CompositeValuedSet.java index 0802e89a6..885f260af 100644 --- a/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/web/workload/freq/CompositeValuedSet.java +++ b/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/geoweb/web/workload/freq/CompositeValuedSet.java @@ -1,4 +1,4 @@ -package org.cloudbus.cloudsim.ex.web.workload.freq; +package org.cloudbus.cloudsim.geoweb.web.workload.freq; import org.uncommons.maths.random.SeedGenerator; diff --git a/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/web/workload/freq/ConstFreqFunction.java b/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/geoweb/web/workload/freq/ConstFreqFunction.java similarity index 91% rename from modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/web/workload/freq/ConstFreqFunction.java rename to modules/cloudsim/src/main/java/org/cloudbus/cloudsim/geoweb/web/workload/freq/ConstFreqFunction.java index 0ddcb87f5..009e1d611 100644 --- a/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/web/workload/freq/ConstFreqFunction.java +++ b/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/geoweb/web/workload/freq/ConstFreqFunction.java @@ -1,4 +1,4 @@ -package org.cloudbus.cloudsim.ex.web.workload.freq; +package org.cloudbus.cloudsim.geoweb.web.workload.freq; /** * A function that returns a constant for every time instance. diff --git a/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/web/workload/freq/FiniteValuedInterval.java b/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/geoweb/web/workload/freq/FiniteValuedInterval.java similarity index 99% rename from modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/web/workload/freq/FiniteValuedInterval.java rename to modules/cloudsim/src/main/java/org/cloudbus/cloudsim/geoweb/web/workload/freq/FiniteValuedInterval.java index 2bc75b77e..83adee188 100644 --- a/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/web/workload/freq/FiniteValuedInterval.java +++ b/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/geoweb/web/workload/freq/FiniteValuedInterval.java @@ -1,4 +1,4 @@ -package org.cloudbus.cloudsim.ex.web.workload.freq; +package org.cloudbus.cloudsim.geoweb.web.workload.freq; import org.uncommons.maths.random.GaussianGenerator; import org.uncommons.maths.random.MersenneTwisterRNG; diff --git a/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/web/workload/freq/FrequencyFunction.java b/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/geoweb/web/workload/freq/FrequencyFunction.java similarity index 96% rename from modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/web/workload/freq/FrequencyFunction.java rename to modules/cloudsim/src/main/java/org/cloudbus/cloudsim/geoweb/web/workload/freq/FrequencyFunction.java index 04447d22a..a5b468508 100644 --- a/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/web/workload/freq/FrequencyFunction.java +++ b/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/geoweb/web/workload/freq/FrequencyFunction.java @@ -1,4 +1,4 @@ -package org.cloudbus.cloudsim.ex.web.workload.freq; +package org.cloudbus.cloudsim.geoweb.web.workload.freq; /** * We are representing the generated workload as a Poisson distribution over a diff --git a/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/web/workload/freq/PeriodicStochasticFrequencyFunction.java b/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/geoweb/web/workload/freq/PeriodicStochasticFrequencyFunction.java similarity index 97% rename from modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/web/workload/freq/PeriodicStochasticFrequencyFunction.java rename to modules/cloudsim/src/main/java/org/cloudbus/cloudsim/geoweb/web/workload/freq/PeriodicStochasticFrequencyFunction.java index a573a276a..06174427c 100644 --- a/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/web/workload/freq/PeriodicStochasticFrequencyFunction.java +++ b/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/geoweb/web/workload/freq/PeriodicStochasticFrequencyFunction.java @@ -1,4 +1,4 @@ -package org.cloudbus.cloudsim.ex.web.workload.freq; +package org.cloudbus.cloudsim.geoweb.web.workload.freq; /** * A frequency function that defines periodic behaviour - for example the diff --git a/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/web/workload/sessions/ConstSessionGenerator.java b/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/geoweb/web/workload/sessions/ConstSessionGenerator.java similarity index 97% rename from modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/web/workload/sessions/ConstSessionGenerator.java rename to modules/cloudsim/src/main/java/org/cloudbus/cloudsim/geoweb/web/workload/sessions/ConstSessionGenerator.java index eeadfab28..f898f65f7 100644 --- a/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/web/workload/sessions/ConstSessionGenerator.java +++ b/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/geoweb/web/workload/sessions/ConstSessionGenerator.java @@ -1,7 +1,7 @@ -package org.cloudbus.cloudsim.ex.web.workload.sessions; +package org.cloudbus.cloudsim.geoweb.web.workload.sessions; -import org.cloudbus.cloudsim.ex.core.disk.DataItem; -import org.cloudbus.cloudsim.ex.web.*; +import org.cloudbus.cloudsim.plus.disk.DataItem; +import org.cloudbus.cloudsim.geoweb.web.*; import org.uncommons.maths.number.ConstantGenerator; import org.uncommons.maths.number.NumberGenerator; diff --git a/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/web/workload/sessions/GeneratorsUtil.java b/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/geoweb/web/workload/sessions/GeneratorsUtil.java similarity index 95% rename from modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/web/workload/sessions/GeneratorsUtil.java rename to modules/cloudsim/src/main/java/org/cloudbus/cloudsim/geoweb/web/workload/sessions/GeneratorsUtil.java index b006c5b8e..622373318 100644 --- a/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/web/workload/sessions/GeneratorsUtil.java +++ b/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/geoweb/web/workload/sessions/GeneratorsUtil.java @@ -1,6 +1,6 @@ -package org.cloudbus.cloudsim.ex.web.workload.sessions; +package org.cloudbus.cloudsim.geoweb.web.workload.sessions; -import org.cloudbus.cloudsim.ex.web.IterableNumberGenerator; +import org.cloudbus.cloudsim.geoweb.web.IterableNumberGenerator; import org.uncommons.maths.number.NumberGenerator; import java.io.BufferedReader; diff --git a/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/web/workload/sessions/ISessionGenerator.java b/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/geoweb/web/workload/sessions/ISessionGenerator.java similarity index 79% rename from modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/web/workload/sessions/ISessionGenerator.java rename to modules/cloudsim/src/main/java/org/cloudbus/cloudsim/geoweb/web/workload/sessions/ISessionGenerator.java index db1aedc45..10960c21f 100644 --- a/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/web/workload/sessions/ISessionGenerator.java +++ b/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/geoweb/web/workload/sessions/ISessionGenerator.java @@ -1,6 +1,6 @@ -package org.cloudbus.cloudsim.ex.web.workload.sessions; +package org.cloudbus.cloudsim.geoweb.web.workload.sessions; -import org.cloudbus.cloudsim.ex.web.WebSession; +import org.cloudbus.cloudsim.geoweb.web.WebSession; /** * Generates sessions per given time. diff --git a/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/web/workload/sessions/StatSessionGenerator.java b/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/geoweb/web/workload/sessions/StatSessionGenerator.java similarity index 94% rename from modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/web/workload/sessions/StatSessionGenerator.java rename to modules/cloudsim/src/main/java/org/cloudbus/cloudsim/geoweb/web/workload/sessions/StatSessionGenerator.java index 457418f63..9036cb499 100644 --- a/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/web/workload/sessions/StatSessionGenerator.java +++ b/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/geoweb/web/workload/sessions/StatSessionGenerator.java @@ -1,7 +1,7 @@ -package org.cloudbus.cloudsim.ex.web.workload.sessions; +package org.cloudbus.cloudsim.geoweb.web.workload.sessions; -import org.cloudbus.cloudsim.ex.core.disk.DataItem; -import org.cloudbus.cloudsim.ex.web.*; +import org.cloudbus.cloudsim.plus.disk.DataItem; +import org.cloudbus.cloudsim.geoweb.web.*; import java.util.*; diff --git a/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/core/DatacenterBrokerEX.java b/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/plus/DatacenterBrokerEX.java similarity index 98% rename from modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/core/DatacenterBrokerEX.java rename to modules/cloudsim/src/main/java/org/cloudbus/cloudsim/plus/DatacenterBrokerEX.java index b5c4db6aa..266bd3c49 100644 --- a/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/core/DatacenterBrokerEX.java +++ b/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/plus/DatacenterBrokerEX.java @@ -1,4 +1,4 @@ -package org.cloudbus.cloudsim.ex.core; +package org.cloudbus.cloudsim.plus; import org.cloudbus.cloudsim.Cloudlet; import org.cloudbus.cloudsim.DatacenterBroker; @@ -7,10 +7,10 @@ import org.cloudbus.cloudsim.core.CloudSim; import org.cloudbus.cloudsim.core.CloudSimTags; import org.cloudbus.cloudsim.core.SimEvent; -import org.cloudbus.cloudsim.ex.core.billing.IVmBillingPolicy; -import org.cloudbus.cloudsim.ex.core.util.CustomLog; -import org.cloudbus.cloudsim.ex.core.vm.VMStatus; -import org.cloudbus.cloudsim.ex.core.vm.VMex; +import org.cloudbus.cloudsim.plus.billing.IVmBillingPolicy; +import org.cloudbus.cloudsim.plus.util.CustomLog; +import org.cloudbus.cloudsim.plus.vm.VMStatus; +import org.cloudbus.cloudsim.plus.vm.VMex; import org.cloudbus.cloudsim.lists.VmList; import java.math.BigDecimal; diff --git a/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/core/DatacenterEX.java b/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/plus/DatacenterEX.java similarity index 94% rename from modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/core/DatacenterEX.java rename to modules/cloudsim/src/main/java/org/cloudbus/cloudsim/plus/DatacenterEX.java index 95b856158..dd0c3c25a 100644 --- a/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/core/DatacenterEX.java +++ b/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/plus/DatacenterEX.java @@ -1,11 +1,11 @@ -package org.cloudbus.cloudsim.ex.core; +package org.cloudbus.cloudsim.plus; import org.cloudbus.cloudsim.*; import org.cloudbus.cloudsim.core.CloudSim; import org.cloudbus.cloudsim.core.CloudSimTags; import org.cloudbus.cloudsim.core.SimEvent; -import org.cloudbus.cloudsim.ex.core.delay.ConstantVMBootDelay; -import org.cloudbus.cloudsim.ex.core.delay.IVMBootDelayDistribution; +import org.cloudbus.cloudsim.plus.delay.ConstantVMBootDelay; +import org.cloudbus.cloudsim.plus.delay.IVMBootDelayDistribution; import java.util.List; import java.util.Objects; diff --git a/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/core/IAutoscalingPolicy.java b/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/plus/IAutoscalingPolicy.java similarity index 91% rename from modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/core/IAutoscalingPolicy.java rename to modules/cloudsim/src/main/java/org/cloudbus/cloudsim/plus/IAutoscalingPolicy.java index 1dbbd6bd8..6ab8ef90b 100644 --- a/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/core/IAutoscalingPolicy.java +++ b/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/plus/IAutoscalingPolicy.java @@ -1,4 +1,4 @@ -package org.cloudbus.cloudsim.ex.core; +package org.cloudbus.cloudsim.plus; /** * diff --git a/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/core/MonitoringBorkerEX.java b/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/plus/MonitoringBorkerEX.java similarity index 97% rename from modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/core/MonitoringBorkerEX.java rename to modules/cloudsim/src/main/java/org/cloudbus/cloudsim/plus/MonitoringBorkerEX.java index 32fb12446..ca32cf017 100644 --- a/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/core/MonitoringBorkerEX.java +++ b/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/plus/MonitoringBorkerEX.java @@ -1,13 +1,13 @@ -package org.cloudbus.cloudsim.ex.core; +package org.cloudbus.cloudsim.plus; import org.cloudbus.cloudsim.ResCloudlet; import org.cloudbus.cloudsim.Vm; import org.cloudbus.cloudsim.core.CloudSim; import org.cloudbus.cloudsim.core.SimEvent; -import org.cloudbus.cloudsim.ex.core.disk.HddCloudlet; -import org.cloudbus.cloudsim.ex.core.disk.HddResCloudlet; -import org.cloudbus.cloudsim.ex.core.disk.HddVm; -import org.cloudbus.cloudsim.ex.core.vm.MonitoredVMex; +import org.cloudbus.cloudsim.plus.disk.HddCloudlet; +import org.cloudbus.cloudsim.plus.disk.HddResCloudlet; +import org.cloudbus.cloudsim.plus.disk.HddVm; +import org.cloudbus.cloudsim.plus.vm.MonitoredVMex; import java.util.ArrayList; import java.util.LinkedHashMap; diff --git a/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/core/VmSchedulerMapVmsToPes.java b/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/plus/VmSchedulerMapVmsToPes.java similarity index 96% rename from modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/core/VmSchedulerMapVmsToPes.java rename to modules/cloudsim/src/main/java/org/cloudbus/cloudsim/plus/VmSchedulerMapVmsToPes.java index b009273c1..7f092599e 100644 --- a/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/core/VmSchedulerMapVmsToPes.java +++ b/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/plus/VmSchedulerMapVmsToPes.java @@ -1,4 +1,4 @@ -package org.cloudbus.cloudsim.ex.core; +package org.cloudbus.cloudsim.plus; import org.cloudbus.cloudsim.Pe; import org.cloudbus.cloudsim.Vm; diff --git a/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/core/VmSchedulerWithIndependentPes.java b/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/plus/VmSchedulerWithIndependentPes.java similarity index 98% rename from modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/core/VmSchedulerWithIndependentPes.java rename to modules/cloudsim/src/main/java/org/cloudbus/cloudsim/plus/VmSchedulerWithIndependentPes.java index 83cd3173b..4ed6ed261 100644 --- a/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/core/VmSchedulerWithIndependentPes.java +++ b/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/plus/VmSchedulerWithIndependentPes.java @@ -1,4 +1,4 @@ -package org.cloudbus.cloudsim.ex.core; +package org.cloudbus.cloudsim.plus; import org.cloudbus.cloudsim.Pe; import org.cloudbus.cloudsim.Vm; diff --git a/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/core/billing/BaseCustomerVmBillingPolicy.java b/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/plus/billing/BaseCustomerVmBillingPolicy.java similarity index 96% rename from modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/core/billing/BaseCustomerVmBillingPolicy.java rename to modules/cloudsim/src/main/java/org/cloudbus/cloudsim/plus/billing/BaseCustomerVmBillingPolicy.java index 7a29db954..a8fbffc05 100644 --- a/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/core/billing/BaseCustomerVmBillingPolicy.java +++ b/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/plus/billing/BaseCustomerVmBillingPolicy.java @@ -1,11 +1,11 @@ -package org.cloudbus.cloudsim.ex.core.billing; +package org.cloudbus.cloudsim.plus.billing; import org.apache.commons.lang3.tuple.ImmutablePair; import org.apache.commons.lang3.tuple.Pair; import org.cloudbus.cloudsim.Vm; import org.cloudbus.cloudsim.core.CloudSim; -import org.cloudbus.cloudsim.ex.core.util.CustomLog; -import org.cloudbus.cloudsim.ex.core.vm.VMex; +import org.cloudbus.cloudsim.plus.util.CustomLog; +import org.cloudbus.cloudsim.plus.vm.VMex; import java.math.BigDecimal; import java.util.List; diff --git a/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/core/billing/EC2OnDemandPolicy.java b/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/plus/billing/EC2OnDemandPolicy.java similarity index 92% rename from modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/core/billing/EC2OnDemandPolicy.java rename to modules/cloudsim/src/main/java/org/cloudbus/cloudsim/plus/billing/EC2OnDemandPolicy.java index f962dc084..3b9df2120 100644 --- a/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/core/billing/EC2OnDemandPolicy.java +++ b/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/plus/billing/EC2OnDemandPolicy.java @@ -1,9 +1,9 @@ -package org.cloudbus.cloudsim.ex.core.billing; +package org.cloudbus.cloudsim.plus.billing; import org.apache.commons.lang3.tuple.Pair; import org.cloudbus.cloudsim.Vm; -import org.cloudbus.cloudsim.ex.core.vm.VMStatus; -import org.cloudbus.cloudsim.ex.core.vm.VMex; +import org.cloudbus.cloudsim.plus.vm.VMStatus; +import org.cloudbus.cloudsim.plus.vm.VMex; import java.math.BigDecimal; import java.util.Map; diff --git a/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/core/billing/ExamplePrices.java b/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/plus/billing/ExamplePrices.java similarity index 99% rename from modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/core/billing/ExamplePrices.java rename to modules/cloudsim/src/main/java/org/cloudbus/cloudsim/plus/billing/ExamplePrices.java index 8cf03ceca..db6cbcd70 100644 --- a/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/core/billing/ExamplePrices.java +++ b/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/plus/billing/ExamplePrices.java @@ -1,4 +1,4 @@ -package org.cloudbus.cloudsim.ex.core.billing; +package org.cloudbus.cloudsim.plus.billing; import com.google.common.collect.ImmutableMap; import org.apache.commons.lang3.tuple.Pair; diff --git a/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/core/billing/GoogleOnDemandPolicy.java b/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/plus/billing/GoogleOnDemandPolicy.java similarity index 93% rename from modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/core/billing/GoogleOnDemandPolicy.java rename to modules/cloudsim/src/main/java/org/cloudbus/cloudsim/plus/billing/GoogleOnDemandPolicy.java index 8def0b143..477b0fcca 100644 --- a/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/core/billing/GoogleOnDemandPolicy.java +++ b/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/plus/billing/GoogleOnDemandPolicy.java @@ -1,9 +1,9 @@ -package org.cloudbus.cloudsim.ex.core.billing; +package org.cloudbus.cloudsim.plus.billing; import org.apache.commons.lang3.tuple.Pair; import org.cloudbus.cloudsim.Vm; -import org.cloudbus.cloudsim.ex.core.vm.VMStatus; -import org.cloudbus.cloudsim.ex.core.vm.VMex; +import org.cloudbus.cloudsim.plus.vm.VMStatus; +import org.cloudbus.cloudsim.plus.vm.VMex; import java.math.BigDecimal; import java.util.Map; diff --git a/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/core/billing/IVmBillingPolicy.java b/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/plus/billing/IVmBillingPolicy.java similarity index 96% rename from modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/core/billing/IVmBillingPolicy.java rename to modules/cloudsim/src/main/java/org/cloudbus/cloudsim/plus/billing/IVmBillingPolicy.java index b1c7e62de..293cef966 100644 --- a/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/core/billing/IVmBillingPolicy.java +++ b/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/plus/billing/IVmBillingPolicy.java @@ -1,4 +1,4 @@ -package org.cloudbus.cloudsim.ex.core.billing; +package org.cloudbus.cloudsim.plus.billing; import org.cloudbus.cloudsim.Vm; diff --git a/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/core/delay/ConstantVMBootDelay.java b/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/plus/delay/ConstantVMBootDelay.java similarity index 92% rename from modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/core/delay/ConstantVMBootDelay.java rename to modules/cloudsim/src/main/java/org/cloudbus/cloudsim/plus/delay/ConstantVMBootDelay.java index aa542873b..3de32c05f 100644 --- a/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/core/delay/ConstantVMBootDelay.java +++ b/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/plus/delay/ConstantVMBootDelay.java @@ -1,4 +1,4 @@ -package org.cloudbus.cloudsim.ex.core.delay; +package org.cloudbus.cloudsim.plus.delay; import org.cloudbus.cloudsim.Vm; diff --git a/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/core/delay/ExampleGaussianDelaysPerType.java b/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/plus/delay/ExampleGaussianDelaysPerType.java similarity index 98% rename from modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/core/delay/ExampleGaussianDelaysPerType.java rename to modules/cloudsim/src/main/java/org/cloudbus/cloudsim/plus/delay/ExampleGaussianDelaysPerType.java index 2bdcc1cd0..008c71ce2 100644 --- a/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/core/delay/ExampleGaussianDelaysPerType.java +++ b/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/plus/delay/ExampleGaussianDelaysPerType.java @@ -1,4 +1,4 @@ -package org.cloudbus.cloudsim.ex.core.delay; +package org.cloudbus.cloudsim.plus.delay; import com.google.common.collect.ImmutableMap; import org.apache.commons.lang3.tuple.Pair; diff --git a/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/core/delay/GaussianByTypeBootDelay.java b/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/plus/delay/GaussianByTypeBootDelay.java similarity index 97% rename from modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/core/delay/GaussianByTypeBootDelay.java rename to modules/cloudsim/src/main/java/org/cloudbus/cloudsim/plus/delay/GaussianByTypeBootDelay.java index 27ccfc75f..a7ae1808c 100644 --- a/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/core/delay/GaussianByTypeBootDelay.java +++ b/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/plus/delay/GaussianByTypeBootDelay.java @@ -1,10 +1,10 @@ -package org.cloudbus.cloudsim.ex.core.delay; +package org.cloudbus.cloudsim.plus.delay; import org.apache.commons.lang3.tuple.ImmutablePair; import org.apache.commons.lang3.tuple.Pair; import org.cloudbus.cloudsim.Vm; -import org.cloudbus.cloudsim.ex.core.billing.BaseCustomerVmBillingPolicy; -import org.cloudbus.cloudsim.ex.core.vm.VMex; +import org.cloudbus.cloudsim.plus.billing.BaseCustomerVmBillingPolicy; +import org.cloudbus.cloudsim.plus.vm.VMex; import org.uncommons.maths.number.NumberGenerator; import org.uncommons.maths.random.GaussianGenerator; import org.uncommons.maths.random.MersenneTwisterRNG; diff --git a/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/core/delay/IVMBootDelayDistribution.java b/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/plus/delay/IVMBootDelayDistribution.java similarity index 90% rename from modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/core/delay/IVMBootDelayDistribution.java rename to modules/cloudsim/src/main/java/org/cloudbus/cloudsim/plus/delay/IVMBootDelayDistribution.java index 83a2cec2f..235b1da12 100644 --- a/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/core/delay/IVMBootDelayDistribution.java +++ b/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/plus/delay/IVMBootDelayDistribution.java @@ -1,4 +1,4 @@ -package org.cloudbus.cloudsim.ex.core.delay; +package org.cloudbus.cloudsim.plus.delay; import org.cloudbus.cloudsim.Vm; diff --git a/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/core/disk/DataItem.java b/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/plus/disk/DataItem.java similarity index 91% rename from modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/core/disk/DataItem.java rename to modules/cloudsim/src/main/java/org/cloudbus/cloudsim/plus/disk/DataItem.java index ce1d28ae8..efa50c4a5 100644 --- a/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/core/disk/DataItem.java +++ b/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/plus/disk/DataItem.java @@ -1,6 +1,6 @@ -package org.cloudbus.cloudsim.ex.core.disk; +package org.cloudbus.cloudsim.plus.disk; -import org.cloudbus.cloudsim.ex.core.util.Id; +import org.cloudbus.cloudsim.plus.util.Id; /** * A data item represents an entity stored on a hard disk, that can be accessed diff --git a/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/core/disk/HddCloudlet.java b/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/plus/disk/HddCloudlet.java similarity index 97% rename from modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/core/disk/HddCloudlet.java rename to modules/cloudsim/src/main/java/org/cloudbus/cloudsim/plus/disk/HddCloudlet.java index e87b1ce5a..43cca52e3 100644 --- a/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/core/disk/HddCloudlet.java +++ b/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/plus/disk/HddCloudlet.java @@ -1,9 +1,9 @@ -package org.cloudbus.cloudsim.ex.core.disk; +package org.cloudbus.cloudsim.plus.disk; import org.cloudbus.cloudsim.Cloudlet; import org.cloudbus.cloudsim.UtilizationModelFull; -import org.cloudbus.cloudsim.ex.core.util.Id; -import org.cloudbus.cloudsim.ex.core.util.TextUtil; +import org.cloudbus.cloudsim.plus.util.Id; +import org.cloudbus.cloudsim.plus.util.TextUtil; /** * A cloudlet that requires disk operations in addition to CPU ones. Besides diff --git a/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/core/disk/HddCloudletSchedulerTimeShared.java b/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/plus/disk/HddCloudletSchedulerTimeShared.java similarity index 99% rename from modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/core/disk/HddCloudletSchedulerTimeShared.java rename to modules/cloudsim/src/main/java/org/cloudbus/cloudsim/plus/disk/HddCloudletSchedulerTimeShared.java index c75e9f751..b33d220ff 100644 --- a/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/core/disk/HddCloudletSchedulerTimeShared.java +++ b/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/plus/disk/HddCloudletSchedulerTimeShared.java @@ -5,14 +5,14 @@ * Copyright (c) 2009-2012, The University of Melbourne, Australia */ -package org.cloudbus.cloudsim.ex.core.disk; +package org.cloudbus.cloudsim.plus.disk; import org.cloudbus.cloudsim.Cloudlet; import org.cloudbus.cloudsim.CloudletScheduler; import org.cloudbus.cloudsim.Consts; import org.cloudbus.cloudsim.ResCloudlet; import org.cloudbus.cloudsim.core.CloudSim; -import org.cloudbus.cloudsim.ex.core.util.CustomLog; +import org.cloudbus.cloudsim.plus.util.CustomLog; import org.cloudbus.cloudsim.lists.ResCloudletList; import java.util.*; diff --git a/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/core/disk/HddDataCenter.java b/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/plus/disk/HddDataCenter.java similarity index 94% rename from modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/core/disk/HddDataCenter.java rename to modules/cloudsim/src/main/java/org/cloudbus/cloudsim/plus/disk/HddDataCenter.java index 835241c87..8bbb0bba0 100644 --- a/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/core/disk/HddDataCenter.java +++ b/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/plus/disk/HddDataCenter.java @@ -1,11 +1,11 @@ -package org.cloudbus.cloudsim.ex.core.disk; +package org.cloudbus.cloudsim.plus.disk; import org.cloudbus.cloudsim.*; import org.cloudbus.cloudsim.core.CloudSimTags; import org.cloudbus.cloudsim.core.SimEvent; -import org.cloudbus.cloudsim.ex.core.DatacenterEX; -import org.cloudbus.cloudsim.ex.core.delay.IVMBootDelayDistribution; -import org.cloudbus.cloudsim.ex.core.util.CustomLog; +import org.cloudbus.cloudsim.plus.DatacenterEX; +import org.cloudbus.cloudsim.plus.delay.IVMBootDelayDistribution; +import org.cloudbus.cloudsim.plus.util.CustomLog; import java.util.List; import java.util.logging.Level; @@ -48,7 +48,7 @@ public HddDataCenter(final String name, final DatacenterCharacteristics characte * * @see * org.cloudbus.cloudsim.Datacenter#processCloudletSubmit(org.cloudbus.cloudsim - * .core.SimEvent, boolean) + * .plus.SimEvent, boolean) */ @Override protected void processCloudletSubmit(final SimEvent ev, final boolean ack) { diff --git a/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/core/disk/HddHost.java b/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/plus/disk/HddHost.java similarity index 97% rename from modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/core/disk/HddHost.java rename to modules/cloudsim/src/main/java/org/cloudbus/cloudsim/plus/disk/HddHost.java index 951b81309..1a4c25b85 100644 --- a/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/core/disk/HddHost.java +++ b/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/plus/disk/HddHost.java @@ -1,11 +1,11 @@ -package org.cloudbus.cloudsim.ex.core.disk; +package org.cloudbus.cloudsim.plus.disk; import org.cloudbus.cloudsim.Host; import org.cloudbus.cloudsim.Pe; import org.cloudbus.cloudsim.Vm; import org.cloudbus.cloudsim.VmScheduler; -import org.cloudbus.cloudsim.ex.core.VmSchedulerWithIndependentPes; -import org.cloudbus.cloudsim.ex.core.util.Id; +import org.cloudbus.cloudsim.plus.VmSchedulerWithIndependentPes; +import org.cloudbus.cloudsim.plus.util.Id; import org.cloudbus.cloudsim.lists.PeList; import org.cloudbus.cloudsim.provisioners.BwProvisioner; import org.cloudbus.cloudsim.provisioners.RamProvisioner; diff --git a/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/core/disk/HddPe.java b/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/plus/disk/HddPe.java similarity index 95% rename from modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/core/disk/HddPe.java rename to modules/cloudsim/src/main/java/org/cloudbus/cloudsim/plus/disk/HddPe.java index 2cd62e756..6e9008503 100644 --- a/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/core/disk/HddPe.java +++ b/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/plus/disk/HddPe.java @@ -1,7 +1,7 @@ -package org.cloudbus.cloudsim.ex.core.disk; +package org.cloudbus.cloudsim.plus.disk; import org.cloudbus.cloudsim.Pe; -import org.cloudbus.cloudsim.ex.core.util.Id; +import org.cloudbus.cloudsim.plus.util.Id; import org.cloudbus.cloudsim.provisioners.PeProvisioner; import java.util.Arrays; diff --git a/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/core/disk/HddResCloudlet.java b/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/plus/disk/HddResCloudlet.java similarity index 98% rename from modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/core/disk/HddResCloudlet.java rename to modules/cloudsim/src/main/java/org/cloudbus/cloudsim/plus/disk/HddResCloudlet.java index e6331207a..41bf1cfd2 100644 --- a/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/core/disk/HddResCloudlet.java +++ b/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/plus/disk/HddResCloudlet.java @@ -1,4 +1,4 @@ -package org.cloudbus.cloudsim.ex.core.disk; +package org.cloudbus.cloudsim.plus.disk; import org.cloudbus.cloudsim.Consts; import org.cloudbus.cloudsim.ResCloudlet; diff --git a/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/core/disk/HddVm.java b/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/plus/disk/HddVm.java similarity index 97% rename from modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/core/disk/HddVm.java rename to modules/cloudsim/src/main/java/org/cloudbus/cloudsim/plus/disk/HddVm.java index e1dc59b11..2fd11a04f 100644 --- a/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/core/disk/HddVm.java +++ b/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/plus/disk/HddVm.java @@ -1,11 +1,11 @@ -package org.cloudbus.cloudsim.ex.core.disk; +package org.cloudbus.cloudsim.plus.disk; import org.cloudbus.cloudsim.CloudletScheduler; import org.cloudbus.cloudsim.Pe; -import org.cloudbus.cloudsim.ex.core.VmSchedulerMapVmsToPes; -import org.cloudbus.cloudsim.ex.core.vm.MonitoredVMex; -import org.cloudbus.cloudsim.ex.core.vm.VMMetadata; -import org.cloudbus.cloudsim.ex.core.vm.VMStatus; +import org.cloudbus.cloudsim.plus.VmSchedulerMapVmsToPes; +import org.cloudbus.cloudsim.plus.vm.MonitoredVMex; +import org.cloudbus.cloudsim.plus.vm.VMMetadata; +import org.cloudbus.cloudsim.plus.vm.VMStatus; import java.util.ArrayList; import java.util.Arrays; diff --git a/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/core/disk/VmDiskScheduler.java b/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/plus/disk/VmDiskScheduler.java similarity index 88% rename from modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/core/disk/VmDiskScheduler.java rename to modules/cloudsim/src/main/java/org/cloudbus/cloudsim/plus/disk/VmDiskScheduler.java index 220ae6191..899169138 100644 --- a/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/core/disk/VmDiskScheduler.java +++ b/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/plus/disk/VmDiskScheduler.java @@ -1,10 +1,10 @@ -package org.cloudbus.cloudsim.ex.core.disk; +package org.cloudbus.cloudsim.plus.disk; import org.cloudbus.cloudsim.Pe; import org.cloudbus.cloudsim.Vm; import org.cloudbus.cloudsim.VmScheduler; import org.cloudbus.cloudsim.VmSchedulerTimeSharedOverSubscription; -import org.cloudbus.cloudsim.ex.core.VmSchedulerWithIndependentPes; +import org.cloudbus.cloudsim.plus.VmSchedulerWithIndependentPes; import java.util.Arrays; import java.util.List; diff --git a/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/core/util/CustomLog.java b/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/plus/util/CustomLog.java similarity index 99% rename from modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/core/util/CustomLog.java rename to modules/cloudsim/src/main/java/org/cloudbus/cloudsim/plus/util/CustomLog.java index 6e6b84bd2..238677351 100644 --- a/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/core/util/CustomLog.java +++ b/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/plus/util/CustomLog.java @@ -1,4 +1,4 @@ -package org.cloudbus.cloudsim.ex.core.util; +package org.cloudbus.cloudsim.plus.util; import com.google.common.base.Function; import org.apache.commons.io.output.NullOutputStream; diff --git a/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/core/util/ExperimentDefinition.java b/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/plus/util/ExperimentDefinition.java similarity index 96% rename from modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/core/util/ExperimentDefinition.java rename to modules/cloudsim/src/main/java/org/cloudbus/cloudsim/plus/util/ExperimentDefinition.java index f23e5d73b..743388cc5 100644 --- a/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/core/util/ExperimentDefinition.java +++ b/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/plus/util/ExperimentDefinition.java @@ -1,4 +1,4 @@ -package org.cloudbus.cloudsim.ex.core.util; +package org.cloudbus.cloudsim.plus.util; /** * diff --git a/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/core/util/ExperimentsRunner.java b/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/plus/util/ExperimentsRunner.java similarity index 99% rename from modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/core/util/ExperimentsRunner.java rename to modules/cloudsim/src/main/java/org/cloudbus/cloudsim/plus/util/ExperimentsRunner.java index f94733360..47a26e165 100644 --- a/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/core/util/ExperimentsRunner.java +++ b/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/plus/util/ExperimentsRunner.java @@ -1,4 +1,4 @@ -package org.cloudbus.cloudsim.ex.core.util; +package org.cloudbus.cloudsim.plus.util; import org.apache.commons.lang3.SystemUtils; diff --git a/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/core/util/Id.java b/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/plus/util/Id.java similarity index 97% rename from modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/core/util/Id.java rename to modules/cloudsim/src/main/java/org/cloudbus/cloudsim/plus/util/Id.java index b3b8dfaed..04bc796cc 100644 --- a/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/core/util/Id.java +++ b/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/plus/util/Id.java @@ -1,4 +1,4 @@ -package org.cloudbus.cloudsim.ex.core.util; +package org.cloudbus.cloudsim.plus.util; import org.cloudbus.cloudsim.*; diff --git a/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/core/util/InMemoryBufferredHandler.java b/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/plus/util/InMemoryBufferredHandler.java similarity index 98% rename from modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/core/util/InMemoryBufferredHandler.java rename to modules/cloudsim/src/main/java/org/cloudbus/cloudsim/plus/util/InMemoryBufferredHandler.java index 5b2462bf0..bb28beac6 100644 --- a/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/core/util/InMemoryBufferredHandler.java +++ b/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/plus/util/InMemoryBufferredHandler.java @@ -1,4 +1,4 @@ -package org.cloudbus.cloudsim.ex.core.util; +package org.cloudbus.cloudsim.plus.util; import java.io.UnsupportedEncodingException; import java.util.logging.*; diff --git a/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/core/util/TextUtil.java b/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/plus/util/TextUtil.java similarity index 99% rename from modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/core/util/TextUtil.java rename to modules/cloudsim/src/main/java/org/cloudbus/cloudsim/plus/util/TextUtil.java index e9e0361e1..2a0f34f82 100644 --- a/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/core/util/TextUtil.java +++ b/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/plus/util/TextUtil.java @@ -1,4 +1,4 @@ -package org.cloudbus.cloudsim.ex.core.util; +package org.cloudbus.cloudsim.plus.util; import com.google.common.base.Function; import com.google.common.collect.Iterables; diff --git a/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/core/util/Textualize.java b/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/plus/util/Textualize.java similarity index 93% rename from modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/core/util/Textualize.java rename to modules/cloudsim/src/main/java/org/cloudbus/cloudsim/plus/util/Textualize.java index 5de0c9184..a0e7ba4f7 100644 --- a/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/core/util/Textualize.java +++ b/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/plus/util/Textualize.java @@ -1,4 +1,4 @@ -package org.cloudbus.cloudsim.ex.core.util; +package org.cloudbus.cloudsim.plus.util; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/core/vm/MonitoredVMex.java b/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/plus/vm/MonitoredVMex.java similarity index 99% rename from modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/core/vm/MonitoredVMex.java rename to modules/cloudsim/src/main/java/org/cloudbus/cloudsim/plus/vm/MonitoredVMex.java index ff71deac8..94dc9f255 100644 --- a/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/core/vm/MonitoredVMex.java +++ b/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/plus/vm/MonitoredVMex.java @@ -1,4 +1,4 @@ -package org.cloudbus.cloudsim.ex.core.vm; +package org.cloudbus.cloudsim.plus.vm; import org.apache.commons.lang3.mutable.MutableDouble; import org.apache.commons.lang3.tuple.MutablePair; diff --git a/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/core/vm/VMMetadata.java b/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/plus/vm/VMMetadata.java similarity index 97% rename from modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/core/vm/VMMetadata.java rename to modules/cloudsim/src/main/java/org/cloudbus/cloudsim/plus/vm/VMMetadata.java index da7555f5c..f2e095cec 100644 --- a/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/core/vm/VMMetadata.java +++ b/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/plus/vm/VMMetadata.java @@ -1,4 +1,4 @@ -package org.cloudbus.cloudsim.ex.core.vm; +package org.cloudbus.cloudsim.plus.vm; import java.lang.reflect.Field; diff --git a/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/core/vm/VMStatus.java b/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/plus/vm/VMStatus.java similarity index 95% rename from modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/core/vm/VMStatus.java rename to modules/cloudsim/src/main/java/org/cloudbus/cloudsim/plus/vm/VMStatus.java index 5a4ffcee3..c415d626b 100644 --- a/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/core/vm/VMStatus.java +++ b/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/plus/vm/VMStatus.java @@ -1,4 +1,4 @@ -package org.cloudbus.cloudsim.ex.core.vm; +package org.cloudbus.cloudsim.plus.vm; import java.util.Arrays; import java.util.HashSet; diff --git a/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/core/vm/VMex.java b/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/plus/vm/VMex.java similarity index 99% rename from modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/core/vm/VMex.java rename to modules/cloudsim/src/main/java/org/cloudbus/cloudsim/plus/vm/VMex.java index dc0cc3057..9de602d4e 100644 --- a/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/ex/core/vm/VMex.java +++ b/modules/cloudsim/src/main/java/org/cloudbus/cloudsim/plus/vm/VMex.java @@ -1,9 +1,9 @@ -package org.cloudbus.cloudsim.ex.core.vm; +package org.cloudbus.cloudsim.plus.vm; import org.cloudbus.cloudsim.CloudletScheduler; import org.cloudbus.cloudsim.Vm; import org.cloudbus.cloudsim.core.CloudSim; -import org.cloudbus.cloudsim.ex.core.util.Id; +import org.cloudbus.cloudsim.plus.util.Id; import java.util.EnumSet; import java.util.Objects;