cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From h...@apache.org
Subject git commit: updated refs/heads/master to 539db08
Date Fri, 04 Jul 2014 12:37:44 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/master cc913cf0b -> 539db0895


CLOUDSTACK-6892 Create separate package for the mysql HA component


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/539db089
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/539db089
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/539db089

Branch: refs/heads/master
Commit: 539db08956eff322efd11771d46d29df0c7289b2
Parents: cc913cf
Author: Hugo Trippaers <htrippaers@schubergphilis.com>
Authored: Fri Jul 4 14:34:48 2014 +0200
Committer: Hugo Trippaers <htrippaers@schubergphilis.com>
Committed: Fri Jul 4 14:37:07 2014 +0200

----------------------------------------------------------------------
 client/tomcatconf/catalina.properties.in |  2 +-
 packaging/centos63/cloud.spec            | 36 ++++++++++++++++++++++++---
 packaging/centos63/package.sh            |  7 +++++-
 3 files changed, 40 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/539db089/client/tomcatconf/catalina.properties.in
----------------------------------------------------------------------
diff --git a/client/tomcatconf/catalina.properties.in b/client/tomcatconf/catalina.properties.in
index ce03ff6..282892b 100644
--- a/client/tomcatconf/catalina.properties.in
+++ b/client/tomcatconf/catalina.properties.in
@@ -44,7 +44,7 @@ package.definition=sun.,java.,org.apache.catalina.,org.apache.coyote.,org.apache
 #     "foo/*.jar": Add all the JARs of the specified folder as class 
 #                  repositories
 #     "foo/bar.jar": Add bar.jar as a class repository
-common.loader=${catalina.base}/lib,${catalina.base}/lib/*.jar,${catalina.home}/lib,${catalina.home}/lib/*.jar,/usr/share/java/mysql-connector-java.jar
+common.loader=${catalina.base}/lib,${catalina.base}/lib/*.jar,${catalina.home}/lib,${catalina.home}/lib/*.jar,/usr/share/java/mysql-connector-java.jar,/usr/share/cloudstack-mysql-ha/lib/*jar
 
 #
 # List of comma-separated paths defining the contents of the "server" 

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/539db089/packaging/centos63/cloud.spec
----------------------------------------------------------------------
diff --git a/packaging/centos63/cloud.spec b/packaging/centos63/cloud.spec
index d2f19cd..1d4d061 100644
--- a/packaging/centos63/cloud.spec
+++ b/packaging/centos63/cloud.spec
@@ -165,6 +165,17 @@ Group: System Environment/Libraries
 %description awsapi
 Apache Cloudstack AWS API compatibility wrapper
 
+%if "%{_ossnoss}" == "NOREDIST"
+%package mysql-ha
+Summary: Apache CloudStack Balancing Strategy for MySQL
+Requires: mysql-connector-java
+Requires: tomcat7
+Group: System Environmnet/Libraries
+%description mysql-ha
+Apache CloudStack Balancing Strategy for MySQL
+
+%endif
+
 %prep
 echo Doing CloudStack build
 
@@ -328,6 +339,12 @@ for name in cloud-bridge.properties commons-logging.properties ec2-service.prope
     ${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}/management/$name
 done
 
+# MYSQL HA
+if [ "x%{_ossnoss}" == "xNOREDIST" ] ; then
+  mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/%{name}-mysql-ha/lib
+  cp -r plugins/database/mysql-ha/target/cloud-plugin-database-mysqlha-%{_maventag}.jar ${RPM_BUILD_ROOT}%{_datadir}/%{name}-mysql-ha/lib
+fi
+
 #Don't package the below for AWS API
 rm -rf ${RPM_BUILD_ROOT}%{_datadir}/%{name}-bridge/webapps/awsapi/WEB-INF/classes/db.properties
 rm -rf ${RPM_BUILD_ROOT}%{_datadir}/%{name}-bridge/webapps/awsapi/WEB-INF/classes/LICENSE.txt
@@ -347,9 +364,13 @@ install -D tools/whisker/LICENSE ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-agen
 install -D tools/whisker/NOTICE ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-usage-%{version}/NOTICE
 install -D tools/whisker/LICENSE ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-usage-%{version}/LICENSE
 install -D tools/whisker/NOTICE ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-awsapi-%{version}/NOTICE
-install -D tools/whisker/NOTICE ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-awsapi-%{version}/LICENSE
-install -D tools/whisker/LICENSE ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-cli-%{version}/NOTICE
+install -D tools/whisker/LICENSE ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-awsapi-%{version}/LICENSE
+install -D tools/whisker/NOTICE ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-cli-%{version}/NOTICE
 install -D tools/whisker/LICENSE ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-cli-%{version}/LICENSE
+if [ "x%{_ossnoss}" == "xNOREDIST" ] ; then
+  install -D tools/whisker/LICENSE ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-mysql-ha-%{version}/LICENSE
+  install -D tools/whisker/NOTICE ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-mysql-ha-%{version}/NOTICE
+fi
 
 %clean
 [ ${RPM_BUILD_ROOT} != "/" ] && rm -rf ${RPM_BUILD_ROOT}
@@ -630,8 +651,17 @@ fi
 %{_defaultdocdir}/%{name}-awsapi-%{version}/LICENSE
 %{_defaultdocdir}/%{name}-awsapi-%{version}/NOTICE
 
+%if "%{_ossnoss}" == "NOREDIST"
+%files mysql-ha
+%defattr(0644,cloud,cloud,0755)
+%attr(0644,root,root) %{_datadir}/%{name}-mysql-ha/lib/*
+%{_defaultdocdir}/%{name}-mysql-ha-%{version}/LICENSE
+%{_defaultdocdir}/%{name}-mysql-ha-%{version}/NOTICE
+%endif
 
 %changelog
+* Fri Jul 04 2014 Hugo Trippaers <hugo@apache.org> 4.5.0
+- Add a package for the mysql ha module
+
 * Fri Oct 03 2012 Hugo Trippaers <hugo@apache.org> 4.1.0
 - new style spec file
-

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/539db089/packaging/centos63/package.sh
----------------------------------------------------------------------
diff --git a/packaging/centos63/package.sh b/packaging/centos63/package.sh
index fa004af..07f95fc 100755
--- a/packaging/centos63/package.sh
+++ b/packaging/centos63/package.sh
@@ -39,7 +39,7 @@ function packaging() {
     fi
 
     VERSION=`(cd ../../; mvn org.apache.maven.plugins:maven-help-plugin:2.1.1:evaluate -Dexpression=project.version)
| grep --color=none '^[0-9]\.'`
-    if echo $VERSION | grep SNAPSHOT ; then
+    if echo $VERSION | grep -q SNAPSHOT ; then
         REALVER=`echo $VERSION | cut -d '-' -f 1`
         DEFVER="-D_ver $REALVER"
         DEFPRE="-D_prerelease 1"
@@ -50,19 +50,24 @@ function packaging() {
         DEFREL="-D_rel 1"
     fi
 
+    echo Preparing to package Apache CloudStack ${VERSION}
+
     mkdir -p $RPMDIR/SPECS
     mkdir -p $RPMDIR/BUILD
     mkdir -p $RPMDIR/RPMS
     mkdir -p $RPMDIR/SRPMS
     mkdir -p $RPMDIR/SOURCES/$PACK_PROJECT-$VERSION
 
+    echo ". preparing source tarball"
     (cd ../../; tar -c --exclude .git --exclude dist  .  | tar -C $RPMDIR/SOURCES/$PACK_PROJECT-$VERSION
-x )
     (cd $RPMDIR/SOURCES/; tar -czf $PACK_PROJECT-$VERSION.tgz $PACK_PROJECT-$VERSION)
 
+    echo ". executing rpmbuild"
     cp cloud.spec $RPMDIR/SPECS
 
     (cd $RPMDIR; rpmbuild --define "_topdir $RPMDIR" "${DEFVER}" "${DEFREL}" ${DEFPRE+"${DEFPRE}"}
${DEFOSSNOSS+"$DEFOSSNOSS"} -bb SPECS/cloud.spec)
 
+    echo "Done"
     exit
 }
 


Mime
View raw message