Remove tomcat dependency for debian

Fix apidocs tests

Author: rsafonseca

client/pom.xml

@@ -468,7 +468,7 @@
           <webAppSourceDirectory>${project.build.directory}/generated-webapp</webAppSourceDirectory>
           <webAppConfig>
             <contextPath>/client</contextPath>
-            <extraClasspath>${project.build.directory}/utilities/scripts/db/;${project.build.directory}/utilities/scripts/db/db/</extraClasspath>
+            <extraClasspath>${project.build.directory}/conf/;${project.build.directory}/utilities/scripts/db/;${project.build.directory}/utilities/scripts/db/db/</extraClasspath>
           </webAppConfig>
 
           <systemProperties>

client/tomcatconf/classpath.conf.in

@@ -6,9 +6,9 @@
 # to you under the Apache License, Version 2.0 (the
 # "License"); you may not use this file except in compliance
 # with the License.  You may obtain a copy of the License at
-#
+# 
 #   http://www.apache.org/licenses/LICENSE-2.0
-#
+# 
 # Unless required by applicable law or agreed to in writing,
 # software distributed under the License is distributed on an
 # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -22,15 +22,20 @@ MCP="@MSCLASSPATH@"
 DCP="@DEPSCLASSPATH@"
 CLASSPATH=$SCP:$DCP:$MCP:@MSCONF@:@SETUPDATADIR@
 for jarfile in "@PREMIUMJAVADIR@"/* ; do
-        if [ ! -e "$jarfile" ] ; then continue ; fi
-        CLASSPATH=$jarfile:$CLASSPATH
+	if [ ! -e "$jarfile" ] ; then continue ; fi
+	CLASSPATH=$jarfile:$CLASSPATH
 done
 for plugin in "@PLUGINJAVADIR@"/* ; do
-        if [ ! -e "$plugin" ] ; then continue ; fi
-        CLASSPATH=$plugin:$CLASSPATH
+	if [ ! -e "$plugin" ] ; then continue ; fi
+	CLASSPATH=$plugin:$CLASSPATH
 done
 for vendorconf in "@MSCONF@"/vendor/* ; do
-        if [ ! -d "$vendorconf" ] ; then continue ; fi
-        CLASSPATH=$vendorconf:$CLASSPATH
+	if [ ! -d "$vendorconf" ] ; then continue ; fi
+	CLASSPATH=$vendorconf:$CLASSPATH
 done
 export CLASSPATH
+if ([ -z "$JAVA_HOME" ] || [ ! -d "$JAVA_HOME" ]) && [ -d /usr/lib/jvm/jre-1.7.0 ]; then
+     export JAVA_HOME=/usr/lib/jvm/jre-1.7.0
+fi
+PATH=$JAVA_HOME/bin:/sbin:/usr/sbin:$PATH
+export PATH

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: ${misc:Depends}, ${python:Depends}, cloudstack-common (= ${source:Version}), tomcat6 | tomcat7 | tomcat8, sudo, jsvc, python-mysqldb, libmysql-java, python-paramiko, augeas-tools, mysql-client, adduser
+Depends: ${misc:Depends}, ${python:Depends}, cloudstack-common (= ${source:Version}), sudo, jsvc, python-mysqldb, libmysql-java, python-paramiko, augeas-tools, mysql-client, adduser
 Conflicts: cloud-server, cloud-client, cloud-client-ui
 Description: CloudStack server library
  The CloudStack management server

packaging/centos63/cloud-management.rc

@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# tomcat6      This shell script takes care of starting and stopping Tomcat
+# cloudstack-management      This shell script takes care of starting and stopping Tomcat
 #
 # chkconfig: - 80 20
 #

packaging/centos63/cloud-management.sysconfig

@@ -15,7 +15,6 @@
 # specific language governing permissions and limitations
 # under the License.
 
-# Required for a tocmat cloned service
 NAME=cloudstack-management
 
 # Where your java installation lives

packaging/centos7/cloud-management.service

@@ -16,8 +16,6 @@
 # under the License.
 
 # Systemd unit file for CloudStack Management server
-# 
-# clone tomcat service, see /usr/lib/systemd/system/tomcat.service
 
 [Unit]
 Description=CloudStack Management Server

packaging/centos7/cloud.spec

@@ -223,10 +223,8 @@ mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/run
 
 # Specific for tomcat
 mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}/management/Catalina/localhost/client
-#ln -sf /usr/share/tomcat/bin ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/bin
 cp -r tomcat/target/cloudstack-tomcat-standalone/bin ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/
 ln -sf /etc/%{name}/management ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/conf
-#ln -sf /usr/share/tomcat/lib ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/lib
 cp -r tomcat/target/cloudstack-tomcat-standalone/lib ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/
 ln -sf /var/log/%{name}/management ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/logs
 ln -sf /var/cache/%{name}/management/temp ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/temp
@@ -358,6 +356,7 @@ if [ ! -f %{_datadir}/cloudstack-common/scripts/vm/hypervisor/xenserver/vhd-util
     echo Please download vhd-util from http://download.cloud.com.s3.amazonaws.com/tools/vhd-util and put it in 
     echo %{_datadir}/cloudstack-common/scripts/vm/hypervisor/xenserver/
 fi
+chown cloud. %{_localstatedir}/run/%{name}-management.pid
 
 %preun agent
 /sbin/service cloudstack-agent stop || true

plugins/pom.xml

@@ -70,6 +70,7 @@
     <module>hypervisors/ovm3</module>
     <module>network-elements/elastic-loadbalancer</module>
     <module>network-elements/ovs</module>
+    <module>network-elements/juniper-contrail</module>
     <module>network-elements/palo-alto</module>
     <module>network-elements/netscaler</module>
     <module>network-elements/nicira-nvp</module>
@@ -98,7 +99,6 @@
     <module>alert-handlers/snmp-alerts</module>
     <module>alert-handlers/syslog-alerts</module>
     <module>network-elements/internal-loadbalancer</module>
-    <module>network-elements/juniper-contrail</module>
     <module>network-elements/vxlan</module>
     <module>network-elements/globodns</module>
   </modules>

tools/apidoc/pom.xml

@@ -23,7 +23,7 @@
     <properties>
         <client.config.base>../../client/target/cloud-client-ui-${project.version}/WEB-INF/</client.config.base>
         <client.config.jars>${client.config.base}/lib</client.config.jars>
-        <client.config.conf>${client.config.base}/classes</client.config.conf>
+        <client.config.conf>../../client/target/conf</client.config.conf>
     </properties>
 
     <dependencies>