diff --git a/agent/distro/centos/SYSCONFDIR/rc.d/init.d/cloud-agent.in b/agent/distro/centos/SYSCONFDIR/rc.d/init.d/cloud-agent.in index 488ced2fa90..14b19e1d57e 100755 --- a/agent/distro/centos/SYSCONFDIR/rc.d/init.d/cloud-agent.in +++ b/agent/distro/centos/SYSCONFDIR/rc.d/init.d/cloud-agent.in @@ -34,12 +34,19 @@ LOCKFILE=@LOCKDIR@/"$SHORTNAME" LOGFILE=@AGENTLOG@ PROGNAME="Cloud Agent" CLASS="com.cloud.agent.AgentShell" +JSVC=`which jsvc 2>/dev/null`; + +# exit if we don't find jsvc +if [ -z "$JSVC" ]; then + echo no jsvc found in path; + exit 1; +fi unset OPTIONS [ -r @SYSCONFDIR@/sysconfig/"$SHORTNAME" ] && source @SYSCONFDIR@/sysconfig/"$SHORTNAME" # The first existing directory is used for JAVA_HOME (if JAVA_HOME is not defined in $DEFAULT) -JDK_DIRS="/usr/lib/jvm/java-6-openjdk /usr/lib/jvm/java-6-openjdk-i386 /usr/lib/jvm/java-6-openjdk-amd64 /usr/lib/jvm/java-6-sun /usr/lib/jvm/java-1.5.0-sun /usr/lib/j2sdk1.5-sun /usr/lib/j2sdk1.5-ibm" +JDK_DIRS="/usr/lib/jvm/jre /usr/lib/jvm/java-6-openjdk /usr/lib/jvm/java-6-openjdk-i386 /usr/lib/jvm/java-6-openjdk-amd64 /usr/lib/jvm/java-6-sun /usr/lib/jvm/java-1.5.0-sun /usr/lib/j2sdk1.5-sun /usr/lib/j2sdk1.5-ibm" for jdir in $JDK_DIRS; do if [ -r "$jdir/bin/java" -a -z "${JAVA_HOME}" ]; then @@ -55,12 +62,12 @@ JCP="/usr/share/java/commons-daemon.jar" # We need to append the JSVC daemon JAR to the classpath # AgentShell implements the JSVC daemon methods -export CLASSPATH="$SCP:$DCP:$ACP:$JCP:@AGENTSYSCONFDIR@" +export CLASSPATH="$SCP:$DCP:$ACP:$JCP:@AGENTSYSCONFDIR@:@AGENTLIBDIR@" start() { echo -n $"Starting $PROGNAME: " if hostname --fqdn >/dev/null 2>&1 ; then - jsvc -cp "$CLASSPATH" -pidfile "$PIDFILE" $CLASS + $JSVC -cp "$CLASSPATH" -pidfile "$PIDFILE" $CLASS RETVAL=$? echo else @@ -75,7 +82,7 @@ start() { stop() { echo -n $"Stopping $PROGNAME: " - jsvc -pidfile "$PIDFILE" -stop $CLASS + $JSVC -pidfile "$PIDFILE" -stop $CLASS RETVAL=$? echo [ $RETVAL = 0 ] && rm -f ${LOCKFILE} ${PIDFILE} @@ -112,4 +119,3 @@ case "$1" in esac exit $RETVAL - diff --git a/agent/distro/fedora/SYSCONFDIR/rc.d/init.d/cloud-agent.in b/agent/distro/fedora/SYSCONFDIR/rc.d/init.d/cloud-agent.in index 488ced2fa90..14b19e1d57e 100755 --- a/agent/distro/fedora/SYSCONFDIR/rc.d/init.d/cloud-agent.in +++ b/agent/distro/fedora/SYSCONFDIR/rc.d/init.d/cloud-agent.in @@ -34,12 +34,19 @@ LOCKFILE=@LOCKDIR@/"$SHORTNAME" LOGFILE=@AGENTLOG@ PROGNAME="Cloud Agent" CLASS="com.cloud.agent.AgentShell" +JSVC=`which jsvc 2>/dev/null`; + +# exit if we don't find jsvc +if [ -z "$JSVC" ]; then + echo no jsvc found in path; + exit 1; +fi unset OPTIONS [ -r @SYSCONFDIR@/sysconfig/"$SHORTNAME" ] && source @SYSCONFDIR@/sysconfig/"$SHORTNAME" # The first existing directory is used for JAVA_HOME (if JAVA_HOME is not defined in $DEFAULT) -JDK_DIRS="/usr/lib/jvm/java-6-openjdk /usr/lib/jvm/java-6-openjdk-i386 /usr/lib/jvm/java-6-openjdk-amd64 /usr/lib/jvm/java-6-sun /usr/lib/jvm/java-1.5.0-sun /usr/lib/j2sdk1.5-sun /usr/lib/j2sdk1.5-ibm" +JDK_DIRS="/usr/lib/jvm/jre /usr/lib/jvm/java-6-openjdk /usr/lib/jvm/java-6-openjdk-i386 /usr/lib/jvm/java-6-openjdk-amd64 /usr/lib/jvm/java-6-sun /usr/lib/jvm/java-1.5.0-sun /usr/lib/j2sdk1.5-sun /usr/lib/j2sdk1.5-ibm" for jdir in $JDK_DIRS; do if [ -r "$jdir/bin/java" -a -z "${JAVA_HOME}" ]; then @@ -55,12 +62,12 @@ JCP="/usr/share/java/commons-daemon.jar" # We need to append the JSVC daemon JAR to the classpath # AgentShell implements the JSVC daemon methods -export CLASSPATH="$SCP:$DCP:$ACP:$JCP:@AGENTSYSCONFDIR@" +export CLASSPATH="$SCP:$DCP:$ACP:$JCP:@AGENTSYSCONFDIR@:@AGENTLIBDIR@" start() { echo -n $"Starting $PROGNAME: " if hostname --fqdn >/dev/null 2>&1 ; then - jsvc -cp "$CLASSPATH" -pidfile "$PIDFILE" $CLASS + $JSVC -cp "$CLASSPATH" -pidfile "$PIDFILE" $CLASS RETVAL=$? echo else @@ -75,7 +82,7 @@ start() { stop() { echo -n $"Stopping $PROGNAME: " - jsvc -pidfile "$PIDFILE" -stop $CLASS + $JSVC -pidfile "$PIDFILE" -stop $CLASS RETVAL=$? echo [ $RETVAL = 0 ] && rm -f ${LOCKFILE} ${PIDFILE} @@ -112,4 +119,3 @@ case "$1" in esac exit $RETVAL - diff --git a/agent/distro/rhel/SYSCONFDIR/rc.d/init.d/cloud-agent.in b/agent/distro/rhel/SYSCONFDIR/rc.d/init.d/cloud-agent.in index 488ced2fa90..14b19e1d57e 100644 --- a/agent/distro/rhel/SYSCONFDIR/rc.d/init.d/cloud-agent.in +++ b/agent/distro/rhel/SYSCONFDIR/rc.d/init.d/cloud-agent.in @@ -34,12 +34,19 @@ LOCKFILE=@LOCKDIR@/"$SHORTNAME" LOGFILE=@AGENTLOG@ PROGNAME="Cloud Agent" CLASS="com.cloud.agent.AgentShell" +JSVC=`which jsvc 2>/dev/null`; + +# exit if we don't find jsvc +if [ -z "$JSVC" ]; then + echo no jsvc found in path; + exit 1; +fi unset OPTIONS [ -r @SYSCONFDIR@/sysconfig/"$SHORTNAME" ] && source @SYSCONFDIR@/sysconfig/"$SHORTNAME" # The first existing directory is used for JAVA_HOME (if JAVA_HOME is not defined in $DEFAULT) -JDK_DIRS="/usr/lib/jvm/java-6-openjdk /usr/lib/jvm/java-6-openjdk-i386 /usr/lib/jvm/java-6-openjdk-amd64 /usr/lib/jvm/java-6-sun /usr/lib/jvm/java-1.5.0-sun /usr/lib/j2sdk1.5-sun /usr/lib/j2sdk1.5-ibm" +JDK_DIRS="/usr/lib/jvm/jre /usr/lib/jvm/java-6-openjdk /usr/lib/jvm/java-6-openjdk-i386 /usr/lib/jvm/java-6-openjdk-amd64 /usr/lib/jvm/java-6-sun /usr/lib/jvm/java-1.5.0-sun /usr/lib/j2sdk1.5-sun /usr/lib/j2sdk1.5-ibm" for jdir in $JDK_DIRS; do if [ -r "$jdir/bin/java" -a -z "${JAVA_HOME}" ]; then @@ -55,12 +62,12 @@ JCP="/usr/share/java/commons-daemon.jar" # We need to append the JSVC daemon JAR to the classpath # AgentShell implements the JSVC daemon methods -export CLASSPATH="$SCP:$DCP:$ACP:$JCP:@AGENTSYSCONFDIR@" +export CLASSPATH="$SCP:$DCP:$ACP:$JCP:@AGENTSYSCONFDIR@:@AGENTLIBDIR@" start() { echo -n $"Starting $PROGNAME: " if hostname --fqdn >/dev/null 2>&1 ; then - jsvc -cp "$CLASSPATH" -pidfile "$PIDFILE" $CLASS + $JSVC -cp "$CLASSPATH" -pidfile "$PIDFILE" $CLASS RETVAL=$? echo else @@ -75,7 +82,7 @@ start() { stop() { echo -n $"Stopping $PROGNAME: " - jsvc -pidfile "$PIDFILE" -stop $CLASS + $JSVC -pidfile "$PIDFILE" -stop $CLASS RETVAL=$? echo [ $RETVAL = 0 ] && rm -f ${LOCKFILE} ${PIDFILE} @@ -112,4 +119,3 @@ case "$1" in esac exit $RETVAL - diff --git a/cloud.spec b/cloud.spec index 47a457a0c38..275de57f9b9 100644 --- a/cloud.spec +++ b/cloud.spec @@ -418,9 +418,7 @@ fi %{_javadir}/%{name}-api.jar %attr(0755,root,root) %{_bindir}/cloud-sccs %attr(0755,root,root) %{_bindir}/cloud-gitrevs -%doc %{_docdir}/%{name}-%{version}/sccs-info %doc %{_docdir}/%{name}-%{version}/version-info -%doc %{_docdir}/%{name}-%{version}/configure-info %doc README.html %doc debian/copyright @@ -449,9 +447,6 @@ fi %{_javadir}/%{name}-plugin-nicira-nvp.jar %{_javadir}/%{name}-plugin-elb.jar %{_javadir}/%{name}-plugin-netapp.jar -%{_javadir}/%{name}-plugin-hypervisor-kvm.jar - /usr/share/java/libvirt-0.4.8.jar - %config(noreplace) %{_sysconfdir}/%{name}/server/* %files agent-scripts @@ -473,9 +468,11 @@ fi %{_javadir}/%{name}-netscaler-sdx.jar %{_javadir}/%{name}-log4j-extras.jar %{_javadir}/%{name}-backport-util-concurrent-3.0.jar +%{_javadir}/%{name}-plugin-hypervisor-kvm.jar %{_javadir}/%{name}-ehcache.jar %{_javadir}/%{name}-email.jar %{_javadir}/%{name}-httpcore-4.0.jar +%{_javadir}/libvirt-0.4.8.jar %{_javadir}/%{name}-log4j.jar %{_javadir}/%{name}-trilead-ssh2-build213.jar %{_javadir}/%{name}-cglib.jar @@ -499,7 +496,8 @@ fi %{_javadir}/%{name}-jasypt-1.8.jar %{_javadir}/%{name}-commons-configuration-1.8.jar %{_javadir}/%{name}-commons-lang-2.6.jar -%{_javadir}/libvirt-0.4.8.jar +%{_javadir}/%{name}-ejb-api-3.0.jar +%{_javadir}/%{name}-javax.persistence-2.0.0.jar %files core @@ -529,12 +527,6 @@ fi %files client %defattr(0644,root,root,0775) %config(noreplace) %{_sysconfdir}/%{name}/management/* -%config(noreplace) %attr(0640,root,%{name}) %{_sysconfdir}/%{name}/management/db.properties -%config(noreplace) %{_sysconfdir}/%{name}/management/log4j-%{name}.xml -%config(noreplace) %{_sysconfdir}/%{name}/management/tomcat6.conf -%dir %attr(0770,root,%{name}) %{_sysconfdir}/%{name}/management/Catalina -%dir %attr(0770,root,%{name}) %{_sysconfdir}/%{name}/management/Catalina/localhost -%dir %attr(0770,root,%{name}) %{_sysconfdir}/%{name}/management/Catalina/localhost/client %config(noreplace) %{_sysconfdir}/sysconfig/%{name}-management %attr(0755,root,root) %{_initrddir}/%{name}-management %dir %{_datadir}/%{name}/management @@ -595,20 +587,22 @@ fi %attr(0755,root,root) %{_bindir}/cloud-setup-bridge %changelog +* Thu Aug 16 2012 Marcus Sorense 4.0 +- rearranged files sections to match currently built files + * Mon May 3 2010 Manuel Amador (Rudd-O) 1.9.12 - Bump version for RC4 release -%changelog * Fri Apr 30 2010 Manuel Amador (Rudd-O) 1.9.11 - Rename to CloudStack everywhere * Wed Apr 28 2010 Manuel Amador (Rudd-O) 1.9.10 - FOSS release -%changelog * Mon Apr 05 2010 Manuel Amador (Rudd-O) 1.9.8 - RC3 branched * Wed Feb 17 2010 Manuel Amador (Rudd-O) 1.9.7 - First initial broken-up release + diff --git a/wscript b/wscript index 9e9acbd340f..561c7703424 100644 --- a/wscript +++ b/wscript @@ -18,10 +18,13 @@ # under the License. -# the following two variables are used by the target "waf dist" -# if you change 'em here, you need to change it also in cloud.spec, add a %changelog entry there, and add an entry in debian/changelog -VERSION = '3.0.3.2012-05-15T19:32:03Z' - +# the following variables are used by the target "waf dist" +# if you change APPNAME here, you need to change 'Name' also +# in cloud.spec, add a %changelog entry there, and add an +# entry in debian/changelog. SHORTVERSION is used in package +# naming for deb/rpm, VERSION is used for tarball and bin +VERSION = '4.0.0.2012-08-15T18:03:12Z' +SHORTVERSION = '4.0' APPNAME = 'cloud' import shutil,os @@ -616,7 +619,7 @@ def rpm(context): if Options.options.VERNUM: ver = Options.options.VERNUM - else: ver = "2.2" + else: ver = SHORTVERSION packagever = ["--define", "_ver %s" % ver] @@ -650,7 +653,7 @@ def deb(context): if Options.options.VERNUM: VERSION = Options.options.VERNUM else: - VERSION = "2.2" + VERSION = SHORTVERSION version = ["--set-envvar=PACKAGEVERSION=%s"%VERSION]