removing need for having LGPL-licensed mysql-connector-java https://reviews.apache.org/r/6180/
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/b1566c0c Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/b1566c0c Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/b1566c0c Branch: refs/heads/deps-ctrl Commit: b1566c0c9bac866e6e616a4df6283de3c1ae1b39 Parents: 8debf07 Author: Pradeep Soundararajan <[email protected]> Authored: Tue Jul 31 16:01:44 2012 -0400 Committer: David Nalley <[email protected]> Committed: Tue Jul 31 16:01:44 2012 -0400 ---------------------------------------------------------------------- build/build-cloud-plugins.xml | 7 +++---- build/build-cloud.xml | 2 +- build/dldeps.xml | 2 +- deps/cloud-mysql-connector-java-5.1.7-bin.jar | Bin 709922 -> 0 bytes deps/cloud-netscaler-sdx.jar | Bin 138839 -> 0 bytes deps/cloud-netscaler.jar | Bin 1881606 -> 0 bytes .../src/com/cloud/cluster/ClusterManagerImpl.java | 3 ++- 7 files changed, 7 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/b1566c0c/build/build-cloud-plugins.xml ---------------------------------------------------------------------- diff --git a/build/build-cloud-plugins.xml b/build/build-cloud-plugins.xml index 9423e16..f48bcdd 100755 --- a/build/build-cloud-plugins.xml +++ b/build/build-cloud-plugins.xml @@ -278,10 +278,9 @@ <!-- ===================== Network Elements ===================== --> - - <target name="compile-network-elements" depends="compile-netscaler, compile-srx, compile-ovs, compile-elb, compile-nicira-nvp" description="Compile all network elements"/> - <target name="build-network-elements" depends="build-netscaler, build-srx, build-ovs, build-elb, build-nicira-nvp" description="build all network elements"/> - + <target name="compile-network-elements" depends="compile-srx, compile-ovs, compile-elb, compile-nicira-nvp" description="Compile all network elements"/> + <target name="build-network-elements" depends="build-srx, build-ovs, build-elb, build-nicira-nvp" description="build all network elements"/> + <!-- ##### These are currently not built by default due to licensing issues --> <target name="compile-netscaler" depends="-init, compile-server" description="Compile NetScaler plugin"> <ant antfile="${base.dir}/plugins/network-elements/netscaler/build.xml" target="build"/> </target> http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/b1566c0c/build/build-cloud.xml ---------------------------------------------------------------------- diff --git a/build/build-cloud.xml b/build/build-cloud.xml index 0f1bdea..9706d36 100755 --- a/build/build-cloud.xml +++ b/build/build-cloud.xml @@ -479,7 +479,7 @@ <target name="build-servers" depends="-init, build-server" /> - <target name="build-opensource" depends="-init, build-server, build-agent, build-scripts, build-ui, build-console-proxy, build-ovm, package-oss-systemvm-iso, build-netscaler, build-srx, build-dp-user-dispersing, build-dp-user-concentrated-pod, build-host-allocator-random, build-user-authenticator-ldap"> + <target name="build-opensource" depends="-init, build-server, build-agent, build-scripts, build-ui, build-console-proxy, build-ovm, package-oss-systemvm-iso, build-srx, build-dp-user-dispersing, build-dp-user-concentrated-pod, build-host-allocator-random, build-user-authenticator-ldap"> <copy overwrite="true" todir="${dist.dir}"> <fileset dir="${base.dir}/build/deploy/"> <include name="deploy-agent.sh" /> http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/b1566c0c/build/dldeps.xml ---------------------------------------------------------------------- diff --git a/build/dldeps.xml b/build/dldeps.xml index 3c7eada..4bcecd6 100644 --- a/build/dldeps.xml +++ b/build/dldeps.xml @@ -44,7 +44,7 @@ <get src="http://repo1.maven.org/maven2/org/mortbay/jetty/jetty/6.1.26/jetty-6.1.26.jar"; dest="deps/jetty-6.1.26.jar" usetimestamp="true" /> <get src="http://repo1.maven.org/maven2/org/mortbay/jetty/jetty-util/6.1.26/jetty-util-6.1.26.jar"; - dest="deps/jetty-util-6.1.26.jar" usetimestramp="true" /> + dest="deps/jetty-util-6.1.26.jar" usetimestamp="true" /> </target> <target name="resolveOptBuildDeps"> http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/b1566c0c/deps/cloud-mysql-connector-java-5.1.7-bin.jar ---------------------------------------------------------------------- diff --git a/deps/cloud-mysql-connector-java-5.1.7-bin.jar b/deps/cloud-mysql-connector-java-5.1.7-bin.jar deleted file mode 100644 index ebfe068..0000000 Binary files a/deps/cloud-mysql-connector-java-5.1.7-bin.jar and /dev/null differ http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/b1566c0c/deps/cloud-netscaler-sdx.jar ---------------------------------------------------------------------- diff --git a/deps/cloud-netscaler-sdx.jar b/deps/cloud-netscaler-sdx.jar deleted file mode 100755 index 25a7496..0000000 Binary files a/deps/cloud-netscaler-sdx.jar and /dev/null differ http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/b1566c0c/deps/cloud-netscaler.jar ---------------------------------------------------------------------- diff --git a/deps/cloud-netscaler.jar b/deps/cloud-netscaler.jar deleted file mode 100755 index a073b50..0000000 Binary files a/deps/cloud-netscaler.jar and /dev/null differ http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/b1566c0c/server/src/com/cloud/cluster/ClusterManagerImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/cluster/ClusterManagerImpl.java b/server/src/com/cloud/cluster/ClusterManagerImpl.java index 4f7cf6f..4dbb16c 100755 --- a/server/src/com/cloud/cluster/ClusterManagerImpl.java +++ b/server/src/com/cloud/cluster/ClusterManagerImpl.java @@ -26,6 +26,7 @@ import java.nio.channels.SocketChannel; import java.rmi.RemoteException; import java.sql.Connection; import java.sql.SQLException; +import java.sql.SQLRecoverableException; import java.util.ArrayList; import java.util.Date; import java.util.Enumeration; @@ -801,7 +802,7 @@ public class ClusterManagerImpl implements ClusterManager { private boolean isRootCauseConnectionRelated(Throwable e) { while (e != null) { - if (e instanceof com.mysql.jdbc.CommunicationsException || e instanceof com.mysql.jdbc.exceptions.jdbc4.CommunicationsException) { + if (e instanceof SQLRecoverableException) { return true; }
