perfsonar development work

Author: nordunet.behrmann
Date: 2012-12-14 10:47:58 +0000 (Fri, 14 Dec 2012)
New Revision: 6068

Added:
   trunk/perfsonar-java-sql-ma/src/rpm/
   trunk/perfsonar-java-sql-ma/src/rpm/changelog
   trunk/perfsonar-java-sql-ma/src/rpm/post
   trunk/perfsonar-java-sql-ma/src/rpm/postun
   trunk/perfsonar-java-sql-ma/src/rpm/preun
Modified:
   trunk/parent/pom.xml
   trunk/perfsonar-java-sql-ma/pom.xml
Log:
perfsonar-java-sql-ma: Integrate RPM packaging into Maven build

The RPM Maven Plugin is now used to build RPM packages. i

In contrast to the DEB plugin, the RPM plugin relies on the native
RPM tools. Thus RPM packaging only works if RPM is installed. RPM
is commonly available on Linux, even on non-RPM distributions like
Debian and Ubuntu. It is not available on other platforms like
Mac OS X and Windows. Therefore I have added the packaging step
to a special Maven profile called rpm. The profile is automatically
activated on Linux, and disabled on other platform. You can explicitly
enable or disable it by adding -P rpm or -P !rpm to the Maven command
line.

For consistency I have moved the Debian packaging step to a Maven
profile called deb. The profile is active by default as Debian
packaging is done without any native tools. It can be explicitly
disabled by adding -P !deb to the Maven command line.

Modified: trunk/parent/pom.xml
===================================================================
--- trunk/parent/pom.xml        2012-12-11 12:47:26 UTC (rev 6067)
+++ trunk/parent/pom.xml        2012-12-14 10:47:58 UTC (rev 6068)
@@ -23,7 +23,7 @@
     <url>http://perfsonar.geant.net/</url>
     <licenses>
         <license>
-            <name>GÉANT Standard Open Source Software Outward Licence</name>
+            <name>GÉANT Standard Open Source Software Outward License</name>
             <distribution>repo</distribution>
         </license>
     </licenses>
@@ -187,6 +187,38 @@
                     <version>3.2</version>
                 </plugin>
 
+                <plugin>
+                    <groupId>org.codehaus.mojo</groupId>
+                    <artifactId>rpm-maven-plugin</artifactId>
+                    <version>2.1-alpha-2</version>
+                    <executions>
+                        <execution>
+                            <phase>package</phase>
+                            <goals>
+                                <goal>rpm</goal>
+                            </goals>
+                        </execution>
+                    </executions>
+                    <configuration>
+                        <copyright>GÉANT Standard Open Source Software 
Outward License</copyright>
+                        <distribution>PerfSONAR</distribution>
+                        <group>Network/Web service</group>
+                        <changelogFile>src/rpm/changelog</changelogFile>
+                        <preinstallScriptlet>
+                            <scriptFile>src/rpm/pre</scriptFile>
+                        </preinstallScriptlet>
+                        <postinstallScriptlet>
+                            <scriptFile>src/rpm/post</scriptFile>
+                        </postinstallScriptlet>
+                        <preremoveScriptlet>
+                            <scriptFile>src/rpm/preun</scriptFile>
+                        </preremoveScriptlet>
+                        <postremoveScriptlet>
+                            <scriptFile>src/rpm/postun</scriptFile>
+                        </postremoveScriptlet>
+                    </configuration>
+                </plugin>
+
             </plugins>
         </pluginManagement>
     </build>

Modified: trunk/perfsonar-java-sql-ma/pom.xml
===================================================================
--- trunk/perfsonar-java-sql-ma/pom.xml 2012-12-11 12:47:26 UTC (rev 6067)
+++ trunk/perfsonar-java-sql-ma/pom.xml 2012-12-14 10:47:58 UTC (rev 6068)
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project>
     <parent>
-      <groupId>net.geant.perfsonar</groupId>
-      <artifactId>parent</artifactId>
-      <version>1.0.0-SNAPSHOT</version>
-      <relativePath>../parent/pom.xml</relativePath>
+        <groupId>net.geant.perfsonar</groupId>
+        <artifactId>parent</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
+        <relativePath>../parent/pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
@@ -14,10 +14,12 @@
 
     <properties>
         <slf4j.version>1.6.6</slf4j.version>
+        <installName>geant2-java-sql-ma</installName>
+        <installPath>/usr/lib/perfsonar/services/${installName}</installPath>
     </properties>
 
     <name>SQL Measurement Archive</name>
-    <description>Relational Database Measurement Archive for 
PerfSONAR.</description>
+    <description>PerfSONAR Relational Database Service</description>
     <inceptionYear>2008</inceptionYear>
     <scm>
         
<connection>scm:svn:http://svn.geant.net/GEANT/SA2/ps-java-services/trunk/perfsonar-java-sql-ma/</connection>
@@ -25,7 +27,7 @@
     </scm>
 
     <build>
-        <finalName>geant2-java-sql-ma</finalName>
+        <finalName>${installName}</finalName>
         <plugins>
 
             <plugin>
@@ -50,76 +52,6 @@
                     </execution>
                 </executions>
             </plugin>
-
-            <plugin>
-                <artifactId>jdeb</artifactId>
-                <groupId>org.vafer</groupId>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>jdeb</goal>
-                        </goals>
-                        <configuration>
-                            
<deb>[[buildDir]]/[[artifactId]]_[[version]]_all.[[extension]]</deb>
-                            <timestamped>true</timestamped>
-                            <dataSet>
-                                <data>
-                                    <src>target/geant2-java-sql-ma</src>
-                                    <type>directory</type>
-                                    <mapper>
-                                        <type>perm</type>
-                                        
<prefix>/usr/lib/perfsonar/services/geant2-java-sql-ma</prefix>
-                                    </mapper>
-                                </data>
-                                <data>
-                                    
<src>packaging/deb/geant2-java-sql-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-sql-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-sql-ma</prefix>
-                                    </mapper>
-                                </data>
-                                <data>
-                                    <src>src/deb/doc</src>
-                                    <type>directory</type>
-                                    <mapper>
-                                        <type>perm</type>
-                                        
<prefix>/usr/share/doc/perfsonar-java-sql-ma</prefix>
-                                    </mapper>
-                                </data>
-                                <data>
-                                    <src>src/main/sbin</src>
-                                    <type>directory</type>
-                                    <mapper>
-                                        <type>perm</type>
-                                        <filemode>755</filemode>
-                                        <prefix>/usr/sbin</prefix>
-                                    </mapper>
-                                </data>
-                            </dataSet>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
         </plugins>
     </build>
 
@@ -232,4 +164,190 @@
 
     </dependencies>
 
+    <profiles>
+
+        <profile>
+            <id>deb</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <artifactId>jdeb</artifactId>
+                        <groupId>org.vafer</groupId>
+                        <executions>
+                            <execution>
+                                <phase>package</phase>
+                                <goals>
+                                    <goal>jdeb</goal>
+                                </goals>
+                                <configuration>
+                                    
<deb>[[buildDir]]/[[artifactId]]_[[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>packaging/deb/geant2-java-sql-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-sql-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-sql-ma</prefix>
+                                            </mapper>
+                                        </data>
+                                        <data>
+                                            <src>src/deb/doc</src>
+                                            <type>directory</type>
+                                            <mapper>
+                                                <type>perm</type>
+                                                
<prefix>/usr/share/doc/perfsonar-java-sql-ma</prefix>
+                                            </mapper>
+                                        </data>
+                                        <data>
+                                            <src>src/main/sbin</src>
+                                            <type>directory</type>
+                                            <mapper>
+                                                <type>perm</type>
+                                                <filemode>755</filemode>
+                                                <prefix>/usr/sbin</prefix>
+                                            </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>
+                            <packager>Gerd Behrmann 
&lt;&gt;</packager>
+                            <defineStatements>
+                                <defineStatement>oldname 
${installName}</defineStatement>
+                                <defineStatement>prefix 
${installPath}</defineStatement>
+                            </defineStatements>
+                            <requires>
+                                <require>jre >= 1.6</require>
+                                <require>tomcat6</require>
+                                <require>perfsonar-exist</require>
+                            </requires>
+                            <obsoletes>
+                                <obsolete>geant2-java-sql-ma</obsolete>
+                            </obsoletes>
+                            <conflicts>
+                                <conflict>geant2-java-sql-ma</conflict>
+                            </conflicts>
+                            <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/*.properties</include>
+                                                
<include>WEB-INF/classes/perfsonar/conf/objects.config</include>
+                                                
<include>WEB-INF/classes/perfsonar/conf/*.xml</include>
+                                                
<include>WEB-INF/classes/*.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/*.properties</exclude>
+                                                
<exclude>WEB-INF/classes/perfsonar/conf/objects.config</exclude>
+                                                
<exclude>WEB-INF/classes/perfsonar/conf/*.xml</exclude>
+                                                
<exclude>WEB-INF/classes/*.xml</exclude>
+                                            </excludes>
+                                        </source>
+                                    </sources>
+                                </mapping>
+                                <mapping>
+                                    
<directory>/usr/share/doc/perfsonar-java-sql-ma</directory>
+                                    <documentation>true</documentation>
+                                    
<recurseDirectories>false</recurseDirectories>
+                                    <sources>
+                                        <source>
+                                            <location>doc</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>
+                            </mappings>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+
 </project>

Added: trunk/perfsonar-java-sql-ma/src/rpm/changelog
===================================================================
--- trunk/perfsonar-java-sql-ma/src/rpm/changelog                             
  (rev 0)
+++ trunk/perfsonar-java-sql-ma/src/rpm/changelog       2012-12-14 10:47:58 
UTC (rev 6068)
@@ -0,0 +1,116 @@
+* Wed Sep 5 2012 Gerd Behrmann 
<>
 2.3rc3
+- Changed dependencies to require Tomcat 6
+- Changed dependencies to require perfsonar-exist
+- Changed default configuration to match installation guide
+
+* Tue Jul 17 2012 Gerd Behrmann 
<>
 2.3rc2
+- Added NMWG specs to docs directory
+- Added sample files
+- Changed Tomcat dependency to Tomcat 6
+- Changed default configuration to enable write requests
+- Added mapping for bwctl and iperf events with trailing slash
+
+* Wed Oct 5 2011 Piotr Pikusa 
<>
 2.3rc1
+- OWAMP and OWAMP SUMMARY requestes implemented
+
+* Tue Aug 07 2010 Piotr Pikusa 
<>
 2.3rc1
+- Removed installation text guides
+- Removed Web Admin Guide in pdf file. Up-to-date Admin Guide is available 
+
+* Tue Jul 07 2009 Piotr Pikusa 
<>
 2.2
+- Removed installation text guides
+- Removed Web Admin Guide in pdf file. Up-to-date Admin Guide is available 
on https://anonsvn.internet2.edu/svn/perfsonar/trunk/perfsonar-doc/manuals/
+- Package name changed from geant2-java-sql-ma to perfsonar-java-sql-ma
+
+* Mon May 25 2009 Piotr Pikusa 
<>
 2.1.1-5
+- New: sql scripts creating db schema in MySql and PostgresSQL added to conf 
directory
+- New: sql script added updating MySql db schema from last stable version to 
current
+- Change: Web Admin Guide document updated (v 1.5)
+
+* Mon May 04 2009 Piotr Pikusa 
<>
 2.1.1-4
+- Fixed Bug #755: In perfsonar_iperf sql table field numBytes changed from 
INT to NUMERIC(40)
+
+* Wed Feb 11 2009 Roman Lapacz 
<>
 2.1.1-1
+- New: support for iperf/nmwg metadata and data
+- Change: xquery statements ("fetch all") for utilization, discards and 
errors metadata elements updated
+- Change: admin guide document updated (v1.3)
+- Change: dealing with ping data updated and officially supported
+- Change: use of pSbase v1.0.20090210
+- Change: use of nmwg v1.0.20090210
+- Change: register interval time in seconds
+
+* Wed Oct 01 2008 Roman Lapacz 
<>
 2.1-1
+- New: ibatisConfig parameter can be moved from store requests to 
eventType-map configuration file
+- New: Available as deb package
+- New: if 'timeValue' attribute in datum element of store request (only for 
link status data) is missing then the current time is used
+- New: support for CompleteMetadataStoreRequest message type which replaces 
metadata configuration content
+- New: ISO time format supported in CompleteMetadataStoreRequest and 
MeasurementArchiveStoreRequest messages
+- New: CompleteMetadataStoreRequest switched off by default
+- New: EchoRequest message allows now checking: if eXist database is running 
and the count the content of metadata configuration file; access data from 
relational database. 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: MeasurementArchiveStoreRequest switched off by default
+- Change: new service path /usr/lib/perfsonar/services/geant2-java-sql-ma/
+- Change: default value of service.r.access_point property update to service 
URL
+- Change: eXist default port is 8180
+- Change: format of log messages changed
+- Change: use of pSbase v1.0.20080902
+- Change: use of web admin library v0.9.3c
+- Change: one database table is now used for domain and interdomain links
+- Change: obsolete authRealm removed from metadata configuration file
+- Fixed Bug #508: error in the SQL setup file
+- Fixed Bug #619: publishing duplicates sent by E2EMon MP
+
+* Wed Apr 16 2008 Roman Lapacz 
<>
 2.0-1
+- New: new namespace (netutil) of datum element in the response containing 
utilization value is used
+- New: Web administration (set of servlets) added
+- New: RPM is used as the installation package
+- New: AuthN functionality supported
+- Change: supportedEventTypes parameter in metadata element (in metadata 
cofiguration file) replaced with eventType element (the parameter is still 
supported). Metadata elements with eventType "Path.Status" still prefer the 
parameter
+- New: support for ErrorResponse message type (use of perfsonar-base library 
version 1.0.20080310)
+- Change: LS register component can now take metadata elements from xml 
database directly (not only from xml metadata config file)
+- Change: LS register dafault interval time changed 12 hours
+- Change: service name has changed (now it is geant2-java-sql-ma)
+
+* Thu Nov 08 2007 Roman Lapacz 
<>
 1.3-1
+- New: installation script asks for eXist context name instead of static 
default
+- New: support for two additional characteristics: ifErrors and ifDiscards
+- New: support of datum element of netutil namespace in the response from 
the service
+- New: eventType paremeter added to the key
+- Change: base chanining switched on, property in service.properties exist 
to switch it off
+- Change: defaultly all log messages are collected in one log file
+- Change: defaultly debug log level is switched off
+- Change: defualt type of accessing XML DB changed is 'xmlrpc'
+- Change: supportedEventType parameter replaced by eventType element in 
metadata config file
+- Change: use of new versions of base and NMWG libraries
+- Change: service can generate keys with parameters elements of different 
namespaces
+- Change: eventType URL-based only
+- Change: service moved to new SVN structure
+- Change: ant scripts improved
+- 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: updated support for LookupInfoRequest to include all service 
properties
+
+* Mon May 21 2007 Roman Lapacz 
<>
 1.2-1
+- Change: saxon jar files have been added to eliminate possible invocation 
exception
+
+* Wed May 16 2007 Roman Lapacz 
<>
 1.1-1
+- New: Support for LookupInfoRequest for getting general information about 
the service
+- New: Iso time type support
+- Change: default log4j parameters updated; log files (archives and current) 
for one log level is limited up to 6MB
+- Change: time type attribute in datum element in the response
+
+* Thu Mar 22 2007 Roman Lapacz 
<>
 1.0-1
+- New: support for relational database data storage
+- New: Support for utilization and L2 path status
+- New: Lookup Service registration
+- New: echoRequest functionality
+- New: result codes
+- New: pre-install, configure, deploy, test steps in installation process
+- New: support for new utilization evenType value naming scheme
+- New: support for both new 
(http://ggf.org/ns/nmwg/topology/l2/3.0/link/status) and old (Path.Status) 
link status evenType value naming scheme
+- Fixed Bug #50: More descriptive debug information in log
+- Fixed Bug #83: Installation process
+- Fixed Bug #127: Installation process
+- Fixed Bug #133: Installation process
+- Fixed Bug #135: Installation process
+- Fixed Bug #154: Error code generated if eventType is missing or its value 
is unknown

Added: trunk/perfsonar-java-sql-ma/src/rpm/post
===================================================================
--- trunk/perfsonar-java-sql-ma/src/rpm/post                            (rev 
0)
+++ trunk/perfsonar-java-sql-ma/src/rpm/post    2012-12-14 10:47:58 UTC (rev 
6068)
@@ -0,0 +1,8 @@
+## make symlink for easy access to conf
+%{__ln_s} -f %{prefix}/WEB-INF/classes/perfsonar/conf/*.properties 
%{_sysconfdir}/%{oldname}
+%{__ln_s} -f %{prefix}/WEB-INF/classes/perfsonar/conf/objects.config 
%{_sysconfdir}/%{oldname}
+%{__ln_s} -f %{prefix}/WEB-INF/classes/perfsonar/conf/*.sql 
%{_sysconfdir}/%{oldname}
+%{__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/tomcat6/webapps/%{oldname}

Added: trunk/perfsonar-java-sql-ma/src/rpm/postun
===================================================================
--- trunk/perfsonar-java-sql-ma/src/rpm/postun                          (rev 
0)
+++ trunk/perfsonar-java-sql-ma/src/rpm/postun  2012-12-14 10:47:58 UTC (rev 
6068)
@@ -0,0 +1 @@
+/sbin/service tomcat6 restart

Added: trunk/perfsonar-java-sql-ma/src/rpm/preun
===================================================================
--- trunk/perfsonar-java-sql-ma/src/rpm/preun                           (rev 
0)
+++ trunk/perfsonar-java-sql-ma/src/rpm/preun   2012-12-14 10:47:58 UTC (rev 
6068)
@@ -0,0 +1,9 @@
+## remove symlink
+if [ ! -e %{prefix}/WEB-INF/classes/perfsonar/conf/service.properties ]; then
+  %{__rm} -rf %{_sysconfdir}/%{oldname}/*.properties || true
+  %{__rm} -rf %{_sysconfdir}/%{oldname}/objects.config || true
+  %{__rm} -rf %{_sysconfdir}/%{oldname}/*.xml || true
+  %{__rm} -rf %{_sysconfdir}/%{oldname}/*.sql || true
+  %{__rm} -rf %{_var}/log/%{oldname} || true
+  %{__rm} -rf %{_var}/lib/tomcat6/webapps/%{oldname} || true
+fi