This is an automated email from the ASF dual-hosted git repository. bhaisaab pushed a commit to branch CLOUDSTACK-10012 in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit 7d7ab5b07d386335860eea1313f184a543c31536 Author: Rohit Yadav <[email protected]> AuthorDate: Mon Oct 16 22:50:27 2017 +0530 cat-x mysql {^-^} Signed-off-by: Rohit Yadav <[email protected]> --- client/pom.xml | 1 + debian/control | 2 +- debian/rules | 4 +++- packaging/centos63/cloud-management.rc | 6 +++--- packaging/centos63/cloud.spec | 6 +++--- packaging/centos7/cloud.spec | 5 +++-- packaging/systemd/cloudstack-management.default | 2 +- pom.xml | 5 +++++ utils/pom.xml | 4 ++++ 9 files changed, 24 insertions(+), 11 deletions(-) diff --git a/client/pom.xml b/client/pom.xml index c00c2fa..0cd1547 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -737,6 +737,7 @@ <exclude>org.apache.tomcat.embed:tomcat-embed-core</exclude> <exclude>org.apache.geronimo.specs:geronimo-servlet_3.0_spec</exclude> <exclude>org.apache.geronimo.specs:geronimo-javamail_1.4_spec</exclude> + <exclude>mysql:mysql-connector-java</exclude> </excludes> </artifactSet> <transformers> diff --git a/debian/control b/debian/control index 971b0a8..98ab7f1 100644 --- a/debian/control +++ b/debian/control @@ -15,7 +15,7 @@ Description: A common package which contains files which are shared by several C Package: cloudstack-management Architecture: all -Depends: ${python:Depends}, openjdk-8-jre-headless | java8-runtime-headless | java8-runtime | openjdk-7-jre-headless, cloudstack-common (= ${source:Version}), sudo, jsvc, python-mysql.connector, libmysql-java, augeas-tools, mysql-client, adduser, bzip2, ipmitool, lsb-release, init-system-helpers (>= 1.14~) +Depends: ${python:Depends}, openjdk-8-jre-headless | java8-runtime-headless | java8-runtime, cloudstack-common (= ${source:Version}), sudo, jsvc, python-mysql.connector, libmysql-java, augeas-tools, mysql-client, adduser, bzip2, ipmitool, lsb-release, init-system-helpers (>= 1.14~) Conflicts: cloud-server, cloud-client, cloud-client-ui Description: CloudStack server library The CloudStack management server diff --git a/debian/rules b/debian/rules index 7053961..5c21639 100755 --- a/debian/rules +++ b/debian/rules @@ -74,9 +74,11 @@ override_dh_auto_install: mkdir $(DESTDIR)/var/lib/$(PACKAGE)/management mkdir $(DESTDIR)/var/lib/$(PACKAGE)/mnt cp -r client/target/utilities/scripts/db/* $(DESTDIR)/usr/share/$(PACKAGE)-management/setup/ + cp -r client/target/classes/META-INF/webapp $(DESTDIR)/usr/share/$(PACKAGE)-management/webapp cp server/target/conf/* $(DESTDIR)/$(SYSCONFDIR)/$(PACKAGE)/server/ cp client/target/conf/* $(DESTDIR)/$(SYSCONFDIR)/$(PACKAGE)/management/ - cp client/target/cloud-client-ui-$(VERSION).jar $(DESTDIR)/usr/share/$(PACKAGE)-management/cloud-management-server.jar + cp client/target/cloud-client-ui-$(VERSION).jar $(DESTDIR)/usr/share/$(PACKAGE)-management/lib/cloudstack.jar + # To make jetty happy from the 1st line of log ln -s log4j-cloud.xml $(DESTDIR)/$(SYSCONFDIR)/$(PACKAGE)/management/log4j.xml diff --git a/packaging/centos63/cloud-management.rc b/packaging/centos63/cloud-management.rc index 24fbd33..3a5d43d 100755 --- a/packaging/centos63/cloud-management.rc +++ b/packaging/centos63/cloud-management.rc @@ -71,10 +71,10 @@ setJavaHome() { setJavaHome JARS=$(ls /usr/share/cloudstack-management/lib/*.jar | tr '\n' ':' | sed s'/.$//') -CLASSPATH="/etc/cloudstack/management:/usr/share/cloudstack-common:/usr/share/cloudstack-management/setup:/usr/share/cloudstack-management:/usr/share/cloudstack-management/cloud-management-server.jar:$JARS" +CLASSPATH="/etc/cloudstack/management:/usr/share/cloudstack-common:/usr/share/cloudstack-management/setup:/usr/share/cloudstack-management:$JARS:/usr/share/java/mysql-connector-java.jar" -if [ -r "/etc/cloudstack/management/cloudmanagementserver.keystore" ] ; then - JAVA_OPTS="-Djava.awt.headless=true -Dcom.sun.management.jmxremote=false -Xmx2g -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/var/log/cloudstack/management/ -XX:PermSize=512M -XX:MaxPermSize=800m -Djavax.net.ssl.trustStore=/etc/cloudstack/management/cloudmanagementserver.keystore -Djavax.net.ssl.trustStorePassword=vmops.com -Djetty.requestlog=$LOGDIR/request.log " +if [ -r "/etc/cloudstack/management/cloud.jks" ] ; then + JAVA_OPTS="-Djava.awt.headless=true -Dcom.sun.management.jmxremote=false -Xmx2g -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/var/log/cloudstack/management/ -XX:PermSize=512M -XX:MaxPermSize=800m -Djavax.net.ssl.trustStore=/etc/cloudstack/management/cloud.jks -Djavax.net.ssl.trustStorePassword=vmops.com -Djetty.requestlog=$LOGDIR/request.log " else JAVA_OPTS="-Djava.awt.headless=true -Dcom.sun.management.jmxremote=false -Xmx2g -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/var/log/cloudstack/management/ -XX:PermSize=512M -XX:MaxPermSize=800m -Djetty.requestlog=$LOGDIR/request.log " fi diff --git a/packaging/centos63/cloud.spec b/packaging/centos63/cloud.spec index 53b27fa..1a906f3 100644 --- a/packaging/centos63/cloud.spec +++ b/packaging/centos63/cloud.spec @@ -265,6 +265,7 @@ cp -r plugins/network-elements/cisco-vnmc/scripts/network/cisco/* ${RPM_BUILD_RO # Management mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/ +mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/lib mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/setup mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/log/%{name}/management mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}/management @@ -283,9 +284,8 @@ install -D client/target/utilities/bin/cloud-sysvmadm ${RPM_BUILD_ROOT}%{_bindir install -D client/target/utilities/bin/cloud-update-xenserver-licenses ${RPM_BUILD_ROOT}%{_bindir}/%{name}-update-xenserver-licenses cp -r client/target/utilities/scripts/db/* ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/setup -cp client/target/cloud-client-ui-%{_maventag}.jar ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/cloud-management-server.jar - -mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/lib +cp -r client/target/classes/META-INF/webapp $(DESTDIR)/usr/share/$(PACKAGE)-management/webapp +cp client/target/cloud-client-ui-%{_maventag}.jar ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/lib/cloudstack.jar # Don't package the scripts in the management webapp rm -rf ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/webapps/client/WEB-INF/classes/scripts diff --git a/packaging/centos7/cloud.spec b/packaging/centos7/cloud.spec index 826ed04..fa4551c 100644 --- a/packaging/centos7/cloud.spec +++ b/packaging/centos7/cloud.spec @@ -232,6 +232,7 @@ cp -r plugins/network-elements/cisco-vnmc/scripts/network/cisco/* ${RPM_BUILD_RO # Management mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/ +mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/lib mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/setup mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/log/%{name}/management mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}/management @@ -254,8 +255,8 @@ install -D client/target/utilities/bin/cloud-update-xenserver-licenses ${RPM_BUI cp -r client/target/utilities/scripts/db/* ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/setup cp -r client/target/cloud-client-ui-%{_maventag}.jar ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/ -mv ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/cloud-client-ui-%{_maventag}.jar ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/cloud-management-server.jar -mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/lib +cp -r client/target/classes/META-INF/webapp $(DESTDIR)/usr/share/$(PACKAGE)-management/webapp +mv ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/cloud-client-ui-%{_maventag}.jar ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/lib/cloudstack.jar # Don't package the scripts in the management webapp rm -rf ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/webapps/client/WEB-INF/classes/scripts diff --git a/packaging/systemd/cloudstack-management.default b/packaging/systemd/cloudstack-management.default index 3ec0f3e..13487df 100644 --- a/packaging/systemd/cloudstack-management.default +++ b/packaging/systemd/cloudstack-management.default @@ -45,6 +45,6 @@ CLOUDSTACK_PID="/var/run/cloudstack-management.pid" LOGDIR="/var/log/cloudstack/management" -CLASSPATH="/etc/cloudstack/management:/usr/share/cloudstack-common:/usr/share/cloudstack-management/setup:/usr/share/cloudstack-management:/usr/share/cloudstack-management/cloud-management-server.jar" +CLASSPATH="/etc/cloudstack/management:/usr/share/cloudstack-common:/usr/share/cloudstack-management/setup:/usr/share/cloudstack-management:/usr/share/cloudstack-management/lib/cloudstack.jar:/usr/share/java/mysql-connector-java.jar" BOOTSTRAP_CLASS=org.apache.cloudstack.ServerDaemon diff --git a/pom.xml b/pom.xml index 5725017..b5493a2 100644 --- a/pom.xml +++ b/pom.xml @@ -324,6 +324,11 @@ </dependency> <dependency> <groupId>com.amazonaws</groupId> + <artifactId>aws-java-sdk-core</artifactId> + <version>${cs.aws.sdk.version}</version> + </dependency> + <dependency> + <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-s3</artifactId> <version>${cs.aws.sdk.version}</version> </dependency> diff --git a/utils/pom.xml b/utils/pom.xml index 483041e..b88086e 100755 --- a/utils/pom.xml +++ b/utils/pom.xml @@ -94,6 +94,10 @@ </dependency> <dependency> <groupId>com.amazonaws</groupId> + <artifactId>aws-java-sdk-core</artifactId> + </dependency> + <dependency> + <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-s3</artifactId> </dependency> <dependency> -- To stop receiving notification emails like this one, please contact "[email protected]" <[email protected]>.
