- fix bnc#771802 - systemd support is broken

* change type froking to simple as it does not make a sense run java in a
    background to emulate that
  * remove the need of nested wrappers, so /usr/sbin/tomcat-sysd now relies on
    systemd features like User/EnvironmentFile
  * workaround the 143 exit code in Stop phase - return 0 in this case

OBS-URL: https://build.opensuse.org/package/show/Java:packages/tomcat?expand=0&rev=5

tomcat-7.0.service

@@ -1,19 +1,20 @@
 # Systemd unit file for tomcat
-# 
-# To create clones of this service:
-# 1) By default SERVICE_NAME=tomcat. When cloned, the value must be defined 
-# before tomcat-sysd is called.
-# 2) Create /etc/sysconfig/${SERVICE_NAME} from /etc/sysconfig/tomcat
-# to override tomcat defaults
+#
+# You can clone this service by adding a new EnvironmentFile declaring the new
+# values for CATALINA_BASE et all 
 
 [Unit]
 Description=Apache Tomcat Web Application Container
 After=syslog.target network.target
 
 [Service]
-Type=forking
+Type=simple
+EnvironmentFile=/etc/tomcat/tomcat.conf
+User=tomcat
+Group=tomcat
 ExecStart=/usr/sbin/tomcat-sysd start
-ExecStop=/usr/sbin/tomcat-sysd stop
+ExecStop=-/usr/sbin/tomcat-sysd stop
+
 
 [Install]
 WantedBy=multi-user.target