perfsonar development work

Author: dante.delvaux
Date: 2012-04-18 15:47:07 +0100 (Wed, 18 Apr 2012)
New Revision: 5925

Added:
   trunk/perfsonar-java-xml-ls/packaging/rhel/
Removed:
   trunk/perfsonar-java-xml-ls/packaging/rpm/
   trunk/perfsonar-java-xml-ls/src/main/webapp/WEB-INF/modules/smtpfault.mar
Modified:
   trunk/perfsonar-java-xml-ls/packaging/debian/changelog
   trunk/perfsonar-java-xml-ls/packaging/debian/copyright
   trunk/perfsonar-java-xml-ls/packaging/package.sh
   trunk/perfsonar-java-xml-ls/packaging/rhel/perfsonar-java-xml-ls.specs
   trunk/perfsonar-java-xml-ls/pom.xml
   
trunk/perfsonar-java-xml-ls/src/test/java/org/perfsonar/tests/suite/LSTestSuite.java
Log:
Complete build process on a RHEL5 host, updated spec file, refs 
PSSERVICES-610.

Modified: trunk/perfsonar-java-xml-ls/packaging/debian/changelog
===================================================================
--- trunk/perfsonar-java-xml-ls/packaging/debian/changelog      2012-04-18 
14:35:59 UTC (rev 5924)
+++ trunk/perfsonar-java-xml-ls/packaging/debian/changelog      2012-04-18 
14:47:07 UTC (rev 5925)
@@ -2,6 +2,7 @@
   
   * New: Embedded eXist DB version 1.2.6
   * Change: dependency against tomcat6
+  * Change: now distributed under the GÉANT Standard Open Source Software 
Outward Licence
   * Fixes: PSSERVICES-572, PSSERVICES-563, PSSERVICES-558, PSSERVICES-613
  -- Antoine Delvaux 
<>
  Thu, 04 Apr 2012 17:46:00 +0000
 

Modified: trunk/perfsonar-java-xml-ls/packaging/debian/copyright
===================================================================
--- trunk/perfsonar-java-xml-ls/packaging/debian/copyright      2012-04-18 
14:35:59 UTC (rev 5924)
+++ trunk/perfsonar-java-xml-ls/packaging/debian/copyright      2012-04-18 
14:47:07 UTC (rev 5925)
@@ -1 +1,3 @@
-See enclosed doc/License.txt and doc/Collaboration.txt files for copyright 
notice.
\ No newline at end of file
+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/packaging/package.sh
===================================================================
--- trunk/perfsonar-java-xml-ls/packaging/package.sh    2012-04-18 14:35:59 
UTC (rev 5924)
+++ trunk/perfsonar-java-xml-ls/packaging/package.sh    2012-04-18 14:47:07 
UTC (rev 5925)
@@ -28,28 +28,31 @@
 # TODO: PROJECT_DIR to be filled by Maven pom.xml ?
 cd ..
 PROJECT_DIR=`pwd`"/"
-TARGET_DIR=${PROJECT_DIR}"target/"  # Should be the Maven target/ output dir
+TARGET_DIR=${PROJECT_DIR}"target/"  # TODO: Should be the Maven target/ 
output dir
 PAKAGING_DIR=${PROJECT_DIR}"packaging/"
+TMP_DIR=${TARGET_DIR}"tmp/"
+WEBADMIN_NAME="perfsonar-java-web-admin"
+WEBADMIN_VERSION="1.0.1"
 WEBADMIN_DIR=${PROJECT_DIR}"../ps-mdm-web-admin/"
+# TODO: building from svn co frequently fails because depencies cannot all 
be downloaded
+# for now, we build from our own svn co maintained manually
+#WEBADMIN_DIR=${TMP_DIR}${WEBADMIN_NAME}-${WEBADMIN_VERSION}"/"
 REDIRECTOR_DIR=${PROJECT_DIR}"../servlet-context-redirector/"
-# TODO: Do we need it?
-TMP_DIR="tmp/"
-DEB_VERSION="1.6"
-# Can include username with 'user@' before the hostname if needed
-DEB_BUILD_HOST="d6"
-RPM_VERSION="%VERSION%"
+SVNURL="svn+ssh:///GEANT/SA2/ps-java-services/"
 SERVICE_NAME="perfsonar-java-xml-ls"
-RPM_SPEC_NAME=$SERVICE_NAME".specs"
+# TODO: Should come from Maven pom.xml
+SERVICE_VERSION="1.6"
+# Can include username with 'user@' before the hostname if needed
+DEBIAN_BUILD_HOST="d6"
+#RHEL_BUILD_HOST="mdm-4.par.fr.geant2.net"
+RHEL_BUILD_HOST="centos5"
+DEBIAN_BUILD_DIR="debian"
+RHEL_BUILD_DIR="rhel"
 
 #
 # Check the dependencies are present
 #
 check_dirs() {
-       echo -n "Checking everything is in place for the build process ... "
-       if [[ ! -d $WEBADMIN_DIR ]]; then
-               echo "WebAdmin build directory is missing: "$WEBADMIN_DIR
-               exit 1
-       fi
        if [[ ! -d $REDIRECTOR_DIR ]]; then
                echo "Servlet redirector build directory is missing: 
"$REDIRECTOR_DIR
                exit 1
@@ -67,12 +70,16 @@
 }
 
 #
-# Build WebAdmin
+# Build WebAdmin from a fresh svn checkout
 # After this call, all should be ready to be copied from build/war/
 #
 build_webadmin() {
        echo "Building the Web Admin in its own directory ${WEBADMIN_DIR}"
-       cd ${WEBADMIN_DIR}"ant"
+       mkdir -p $WEBADMIN_DIR
+       cd $WEBADMIN_DIR
+       # this usually fails because all needed dependencies need to be 
redownloaded which usually leads to errors
+       #       svn co ${SVNURL}tags/${WEBADMIN_NAME}-${WEBADMIN_VERSION} .
+       cd "ant"
        ant -q distclean get-repo prepare-war-structure
        echo
 }
@@ -106,29 +113,25 @@
 # then we have:
 #    target/perfsonar-java-xml-ls/
 # And we need to add:
-#    target/debian
-#    target/wa -> ant script from ps-mdm-web-admin
+#    target/debian -> the Debian build dir
+#    target/rhel -> the RHEL build dir
 #    target/geant2-java-xml-ls -> mvn for servlet-redirector
+#    target/wa -> ant script from ps-mdm-web-admin
 #
 do_structure() {
        echo -n "Creating packaging directory structure ... "
 
        cd ${TARGET_DIR}
-       # We'll make the Debian package in debian/
-       BUILD_DIR="debian/"
-       mkdir -p ${BUILD_DIR}
        # Adding WebAdmin interface
        cp -an ${WEBADMIN_DIR}build/war/wa .
        cp -an ${WEBADMIN_DIR}build/war/index.jsp .
        cp -an ${WEBADMIN_DIR}build/war/WEB-INF/lib/* 
${SERVICE_NAME}/WEB-INF/lib/
        # Add the servlet-context-redirector
        cp -an ${REDIRECTOR_DIR}target/geant2-java-xml-ls .
-       # Then add the .deb scripts and config files
-       cp -a ${PAKAGING_DIR}/debian/* debian/
        
-       # We'll make the RedHat package in redhat/
-# TODO: redhat build dir
-       mkdir -p ${TMP_DIR}/redhat
+       # Remove the tmp directory from dependencies
+       rm -rf ${TMP_DIR}
+
        echo "done!"
        echo  
 }
@@ -136,81 +139,53 @@
 #
 # build debian package 
 #
-build_deb_package() {
+build_debian_package() {
        echo -n "Building the Debian package on the build host ... "
        
        cd $TARGET_DIR
-       # We build in the home directory of the current user
-       rsync -a --delete . 
${DEB_BUILD_HOST}":~/"${SERVICE_NAME}-${DEB_VERSION}/
-       ssh ${DEB_BUILD_HOST} "cd ${SERVICE_NAME}-${DEB_VERSION}; 
dpkg-buildpackage; ~/gen_packages.sh"
+       # Remove unneeded RHEL directory
+       rm -rf ${RHEL_BUILD_DIR}
+       # We'll make the Debian package in debian/
+       mkdir -p ${DEBIAN_BUILD_DIR}
+       # Add the .deb scripts and config files
+       cp -a ${PAKAGING_DIR}/${DEBIAN_BUILD_DIR}/* debian/
+       
+       # We build in the home directory of the build host user
+       rsync -a --partial --delete . 
${DEBIAN_BUILD_HOST}":~/"${SERVICE_NAME}-${SERVICE_VERSION}/
+       ssh ${DEBIAN_BUILD_HOST} "cd ${SERVICE_NAME}-${SERVICE_VERSION}; 
dpkg-buildpackage; ~/gen_packages.sh"
        echo "done!"
        echo 
 }
 
 #
-# create rpm structure
-# 1)create directories rpm/rpmbuild/{BUILD,RPMS,SOURCES,SPECS,SRPMS,TMP}
-# 2)tar.gz project 
-# 3)copy tar.gz to SOURCES directory
-# 4)copy required configuration file for deb-packaging 
-#
-do_rpm_struct() {
-    
-       cd $CURR_DIR;
-       echo " CREATE RPM STRUCT"    
-       rm -rfv temp/rpm
-       mkdir temp/rpm
-       mkdir -pv temp/rpm/rpmbuild/{BUILD,RPMS,SOURCES,SPECS,SRPMS,TMP}    
-       echo "[ ] Create symbolic link and create tar archive"  
-       cd temp/webapps    
-       LSVER=$(ls | grep $SERVICE_NAME)
-       ln -sv $LSVER $SERVICE_NAME-$RPM_VERSION
-       echo "[ ] TAR"
-       rsync -r --exclude=.svn ../../../samples/requests 
$SERVICE_NAME-$RPM_VERSION/samples
-       rsync -r --exclude=.svn ../../../samples/responses 
$SERVICE_NAME-$RPM_VERSION/samples
-       mkdir $SERVICE_NAME-$RPM_VERSION/doc
-       cp -a ../../rpm/$RPM_SPEC_NAME $SERVICE_NAME-$RPM_VERSION/doc
-       tar -czhf $SERVICE_NAME-$RPM_VERSION.tar.gz $SERVICE_NAME-$RPM_VERSION
-       cd ..    
-       echo "[ ] Copy tarball into SOURCES"
-       pwd
-       mv -v webapps/$SERVICE_NAME-$RPM_VERSION.tar.gz rpm/rpmbuild/SOURCES
-       cp -r webapps/geant2-java-xml-ls rpm/rpmbuild/BUILD
-       echo "[ ] Copy RPM .specs file"
-       cp -v ../rpm/$RPM_SPEC_NAME rpm/rpmbuild
-       echo
-       echo 
-}
-
-#
 # build rpm package 
 #
-build_rpm_package() {
+build_rhel_package() {
+       echo -n "Building the RHEL package on the build host ... "
 
-       echo " CREATE RPM PACKAGE"
-       cd $CURR_DIR
-       cd temp/rpm
-       topdir=`pwd`/rpmbuild
-       echo $topdir
-       rpmbuild -bb --define "_topdir $topdir" rpmbuild/$RPM_SPEC_NAME
-       echo
-       echo 
+       cd ${TARGET_DIR}
+       # Remove unneeded DEBIAN directory
+       rm -rf ${DEBIAN_BUILD_DIR}
+       cd ..
+       # Create a tarball to prepare for the RPM
+       ln -s ${TARGET_DIR} ${SERVICE_NAME}-${SERVICE_VERSION}
+       tar -czhf ${SERVICE_NAME}-${SERVICE_VERSION}.tar.gz 
${SERVICE_NAME}-${SERVICE_VERSION}
+       rm -f ${SERVICE_NAME}-${SERVICE_VERSION}
+       cd ${TARGET_DIR}
+       # We'll make the RedHat package in redhat/
+       mkdir -p ${RHEL_BUILD_DIR}/{BUILD,RPMS,SOURCES,SPECS,SRPMS,TMP}
+       cd ${RHEL_BUILD_DIR}
+       mv ${TARGET_DIR}/../${SERVICE_NAME}-${SERVICE_VERSION}.tar.gz SOURCES/
+       cp -a ${PAKAGING_DIR}${RHEL_BUILD_DIR}/${SERVICE_NAME}.specs SPECS/
 
-}
-
-#
-#  remove unnecessary files, copy *.rpm package do target folder
-#
-cleanup_after_rpm_packaging(){
-
-       cd $CURR_DIR
-       file=$(find temp/rpm/rpmbuild/RPMS/noarch -regex ".+\.rpm$")
-       mkdir target
-       cp $file target
-       rm -rf temp 
-       echo
+       # We build in the home directory of the build host user
+       rsync -a --partial --delete . 
${RHEL_BUILD_HOST}":~/"${SERVICE_NAME}-${SERVICE_VERSION}/
+       TOPDIR=`ssh ${RHEL_BUILD_HOST} "pwd"`
+       # We call ntpdate to be sure not have RPM warning errors with 
timestamps
+       ssh ${RHEL_BUILD_HOST} "cd ${SERVICE_NAME}-${SERVICE_VERSION}; 
rpmbuild -bb --quiet --define \"_topdir 
${TOPDIR}/${SERVICE_NAME}-${SERVICE_VERSION}\" SPECS/${SERVICE_NAME}.specs"
+       echo "done!"
        echo 
-
+       
 }
 
 #
@@ -239,31 +214,27 @@
        build_all
         do_structure
         ;;
-    deb)
+    debian)
                do_clean_up
        build_all
        do_structure
-        build_deb_package
+        build_debian_package
         ;;
-    rpm)
+    rhel)
        do_clean_up
        build_all
        do_structure
-        do_rpm_struct
-        build_rpm_package
-        cleanup_after_rpm_packaging
+       build_rhel_package
         ;;
     all)
         do_clean_up
        build_all
         do_structure
-        do_rpm_struct
-        build_deb_package
-        build_rpm_package
-        cleanup_after_rpm_packaging
+        build_debian_package
+        build_rhel_package
         ;;
     *)
-        echo "Usage: $0 clean|structure|deb|rpm|all" >&2
+        echo "Usage: $0 clean|structure|debian|rhel|all" >&2
         exit 3
         ;;
 esac

Modified: 
trunk/perfsonar-java-xml-ls/packaging/rhel/perfsonar-java-xml-ls.specs
===================================================================
--- trunk/perfsonar-java-xml-ls/packaging/rpm/perfsonar-java-xml-ls.specs     
  2012-04-10 19:47:01 UTC (rev 5919)
+++ trunk/perfsonar-java-xml-ls/packaging/rhel/perfsonar-java-xml-ls.specs    
  2012-04-18 14:47:07 UTC (rev 5925)
@@ -1,142 +1,154 @@
-%define prefix /usr/lib/perfsonar/services/%{name}
 %define old_name geant2-java-xml-ls
-%define old_prefix /usr/lib/perfsonar/services/%{old_name}
+%define prefix /usr/lib/perfsonar/services/
+%define tomcat tomcat5
+%define tomcatwebapps %{_var}/lib/%{tomcat}/webapps/
+%define tomcatendorsed /usr/share/%{tomcat}/common/endorsed/
+%define tomcatconf /etc/%{tomcat}/%{tomcat}.conf
 
 Name: perfsonar-java-xml-ls
-Version: 1.5
-Release: 1
-License: Modified BSD
+Version: 1.6
+Release: 0a
 Summary: perfSONAR Lookup Service
-Source0: %{name}-%{version}.tar.gz
+Vendor: GÉANT
+Group: Network/Web service
+URL: http://perfsonar.forge.geant.net
+License: GÉANT Standard Open Source Software Outward Licence
+Packager: Antoine Delvaux 
<>
+Source: %{name}-%{version}.tar.gz
+Requires: jre >= 1.6, %{tomcat}
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}
-Group: Network/Web service
-packager: Krzysztof Jedrzejewski 
<>
-URL: http://www.perfsonar.org
-Requires: exist
-Requires: jre >= 1.6
-Requires: tomcat5
 BuildArch: noarch
 
 
-
 %description
-perfSONAR Lookup Service based on psBase2
+perfSONAR XML Lookup Service based on psBase2 and eXist DB backend.
 
 
-
 %prep
 %{__rm} -rf ${RPM_BUILD_DIR}/%{name}-%{version}
 %setup -q
 
 
-
 %build
 pushd ${RPM_BUILD_DIR}/%{name}-%{version}
 popd
 
 
-
 %install
 # make the directory
 rm -rf $RPM_BUILD_ROOT
-%{__install} -d -m 755 ${RPM_BUILD_ROOT}%{prefix}
-%{__install} -d -m 755 ${RPM_BUILD_ROOT}%{old_prefix}
+%{__install} -d -m 755 ${RPM_BUILD_ROOT}%{prefix}%{name}
+%{__install} -d -m 755 ${RPM_BUILD_ROOT}%{prefix}%{old_name}
 %{__install} -d -m 755 ${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}
 %{__install} -d -m 755 ${RPM_BUILD_ROOT}/usr/share/doc/%{name}
-%{__install} -d -m 755 ${RPM_BUILD_ROOT}/usr/share/doc/%{name}/schema
-%{__install} -d -m 755 ${RPM_BUILD_ROOT}%{prefix}/WEB-INF
-%{__install} -d -m 755 ${RPM_BUILD_ROOT}%{prefix}/WEB-INF/samples
-%{__install} -d -m 755 ${RPM_BUILD_ROOT}%{prefix}/WEB-INF/samples/requests
-%{__install} -d -m 755 ${RPM_BUILD_ROOT}%{prefix}/WEB-INF/samples/responses
-%{__install} -d -m 755 ${RPM_BUILD_ROOT}%{_var}/run/%{name}
-%{__install} -d -m 755 ${RPM_BUILD_ROOT}%{prefix}/WEB-INF/log
+%{__install} -d -m 755 ${RPM_BUILD_ROOT}%{_var}/lib/%{name}
+%{__install} -d -m 755 ${RPM_BUILD_ROOT}%{_var}/log/%{name}
 
-
 # copy the service content to the tomcat webapps directory
-pushd ${RPM_BUILD_DIR}
-    %{__cp} -a  %{name}-%{version}/* ${RPM_BUILD_ROOT}%{prefix}
+pushd ${RPM_BUILD_DIR}/%{name}-%{version}
     # servlet-context-redirector
-    %{__cp} -a  %{old_name}/* ${RPM_BUILD_ROOT}%{old_prefix}
+    %{__cp} -a  %{old_name} ${RPM_BUILD_ROOT}%{prefix}
+    %{__cp} -a  %{name}/data ${RPM_BUILD_ROOT}%{_var}/lib/%{name}
+    %{__cp} -a  %{name}/db ${RPM_BUILD_ROOT}%{prefix}%{name}
+    %{__cp} -a  %{name}/META-INF ${RPM_BUILD_ROOT}%{prefix}%{name}
+    %{__cp} -a  %{name}/schema ${RPM_BUILD_ROOT}%{prefix}%{name}
+    %{__cp} -a  %{name}/WEB-INF ${RPM_BUILD_ROOT}%{prefix}%{name}
+    %{__cp} -a  wa ${RPM_BUILD_ROOT}%{prefix}%{name}
+    %{__cp} -a  index.jsp ${RPM_BUILD_ROOT}%{prefix}%{name}
+    %{__cp} -a  %{name}/doc/* ${RPM_BUILD_ROOT}/usr/share/doc/%{name}
 popd
 
-pushd ${RPM_BUILD_DIR}/%{name}-%{version}/doc
-    %{__cp} -a * ${RPM_BUILD_ROOT}/usr/share/doc/%{name}
-popd
 
-
-pushd ${RPM_BUILD_DIR}/%{name}-%{version}
-    %{__cp} -a samples/requests/* 
${RPM_BUILD_ROOT}%{prefix}/WEB-INF/samples/requests
-    %{__cp} -a samples/responses/* 
${RPM_BUILD_ROOT}%{prefix}/WEB-INF/samples/responses
-popd
-
 %post
-## make symlink for easy access to conf
-%{__ln_s} -f %{prefix}/WEB-INF/classes/perfsonar/conf/*.xml 
%{_sysconfdir}/%{name}
-%{__ln_s} -f %{prefix}/WEB-INF/log %{_var}/log/%{name}
-if [ ! -e %{_var}/lib/tomcat5/webapps/%{name} ]; then
-       %{__ln_s} -f %{prefix} %{_var}/lib/tomcat5/webapps/%{name} || true
+## make symlinks for an easy access to conf
+if [ ! -e %{_sysconfdir}/%{name} ]; then
+    %{__ln_s} -f %{prefix}%{name}/WEB-INF/classes/perfsonar/conf 
%{_sysconfdir}/%{name} || true
 fi
-if [ ! -e %{_var}/lib/tomcat5/webapps/%{old_name} ]; then
-       %{__ln_s} -f %{old_prefix} %{_var}/lib/tomcat5/webapps/%{old_name} || 
true
+if [ ! -e %{tomcatwebapps}%{name} ]; then
+       %{__ln_s} -f %{prefix}%{name} %{tomcatwebapps}%{name} || true
 fi
-
-## workaround - to create link to old name - geant2-...
-sh %{prefix}/temp/link_creator.sh %{prefix} 
%{_var}/lib/tomcat5/webapps/%{old_name} &
-
+if [ ! -e %{tomcatwebapps}%{old_name} ]; then
+       %{__ln_s} -f %{prefix}%{old_name} %{tomcatwebapps}%{old_name} || true
+fi
+## Make symlinks for the endorsed jars
+## This is needed for eXist to work properly (see eXist doc)
+if [ ! -e %{tomcatendorsed}xml-resolver-1.2.jar ]; then
+    %{__ln_s} -f %{prefix}%{name}/WEB-INF/lib/xml-resolver-1.2.jar 
%{tomcatendorsed} || true
+fi
+## Increase tomcat JVM default memory allocation, only if it is not already 
changed
+if [ -e %{tomcatconf} ]; then
+    grep "\-Xmx" %{tomcatconf} > /dev/null
+    if [ $? ]; then
+        echo "Increasing %{tomcat} default memory allocation"
+        echo -e "\n# perfSONAR - increase JVM default 
memory\nJAVA_OPTS=\"\${JAVA_OPTS} -Xmx512m\"" >> %{tomcatconf}
+    fi
+fi
+## Open firewall port 8080 so tomcat can actually listen
+grep "\-\-dport 8080" /etc/sysconfig/iptables > /dev/null
+if [ $? ]; then
+    echo "Opening iptables firewall port 8080 for tomcat"
+    iptables -I RH-Firewall-1-INPUT -m state --state NEW -p tcp --dport 8080 
-j ACCEPT
+    sed '/-A RH-Firewall-1-INPUT -j REJECT --reject-with 
icmp-host-prohibited/i-A RH-Firewall-1-INPUT -m state --state NEW -m tcp -p 
tcp --dport 8080 -j ACCEPT'
+    echo "--port=8080:tcp" >> /etc/sysconfig/system-config-securitylevel
+fi
 ## restart tomcat
-/sbin/service tomcat5 restart
+chkconfig %{tomcat} on
+service %{tomcat} restart
 
 
-
 %preun
 ## remove symlink
-
 if [ $1 -eq 1 ]; then
        ## upgrade - do nothing
        echo 
 else
-       ## remove - cleanup
-       if [ ! -e %{prefix}/WEB-INF/classes/perfsonar/conf/configuration.xml 
]; then
-         %{__rm} -rf %{_sysconfdir}/%{name}/*.xml || true
+       ## remove - cleanup - TODO: to improve...
+       if [ ! -e %{prefix}/WEB-INF/classes/perfsonar/conf ]; then
+         %{__rm} -rf %{_sysconfdir}/%{name} || true
          %{__rm} -rf %{_var}/log/%{name} || true
        fi
-       if [  -e %{_var}/lib/tomcat5/webapps/%{name} ]; then
-               %{__rm} -rf %{_var}/lib/tomcat5/webapps/%{name} || true
+       if [ -e %{tomcatwebapps}%{name} ]; then
+               %{__rm} -rf %{tomcatwebapps}%{name} || true
        fi
-       if [  -e %{_var}/lib/tomcat5/webapps/%{old_name} ]; then
-               %{__rm} -rf %{_var}/lib/tomcat5/webapps/%{old_name} || true
+       if [ -e %{tomcatwebapps}%{old_name} ]; then
+        %{__rm} -rf %{tomcatwebapps}%{old_name} || true
        fi
+       fi [ -e %{tomcatendorsed}xml-resolver-1.2.jar ]; then
+          %{__rm} -rf %{tomcatendorsed}xml-resolver-1.2.jar || true
+       fi
 fi
 
 
-
-
 %postun
 ## restart tomcat
-/sbin/service tomcat5 restart
+/sbin/service %{tomcat} restart
 
 
 
 %clean
-# clean up the durt
+# clean up our mess
 rm -rf $RPM_BUILD_ROOT
 
 
-
 %files
 %defattr(0644,root,tomcat,0755)
-%attr(755,tomcat,tomcat) %{_var}/run/%{name}
-%attr(755,tomcat,tomcat) %{prefix}/WEB-INF/log
-%attr(640,tomcat,tomcat) %config(noreplace) 
%{prefix}/WEB-INF/classes/perfsonar/conf/*.xml
-%{prefix}
-%{old_prefix}
+%docdir /usr/share/doc/%{name}
+%attr(755,tomcat,tomcat) %{_var}/lib/%{name}
+%attr(644,tomcat,tomcat) %{_var}/lib/%{name}/data/README
+%attr(755,tomcat,tomcat) %{_var}/log/%{name}
+%attr(640,tomcat,tomcat) %config(noreplace) 
%{prefix}%{name}/WEB-INF/classes/perfsonar/conf/*.xml
+%{prefix}%{name}
+%{prefix}%{old_name}
+/usr/share/doc/%{name}
 %{_sysconfdir}/%{name}
-/usr/share/doc/%{name}
-/usr/share/doc/%{name}/schema
 
 
+%changelog
+* Thu Apr 18 2012 Antoine Delvaux 
<>
 1.6-0a
+ - New: Embedded eXist DB version 1.2.6
+ - Change: now distributed under the GÉANT Standard Open Source Software 
Outward Licence
+ - Fixes: PSSERVICES-572, PSSERVICES-563, PSSERVICES-558, PSSERVICES-613
 
-%changelog
 * Fri Sep 24 2010 Krzysztof Jedrzejewski 
<>
 1.5-1
 - Final release
 

Modified: trunk/perfsonar-java-xml-ls/pom.xml
===================================================================
--- trunk/perfsonar-java-xml-ls/pom.xml 2012-04-18 14:35:59 UTC (rev 5924)
+++ trunk/perfsonar-java-xml-ls/pom.xml 2012-04-18 14:47:07 UTC (rev 5925)
@@ -449,7 +449,7 @@
                <dependency>
                        <groupId>commons-logging</groupId>
                        <artifactId>commons-logging</artifactId>
-                       <version>1.0.4</version>
+                       <version>1.1.1</version>
                </dependency>
                <dependency>
                        <groupId>xalan</groupId>
@@ -488,11 +488,6 @@
                </dependency>
                <dependency>
                        <groupId>exist</groupId>
-                       <artifactId>xml-apis</artifactId>
-                       <version>exist-${exist.version}</version>
-               </dependency>
-               <dependency>
-                       <groupId>exist</groupId>
                        <artifactId>xmldb</artifactId>
                        <version>exist-${exist.version}</version>
                </dependency>
@@ -545,6 +540,16 @@
                        <artifactId>trang</artifactId>
                        <version>20091111</version>
                </dependency>
+               <dependency>
+                       <groupId>xml-apis</groupId>
+                       <artifactId>xml-apis</artifactId>
+                       <version>1.3.04</version>
+               </dependency>
+               <dependency>
+                       <groupId>net.sf.saxon</groupId>
+                       <artifactId>saxon-dom</artifactId>
+                       <version>8.7</version>
+               </dependency>
        </dependencies>
 
        <profiles>
@@ -579,17 +584,16 @@
                        </properties>
                </profile>
                <profile>
-                       <id>deb</id>
+                       <id>debian</id>
                        <properties>
-                               <!-- TODO: why change from 8180 ??? -->
                                <port>8080</port>
                                
<datadir>/var/lib/perfsonar-java-xml-ls/data/</datadir>
                        </properties>
                </profile>
                <profile>
-                       <id>rpm</id>
+                       <id>rhel</id>
                        <properties>
-                               <datadir>/var/lib/perfsonar-java-xml-ls/data/ 
  </datadir>
+                               
<datadir>/var/lib/perfsonar-java-xml-ls/data/</datadir>
                        </properties>
                </profile>
        </profiles>
@@ -606,4 +610,13 @@
                <system>Jenkins</system>
                <url>https://ci.geant.net/jenkins/job/perfSONAR%20LS/</url>
        </ciManagement>
+       <dependencyManagement>
+               <dependencies>
+                       <dependency>
+                               <groupId>xerces</groupId>
+                               <artifactId>xmlParserAPIs</artifactId>
+                               <version>2.6.2</version>
+                       </dependency>
+               </dependencies>
+       </dependencyManagement>
 </project>

Deleted: 
trunk/perfsonar-java-xml-ls/src/main/webapp/WEB-INF/modules/smtpfault.mar
===================================================================
(Binary files differ)

Modified: 
trunk/perfsonar-java-xml-ls/src/test/java/org/perfsonar/tests/suite/LSTestSuite.java
===================================================================
--- 
trunk/perfsonar-java-xml-ls/src/test/java/org/perfsonar/tests/suite/LSTestSuite.java
        2012-04-18 14:35:59 UTC (rev 5924)
+++ 
trunk/perfsonar-java-xml-ls/src/test/java/org/perfsonar/tests/suite/LSTestSuite.java
        2012-04-18 14:47:07 UTC (rev 5925)
@@ -45,8 +45,8 @@
                suite.addTestSuite(ModificationCounterComponentTest.class);
                suite.addTestSuite(XMLDBComponentTest.class);
                
-               // DAO - FIXME: threading issue
-               // TODO: add LookupServiceDAOFactory
+               // TODO: add LookupServiceDAOFactory tests
+               // TODO: add DAO tests in a threaded environment if possible
                suite.addTestSuite(XQueryExistDAOImplTests.class);
                suite.addTestSuite(MultipleFilesDAOImplTests.class);
                suite.addTestSuite(SummarizationDaoTests.class);
@@ -62,7 +62,7 @@
                // Summarization
                suite.addTestSuite(SummarizationTests.class);
 
-               // TODO: Scheduler
+               // TODO: Scheduler tests
 
                return suite;
        }