diff --git a/cloud-selenium-server.jar b/cloud-selenium-server.jar new file mode 100644 index 00000000000..004d7daca25 Binary files /dev/null and b/cloud-selenium-server.jar differ diff --git a/server/src/com/cloud/alert/AlertManagerImpl.java b/server/src/com/cloud/alert/AlertManagerImpl.java index 0368e27b709..eb38c695f50 100755 --- a/server/src/com/cloud/alert/AlertManagerImpl.java +++ b/server/src/com/cloud/alert/AlertManagerImpl.java @@ -31,11 +31,11 @@ import java.util.TimerTask; import javax.ejb.Local; import javax.mail.Authenticator; +import javax.mail.Message.RecipientType; import javax.mail.MessagingException; import javax.mail.PasswordAuthentication; import javax.mail.Session; import javax.mail.URLName; -import javax.mail.Message.RecipientType; import javax.mail.internet.InternetAddress; import javax.naming.ConfigurationException; @@ -51,9 +51,9 @@ import com.cloud.capacity.dao.CapacityDaoImpl.SummedCapacity; import com.cloud.configuration.Config; import com.cloud.configuration.dao.ConfigurationDao; import com.cloud.dc.ClusterVO; +import com.cloud.dc.DataCenter.NetworkType; import com.cloud.dc.DataCenterVO; import com.cloud.dc.HostPodVO; -import com.cloud.dc.DataCenter.NetworkType; import com.cloud.dc.Vlan.VlanType; import com.cloud.dc.dao.ClusterDao; import com.cloud.dc.dao.DataCenterDao; @@ -74,7 +74,6 @@ import com.cloud.utils.component.ComponentLocator; import com.cloud.utils.component.Inject; import com.cloud.utils.db.DB; import com.cloud.utils.db.SearchCriteria; -import com.gargoylesoftware.htmlunit.html.xpath.IsDescendantOfContextualFormFunction; import com.sun.mail.smtp.SMTPMessage; import com.sun.mail.smtp.SMTPSSLTransport; import com.sun.mail.smtp.SMTPTransport; diff --git a/server/src/com/cloud/network/element/NetscalerElement.java b/server/src/com/cloud/network/element/NetscalerElement.java index 8ca9bf36eb6..296e8045e66 100644 --- a/server/src/com/cloud/network/element/NetscalerElement.java +++ b/server/src/com/cloud/network/element/NetscalerElement.java @@ -106,7 +106,7 @@ import com.cloud.vm.VirtualMachineProfile; import com.google.gson.Gson; @Local(value=NetworkElement.class) -public class NetscalerElement extends ExternalLoadBalancerDeviceManagerImpl implements LoadBalancingServiceProvider, NetscalerLoadBalancerElementService, ExternalLoadBalancerDeviceManager, IpDeployer, StaticNatServiceProvider, FirewallServiceProvider { +public class NetscalerElement extends ExternalLoadBalancerDeviceManagerImpl implements LoadBalancingServiceProvider, NetscalerLoadBalancerElementService, ExternalLoadBalancerDeviceManager, IpDeployer, StaticNatServiceProvider { private static final Logger s_logger = Logger.getLogger(NetscalerElement.class); @@ -524,11 +524,6 @@ public class NetscalerElement extends ExternalLoadBalancerDeviceManagerImpl impl return this; } - @Override - public boolean applyFWRules(Network network, List rules) throws ResourceUnavailableException { - return true; - } - public boolean applyElasticLoadBalancerRules(Network network, List rules) throws ResourceUnavailableException { List loadBalancingRules = new ArrayList(); diff --git a/tools/tooljars/cloud-selenium-java-client-driver.jar b/tools/tooljars/cloud-selenium-java-client-driver.jar index 4a1269853fd..004d7daca25 100644 Binary files a/tools/tooljars/cloud-selenium-java-client-driver.jar and b/tools/tooljars/cloud-selenium-java-client-driver.jar differ