perfsonar development work

Author: dante.delvaux
Date: 2013-01-02 21:03:38 +0000 (Wed, 02 Jan 2013)
New Revision: 6082

Added:
   trunk/perfsonar-java-xml-ls/src/deb/
   trunk/perfsonar-java-xml-ls/src/deb/README.Debian
   trunk/perfsonar-java-xml-ls/src/deb/control/
   trunk/perfsonar-java-xml-ls/src/deb/control/conffiles
   trunk/perfsonar-java-xml-ls/src/deb/control/control
   trunk/perfsonar-java-xml-ls/src/deb/control/postinst
   trunk/perfsonar-java-xml-ls/src/deb/control/postrm
   trunk/perfsonar-java-xml-ls/src/deb/control/preinst
   trunk/perfsonar-java-xml-ls/src/deb/control/prerm
   trunk/perfsonar-java-xml-ls/src/deb/copyright
Modified:
   trunk/perfsonar-java-xml-ls/pom.xml
   
trunk/perfsonar-java-xml-ls/src/main/java/org/perfsonar/service/lookupservice/registration/summarization/SummarizeIpAddrs.java
Log:
LS: Adding Debian package generation directly from Maven (to be tested).


Modified: trunk/perfsonar-java-xml-ls/pom.xml
===================================================================
--- trunk/perfsonar-java-xml-ls/pom.xml 2013-01-02 16:16:06 UTC (rev 6081)
+++ trunk/perfsonar-java-xml-ls/pom.xml 2013-01-02 21:03:38 UTC (rev 6082)
@@ -519,6 +519,101 @@
                                
<datadir>/var/lib/perfsonar-java-xml-ls/data/</datadir>
                        </properties>
                </profile>
+               <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]]/[[artifactId]]_[[version]]_all.[[extension]]</deb>
+                                                                       
<timestamped>true</timestamped>
+                                                                       
<verbose>false</verbose>
+                                                                       
<dataSet>
+                                                                             
  <!-- <data> <src>${project.build.directory}/geant2-java-xml-ls</src> 
+                                                                             
          <type>directory</type> <mapper> <type>perm</type> 
<prefix>/usr/lib/perfsonar/services/geant2-java-xml-ls</prefix> 
+                                                                             
          </mapper> </data> -->
+                                                                             
  <data>
+                                                                             
          <src>${project.build.directory}/${project.build.finalName}</src>
+                                                                             
          <type>directory</type>
+                                                                             
          <excludes>data/,doc/</excludes>
+                                                                             
          <mapper>
+                                                                             
                  <type>perm</type>
+                                                                             
                  
<prefix>/usr/lib/perfsonar/services/${project.artifactId}</prefix>
+                                                                             
          </mapper>
+                                                                             
  </data>
+                                                                             
  <data>
+                                                                             
          
<src>${project.build.directory}/${project.build.finalName}/data</src>
+                                                                             
          <type>directory</type>
+                                                                             
          <mapper>
+                                                                             
                  <type>perm</type>
+                                                                             
                  <prefix>/var/lib/${project.artifactId}/data</prefix>
+                                                                             
          </mapper>
+                                                                             
  </data>
+                                                                             
  <data>
+                                                                             
          <src>${project.build.directory}/${project.build.finalName}/doc</src>
+                                                                             
          <type>directory</type>
+                                                                             
          <includes>Collaboration.txt,License.txt,changelog.txt</includes>
+                                                                             
          <mapper>
+                                                                             
                  <type>perm</type>
+                                                                             
                  <prefix>/usr/share/doc/${project.artifactId}</prefix>
+                                                                             
          </mapper>
+                                                                             
  </data>
+                                        <data>
+                                            <src>${basedir}/src/deb</src>
+                                            <type>directory</type>
+                                            
<includes>copyright,README.Debian</includes>
+                                            <mapper>
+                                                <type>perm</type>
+                                                
<prefix>/usr/share/doc/${project.artifactId}</prefix>
+                                            </mapper>
+                                        </data>
+                                                                             
  <data>
+                                                                             
          <type>template</type>
+                                                                             
          <paths>
+                                                                             
                  <path>/var/log/${project.artifactId}</path>
+                                                                             
          </paths>
+                                                                             
  </data>
+                                                                             
  <!-- <data> <type>link</type> 
<src>usr/lib/perfsonar/services/geant2-java-xml-ls</src> 
+                                                                             
          
<linkTarget>/var/lib/tomcat6/webapps/geant2-java-xml-ls</linkTarget> 
<symlink>true</symlink> 
+                                                                             
          </data> -->
+                                                                             
          <!-- links are not supported in the 0.11 version of jDeb
+                                                                             
  <data>
+                                            
<src>/var/lib/tomcat6/webapps/${project.artifactId}</src>
+                                            <type>link</type>
+                                                                             
          
<linkTarget>/usr/lib/perfsonar/services/${project.artifactId}</linkTarget>
+                                                                             
          <symlink>true</symlink>
+                                                                             
  </data>
+                                                                             
  <data>
+                                                                             
          
<src>/usr/lib/perfsonar/services/${project.artifactId}/WEB-INF/classes/perfsonar/conf</src>
+                                            <type>link</type>
+                                                                             
          <linkTarget>/etc/${project.artifactId}</linkTarget>
+                                                                             
          <symlink>true</symlink>
+                                                                             
  </data>
+                                                                             
   -->
+                                                                       
</dataSet>
+                                                               
</configuration>
+                                                       </execution>
+                                               </executions>
+                                       </plugin>
+                               </plugins>
+                       </build>
+               </profile>
        </profiles>
 
        <dependencyManagement>

Added: trunk/perfsonar-java-xml-ls/src/deb/README.Debian
===================================================================
--- trunk/perfsonar-java-xml-ls/src/deb/README.Debian                         
  (rev 0)
+++ trunk/perfsonar-java-xml-ls/src/deb/README.Debian   2013-01-02 21:03:38 
UTC (rev 6082)
@@ -0,0 +1,20 @@
+                         perfSONAR Java Lookup Service
+                         =============================
+
+perfSONAR XML-LS is run as a servlet from within Tomcat.  It includes the  
eXist
+DB as then XML backend.
+
+Tomcat memory
+-------------
+
+To work properly eXist DB needs Tomcat to allocate more memory, the  default 
 of
+128m is not enough.  Our Debian installation script tries to modify  the  
Tomcat
+default value and increase it to 512m. However, if the memory allocation of 
the
+Tomcat installation was first  customised  on  this  machine,  the  
installation
+script will not modify it.  Users should make sure at the very minimum 160m  
is
+allocated to Tomcat.
+
+Tomcat memory allocation is usually done in the /etc/default/tomcat file 
through
+the use of the -Xmx JVM parameter.
+
+The more memory you can allocate to Tomcat, the better the overall 
performance.
\ No newline at end of file

Added: trunk/perfsonar-java-xml-ls/src/deb/control/conffiles
===================================================================
--- trunk/perfsonar-java-xml-ls/src/deb/control/conffiles                     
          (rev 0)
+++ trunk/perfsonar-java-xml-ls/src/deb/control/conffiles       2013-01-02 
21:03:38 UTC (rev 6082)
@@ -0,0 +1,8 @@
+usr/lib/perfsonar/services/[[artifactId]]/WEB-INF/classes/perfsonar/conf/configuration.xml
+usr/lib/perfsonar/services/[[artifactId]]/WEB-INF/classes/perfsonar/conf/configuration-rules.xml
+usr/lib/perfsonar/services/[[artifactId]]/WEB-INF/classes/perfsonar/conf/webAdminConfig.xml
+usr/lib/perfsonar/services/[[artifactId]]/WEB-INF/classes/log4j.xml
+usr/lib/perfsonar/services/[[artifactId]]/WEB-INF/classes/conf.xml
+usr/lib/perfsonar/services/[[artifactId]]/WEB-INF/conf/axis2.xml
+usr/lib/perfsonar/services/[[artifactId]]/WEB-INF/services/LookupService/META-INF/services.xml
+usr/lib/perfsonar/services/[[artifactId]]/WEB-INF/web.xml
\ No newline at end of file

Added: trunk/perfsonar-java-xml-ls/src/deb/control/control
===================================================================
--- trunk/perfsonar-java-xml-ls/src/deb/control/control                       
  (rev 0)
+++ trunk/perfsonar-java-xml-ls/src/deb/control/control 2013-01-02 21:03:38 
UTC (rev 6082)
@@ -0,0 +1,12 @@
+Source: [[artifactId]]
+Section: web
+Priority: extra
+Maintainer: Antoine Delvaux 
<>
+Homepage: http://perfsonar.forge.geant.net
+Build-Depends: debhelper (>= 5), maven | maven2
+Standards-Version: 3.7.2
+Package: [[artifactId]]
+Version: [[version]]
+Architecture: all
+Depends: tomcat6
+Description: [[description]]
\ No newline at end of file

Added: trunk/perfsonar-java-xml-ls/src/deb/control/postinst
===================================================================
--- trunk/perfsonar-java-xml-ls/src/deb/control/postinst                      
          (rev 0)
+++ trunk/perfsonar-java-xml-ls/src/deb/control/postinst        2013-01-02 
21:03:38 UTC (rev 6082)
@@ -0,0 +1,69 @@
+#!/bin/sh
+# postinst script for perfsonar-java-xml-ls
+#
+# 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
+
+OLD_SERVICENAME="geant2-java-xml-ls"
+SERVICENAME="[[artifactId]]"
+SERVICEPATH="/usr/lib/perfsonar/services"
+TOMCAT="tomcat6"
+
+
+case "$1" in
+    configure)
+
+    /etc/init.d/${TOMCAT} stop
+
+       # TODO: the writable conf files should be in /etc/ or /var/lib (if 
changeable through the webinterface), see PSSERVICES-614
+    chown ${TOMCAT}:${TOMCAT} 
$SERVICEPATH/$SERVICENAME/WEB-INF/classes/perfsonar/conf/configuration.xml
+    chown ${TOMCAT}:${TOMCAT} 
$SERVICEPATH/$SERVICENAME/WEB-INF/classes/perfsonar/conf/webAdminConfig.xml
+    chmod 660 
$SERVICEPATH/$SERVICENAME/WEB-INF/classes/perfsonar/conf/configuration.xml
+    chmod 660 
$SERVICEPATH/$SERVICENAME/WEB-INF/classes/perfsonar/conf/webAdminConfig.xml
+    chown -R ${TOMCAT}:${TOMCAT} /var/log/$SERVICENAME
+    chown -R ${TOMCAT}:${TOMCAT} /var/lib/$SERVICENAME 
+
+    if [ -f /etc/default/${TOMCAT} ]
+    then
+        # Increase memory allocated to Tomcat JVM, the default (128m is not 
enough for eXist to work properly, see eXist site notes)
+        COUNT=`grep -c "^JAVA_OPTS=\"-Djava.awt.headless=true -Xmx128m" 
/etc/default/${TOMCAT}` || true
+        if [ $COUNT -gt 0 ]
+            then
+            echo "Increasing ${TOMCAT} default memory allocation to 512m"
+            sed -i 's/JAVA_OPTS="-Djava.awt.headless=true 
-Xmx128m/JAVA_OPTS="-Djava.awt.headless=true -Xmx512m/' /etc/default/${TOMCAT}
+        fi
+    fi
+    
+    /etc/init.d/${TOMCAT} 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-xml-ls/src/deb/control/postrm
===================================================================
--- trunk/perfsonar-java-xml-ls/src/deb/control/postrm                        
  (rev 0)
+++ trunk/perfsonar-java-xml-ls/src/deb/control/postrm  2013-01-02 21:03:38 
UTC (rev 6082)
@@ -0,0 +1,58 @@
+#!/bin/sh
+# postrm script for geant2-java-xml-ls
+#
+# 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="[[artifactId]]"
+OLD_SERVICENAME="geant2-java-xml-ls"
+SERVICEPATH="/usr/lib/perfsonar/services"
+TOMCAT="tomcat6"
+
+
+case "$1" in
+    purge)
+    
+    if [ -h /etc/$SERVICENAME ]
+    then
+        rm /etc/$SERVICENAME
+    fi
+
+    rm -f /var/log/$SERVICENAME/exist.log*
+    rm -f /var/log/$SERVICENAME/perfsonar.log*
+    rm -rf /var/lib/$SERVICENAME/data
+    
+    ;;
+
+    remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
+    ;;
+
+    *)
+        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-xml-ls/src/deb/control/preinst
===================================================================
--- trunk/perfsonar-java-xml-ls/src/deb/control/preinst                       
  (rev 0)
+++ trunk/perfsonar-java-xml-ls/src/deb/control/preinst 2013-01-02 21:03:38 
UTC (rev 6082)
@@ -0,0 +1,71 @@
+#!/bin/sh
+# preinst script for perfsonar-java-xml-ls
+#
+# 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="geant2-java-xml-ls"
+
+
+
+case "$1" in
+    install|upgrade)
+       
+       if [ -f /etc/init.d/tomcat ]
+       then
+       /etc/init.d/tomcat stop
+    fi
+
+       if [ -h $SERVICEPATH/$SERVICENAME ]
+    then
+        rm -rf $SERVICEPATH/$SERVICENAME
+    fi
+       
+       if [ -h /var/lib/tomcat/webapps/$SERVICENAME ]
+    then
+        rm -rf /var/lib/tomcat/webapps/$SERVICENAME
+    fi
+       
+       if [ -h /usr/share/tomcat/webapps/$SERVICENAME ]
+    then
+        rm -rf /usr/share/tomcat/webapps/$SERVICENAME
+       fi
+       
+       if [ -h /etc/$SERVICENAME ]
+       then
+        rm -rf /etc/$SERVICENAME
+       fi
+
+       if [ -h /var/log/$SERVICENAME ]
+    then
+        rm -rf /var/log/$SERVICENAME
+       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-xml-ls/src/deb/control/prerm
===================================================================
--- trunk/perfsonar-java-xml-ls/src/deb/control/prerm                         
  (rev 0)
+++ trunk/perfsonar-java-xml-ls/src/deb/control/prerm   2013-01-02 21:03:38 
UTC (rev 6082)
@@ -0,0 +1,52 @@
+#!/bin/sh
+# prerm script for geant2-java-xml-ls
+#
+# 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
+
+SERVICENAME="[[artifactId]]"
+OLD_SERVICENAME="geant2-java-xml-ls"
+TOMCAT="tomcat6"
+
+
+case "$1" in
+    remove|upgrade|deconfigure)
+    if [ -h /var/lib/${TOMCAT}/webapps/$SERVICENAME ]
+    then
+        rm /var/lib/${TOMCAT}/webapps/$SERVICENAME
+    fi
+    if [ -h /var/lib/${TOMCAT}/webapps/$OLD_SERVICENAME ]
+    then
+        rm /var/lib/${TOMCAT}/webapps/$OLD_SERVICENAME
+    fi
+    ;;
+
+    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-xml-ls/src/deb/copyright
===================================================================
--- trunk/perfsonar-java-xml-ls/src/deb/copyright                             
  (rev 0)
+++ trunk/perfsonar-java-xml-ls/src/deb/copyright       2013-01-02 21:03:38 
UTC (rev 6082)
@@ -0,0 +1,3 @@
+This software is distributed under the GÉANT Standard Open Source Software
+Outward Licence. See enclosed doc/License.txt and doc/Collaboration.txt files
+for copyright notice.
\ No newline at end of file

Modified: 
trunk/perfsonar-java-xml-ls/src/main/java/org/perfsonar/service/lookupservice/registration/summarization/SummarizeIpAddrs.java
===================================================================
--- 
trunk/perfsonar-java-xml-ls/src/main/java/org/perfsonar/service/lookupservice/registration/summarization/SummarizeIpAddrs.java
      2013-01-02 16:16:06 UTC (rev 6081)
+++ 
trunk/perfsonar-java-xml-ls/src/main/java/org/perfsonar/service/lookupservice/registration/summarization/SummarizeIpAddrs.java
      2013-01-02 21:03:38 UTC (rev 6082)
@@ -5,7 +5,6 @@
 import java.util.HashSet;
 import java.util.Set;
 
-import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
@@ -17,8 +16,6 @@
  */
 public final class SummarizeIpAddrs {
 
-    protected static Logger logger = 
LoggerFactory.getLogger(SummarizeIpAddrs.class);
-
     private SummarizeIpAddrs() { }  // Prevents instantiation
 
     /**
@@ -39,7 +36,7 @@
                 long aLongValue = newIp.getAddrAsLong();
                 trie = trie.add(aLongValue, 
SummarizationConstants.MAX_KEY_LENGTH, newIp);
             } catch (InvalidIPAddressException e) {
-                logger.warn("Ignoring address: " + newIpAddr + " - Error: " 
+ e.getMessage());
+                
LoggerFactory.getLogger(SummarizeIpAddrs.class).warn("Ignoring address: " + 
newIpAddr + " - Error: " + e.getMessage());
             }
         }