perfsonar development work

Author: nordunet.behrmann
Date: 2012-12-17 07:12:53 +0000 (Mon, 17 Dec 2012)
New Revision: 6070

Added:
   trunk/perfsonar-java-rrd-ma-SQL_backend/src/rpm/
   trunk/perfsonar-java-rrd-ma-SQL_backend/src/rpm/changelog
   trunk/perfsonar-java-rrd-ma-SQL_backend/src/rpm/post
   trunk/perfsonar-java-rrd-ma-SQL_backend/src/rpm/postun
   trunk/perfsonar-java-rrd-ma-SQL_backend/src/rpm/prep
   trunk/perfsonar-java-rrd-ma-SQL_backend/src/rpm/preun
Modified:
   trunk/perfsonar-java-rrd-ma-SQL_backend/pom.xml
Log:
perfsonar-java-rrd-ma-SQL_backend: Integrate RPM into Maven lifecycle

Also moven building of Debian packages to the deb profile.

Modified: trunk/perfsonar-java-rrd-ma-SQL_backend/pom.xml
===================================================================
--- trunk/perfsonar-java-rrd-ma-SQL_backend/pom.xml     2012-12-14 11:52:13 
UTC (rev 6069)
+++ trunk/perfsonar-java-rrd-ma-SQL_backend/pom.xml     2012-12-17 07:12:53 
UTC (rev 6070)
@@ -16,7 +16,7 @@
     <version>3.4.2-SNAPSHOT</version>
 
     <name>RRD Measurement Archive</name>
-    <description>Round Robin Database Measurement Archive for 
PerfSONAR.</description>
+    <description>PerfSONAR Round Robin Database</description>
     <inceptionYear>2009</inceptionYear>
 
     <properties>
@@ -24,6 +24,8 @@
         <axis2Id>axis2-1.4.1</axis2Id>
         <aar.name>${project.artifactId}</aar.name>
         
<version.nmwg-sql-converter>1.0.1-SNAPSHOT</version.nmwg-sql-converter>
+        <installName>perfsonar-java-rrd-ma</installName>
+        <installPath>/usr/lib/perfsonar/services/${installName}</installPath>
     </properties>
 
     <scm>
@@ -180,93 +182,6 @@
                 </configuration>
             </plugin>
 
-            <plugin>
-                <artifactId>jdeb</artifactId>
-                <groupId>org.vafer</groupId>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>jdeb</goal>
-                        </goals>
-                        <configuration>
-                            
<deb>[[buildDir]]/perfsonar-java-rrd-ma_[[version]]_all.[[extension]]</deb>
-                            <timestamped>true</timestamped>
-                            <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>
 
@@ -353,4 +268,215 @@
         </dependency>
 
     </dependencies>
+
+    <profiles>
+        <profile>
+            <id>deb</id>
+            <activation>
+                <!-- Activate this profile by default unless explicitly 
disabled. See
+                     
http://stackoverflow.com/questions/5309379/how-to-keep-maven-profiles-which-are-activebydefault-active-even-if-another-prof
+                     for details on why activeByDefault cannot be used here. 
-->
+                <property>
+                    <name>!skipDebProfile</name>
+                </property>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <artifactId>jdeb</artifactId>
+                        <groupId>org.vafer</groupId>
+                        <executions>
+                            <execution>
+                                <phase>package</phase>
+                                <goals>
+                                    <goal>jdeb</goal>
+                                </goals>
+                                <configuration>
+                                    
<deb>[[buildDir]]/[[installName]]_[[version]]_all.[[extension]]</deb>
+                                    <timestamped>true</timestamped>
+                                    <dataSet>
+                                        <data>
+                                            
<src>${project.build.directory}/${project.build.finalName}</src>
+                                            <type>directory</type>
+                                            <mapper>
+                                                <type>perm</type>
+                                                
<prefix>${installPath)</prefix>
+                                            </mapper>
+                                        </data>
+                                        <data>
+                                            <src>samples</src>
+                                            <type>directory</type>
+                                            <mapper>
+                                                <type>perm</type>
+                                                
<prefix>${installPath}/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/${installName}</prefix>
+                                            </mapper>
+                                        </data>
+                                        <data>
+                                            <src>doc/ChangeLog.txt</src>
+                                            <dst>changelog</dst>
+                                            <type>file</type>
+                                            <mapper>
+                                                <type>perm</type>
+                                                
<prefix>/usr/share/doc/${installName}</prefix>
+                                            </mapper>
+                                        </data>
+                                        <data>
+                                            <src>src/deb/doc</src>
+                                            <type>directory</type>
+                                            <mapper>
+                                                <type>perm</type>
+                                                
<prefix>/usr/share/doc/${installName}</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/${installName}</path>
+                                            </paths>
+                                            <mapper>
+                                                <type>perm</type>
+                                            </mapper>
+                                        </data>
+                                    </dataSet>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+
+        <profile>
+            <id>rpm</id>
+            <activation>
+                <os>
+                    <family>unix</family>
+                    <name>Linux</name>
+                </os>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.codehaus.mojo</groupId>
+                        <artifactId>rpm-maven-plugin</artifactId>
+                        <configuration>
+                            <name>${installName}</name>
+                            <packager>Gerd Behrmann 
&lt;&gt;</packager>
+                            <defineStatements>
+                                <defineStatement>prefix 
${installPath}</defineStatement>
+                            </defineStatements>
+                            <requires>
+                                <require>jre >= 1.6</require>
+                                <require>tomcat6</require>
+                                <require>rrdtool</require>
+                                <require>mysql-server</require>
+                                <require>mysql</require>
+                            </requires>
+                            <defaultFilemode>644</defaultFilemode>
+                            <defaultDirmode>755</defaultDirmode>
+                            <defaultGroupname>tomcat</defaultGroupname>
+                            <defaultUsername>root</defaultUsername>
+
+                            <mappings>
+                                <mapping>
+                                    <directory>${installPath}</directory>
+                                    <filemode>640</filemode>
+                                    <username>tomcat</username>
+                                    <groupname>tomcat</groupname>
+                                    <configuration>noreplace</configuration>
+                                    <sources>
+                                        <source>
+                                            
<location>${project.build.directory}/${project.build.finalName}</location>
+                                            <includes>
+                                                
<include>WEB-INF/classes/perfsonar/conf/configuration.xml</include>
+                                            </includes>
+                                        </source>
+                                    </sources>
+                                </mapping>
+                                <mapping>
+                                    <directory>${installPath}</directory>
+                                    
<recurseDirectories>false</recurseDirectories>
+                                    <sources>
+                                        <source>
+                                            
<location>${project.build.directory}/${project.build.finalName}</location>
+                                            <excludes>
+                                                
<exclude>WEB-INF/classes/perfsonar/conf/configuration.xml</exclude>
+                                            </excludes>
+                                        </source>
+                                    </sources>
+                                </mapping>
+                                <mapping>
+                                    
<directory>/usr/share/doc/${installName}</directory>
+                                    <documentation>true</documentation>
+                                    
<recurseDirectories>false</recurseDirectories>
+                                    <sources>
+                                        <source>
+                                            <location>doc</location>
+                                        </source>
+                                    </sources>
+                                </mapping>
+                                <mapping>
+                                    
<directory>${installPath}/WEB-INF/samples</directory>
+                                    
<recurseDirectories>false</recurseDirectories>
+                                    <sources>
+                                        <source>
+                                            <location>samples</location>
+                                        </source>
+                                    </sources>
+                                </mapping>
+                                <mapping>
+                                    <directory>/usr/sbin</directory>
+                                    <filemode>755</filemode>
+                                    <username>root</username>
+                                    <groupname>root</groupname>
+                                    
<directoryIncluded>false</directoryIncluded>
+                                    <sources>
+                                        <source>
+                                            
<location>src/main/sbin</location>
+                                        </source>
+                                    </sources>
+                                </mapping>
+                                <mapping>
+                                    
<directory>${installPath}/WEB-INF/log</directory>
+                                    <username>tomcat</username>
+                                    <groupname>tomcat</groupname>
+                                    <filemode>755</filemode>
+                                </mapping>
+                                <mapping>
+                                    
<directory>/etc/${installName}</directory>
+                                </mapping>
+                            </mappings>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+
+    </profiles>
 </project>

Added: trunk/perfsonar-java-rrd-ma-SQL_backend/src/rpm/changelog
===================================================================
--- trunk/perfsonar-java-rrd-ma-SQL_backend/src/rpm/changelog                 
          (rev 0)
+++ trunk/perfsonar-java-rrd-ma-SQL_backend/src/rpm/changelog   2012-12-17 
07:12:53 UTC (rev 6070)
@@ -0,0 +1,126 @@
+* Wed Aug 29 2012 Gerd Behrmann 
<>
 3.4-2
+- Set explicit table name for interfaces table
+- Reduced logging overhead of large messages
+- Changed SQL meta data backend to not hardcode interface name
+- Changed Hibernate config to not recreate schema on restart
+- Replaced rrdjtool with JNA wrapper of librrd
+- Updated external dependencies to newer versions
+- Dropped perfsonar base 3
+- Added automatic table creation during intial start
+- Changed default configuration to assume Tomcat port 8080
+- Changed default configuration to assume perfsonar_rrdma schema name
+- Added nmwg-sql-converter utility
+
+* Tue Apr 24 2012 Piotr Pikusa 
<>
 3.4-1
+- Cooperation with new version of Web psUI fixed
+
+* Tue Mar 09 2012 Piotr Pikusa 
<>
 3.4-0
+- New: SQL backend provided instead of exist
+- New: NMWG to SQL Converter application added
+
+
+* Tue Mar 23 2010 Piotr Pikusa 
<>
 3.3-2
+- New: Web Admin v1.0 integrated with the service
+- Change: new configuration.xml
+
+* Thu Feb 25 2010 Piotr Pikusa 
<>
 3.3-1
+- New: Use of new base library (base2)
+- Change: Removed WebAdmin. New WebAdmin will be available in the next rc
+- Change: Renamed service. Now the name of the service is: 
perfsonar-java-rrd-ma
+- Change: Directory structure changed - now the main service directory is: 
/usr/lib/perfsonar/services/perfsonar-java-rrd-ma
+- Change: Url changed. Now the service url is: 
http://localhost:8080/perfsonar-java-rrd-ma/services/MeasurementArchiveService
+- Change: Configuration files changed. Now the main conf file is: 
configuration.xml
+- Change: SVN migration. Now the SVN adress is: 
http://svn.geant.net/GEANT/SA2/ps-java-services/trunk/perfsonar-java-rrd-ma
+
+* Wed Jul 08 2009 Piotr Pikusa 
<>
 3.2
+- Change: Removed Admin Guide from doc directory. Up-to-date Admin Guide is 
now available only on svn
+- Change: Rename package from geant2-java-sql-ma to perfsonar-java-sql-ma
+
+* Wed Jul 08 2009 Piotr Pikusa 
<>
 3.1.2-1
+- Dummy package to rename service from geant2-java-rrd-ma to 
perfsonar-java-rrd-ma
+
+* Wed Mar 04 2009 Roman Lapacz 
<>
 3.1.1-1
+- Fixed Bug #724: wrong paths of log files
+
+* Wed Oct 01 2008 Roman Lapacz 
<>
 3.1-1
+- New: EchoRequest message allows now checking: if eXist database is running 
and the count the content of metadata configuration file; access data from 
random RRD file. It is also possible to request a self-test including all 
above.
+- New: parameter keyword introduced in metadata block to indicate 
project/organisation name
+- New: new request MeasurementArchiveStoreRequest switched off by default
+- New: performance improvements for MetadataKeyRequest message which fetches 
all metadata elements
+- Change: new service path /usr/lib/perfsonar/services/geant2-java-rrd-ma/
+- Change: format of log messages changed
+- Change: use of pSbase v1.0.20080902
+- Change: use of web admin library v0.9.3c
+- Change: eXist default port is 8180
+- Change: obsolete authRealm removed from metadata configuration file
+- Fixed Bug #497: default value of service.r.access_point property
+- Fixed Bug #405: request for ability to define which domain is the 
interface (solved via keyword)
+
+* Mon Mar 10 2008 Roman Lapacz 
<>
 3.0-1
+- New: support of ErrorResponse message type (use of perfsonar-base library 
version 1.0.20080310)
+- New: netutil namespace of datum element in the response containing 
utilization value is used.
+- New: WebAdmin administration (set of servlets) added
+- New: RPM is used as the installation package
+- New: support of AuthN functionality
+- Change: supportedEventTypes parameter in metadata element (in metadata 
cofiguration file) replaced with eventType element (the parameter is still 
supported)
+- Change: LS register component can now take metadata elements from xml 
database directly (not only from XML metadata config file)
+- Change: LS register interval time updated (now it's 12 hours)
+- Change: service name has changed (now it is geant2-java-rrd-ma)
+
+* Fri Nov 23 2007 Roman Lapacz 
<>
 2.3.2-1
+- New: the dump of rrd test file added
+- Fixed Bug #264: bulding the rrdjtool library for 64 bit arch fixed
+
+* Fri Oct 26 2007 Roman Lapacz 
<>
 2.3.1-1
+- Fixed Bug #243: problem with static default context name of eXist in URL 
address fixed
+
+* Wed Oct 24 2007 Roman Lapacz 
<>
 2.3-1
+- New: support for two additional characteristics: ifErrors and ifDiscards
+- New: new RRD test file to reflect new characteristics
+- New: eventType paremeter added to the key
+- Change: nmwg namespace for utilization datum element
+- Change: defaultly all log messages are collected in one log file
+- Change: defaultly debug log level is switched off
+- Change: base chanining switched on, propert in service.properties exist to 
switch it off
+- Change: eventType URL-based only
+- Change: service moved to new SVN structure
+- Change: ant scripts improved
+- Change: namespace of datum elements in SetupDataResponse message tied to 
eventType value
+- Change: supportedEventType parameter replaced by eventType element in 
metadata config file (excluding utilization). But service supports both
+- Change: use of new versions of base and NMWG libraries
+- Change: if 'jar' target is called and const.properties file does not exist 
then const.properties.template is renamed into const.properties before 
compilation
+- Change: new parameters set in data element in SetupDataResponse message 
containing general parameters used to create rrd file
+- Change: updated support for LookupInfoRequest to include all service 
properties
+- Change: service can generate keys with parameters elements of different 
namespaces
+- Fixed Bug #102: missing data in response
+- Fixed Bug #103: missing data in response
+- Fixed Bug #150: time interval shifted
+- Fixed Bug #157: namespace declaration
+- Fixed Bug #195: directories structure
+- Fixed Bug #198: exist database installation and initialisation limitations
+- Fixed Bug #221: supportedEventType vs eventType compatibility issue
+
+* Tue May 22 2007 Roman Lapacz 
<>
 2.2-1
+- Change: default log4j parameters updated; can generate 11 archive log 
files for each log level (500KB each)
+- Change: bug of wrong Context of exist war file fixed
+- Change: bug of wrong data source name when writing data into new RRD file 
fixed. Using new eventType was causing a problem while storing new data in 
RRD MA
+
+* Tue May 15 2007 Roman Lapacz 
<>
 2.1-1
+- New: Support for LookupInfoRequest for getting general information about 
the service
+- New: Key contains optional parameters describing RRD file: step, data 
type, heartbeat, min and max value
+- New: Configure script asks for service description, contact email and 
organization name
+- New: Iso time type support
+- Change: using only one exception class
+
+* Wed Mar 21 2007 Roman Lapacz 
<>
 2.0-1
+- New: Lookup Service registration
+- New: pre-install, configure, deploy, test steps in installation process
+- New: echoRequest functionality
+- New: 64-bit Linux support for building the rrdjtool library
+- New: result codes
+- New: support for mulitple service in one Tomcat instance
+- New: removing whitespaces such as newline, tabs, etc that are present in 
the request messages
+- Change: support for new utilization evenType value naming scheme
+- Change: log4J configuration in log4j.properties
+- Fixed Bug #108: installation process
+- Fixed Bug #109: installation process

Added: trunk/perfsonar-java-rrd-ma-SQL_backend/src/rpm/post
===================================================================
--- trunk/perfsonar-java-rrd-ma-SQL_backend/src/rpm/post                      
          (rev 0)
+++ trunk/perfsonar-java-rrd-ma-SQL_backend/src/rpm/post        2012-12-17 
07:12:53 UTC (rev 6070)
@@ -0,0 +1,11 @@
+## make symlink for easy access to conf
+%{__ln_s} -f %{prefix}/WEB-INF/classes/perfsonar/conf/*.xml 
%{_sysconfdir}/%{name}
+%{__ln_s} -f %{prefix}/WEB-INF/classes/perfsonar/conf/*.sql 
%{_sysconfdir}/%{name}
+%{__ln_s} -f %{prefix}/WEB-INF/log %{_var}/log/%{name}
+%{__ln_s} -f %{prefix} %{_var}/lib/tomcat6/webapps/%{name}
+rm -rf /var/lib/tomcat6/webapps/geant2-java-rrd-ma || true
+rm -rf %{_sysconfdir}/geant2-java-rrd-ma || true
+rm -rf /usr/share/doc/geant2-java-rrd-ma || true
+
+## restart tomcat
+/sbin/service tomcat6 restart

Added: trunk/perfsonar-java-rrd-ma-SQL_backend/src/rpm/postun
===================================================================
--- trunk/perfsonar-java-rrd-ma-SQL_backend/src/rpm/postun                    
          (rev 0)
+++ trunk/perfsonar-java-rrd-ma-SQL_backend/src/rpm/postun      2012-12-17 
07:12:53 UTC (rev 6070)
@@ -0,0 +1,2 @@
+## restart tomcat
+/sbin/service tomcat6 restart

Added: trunk/perfsonar-java-rrd-ma-SQL_backend/src/rpm/prep
===================================================================
--- trunk/perfsonar-java-rrd-ma-SQL_backend/src/rpm/prep                      
          (rev 0)
+++ trunk/perfsonar-java-rrd-ma-SQL_backend/src/rpm/prep        2012-12-17 
07:12:53 UTC (rev 6070)
@@ -0,0 +1,3 @@
+echo ${RPM_BUILD_DIR}
+%{__rm} -rf ${RPM_BUILD_DIR}/%{name}-%{version}
+%setup -q

Added: trunk/perfsonar-java-rrd-ma-SQL_backend/src/rpm/preun
===================================================================
--- trunk/perfsonar-java-rrd-ma-SQL_backend/src/rpm/preun                     
          (rev 0)
+++ trunk/perfsonar-java-rrd-ma-SQL_backend/src/rpm/preun       2012-12-17 
07:12:53 UTC (rev 6070)
@@ -0,0 +1,5 @@
+## remove symlink
+rm -rf %{_sysconfdir}/%{name}/*.xml || true
+rm -rf %{prefix}/WEB-INF/log ||true
+rm -rf /var/log/%{name} || true
+rm -rf /var/lib/tomcat6/webapps/%{name} || true