perfsonar development work

Author: nordunet.behrmann
Date: 2012-09-05 10:29:12 +0100 (Wed, 05 Sep 2012)
New Revision: 5991

Modified:
   trunk/perfsonar-java-sql-ma/packaging/package.sh
   trunk/perfsonar-java-sql-ma/packaging/rpm/geant2-java-sql-ma.specs
Log:
perfsonar-java-sql-ma: Package for Tomcat 6 on Redhat

Also made RPM packaging work on Debian/Ubuntu

Modified: trunk/perfsonar-java-sql-ma/packaging/package.sh
===================================================================
--- trunk/perfsonar-java-sql-ma/packaging/package.sh    2012-09-05 09:29:12 
UTC (rev 5990)
+++ trunk/perfsonar-java-sql-ma/packaging/package.sh    2012-09-05 09:29:12 
UTC (rev 5991)
@@ -1,8 +1,9 @@
-
-#!/bin/sh
+#!/bin/bash
 #author: Slawomir Trzaszczka 
<>
 #update: Piotr Pikusa 
<>
 
+set -e
+
 CURR_DIR=$(pwd)
 RPM_VERSION="2.3"
 RPM_SPEC_NAME="geant2-java-sql-ma.specs"
@@ -34,7 +35,6 @@
        cd $CURR_DIR
        rm -rfv temp
        mkdir temp
-       mkdir temp/webapps
        pwd
        echo "done !"
        echo
@@ -82,7 +82,7 @@
        echo " CREATE DEB"
 
        cd temp/deb
-       fakeroot dpkg-buildpackage 
+       fakeroot dpkg-buildpackage || :
        echo
        echo 
 }
@@ -148,7 +148,7 @@
        echo " CREATE RPM PACKAGE"
        cd $CURR_DIR
        cd temp/rpm/rpmbuild
-       rpmbuild -bb $RPM_SPEC_NAME
+       rpmbuild --define "_topdir $(pwd)" -bb $RPM_SPEC_NAME
        echo
        echo 
 

Modified: trunk/perfsonar-java-sql-ma/packaging/rpm/geant2-java-sql-ma.specs
===================================================================
--- trunk/perfsonar-java-sql-ma/packaging/rpm/geant2-java-sql-ma.specs  
2012-09-05 09:29:12 UTC (rev 5990)
+++ trunk/perfsonar-java-sql-ma/packaging/rpm/geant2-java-sql-ma.specs  
2012-09-05 09:29:12 UTC (rev 5991)
@@ -13,9 +13,8 @@
 packager: Piotr Pikusa 
<>
 URL: http://www.perfsonar.org
 Requires: jre >= 1.6
-Requires: tomcat5
-Requires: exist
-Requires: rrdjtool
+Requires: tomcat6
+Requires: perfsonar-exist
 BuildArch: noarch
 #BuildRequires: maven2
 
@@ -37,9 +36,6 @@
 
 
 %build
-pushd ${RPM_BUILD_DIR}/%{name}-%{version}
-    #mvn package
-popd
 
 
 
@@ -58,21 +54,13 @@
 
 
 # copy the service content to the tomcat webapps directory
-pushd ${RPM_BUILD_DIR}/%{name}-%{version}/build
-    %{__cp} -a  %{oldname}/* ${RPM_BUILD_ROOT}%{prefix}
-popd
+%{__cp} -a  build/%{oldname}/* ${RPM_BUILD_ROOT}%{prefix}
+%{__cp} -a doc/* ${RPM_BUILD_ROOT}/usr/share/doc/%{oldname}
+%{__cp} -a samples/requests/* 
${RPM_BUILD_ROOT}%{prefix}/WEB-INF/samples/requests
+%{__cp} -a samples/responses/* 
${RPM_BUILD_ROOT}%{prefix}/WEB-INF/samples/responses
 
-pushd ${RPM_BUILD_DIR}/%{name}-%{version}/doc
-    %{__cp} -a * ${RPM_BUILD_ROOT}/usr/share/doc/%{oldname}
-popd
 
-pushd ${RPM_BUILD_DIR}/%{name}-%{version}
-    %{__cp} -a samples/requests/* 
${RPM_BUILD_ROOT}%{prefix}/WEB-INF/samples/requests
-    %{__cp} -a samples/responses/* 
${RPM_BUILD_ROOT}%{prefix}/WEB-INF/samples/responses
-popd
 
-
-
 %post
 ## make symlink for easy access to conf
 %{__ln_s} -f %{prefix}/WEB-INF/classes/perfsonar/conf/*.properties 
%{_sysconfdir}/%{oldname}
@@ -81,17 +69,11 @@
 %{__ln_s} -f %{prefix}/WEB-INF/classes/perfsonar/conf/*.xml 
%{_sysconfdir}/%{oldname}
 %{__ln_s} -f %{prefix}/WEB-INF/classes/*.xml %{_sysconfdir}/%{oldname}
 %{__ln_s} -f %{prefix}/WEB-INF/log %{_var}/log/%{oldname}
-%{__ln_s} -f %{prefix} %{_var}/lib/tomcat5/webapps/%{oldname}
+%{__ln_s} -f %{prefix} %{_var}/lib/tomcat6/webapps/%{oldname}
 
 
-#%{__cp} /var/lib/tomcat5/webapps/exist/WEB-INF/lib/resolver-1.2.jar 
/var/#lib/tomcat5/common/endorsed/
-#%{__cp} /var/lib/tomcat5/webapps/exist/WEB-INF/lib/serializer-2.9.1.jar 
/#var/lib/tomcat5/common/endorsed/
-#%{__cp} /var/lib/tomcat5/webapps/exist/WEB-INF/lib/xalan-2.7.1.jar 
/var/lib/#tomcat5/common/endorsed/
-#%{__cp} /var/lib/tomcat5/webapps/exist/WEB-INF/lib/xercesImpl-2.9.1.jar 
/#var/lib/tomcat5/common/endorsed/
-#%{__cp} /var/lib/tomcat5/webapps/exist/WEB-INF/lib/xml-apis.jar 
/var/lib/#tomcat5/common/endorsed/
-
 ## restart tomcat
-/sbin/service tomcat5 restart
+/sbin/service tomcat6 restart
 
 
 
@@ -103,14 +85,14 @@
   %{__rm} -rf %{_sysconfdir}/%{oldname}/*.xml || true
   %{__rm} -rf %{_sysconfdir}/%{oldname}/*.sql || true
   %{__rm} -rf %{_var}/log/%{oldname} || true
-  %{__rm} -rf %{_var}/lib/tomcat5/webapps/%{oldname} || true
+  %{__rm} -rf %{_var}/lib/tomcat6/webapps/%{oldname} || true
 fi
 
 
 
 %postun
 ## restart tomcat
-/sbin/service tomcat5 restart
+/sbin/service tomcat6 restart