refactoring plus packages

Cloudslab · Jun 3, 2019 · 407e78d · 407e78d
1 parent a5190ba
commit 407e78d
Show file tree

Hide file tree

Showing 95 changed files with 283 additions and 283 deletions.
diff --git a/...m/examples/ex/web/CloudSimWebExample.java → ...amples/geoweb/web/CloudSimWebExample.java b/...m/examples/ex/web/CloudSimWebExample.java → ...amples/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<Host> hostList = new ArrayList<Host>();
 
         // 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<Pe> peList = new ArrayList<>();
         List<HddPe> hddList = new ArrayList<>();
 

diff --git a/...es/ex/web/CloudSimWorkloadWebExample.java → ...eoweb/web/CloudSimWorkloadWebExample.java b/...es/ex/web/CloudSimWorkloadWebExample.java → ...eoweb/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<Host> hostList = new ArrayList<Host>();
 
 	// 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<Pe> peList = new ArrayList<>();
 	List<HddPe> hddList = new ArrayList<>();
 

diff --git a/...sim/examples/ex/CloudSimDisksExample.java → ...m/examples/plus/CloudSimDisksExample.java b/...sim/examples/ex/CloudSimDisksExample.java → ...m/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/...s/cloudsim/examples/ex/DelayExample1.java → ...cloudsim/examples/plus/DelayExample1.java b/...s/cloudsim/examples/ex/DelayExample1.java → ...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<Host> hostList = new ArrayList<Host>();
 
         // 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<Pe> peList = new ArrayList<Pe>();
 
         int mips = 1000;

diff --git a/...x/geolocation/BaseGeolocationService.java → ...b/geolocation/BaseGeolocationService.java b/...x/geolocation/BaseGeolocationService.java → ...b/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/...udsim/ex/geolocation/BaseIPGenerator.java → ...m/geoweb/geolocation/BaseIPGenerator.java b/...udsim/ex/geolocation/BaseIPGenerator.java → ...m/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/...m/ex/geolocation/GeoDistanceCacheKey.java → ...oweb/geolocation/GeoDistanceCacheKey.java b/...m/ex/geolocation/GeoDistanceCacheKey.java → ...oweb/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/...m/ex/geolocation/IGeolocationService.java → ...oweb/geolocation/IGeolocationService.java b/...m/ex/geolocation/IGeolocationService.java → ...oweb/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/.../cloudsim/ex/geolocation/IPGenerator.java → ...udsim/geoweb/geolocation/IPGenerator.java b/.../cloudsim/ex/geolocation/IPGenerator.java → ...udsim/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/...s/cloudsim/ex/geolocation/IPMetadata.java → ...oudsim/geoweb/geolocation/IPMetadata.java b/...s/cloudsim/ex/geolocation/IPMetadata.java → ...oudsim/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/...udbus/cloudsim/ex/geolocation/IPUtil.java → ...s/cloudsim/geoweb/geolocation/IPUtil.java b/...udbus/cloudsim/ex/geolocation/IPUtil.java → ...s/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/...geolocation/geoip2/GeoIP2IPGenerator.java → ...geolocation/geoip2/GeoIP2IPGenerator.java b/...geolocation/geoip2/GeoIP2IPGenerator.java → ...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<String> 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/...olocation/geoip2/GeoIP2PingERService.java → ...olocation/geoip2/GeoIP2PingERService.java b/...olocation/geoip2/GeoIP2PingERService.java → ...olocation/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/...oip2/GeolocationServiceWithOverrides.java → ...oip2/GeolocationServiceWithOverrides.java b/...oip2/GeolocationServiceWithOverrides.java → ...oip2/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/...tion/geoip2/LookUpGeoLocationService.java → ...tion/geoip2/LookUpGeoLocationService.java b/...tion/geoip2/LookUpGeoLocationService.java → ...tion/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/...m/ex/geolocation/geoip2/OverrideRule.java → ...oweb/geolocation/geoip2/OverrideRule.java b/...m/ex/geolocation/geoip2/OverrideRule.java → ...oweb/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/...m/ex/geolocation/geoip2/ResourceUtil.java → ...oweb/geolocation/geoip2/ResourceUtil.java b/...m/ex/geolocation/geoip2/ResourceUtil.java → ...oweb/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/...s/cloudsim/ex/web/BaseDBLoadBalancer.java → ...oudsim/geoweb/web/BaseDBLoadBalancer.java b/...s/cloudsim/ex/web/BaseDBLoadBalancer.java → ...oudsim/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/...us/cloudsim/ex/web/BaseStatGenerator.java → ...loudsim/geoweb/web/BaseStatGenerator.java b/...us/cloudsim/ex/web/BaseStatGenerator.java → ...loudsim/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<String, ? extends NumberGenerator<? extends N
     /**
      * (non-Javadoc)
      * 
-     * @see org.cloudbus.cloudsim.ex.web.IGenerator#peek()
+     * @see org.cloudbus.cloudsim.geoweb.web.IGenerator#peek()
      */
     @Override
     public T peek() {
@@ -107,7 +107,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() {
@@ -123,7 +123,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() {
@@ -133,7 +133,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/.../cloudsim/ex/web/BaseWebLoadBalancer.java → ...udsim/geoweb/web/BaseWebLoadBalancer.java b/.../cloudsim/ex/web/BaseWebLoadBalancer.java → ...udsim/geoweb/web/BaseWebLoadBalancer.java
@@ -1,8 +1,8 @@
-package org.cloudbus.cloudsim.ex.web;
+package org.cloudbus.cloudsim.geoweb.web;
 
-import org.cloudbus.cloudsim.ex.core.disk.HddVm;
-import org.cloudbus.cloudsim.ex.core.util.Id;
-import org.cloudbus.cloudsim.ex.core.vm.VMStatus;
+import org.cloudbus.cloudsim.plus.disk.HddVm;
+import org.cloudbus.cloudsim.plus.util.Id;
+import org.cloudbus.cloudsim.plus.vm.VMStatus;
 
 import java.util.ArrayList;
 import java.util.List;

diff --git a/...s/cloudsim/ex/web/CompositeGenerator.java → ...oudsim/geoweb/web/CompositeGenerator.java b/...s/cloudsim/ex/web/CompositeGenerator.java → ...oudsim/geoweb/web/CompositeGenerator.java
@@ -1,4 +1,4 @@
-package org.cloudbus.cloudsim.ex.web;
+package org.cloudbus.cloudsim.geoweb.web;
 
 import java.util.ArrayList;
 import java.util.Arrays;

diff --git a/...cloudsim/ex/web/CompressLoadBalancer.java → ...dsim/geoweb/web/CompressLoadBalancer.java b/...cloudsim/ex/web/CompressLoadBalancer.java → ...dsim/geoweb/web/CompressLoadBalancer.java
@@ -1,10 +1,10 @@
-package org.cloudbus.cloudsim.ex.web;
+package org.cloudbus.cloudsim.geoweb.web;
 
 import org.cloudbus.cloudsim.core.CloudSim;
-import org.cloudbus.cloudsim.ex.core.disk.HddVm;
-import org.cloudbus.cloudsim.ex.core.util.CustomLog;
-import org.cloudbus.cloudsim.ex.core.vm.MonitoredVMex;
-import org.cloudbus.cloudsim.ex.web.workload.brokers.WebBroker;
+import org.cloudbus.cloudsim.plus.disk.HddVm;
+import org.cloudbus.cloudsim.plus.util.CustomLog;
+import org.cloudbus.cloudsim.plus.vm.MonitoredVMex;
+import org.cloudbus.cloudsim.geoweb.web.workload.brokers.WebBroker;
 
 import java.util.*;
 import java.util.logging.Level;

diff --git a/...udbus/cloudsim/ex/web/ConstGenerator.java → ...s/cloudsim/geoweb/web/ConstGenerator.java b/...udbus/cloudsim/ex/web/ConstGenerator.java → ...s/cloudsim/geoweb/web/ConstGenerator.java
@@ -1,4 +1,4 @@
-package org.cloudbus.cloudsim.ex.web;
+package org.cloudbus.cloudsim.geoweb.web;
 
 /**
  * A generator, which generates the same value again and again.

diff --git a/...cloudbus/cloudsim/ex/web/IDBBalancer.java → ...dbus/cloudsim/geoweb/web/IDBBalancer.java b/...cloudbus/cloudsim/ex/web/IDBBalancer.java → ...dbus/cloudsim/geoweb/web/IDBBalancer.java
@@ -1,7 +1,7 @@
-package org.cloudbus.cloudsim.ex.web;
+package org.cloudbus.cloudsim.geoweb.web;
 
-import org.cloudbus.cloudsim.ex.core.disk.HddCloudlet;
-import org.cloudbus.cloudsim.ex.core.disk.HddVm;
+import org.cloudbus.cloudsim.plus.disk.HddCloudlet;
+import org.cloudbus.cloudsim.plus.disk.HddVm;
 
 import java.util.List;