perfsonar-dev - [pS-dev] [GEANT/SA2/ps-java-services] r6040 - in trunk/perfsonar-java-rrd-ma-SQL_backend: . src src/deb src/deb/control src/deb/doc
Subject: perfsonar development work
List archive
[pS-dev] [GEANT/SA2/ps-java-services] r6040 - in trunk/perfsonar-java-rrd-ma-SQL_backend: . src src/deb src/deb/control src/deb/doc
Chronological Thread
- From:
- To:
- Subject: [pS-dev] [GEANT/SA2/ps-java-services] r6040 - in trunk/perfsonar-java-rrd-ma-SQL_backend: . src src/deb src/deb/control src/deb/doc
- Date: Tue, 27 Nov 2012 14:22:46 +0000 (GMT)
Author: nordunet.behrmann
Date: 2012-11-27 14:22:46 +0000 (Tue, 27 Nov 2012)
New Revision: 6040
Added:
trunk/perfsonar-java-rrd-ma-SQL_backend/src/deb/
trunk/perfsonar-java-rrd-ma-SQL_backend/src/deb/control/
trunk/perfsonar-java-rrd-ma-SQL_backend/src/deb/control/conffiles
trunk/perfsonar-java-rrd-ma-SQL_backend/src/deb/control/control
trunk/perfsonar-java-rrd-ma-SQL_backend/src/deb/control/postinst
trunk/perfsonar-java-rrd-ma-SQL_backend/src/deb/control/postrm
trunk/perfsonar-java-rrd-ma-SQL_backend/src/deb/control/preinst
trunk/perfsonar-java-rrd-ma-SQL_backend/src/deb/control/prerm
trunk/perfsonar-java-rrd-ma-SQL_backend/src/deb/doc/
trunk/perfsonar-java-rrd-ma-SQL_backend/src/deb/doc/copyright
Modified:
trunk/perfsonar-java-rrd-ma-SQL_backend/pom.xml
Log:
perfsonar-java-rrd-ma: Added Debian packaging as a Maven plugin
Allows Debian packages to be creatd on other platforms than
Debian/Ubuntu.
Modified: trunk/perfsonar-java-rrd-ma-SQL_backend/pom.xml
===================================================================
--- trunk/perfsonar-java-rrd-ma-SQL_backend/pom.xml 2012-11-27 14:22:45
UTC (rev 6039)
+++ trunk/perfsonar-java-rrd-ma-SQL_backend/pom.xml 2012-11-27 14:22:46
UTC (rev 6040)
@@ -8,7 +8,7 @@
<artifactId>perfsonar-java-rrd-ma</artifactId>
<packaging>war</packaging>
<name>RRD Measurement Archive</name>
- <version>3.4</version>
+ <version>3.4.1</version>
<description>Round Robin Database Measurement Archive for
perfSONAR. For more information see the wiki-page.</description>
<url>http://wiki.perfsonar.net/jra1-wiki/index.php/PerfSONAR_Java_RRD_MA_release_candidate</url>
@@ -19,6 +19,7 @@
<axis2Id>axis2-1.4.1</axis2Id>
<aar.name>${project.artifactId}</aar.name>
<version.nmwg-sql-converter>1.0.0</version.nmwg-sql-converter>
+ <deb.version>${project.version}-1</deb.version>
</properties>
<build>
@@ -199,6 +200,93 @@
</configuration>
</plugin>
+ <plugin>
+ <artifactId>jdeb</artifactId>
+ <groupId>org.vafer</groupId>
+ <version>0.11</version>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>jdeb</goal>
+ </goals>
+ <configuration>
+
<deb>[[buildDir]]/perfsonar-java-rrd-ma_[[deb.version]]_all.[[extension]]</deb>
+ <dataSet>
+ <data>
+
<src>${project.build.directory}/${project.build.finalName}</src>
+ <type>directory</type>
+ <mapper>
+ <type>perm</type>
+
<prefix>/usr/lib/perfsonar/services/perfsonar-java-rrd-ma</prefix>
+ </mapper>
+ </data>
+ <data>
+ <src>samples</src>
+ <type>directory</type>
+ <mapper>
+ <type>perm</type>
+
<prefix>/usr/lib/perfsonar/services/perfsonar-java-rrd-ma/WEB-INF/samples</prefix>
+ </mapper>
+ </data>
+ <data>
+
<src>packaging/deb/perfsonar-java-rrd-ma.xml</src>
+ <type>file</type>
+ <mapper>
+ <type>perm</type>
+
<prefix>/etc/tomcat6/Catalina/localhost</prefix>
+ </mapper>
+ </data>
+ <data>
+ <src>doc</src>
+ <type>directory</type>
+ <excludes>ChangeLog.txt</excludes>
+ <mapper>
+ <type>perm</type>
+
<prefix>/usr/share/doc/perfsonar-java-rrd-ma</prefix>
+ </mapper>
+ </data>
+ <data>
+ <src>doc/ChangeLog.txt</src>
+ <dst>changelog</dst>
+ <type>file</type>
+ <mapper>
+ <type>perm</type>
+
<prefix>/usr/share/doc/perfsonar-java-rrd-ma</prefix>
+ </mapper>
+ </data>
+ <data>
+ <src>src/deb/doc</src>
+ <type>directory</type>
+ <mapper>
+ <type>perm</type>
+
<prefix>/usr/share/doc/perfsonar-java-rrd-ma</prefix>
+ </mapper>
+ </data>
+ <data>
+ <src>src/main/sbin/nmwg-sql-converter</src>
+ <type>file</type>
+ <mapper>
+ <type>perm</type>
+ <filemode>755</filemode>
+ <prefix>/usr/sbin/</prefix>
+ </mapper>
+ </data>
+ <data>
+ <type>template</type>
+ <paths>
+
<path>/var/run/perfsonar-java-rrd-ma</path>
+ </paths>
+ <mapper>
+ <type>perm</type>
+ </mapper>
+ </data>
+ </dataSet>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
</plugins>
</build>
Added: trunk/perfsonar-java-rrd-ma-SQL_backend/src/deb/control/conffiles
===================================================================
--- trunk/perfsonar-java-rrd-ma-SQL_backend/src/deb/control/conffiles
(rev 0)
+++ trunk/perfsonar-java-rrd-ma-SQL_backend/src/deb/control/conffiles
2012-11-27 14:22:46 UTC (rev 6040)
@@ -0,0 +1,8 @@
+/usr/lib/perfsonar/services/perfsonar-java-rrd-ma/WEB-INF/classes/perfsonar/conf/configuration.xml
+/usr/lib/perfsonar/services/perfsonar-java-rrd-ma/WEB-INF/classes/perfsonar/conf/webAdminConfig.xml
+/usr/lib/perfsonar/services/perfsonar-java-rrd-ma/WEB-INF/classes/log4j.properties
+/usr/lib/perfsonar/services/perfsonar-java-rrd-ma/WEB-INF/classes/perfsonar/conf/rrdma_db.sql
+/usr/lib/perfsonar/services/perfsonar-java-rrd-ma/WEB-INF/classes/perfsonar/conf/test_rrdma_db.sql
+/usr/lib/perfsonar/services/perfsonar-java-rrd-ma/WEB-INF/conf/axis2.xml
+/usr/lib/perfsonar/services/perfsonar-java-rrd-ma/WEB-INF/web.xml
+
Added: trunk/perfsonar-java-rrd-ma-SQL_backend/src/deb/control/control
===================================================================
--- trunk/perfsonar-java-rrd-ma-SQL_backend/src/deb/control/control
(rev 0)
+++ trunk/perfsonar-java-rrd-ma-SQL_backend/src/deb/control/control
2012-11-27 14:22:46 UTC (rev 6040)
@@ -0,0 +1,11 @@
+Section: web
+Priority: extra
+Maintainer: Gerd Behrmann
<>
+Build-Depends: debhelper (>= 5), maven | maven2
+Standards-Version: 3.7.2
+Package: perfsonar-java-rrd-ma
+Version: [[deb.version]]
+Architecture: all
+Depends: mysql-server, java6-runtime, tomcat6, librrd4
+Description: perfSONAR Round Robin Database
+Distribution: testing
Added: trunk/perfsonar-java-rrd-ma-SQL_backend/src/deb/control/postinst
===================================================================
--- trunk/perfsonar-java-rrd-ma-SQL_backend/src/deb/control/postinst
(rev 0)
+++ trunk/perfsonar-java-rrd-ma-SQL_backend/src/deb/control/postinst
2012-11-27 14:22:46 UTC (rev 6040)
@@ -0,0 +1,92 @@
+#!/bin/sh
+# postinst script for ps-mdm-rrd-ma
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+# * <postinst> `configure' <most-recently-configured-version>
+# * <old-postinst> `abort-upgrade' <new version>
+# * <conflictor's-postinst> `abort-remove' `in-favour' <package>
+# <new-version>
+# * <postinst> `abort-remove'
+# * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
+# <failed-install-package> <version> `removing'
+# <conflicting-package> <version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+SERVICENAME="perfsonar-java-rrd-ma"
+SERVICEPATH="/usr/lib/perfsonar/services"
+
+
+
+case "$1" in
+ configure)
+
+
+ #Bug fix for a previous package version,
+ #where symbolic links where not removed on package removal
+ OLD_SERVICE_NAME=geant2-java-rrd-ma
+ if [ -e /var/lib/tomcat5.5/webapps/$OLD_SERVICE_NAME ]; then
+ rm -rf /var/lib/tomcat5.5/webapps/$OLD_SERVICE_NAME
+ fi
+
+ if [ -e /etc/$OLD_SERVICE_NAME ]; then
+ rm -rf /etc/$OLD_SERVICE_NAME/*
+ fi
+
+ if [ -e /var/log/$OLD_SERVICE_NAME ]; then
+ rm -rf /var/log/$OLD_SERVICE_NAME
+ fi
+
+ if [ -e /usr/share/doc/$OLD_SERVICE_NAME ]; then
+ rm -rf /usr/share/doc/$OLD_SERVICE_NAME
+ fi
+
+ #Installing new service
+ if [ -h /etc/$SERVICENAME ]
+ then
+ rm /etc/$SERVICENAME
+ fi
+ ln -sf $SERVICEPATH/$SERVICENAME/WEB-INF/classes/perfsonar/conf
/etc/$SERVICENAME || true
+
+ if [ -h /var/log/$SERVICENAME ]
+ then
+ rm /var/log/$SERVICENAME
+ fi
+ mkdir -p $SERVICEPATH/$SERVICENAME/WEB-INF/log
+ ln -sf $SERVICEPATH/$SERVICENAME/WEB-INF/log /var/log/$SERVICENAME ||
true
+
+ if [ -h /usr/share/doc/$SERVICENAME/spec ]
+ then
+ rm /usr/share/doc/$SERVICENAME/spec
+ fi
+ ln -sf $SERVICEPATH/$SERVICENAME/WEB-INF/doc
/usr/share/doc/$SERVICENAME/spec || true
+
+ chown -R tomcat6 $SERVICEPATH/$SERVICENAME/WEB-INF/classes/perfsonar/conf
+ chown tomcat6 $SERVICEPATH/$SERVICENAME/WEB-INF/log
+ chown tomcat6 /var/run/$SERVICENAME
+
+ service tomcat6 restart
+
+ ;;
+
+ abort-upgrade|abort-remove|abort-deconfigure)
+ ;;
+
+ *)
+ echo "postinst called with unknown argument \`$1'" >&2
+ exit 1
+ ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
+
+
Added: trunk/perfsonar-java-rrd-ma-SQL_backend/src/deb/control/postrm
===================================================================
--- trunk/perfsonar-java-rrd-ma-SQL_backend/src/deb/control/postrm
(rev 0)
+++ trunk/perfsonar-java-rrd-ma-SQL_backend/src/deb/control/postrm
2012-11-27 14:22:46 UTC (rev 6040)
@@ -0,0 +1,70 @@
+#!/bin/sh
+# postrm script for ps-mdm-rrd-ma
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+# * <postrm> `remove'
+# * <postrm> `purge'
+# * <old-postrm> `upgrade' <new-version>
+# * <new-postrm> `failed-upgrade' <old-version>
+# * <new-postrm> `abort-install'
+# * <new-postrm> `abort-install' <old-version>
+# * <new-postrm> `abort-upgrade' <old-version>
+# * <disappearer's-postrm> `disappear' <overwriter>
+# <overwriter-version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+
+SERVICENAME="perfsonar-java-rrd-ma"
+SERVICEPATH="/usr/lib/perfsonar/services"
+
+
+case "$1" in
+ purge)
+
+ if [ -h /etc/$SERVICENAME ]
+ then
+ rm -rf /etc/$SERVICENAME
+ fi
+
+ if [ -h /var/log/$SERVICENAME ]
+ then
+ rm -rf /var/log/$SERVICENAME
+ fi
+ rm -fr $SERVICEPATH/$SERVICENAME/WEB-INF/log
+
+ if [ -h /usr/share/doc/$SERVICENAME/spec ]
+ then
+ rm -rf /usr/share/doc/$SERVICENAME/spec
+ fi
+
+ rm -rf $SERVICEPATH/$SERVICENAME
+
+ service tomcat6 restart
+ ;;
+
+
+
+ remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
+
+ service tomcat6 restart
+ ;;
+
+ *)
+ echo "postrm called with unknown argument \`$1'" >&2
+ exit 1
+ ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
+
+
Added: trunk/perfsonar-java-rrd-ma-SQL_backend/src/deb/control/preinst
===================================================================
--- trunk/perfsonar-java-rrd-ma-SQL_backend/src/deb/control/preinst
(rev 0)
+++ trunk/perfsonar-java-rrd-ma-SQL_backend/src/deb/control/preinst
2012-11-27 14:22:46 UTC (rev 6040)
@@ -0,0 +1,45 @@
+#!/bin/sh
+# preinst script for ps-mdm-rrd-ma
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+# * <new-preinst> `install'
+# * <new-preinst> `install' <old-version>
+# * <new-preinst> `upgrade' <old-version>
+# * <old-preinst> `abort-upgrade' <new-version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+SERVICEPATH="/usr/lib/perfsonar/services"
+SERVICENAME="perfsonar-java-rrd-ma"
+case "$1" in
+ install|upgrade)
+ #Temporary solution to make conffiles updatetable - renaming
configuration.xml to confguration.xml.old
+ if [ -e
$SERVICEPATH/$SERVICENAME/WEB-INF/classes/perfsonar/conf/configuration.xml ];
then
+ cp
$SERVICEPATH/$SERVICENAME/WEB-INF/classes/perfsonar/conf/configuration.xml
$SERVICEPATH/$SERVICENAME/WEB-INF/classes/perfsonar/conf/configuration.xml.old
+ fi
+
+
+
+ ;;
+
+ abort-upgrade)
+ ;;
+
+ *)
+ echo "preinst called with unknown argument \`$1'" >&2
+ exit 1
+ ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
+
+
Added: trunk/perfsonar-java-rrd-ma-SQL_backend/src/deb/control/prerm
===================================================================
--- trunk/perfsonar-java-rrd-ma-SQL_backend/src/deb/control/prerm
(rev 0)
+++ trunk/perfsonar-java-rrd-ma-SQL_backend/src/deb/control/prerm
2012-11-27 14:22:46 UTC (rev 6040)
@@ -0,0 +1,40 @@
+#!/bin/sh
+# prerm script for ps-mdm-rrd-ma
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+# * <prerm> `remove'
+# * <old-prerm> `upgrade' <new-version>
+# * <new-prerm> `failed-upgrade' <old-version>
+# * <conflictor's-prerm> `remove' `in-favour' <package> <new-version>
+# * <deconfigured's-prerm> `deconfigure' `in-favour'
+# <package-being-installed> <version> `removing'
+# <conflicting-package> <version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+
+case "$1" in
+ remove|upgrade|deconfigure)
+ ;;
+
+ failed-upgrade)
+ ;;
+
+ *)
+ echo "prerm called with unknown argument \`$1'" >&2
+ exit 1
+ ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
+
+
Added: trunk/perfsonar-java-rrd-ma-SQL_backend/src/deb/doc/copyright
===================================================================
--- trunk/perfsonar-java-rrd-ma-SQL_backend/src/deb/doc/copyright
(rev 0)
+++ trunk/perfsonar-java-rrd-ma-SQL_backend/src/deb/doc/copyright
2012-11-27 14:22:46 UTC (rev 6040)
@@ -0,0 +1,30 @@
+Format-Specification:
http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135
+Name: perfsonar-java-rrd-ma
+Maintainer: Gerd Behrmann
<>
+Source: https://forge.geant.net/forge/display/perfsonar/Home
+
+Files: *
+Copyright: 2008-2012, DANTE on behalf of the GEANT2 NRENs
+License: BSD-3-clause
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+ * Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+ * Neither the name of the DANTE or GEANT2 nor the
+ names of its contributors may be used to endorse or promote products
+ derived from this software without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY DANTE ``AS IS AND ANY
+ EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED. IN NO EVENT SHALL DANTE or the GEANT2 NRENS BE LIABLE FOR ANY
+ DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
THIS
+ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
- [pS-dev] [GEANT/SA2/ps-java-services] r6040 - in trunk/perfsonar-java-rrd-ma-SQL_backend: . src src/deb src/deb/control src/deb/doc, svn-noreply, 11/27/2012
Archive powered by MHonArc 2.6.16.