perfsonar development work

Author: dante.delvaux
Date: 2012-05-08 17:24:40 +0100 (Tue, 08 May 2012)
New Revision: 5927

Added:
   trunk/perfsonar-java-xml-ls/packaging/jar/org.perfsonar.soapUI.ls.jardesc
   trunk/perfsonar-java-xml-ls/packaging/rhel5/
   trunk/perfsonar-java-xml-ls/soapUI/
   trunk/perfsonar-java-xml-ls/soapUI/README
   trunk/perfsonar-java-xml-ls/soapUI/org/
Removed:
   trunk/perfsonar-java-xml-ls/doc/LS_configuration_files.doc
   trunk/perfsonar-java-xml-ls/doc/LS_installation_actions.doc
   trunk/perfsonar-java-xml-ls/doc/LS_interface_appendix.doc
   trunk/perfsonar-java-xml-ls/packaging/rhel/
   trunk/perfsonar-java-xml-ls/soapUI/lib/log4j-1.2.8.jar
   trunk/perfsonar-java-xml-ls/soapUI/src/log4j.properties
   trunk/perfsonar-java-xml-ls/src/test/soapUI/
Modified:
   trunk/perfsonar-java-xml-ls/doc/changelog.txt
   trunk/perfsonar-java-xml-ls/packaging/debian/changelog
   trunk/perfsonar-java-xml-ls/packaging/debian/conffiles
   trunk/perfsonar-java-xml-ls/packaging/debian/perfsonar-java-xml-ls.postinst
   trunk/perfsonar-java-xml-ls/packaging/package.sh
   trunk/perfsonar-java-xml-ls/packaging/rhel5/perfsonar-java-xml-ls.specs
   trunk/perfsonar-java-xml-ls/pom.xml
   trunk/perfsonar-java-xml-ls/soapUI/perfsonar-LS-base2-soapui-project.xml
   
trunk/perfsonar-java-xml-ls/soapUI/src/org/perfsonar/soapUI/ls/TestUtil.java
   
trunk/perfsonar-java-xml-ls/src/main/resources/perfsonar/conf/webAdminConfig.xml
Log:
Re-organising soapUI testing files and adding a README to explain how to use 
the soapUI project.

Deleted: trunk/perfsonar-java-xml-ls/doc/LS_configuration_files.doc
===================================================================
(Binary files differ)

Deleted: trunk/perfsonar-java-xml-ls/doc/LS_installation_actions.doc
===================================================================
(Binary files differ)

Deleted: trunk/perfsonar-java-xml-ls/doc/LS_interface_appendix.doc
===================================================================
(Binary files differ)

Modified: trunk/perfsonar-java-xml-ls/doc/changelog.txt
===================================================================
--- trunk/perfsonar-java-xml-ls/doc/changelog.txt       2012-05-08 15:57:21 
UTC (rev 5926)
+++ trunk/perfsonar-java-xml-ls/doc/changelog.txt       2012-05-08 16:24:40 
UTC (rev 5927)
@@ -3,9 +3,10 @@
 
 XML LS 1.6
 - Fixes: DB collections are owned by lookupservice user, fixes PSSERVICES-563
-- New: eXist DB is now embedded, fixes PSSERVICES-613
+- New: eXist DB is now embedded, fixes PSSERVICES-572 and PSSERVICES-613
 - Change: some xQuery speed improvements, fixes PSSERVICES-558
 - Change: Moving to GEANT Standard Open Source Software Outward Licence
+- Change: lighter default logging (only errors and warnings) and separated 
into exist.log and perfsonar.log
 
 XML LS 1.5  
 - Fixes: bugs fixes PSSERVICES-503

Modified: trunk/perfsonar-java-xml-ls/packaging/debian/changelog
===================================================================
--- trunk/perfsonar-java-xml-ls/packaging/debian/changelog      2012-05-08 
15:57:21 UTC (rev 5926)
+++ trunk/perfsonar-java-xml-ls/packaging/debian/changelog      2012-05-08 
16:24:40 UTC (rev 5927)
@@ -1,10 +1,11 @@
-perfsonar-java-xml-ls (1.6-0a) stable; urgency=low
+perfsonar-java-xml-ls (1.6-0b) stable; urgency=low
   
   * 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
+  * Change: lighter default logging (only errors and warnings) and separated 
into exist.log and perfsonar.log
   * Fixes: PSSERVICES-572, PSSERVICES-563, PSSERVICES-558, PSSERVICES-613
- -- Antoine Delvaux 
<>
  Thu, 04 Apr 2012 17:46:00 +0000
+ -- Antoine Delvaux 
<>
  Thu, 08 May 2012 13:42:00 +0000
 
 perfsonar-java-xml-ls (1.5-1) stable; urgency=low
   

Modified: trunk/perfsonar-java-xml-ls/packaging/debian/conffiles
===================================================================
--- trunk/perfsonar-java-xml-ls/packaging/debian/conffiles      2012-05-08 
15:57:21 UTC (rev 5926)
+++ trunk/perfsonar-java-xml-ls/packaging/debian/conffiles      2012-05-08 
16:24:40 UTC (rev 5927)
@@ -1,5 +1,6 @@
 
usr/lib/perfsonar/services/perfsonar-java-xml-ls/WEB-INF/classes/perfsonar/conf/configuration.xml
 
usr/lib/perfsonar/services/perfsonar-java-xml-ls/WEB-INF/classes/perfsonar/conf/configuration-rules.xml
+usr/lib/perfsonar/services/perfsonar-java-xml-ls/WEB-INF/classes/perfsonar/conf/webAdminConfig.xml
 usr/lib/perfsonar/services/perfsonar-java-xml-ls/WEB-INF/classes/log4j.xml
 usr/lib/perfsonar/services/perfsonar-java-xml-ls/WEB-INF/classes/conf.xml
 usr/lib/perfsonar/services/perfsonar-java-xml-ls/WEB-INF/conf/axis2.xml

Modified: 
trunk/perfsonar-java-xml-ls/packaging/debian/perfsonar-java-xml-ls.postinst
===================================================================
--- 
trunk/perfsonar-java-xml-ls/packaging/debian/perfsonar-java-xml-ls.postinst 
2012-05-08 15:57:21 UTC (rev 5926)
+++ 
trunk/perfsonar-java-xml-ls/packaging/debian/perfsonar-java-xml-ls.postinst 
2012-05-08 16:24:40 UTC (rev 5927)
@@ -30,6 +30,9 @@
 
        # 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 
 

Added: 
trunk/perfsonar-java-xml-ls/packaging/jar/org.perfsonar.soapUI.ls.jardesc
===================================================================
--- trunk/perfsonar-java-xml-ls/packaging/jar/org.perfsonar.soapUI.ls.jardesc 
                          (rev 0)
+++ trunk/perfsonar-java-xml-ls/packaging/jar/org.perfsonar.soapUI.ls.jardesc 
  2012-05-08 16:24:40 UTC (rev 5927)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<jardesc>
+    <jar path="/Applications/SmartBear/org.perfsonar.soapUI.ls.jar"/>
+    <options buildIfNeeded="true" compress="true" 
descriptionLocation="/XML-LS.trunk/packaging/jar/org.perfsonar.soapUI.ls.jardesc"
 exportErrors="true" exportWarnings="true" includeDirectoryEntries="true" 
overwrite="false" saveDescription="true" storeRefactorings="false" 
useSourceFolders="false"/>
+    <storedRefactorings deprecationInfo="true" structuralOnly="false"/>
+    <selectedProjects/>
+    <manifest generateManifest="true" 
manifestLocation="/XML-LS.trunk/packaging/jar/soapUI.ls.MANIFEST" 
manifestVersion="1.0" reuseManifest="false" saveManifest="false" 
usesManifest="true">
+        <sealing sealJar="false">
+            <packagesToSeal/>
+            <packagesToUnSeal/>
+        </sealing>
+    </manifest>
+    <selectedElements exportClassFiles="true" exportJavaFiles="false" 
exportOutputFolder="false">
+        <javaElement handleIdentifier="=XML-LS.trunk/soapUI\/src"/>
+        <folder path="/XML-LS.trunk/soapUI/rnc"/>
+    </selectedElements>
+</jardesc>


Property changes on: 
trunk/perfsonar-java-xml-ls/packaging/jar/org.perfsonar.soapUI.ls.jardesc
___________________________________________________________________
Added: svn:mime-type
   + text/plain

Modified: trunk/perfsonar-java-xml-ls/packaging/package.sh
===================================================================
--- trunk/perfsonar-java-xml-ls/packaging/package.sh    2012-05-08 15:57:21 
UTC (rev 5926)
+++ trunk/perfsonar-java-xml-ls/packaging/package.sh    2012-05-08 16:24:40 
UTC (rev 5927)
@@ -1,40 +1,38 @@
 #!/bin/bash
 #
-# This script takes care of creating 2 packages to distribute the 
LookupService:
+# This script takes care of creating 3 packages to distribute the 
LookupService:
 # - one .deb for Debian
-# - one .rpm for RedHat
+# - two .rpm for RedHatEntrepriseLinux
 #
 # It works the following way:
-# - First it creates the war package, but keep it 'exploded' : mvn clean 
compile war:exploded
+# - First it builds the dependencies (WebAdmin and Servlet Redirector)
+# - Then it creates the war package, but keep it 'exploded'
 # - Then all files are grouped according to package policies
-# - Finally all files are sent to the Debian and RedHat hosts with rsync
-# - for the proper packaging to happen on those distros
+# - Finally all files are sent to the Debian and RHEL hosts with rsync
+#   for the proper packaging to happen on those distros
+# - And packages are copied over a /media/mirror directory for ease of 
collection
 #
 # Requirements
 # The following packages need to be installed for this script to work:
 # Debian (should we build a src package?)
 # - dpkg-dev
 # - debhelper
+# RHEL
+# - rpm-build
+# A /media/mirror partition should exist if you want the packages to be 
copied over there (optionnal)
 
-# Should be done this way:
-# - maven package on eclipse machine and through eclipse
-# - end up with war directory structure and send it to Debian or RedHat host
-#   - rsync target/perfsonar-java-xml-ls/
-# - build .deb on Debian host
-# - build .rpm on RedHat host
-# all done through maven if at all possible
-
 # Variables
 # TODO: PROJECT_DIR to be filled by Maven pom.xml ?
 cd ..
 PROJECT_DIR=`pwd`"/"
-TARGET_DIR=${PROJECT_DIR}"target/"  # TODO: Should be the Maven target/ 
output dir
+# TODO: Should be the Maven target/ output dir
+TARGET_DIR=${PROJECT_DIR}"target/"
 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
+# TODO: building from svn co frequently fails because depencies cannot all 
be downloaded at once
 # 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/"
@@ -44,20 +42,26 @@
 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"
+#RHEL5_BUILD_HOST="mdm-4.par.fr.geant2.net"
+RHEL5_BUILD_HOST="centos5"
+RHEL5_BUILD_DIR="rhel5"
+RHEL6_BUILD_HOST="centos6"
+RHEL6_BUILD_DIR="rhel6"
 
 #
 # Check the dependencies are present
 #
 check_dirs() {
+       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
        fi
-               echo "done!"
+       echo "done!"
        echo
 }
 
@@ -102,7 +106,7 @@
 build_service() {
        echo -n "Building the ${SERVICE_NAME} for ${profile} ... "
        cd ${PROJECT_DIR}
-       mvn -q -P $profile clean compile war:exploded
+       mvn -q -P production clean compile war:exploded
        echo "done!"
        echo    
 }
@@ -143,8 +147,9 @@
        echo -n "Building the Debian package on the build host ... "
        
        cd $TARGET_DIR
-       # Remove unneeded RHEL directory
-       rm -rf ${RHEL_BUILD_DIR}
+       # Remove unneeded RHEL directories
+       rm -rf ${RHEL5_BUILD_DIR}
+       rm -rf ${RHEL6_BUILD_DIR}
        # We'll make the Debian package in debian/
        mkdir -p ${DEBIAN_BUILD_DIR}
        # Add the .deb scripts and config files
@@ -153,17 +158,15 @@
        # 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"
+       # One can ignore the gen_packages.sh script related errors if not 
present on the build host
        echo "done!"
        echo 
 }
 
 #
-# build rpm package 
+# build rpm package for RHEL
 #
 build_rhel_package() {
-       echo -n "Building the RHEL package on the build host ... "
-
-       cd ${TARGET_DIR}
        # Remove unneeded DEBIAN directory
        rm -rf ${DEBIAN_BUILD_DIR}
        cd ..
@@ -181,14 +184,40 @@
        # 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"
+       ssh ${RHEL_BUILD_HOST} "cd ${SERVICE_NAME}-${SERVICE_VERSION}; 
rpmbuild -bb --quiet --define \"_topdir 
${TOPDIR}/${SERVICE_NAME}-${SERVICE_VERSION}\" SPECS/${SERVICE_NAME}.specs; 
cp -f RPMS/noarch/*.rpm /media/mirror/rpm/"
+       # One can ignore the cp related errors if the /media/mirror/rpm 
directory is not present on the build host
        echo "done!"
        echo 
        
 }
 
 #
+# build rpm package for RHEL5
+#
+build_rhel5_package() {
+       echo -n "Building the RHEL5 package on the build host ... "
+       cd ${TARGET_DIR}
+       # Remove unneeded RHEL6 directory
+       rm -rf ${RHEL6_BUILD_DIR}
+       RHEL_BUILD_HOST=$RHEL5_BUILD_HOST
+       RHEL_BUILD_DIR=$RHEL5_BUILD_DIR
+       build_rhel_package
+}
+
+#
+# build rpm package for RHEL6
+#
+build_rhel6_package() {
+       echo -n "Building the RHEL6 package on the build host ... "
+       cd ${TARGET_DIR}
+       # Remove unneeded RHEL5 directory
+       rm -rf ${RHEL5_BUILD_DIR}
+       RHEL_BUILD_HOST=$RHEL6_BUILD_HOST
+       RHEL_BUILD_DIR=$RHEL6_BUILD_DIR
+       build_rhel_package
+}
+
+#
 # Build all needed projects
 #
 build_all() {
@@ -220,21 +249,28 @@
        do_structure
         build_debian_package
         ;;
-    rhel)
+    rhel5)
        do_clean_up
        build_all
        do_structure
-       build_rhel_package
+       build_rhel5_package
         ;;
+    rhel6)
+       do_clean_up
+       build_all
+       do_structure
+       build_rhel6_package
+        ;;
     all)
         do_clean_up
        build_all
         do_structure
         build_debian_package
-        build_rhel_package
+        build_rhel5_package
+        build_rhel6_package
         ;;
     *)
-        echo "Usage: $0 clean|structure|debian|rhel|all" >&2
+        echo "Usage: $0 clean|structure|debian|rhel5|rhel6|all" >&2
         exit 3
         ;;
 esac

Modified: 
trunk/perfsonar-java-xml-ls/packaging/rhel5/perfsonar-java-xml-ls.specs
===================================================================
--- trunk/perfsonar-java-xml-ls/packaging/rhel/perfsonar-java-xml-ls.specs    
  2012-04-18 14:47:07 UTC (rev 5925)
+++ trunk/perfsonar-java-xml-ls/packaging/rhel5/perfsonar-java-xml-ls.specs   
  2012-05-08 16:24:40 UTC (rev 5927)
@@ -7,7 +7,7 @@
 
 Name: perfsonar-java-xml-ls
 Version: 1.6
-Release: 0a
+Release: 0b.el5_8
 Summary: perfSONAR Lookup Service
 Vendor: GÉANT
 Group: Network/Web service
@@ -79,7 +79,7 @@
 if [ -e %{tomcatconf} ]; then
     grep "\-Xmx" %{tomcatconf} > /dev/null
     if [ $? ]; then
-        echo "Increasing %{tomcat} default memory allocation"
+        echo "Increasing %{tomcat} default memory allocation to 512m"
         echo -e "\n# perfSONAR - increase JVM default 
memory\nJAVA_OPTS=\"\${JAVA_OPTS} -Xmx512m\"" >> %{tomcatconf}
     fi
 fi
@@ -88,7 +88,7 @@
 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'
+    sed -i '/-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' /etc/sysconfig/iptables
     echo "--port=8080:tcp" >> /etc/sysconfig/system-config-securitylevel
 fi
 ## restart tomcat
@@ -113,7 +113,7 @@
        if [ -e %{tomcatwebapps}%{old_name} ]; then
         %{__rm} -rf %{tomcatwebapps}%{old_name} || true
        fi
-       fi [ -e %{tomcatendorsed}xml-resolver-1.2.jar ]; then
+       if [ -e %{tomcatendorsed}xml-resolver-1.2.jar ]; then
           %{__rm} -rf %{tomcatendorsed}xml-resolver-1.2.jar || true
        fi
 fi
@@ -133,20 +133,35 @@
 %files
 %defattr(0644,root,tomcat,0755)
 %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}
+%dir %attr(0775,tomcat,tomcat) %{_var}/lib/%{name}/data/
+%{_var}/lib/%{name}/data/README
+%dir %attr(0775,tomcat,tomcat) %{_var}/log/%{name}
+%config %{prefix}%{name}/WEB-INF/web.xml
+%config(noreplace) %{prefix}%{name}/WEB-INF/classes/conf.xml
+%config(noreplace) %{prefix}%{name}/WEB-INF/classes/log4j.xml
+%config 
%{prefix}%{name}/WEB-INF/classes/perfsonar/conf/configuration-rules.xml
+%attr(0660,tomcat,tomcat) %config(noreplace) 
%{prefix}%{name}/WEB-INF/classes/perfsonar/conf/configuration.xml
+%attr(0660,tomcat,tomcat) %config(noreplace) 
%{prefix}%{name}/WEB-INF/classes/perfsonar/conf/webAdminConfig.xml
+%{prefix}%{name}/META-INF
+%{prefix}%{name}/db
+%{prefix}%{name}/index.jsp
+%{prefix}%{name}/schema
+%{prefix}%{name}/wa
+%{prefix}%{name}/WEB-INF/classes/org
+%{prefix}%{name}/WEB-INF/conf
+%{prefix}%{name}/WEB-INF/lib
+%{prefix}%{name}/WEB-INF/modules
+%{prefix}%{name}/WEB-INF/services
 %{prefix}%{old_name}
 /usr/share/doc/%{name}
 %{_sysconfdir}/%{name}
 
 
 %changelog
-* Thu Apr 18 2012 Antoine Delvaux 
<>
 1.6-0a
+* Thu May 08 2012 Antoine Delvaux 
<>
 1.6-0b
  - New: Embedded eXist DB version 1.2.6
  - Change: now distributed under the GÉANT Standard Open Source Software 
Outward Licence
+ - Change: lighter default logging (only errors and warnings) and separated 
into exist.log and perfsonar.log
  - Fixes: PSSERVICES-572, PSSERVICES-563, PSSERVICES-558, PSSERVICES-613
 
 * Fri Sep 24 2010 Krzysztof Jedrzejewski 
<>
 1.5-1

Modified: trunk/perfsonar-java-xml-ls/pom.xml
===================================================================
--- trunk/perfsonar-java-xml-ls/pom.xml 2012-05-08 15:57:21 UTC (rev 5926)
+++ trunk/perfsonar-java-xml-ls/pom.xml 2012-05-08 16:24:40 UTC (rev 5927)
@@ -584,18 +584,11 @@
                        </properties>
                </profile>
                <profile>
-                       <id>debian</id>
+                       <id>production</id>
                        <properties>
-                               <port>8080</port>
                                
<datadir>/var/lib/perfsonar-java-xml-ls/data/</datadir>
                        </properties>
                </profile>
-               <profile>
-                       <id>rhel</id>
-                       <properties>
-                               
<datadir>/var/lib/perfsonar-java-xml-ls/data/</datadir>
-                       </properties>
-               </profile>
        </profiles>
 
        <organization>

Added: trunk/perfsonar-java-xml-ls/soapUI/README
===================================================================
--- trunk/perfsonar-java-xml-ls/soapUI/README                           (rev 
0)
+++ trunk/perfsonar-java-xml-ls/soapUI/README   2012-05-08 16:24:40 UTC (rev 
5927)
@@ -0,0 +1,17 @@
+soapUI testing of LS
+--------------------
+
+Build and install org.perfsonar.soapUI.ls jar:
+- This jar can be built from the jardesc in the packaging directory.
+- Resulting jar should only contain 2 compiled classes and a directory with 
RNC schema files.
+- The jar should be copied over to the bin/ext directory of soapUI (location 
is dependent upon your own soapUI installation).
+- The jing.jar should be copied to the bin/ext directory, and a log4j.jar as 
well.
+
+Open the perfsonar-LS-base2-soapui-project.xml with soapUI version 4.0 or 
higher and change the following settings to match your testing setup:
+- In the project "perfSONAR - Lookup Service" custom properties, set the 
lsHost variable to the URL of the server/service you want to test (and if you 
changed some other LS configurations like the eXist username or password, 
change it here as well).
+- In the LookupServiceSoap12Binding, use or change one of the Service 
Endpoints to match that of your server (use the same URL as above).
+- Then assign this new/edited Endpoint to All Requests and TestRequests.
+
+There should be no need to change anything else in the project, all test 
case properties should be changed and modified automatically as the tests 
execute.
+
+The soapUI project should now be ready to run.  You can run the whole test 
suite the main "perfSONAR - Lookup Service" window or go to each test case 
individually.

Deleted: trunk/perfsonar-java-xml-ls/soapUI/lib/log4j-1.2.8.jar
===================================================================
(Binary files differ)

Modified: 
trunk/perfsonar-java-xml-ls/soapUI/perfsonar-LS-base2-soapui-project.xml
===================================================================
--- 
trunk/perfsonar-java-xml-ls/src/test/soapUI/perfsonar-LS-base2-soapui-project.xml
   2012-04-18 14:47:07 UTC (rev 5925)
+++ trunk/perfsonar-java-xml-ls/soapUI/perfsonar-LS-base2-soapui-project.xml  
  2012-05-08 16:24:40 UTC (rev 5927)
@@ -481,7 +481,7 @@
 def data = 
ResponseHolder.getDomNodes('/soapenv:Envelope/soapenv:Body/nmwg:message/nmwg:data[@metadataIdRef="'+metadataIdRef+'"]/nmwgr:datum')
 assert data.size() == 1
 assert data[0].getValueAsString().contains(apKey)
-</scriptText></con:configuration></con:assertion><con:credentials><con:username
 xsi:nil="true"/><con:password xsi:nil="true"/><con:domain 
xsi:nil="true"/></con:credentials><con:jmsConfig 
JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:wsaConfig 
mustUnderstand="NONE" version="200508"/><con:wsrmConfig 
version="1.2"/></con:request></con:config></con:testStep><con:properties><con:property><con:name>lsKey</con:name><con:value>http://s02-0038.load.service.geant.net:8080/perfsonar-java-rrd-ma/services/MeasurementArchiveService</con:value></con:property></con:properties></con:testCase><con:testCase
 failOnError="true" failTestCaseOnErrors="true" keepSession="false" 
maxResults="0" name="Double Registration" searchProperties="true" 
id="724f833a-ee9d-46e3-a0ad-02b1d7e11205"><con:settings/><con:testStep 
type="request" name="Double Service Registration" 
id="c047b0c2-2c93-419b-8713-47dc9c4145fc"><con:settings/><con:config 
xsi:type="con:RequestStep" xmlns:xsi="http://www.w3.org/2
 
001/XMLSchema-instance"><con:interface>LookupServiceSoap12Binding</con:interface><con:operation>message</con:operation><con:request
 name="Double Service Registration" outgoingWss="" 
incomingWss=""><con:settings><con:setting 
id="com.eviware.soapui.impl.wsdl.WsdlRequest@inline-response-attachments">false</con:setting><con:setting
 
id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:encoding>UTF-8</con:encoding><con:endpoint>http://ls-1-6:8080/perfsonar-java-xml-ls/services/LookupService</con:endpoint><con:request><![CDATA[<!--
 Two Services registration with data -->
+</scriptText></con:configuration></con:assertion><con:credentials><con:username
 xsi:nil="true"/><con:password xsi:nil="true"/><con:domain 
xsi:nil="true"/></con:credentials><con:jmsConfig 
JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:wsaConfig 
mustUnderstand="NONE" version="200508"/><con:wsrmConfig 
version="1.2"/></con:request></con:config></con:testStep><con:properties><con:property><con:name>lsKey</con:name><con:value>http://s05-0035.load.service.geant.net:8080/perfsonar-java-rrd-ma/services/MeasurementArchiveService</con:value></con:property></con:properties></con:testCase><con:testCase
 failOnError="true" failTestCaseOnErrors="true" keepSession="false" 
maxResults="0" name="Double Registration" searchProperties="true" 
id="724f833a-ee9d-46e3-a0ad-02b1d7e11205"><con:settings/><con:testStep 
type="request" name="Double Service Registration" 
id="c047b0c2-2c93-419b-8713-47dc9c4145fc"><con:settings/><con:config 
xsi:type="con:RequestStep" xmlns:xsi="http://www.w3.org/2
 
001/XMLSchema-instance"><con:interface>LookupServiceSoap12Binding</con:interface><con:operation>message</con:operation><con:request
 name="Double Service Registration" outgoingWss="" 
incomingWss=""><con:settings><con:setting 
id="com.eviware.soapui.impl.wsdl.WsdlRequest@inline-response-attachments">false</con:setting><con:setting
 
id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:encoding>UTF-8</con:encoding><con:endpoint>http://ls-1-6:8080/perfsonar-java-xml-ls/services/LookupService</con:endpoint><con:request><![CDATA[<!--
 Two Services registration with data -->
 <soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/";>
    <soapenv:Header/>
    <soapenv:Body>
@@ -5113,7 +5113,7 @@
        props.setPropertyValue("Counter", counter)
        
props.setPropertyValue("accessPoint","http://s"+thread+"-"+counter+"."+apName+":"+apPort+apPath)
 }
-</script></con:config></con:testStep><con:testStep type="calltestcase" 
name="Threaded Single Reg"><con:settings/><con:config 
xsi:type="con:RunTestCaseStep" 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";><con:targetTestCase>3e654b7b-53a4-4f13-8628-6d7bfc9c4512</con:targetTestCase><con:properties><con:property><con:name>ParentThread</con:name><con:value>00</con:value></con:property><con:property><con:name>Counter</con:name><con:value>0035</con:value></con:property><con:property><con:name>lsKey</con:name><con:value>http://s00-0001.load.service.geant.net:8080/perfsonar-java-rrd-ma/services/MeasurementArchiveService</con:value></con:property><con:property><con:name>accessPoint</con:name><con:value>http://s00-0035.load.service.geant.net:8080/perfsonar-java-rrd-ma/services/MeasurementArchiveService</con:value></con:property></con:properties><con:returnProperties/><con:runMode>PARALLELL</con:runMode></con:config></con:testStep><con:loadTest
 name="Lots of Registrations" id="6c
 
2383df-9e36-4bc7-89f3-b464f710407c"><con:settings/><con:threadCount>30</con:threadCount><con:startDelay>0</con:startDelay><con:sampleInterval>250</con:sampleInterval><con:calculateTPSOnTimePassed>true</con:calculateTPSOnTimePassed><con:resetStatisticsOnThreadCountChange>true</con:resetStatisticsOnThreadCountChange><con:historyLimit>-1</con:historyLimit><con:testLimit>300</con:testLimit><con:limitType>TIME</con:limitType><con:loadStrategy><con:type>Simple</con:type></con:loadStrategy><con:assertion
 type="Step Status" name="Step 
Status"/><con:maxAssertionErrors>100</con:maxAssertionErrors><con:cancelExcessiveThreads>true</con:cancelExcessiveThreads><con:strategyInterval>500</con:strategyInterval><con:setupScript>//
 Init an empty DB
+</script></con:config></con:testStep><con:testStep type="calltestcase" 
name="Threaded Single Reg"><con:settings/><con:config 
xsi:type="con:RunTestCaseStep" 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";><con:targetTestCase>3e654b7b-53a4-4f13-8628-6d7bfc9c4512</con:targetTestCase><con:properties><con:property><con:name>ParentThread</con:name><con:value>00</con:value></con:property><con:property><con:name>Counter</con:name><con:value>0037</con:value></con:property><con:property><con:name>lsKey</con:name><con:value>http://s00-0001.load.service.geant.net:8080/perfsonar-java-rrd-ma/services/MeasurementArchiveService</con:value></con:property><con:property><con:name>accessPoint</con:name><con:value>http://s00-0037.load.service.geant.net:8080/perfsonar-java-rrd-ma/services/MeasurementArchiveService</con:value></con:property></con:properties><con:returnProperties/><con:runMode>PARALLELL</con:runMode></con:config></con:testStep><con:loadTest
 name="Lots of Registrations" id="6c
 
2383df-9e36-4bc7-89f3-b464f710407c"><con:settings/><con:threadCount>30</con:threadCount><con:startDelay>0</con:startDelay><con:sampleInterval>250</con:sampleInterval><con:calculateTPSOnTimePassed>true</con:calculateTPSOnTimePassed><con:resetStatisticsOnThreadCountChange>true</con:resetStatisticsOnThreadCountChange><con:historyLimit>-1</con:historyLimit><con:testLimit>300</con:testLimit><con:limitType>TIME</con:limitType><con:loadStrategy><con:type>Simple</con:type></con:loadStrategy><con:assertion
 type="Step Status" name="Step 
Status"/><con:maxAssertionErrors>100</con:maxAssertionErrors><con:cancelExcessiveThreads>true</con:cancelExcessiveThreads><con:strategyInterval>500</con:strategyInterval><con:setupScript>//
 Init an empty DB
 def tc = loadTestRunner.loadTest.testCase
 def initdbtc = 
tc.getTestSuite().getProject().getTestSuiteByName("Initialisation").getTestCaseByName("Empty
 DB")
 initdbtc.run(null, false)
@@ -5145,7 +5145,7 @@
        } else
                
props.setPropertyValue("accessPoint","http://s"+thread+"-"+counter+"."+apName+":"+apPort+apPath)
 }
-</script></con:config></con:testStep><con:testStep type="calltestcase" 
name="Threaded Single Reg"><con:settings/><con:config 
xsi:type="con:RunTestCaseStep" 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";><con:targetTestCase>3e654b7b-53a4-4f13-8628-6d7bfc9c4512</con:targetTestCase><con:properties><con:property><con:name>ParentThread</con:name><con:value>00</con:value></con:property><con:property><con:name>Counter</con:name><con:value>0030</con:value></con:property><con:property><con:name>lsKey</con:name><con:value>http://s00-0039.load.service.geant.net:8080/perfsonar-java-rrd-ma/services/MeasurementArchiveService</con:value></con:property><con:property><con:name>accessPoint</con:name><con:value>http://s00-0030.load.service.geant.net:8080/perfsonar-java-rrd-ma/services/MeasurementArchiveService</con:value></con:property></con:properties><con:returnProperties/><con:runMode>PARALLELL</con:runMode></con:config></con:testStep><con:testStep
 type="calltestcase" name="Threaded 
 Double Reg"><con:settings/><con:config xsi:type="con:RunTestCaseStep" 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";><con:targetTestCase>724f833a-ee9d-46e3-a0ad-02b1d7e11205</con:targetTestCase><con:properties><con:property><con:name>ParentThread</con:name><con:value>00</con:value></con:property><con:property><con:name>Counter</con:name><con:value>0026</con:value></con:property><con:property><con:name>lsKeyA</con:name><con:value>http://s00-0007-a.load.service.geant.net:8080/perfsonar-java-rrd-ma/services/MeasurementArchiveService</con:value></con:property><con:property><con:name>lsKeyB</con:name><con:value>http://s00-0007-b.load.service.geant.net:8080/perfsonar-java-rrd-ma/services/MeasurementArchiveService</con:value></con:property><con:property><con:name>accessPointA</con:name><con:value>http://s00-0026-a.load.service.geant.net:8080/perfsonar-java-rrd-ma/services/MeasurementArchiveService</con:value></con:property><con:property><con:name>accessPointB</con:name><con:
 
value>http://s00-0026-b.load.service.geant.net:8080/perfsonar-java-rrd-ma/services/MeasurementArchiveService</con:value></con:property></con:properties><con:returnProperties/><con:runMode>PARALLELL</con:runMode></con:config></con:testStep><con:testStep
 type="calltestcase" name="Threaded Dereg"><con:settings/><con:config 
xsi:type="con:RunTestCaseStep" 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";><con:targetTestCase>01c061ba-e53c-42f2-b08b-6f705a53e8af</con:targetTestCase><con:properties><con:property><con:name>lsKey</con:name><con:value>http://s00-0009.load.service.geant.net:8080/perfsonar-java-rrd-ma/services/MeasurementArchiveService</con:value></con:property><con:property><con:name>ParentThread</con:name><con:value>00</con:value></con:property><con:property><con:name>Counter</con:name><con:value>0042</con:value></con:property><con:property><con:name>accessPoint</con:name><con:value>http://s00-0042.load.service.geant.net:8080/perfsonar-java-rrd-ma/services/Measurem
 
entArchiveService</con:value></con:property></con:properties><con:returnProperties/><con:runMode>PARALLELL</con:runMode></con:config></con:testStep><con:loadTest
 name="Lots of Random 
Reg-Dereg"><con:settings/><con:threadCount>8</con:threadCount><con:startDelay>0</con:startDelay><con:sampleInterval>250</con:sampleInterval><con:calculateTPSOnTimePassed>true</con:calculateTPSOnTimePassed><con:resetStatisticsOnThreadCountChange>true</con:resetStatisticsOnThreadCountChange><con:historyLimit>-1</con:historyLimit><con:testLimit>3600</con:testLimit><con:limitType>TIME</con:limitType><con:loadStrategy><con:type>Simple</con:type></con:loadStrategy><con:assertion
 type="Step Status" name="Step 
Status"/><con:maxAssertionErrors>100</con:maxAssertionErrors><con:cancelExcessiveThreads>true</con:cancelExcessiveThreads><con:strategyInterval>500</con:strategyInterval><con:setupScript>//
 Init an empty DB or keep the existing one
+</script></con:config></con:testStep><con:testStep type="calltestcase" 
name="Threaded Single Reg"><con:settings/><con:config 
xsi:type="con:RunTestCaseStep" 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";><con:targetTestCase>3e654b7b-53a4-4f13-8628-6d7bfc9c4512</con:targetTestCase><con:properties><con:property><con:name>ParentThread</con:name><con:value>00</con:value></con:property><con:property><con:name>Counter</con:name><con:value>0048</con:value></con:property><con:property><con:name>lsKey</con:name><con:value>http://s00-0039.load.service.geant.net:8080/perfsonar-java-rrd-ma/services/MeasurementArchiveService</con:value></con:property><con:property><con:name>accessPoint</con:name><con:value>http://s00-0048.load.service.geant.net:8080/perfsonar-java-rrd-ma/services/MeasurementArchiveService</con:value></con:property></con:properties><con:returnProperties/><con:runMode>PARALLELL</con:runMode></con:config></con:testStep><con:testStep
 type="calltestcase" name="Threaded 
 Double Reg"><con:settings/><con:config xsi:type="con:RunTestCaseStep" 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";><con:targetTestCase>724f833a-ee9d-46e3-a0ad-02b1d7e11205</con:targetTestCase><con:properties><con:property><con:name>ParentThread</con:name><con:value>00</con:value></con:property><con:property><con:name>Counter</con:name><con:value>0009</con:value></con:property><con:property><con:name>lsKeyA</con:name><con:value>http://s00-0007-a.load.service.geant.net:8080/perfsonar-java-rrd-ma/services/MeasurementArchiveService</con:value></con:property><con:property><con:name>lsKeyB</con:name><con:value>http://s00-0007-b.load.service.geant.net:8080/perfsonar-java-rrd-ma/services/MeasurementArchiveService</con:value></con:property><con:property><con:name>accessPointA</con:name><con:value>http://s00-0009-a.load.service.geant.net:8080/perfsonar-java-rrd-ma/services/MeasurementArchiveService</con:value></con:property><con:property><con:name>accessPointB</con:name><con:
 
value>http://s00-0009-b.load.service.geant.net:8080/perfsonar-java-rrd-ma/services/MeasurementArchiveService</con:value></con:property></con:properties><con:returnProperties/><con:runMode>PARALLELL</con:runMode></con:config></con:testStep><con:testStep
 type="calltestcase" name="Threaded Dereg"><con:settings/><con:config 
xsi:type="con:RunTestCaseStep" 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";><con:targetTestCase>01c061ba-e53c-42f2-b08b-6f705a53e8af</con:targetTestCase><con:properties><con:property><con:name>lsKey</con:name><con:value>http://s00-0009.load.service.geant.net:8080/perfsonar-java-rrd-ma/services/MeasurementArchiveService</con:value></con:property><con:property><con:name>ParentThread</con:name><con:value>00</con:value></con:property><con:property><con:name>Counter</con:name><con:value>0003</con:value></con:property><con:property><con:name>accessPoint</con:name><con:value>http://s00-0003.load.service.geant.net:8080/perfsonar-java-rrd-ma/services/Measurem
 
entArchiveService</con:value></con:property></con:properties><con:returnProperties/><con:runMode>PARALLELL</con:runMode></con:config></con:testStep><con:loadTest
 name="Lots of Random 
Reg-Dereg"><con:settings/><con:threadCount>8</con:threadCount><con:startDelay>0</con:startDelay><con:sampleInterval>250</con:sampleInterval><con:calculateTPSOnTimePassed>true</con:calculateTPSOnTimePassed><con:resetStatisticsOnThreadCountChange>true</con:resetStatisticsOnThreadCountChange><con:historyLimit>-1</con:historyLimit><con:testLimit>300</con:testLimit><con:limitType>TIME</con:limitType><con:loadStrategy><con:type>Simple</con:type></con:loadStrategy><con:assertion
 type="Step Status" name="Step 
Status"/><con:maxAssertionErrors>100</con:maxAssertionErrors><con:cancelExcessiveThreads>true</con:cancelExcessiveThreads><con:strategyInterval>500</con:strategyInterval><con:setupScript>//
 Init an empty DB or keep the existing one
 def tc = loadTestRunner.loadTest.testCase
 def initdbtc = 
tc.getTestSuite().getProject().getTestSuiteByName("Initialisation").getTestCaseByName("Empty
 DB")
 initdbtc.run(null, false)
@@ -5221,7 +5221,7 @@
 if (prop) counter = prop.toInteger()
 else counter = 0
 ts.setPropertyValue("ServicesCounter", String.format('%d',++counter))
-</script></con:config></con:testStep><con:testStep type="calltestcase" 
name="Threaded Single Reg"><con:settings/><con:config 
xsi:type="con:RunTestCaseStep" 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";><con:targetTestCase>3e654b7b-53a4-4f13-8628-6d7bfc9c4512</con:targetTestCase><con:properties><con:property><con:name>ParentThread</con:name><con:value>00</con:value></con:property><con:property><con:name>Counter</con:name><con:value>0036</con:value></con:property><con:property><con:name>lsKey</con:name><con:value>http://s00-0028.load.service.geant.net:8080/perfsonar-java-rrd-ma/services/MeasurementArchiveService</con:value></con:property><con:property><con:name>accessPoint</con:name><con:value>http://s00-0036.load.service.geant.net:8080/perfsonar-java-rrd-ma/services/MeasurementArchiveService</con:value></con:property><con:property><con:name>ServicesCounter</con:name><con:value>0</con:value></con:property></con:properties><con:returnProperties/><con:runMode>PARALLELL</
 con:runMode></con:config></con:testStep><con:testStep type="request" 
name="Test Double Service exist"><con:settings/><con:config 
xsi:type="con:RequestStep" 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";><con:interface>LookupServiceSoap12Binding</con:interface><con:operation>message</con:operation><con:request
 name="Test Double Service exist" outgoingWss="" 
incomingWss=""><con:settings><con:setting 
id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:encoding>UTF-8</con:encoding><con:endpoint>http://ls-1-6:8080/perfsonar-java-xml-ls/services/LookupService</con:endpoint><con:request><![CDATA[<!--
 XPath query: lookup for registered services of given serviceType and 
serviceName -->
+</script></con:config></con:testStep><con:testStep type="calltestcase" 
name="Threaded Single Reg"><con:settings/><con:config 
xsi:type="con:RunTestCaseStep" 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";><con:targetTestCase>3e654b7b-53a4-4f13-8628-6d7bfc9c4512</con:targetTestCase><con:properties><con:property><con:name>ParentThread</con:name><con:value>00</con:value></con:property><con:property><con:name>Counter</con:name><con:value>0040</con:value></con:property><con:property><con:name>lsKey</con:name><con:value>http://s00-0028.load.service.geant.net:8080/perfsonar-java-rrd-ma/services/MeasurementArchiveService</con:value></con:property><con:property><con:name>accessPoint</con:name><con:value>http://s00-0040.load.service.geant.net:8080/perfsonar-java-rrd-ma/services/MeasurementArchiveService</con:value></con:property><con:property><con:name>ServicesCounter</con:name><con:value>0</con:value></con:property></con:properties><con:returnProperties/><con:runMode>PARALLELL</
 con:runMode></con:config></con:testStep><con:testStep type="request" 
name="Test Double Service exist"><con:settings/><con:config 
xsi:type="con:RequestStep" 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";><con:interface>LookupServiceSoap12Binding</con:interface><con:operation>message</con:operation><con:request
 name="Test Double Service exist" outgoingWss="" 
incomingWss=""><con:settings><con:setting 
id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:encoding>UTF-8</con:encoding><con:endpoint>http://ls-1-6:8080/perfsonar-java-xml-ls/services/LookupService</con:endpoint><con:request><![CDATA[<!--
 XPath query: lookup for registered services of given serviceType and 
serviceName -->
 <soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/"; 
xmlns:xs="http://www.w3.org/2001/XMLSchema";>
    <soapenv:Header/>
    <soapenv:Body>
@@ -5265,7 +5265,7 @@
 if (prop) counter = prop.toInteger()
 else counter = 0
 ts.setPropertyValue("ServicesCounter", String.format('%d',++counter))
-</script></con:config></con:testStep><con:testStep type="calltestcase" 
name="Threaded Double Reg"><con:settings/><con:config 
xsi:type="con:RunTestCaseStep" 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";><con:targetTestCase>724f833a-ee9d-46e3-a0ad-02b1d7e11205</con:targetTestCase><con:properties><con:property><con:name>ParentThread</con:name><con:value>00</con:value></con:property><con:property><con:name>Counter</con:name><con:value>0020</con:value></con:property><con:property><con:name>lsKeyA</con:name><con:value>http://s00-0020-a.load.service.geant.net:8080/perfsonar-java-rrd-ma/services/MeasurementArchiveService</con:value></con:property><con:property><con:name>lsKeyB</con:name><con:value>http://s00-0020-b.load.service.geant.net:8080/perfsonar-java-rrd-ma/services/MeasurementArchiveService</con:value></con:property><con:property><con:name>accessPointA</con:name><con:value>http://s00-0020-a.load.service.geant.net:8080/perfsonar-java-rrd-ma/services/MeasurementArchive
 
Service</con:value></con:property><con:property><con:name>accessPointB</con:name><con:value>http://s00-0020-b.load.service.geant.net:8080/perfsonar-java-rrd-ma/services/MeasurementArchiveService</con:value></con:property><con:property><con:name>ServicesCounter</con:name><con:value>0</con:value></con:property></con:properties><con:returnProperties/><con:runMode>PARALLELL</con:runMode></con:config></con:testStep><con:testStep
 type="request" name="Test Dereg Service exist"><con:settings/><con:config 
xsi:type="con:RequestStep" 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";><con:interface>LookupServiceSoap12Binding</con:interface><con:operation>message</con:operation><con:request
 name="Test Dereg Service exist" outgoingWss="" 
incomingWss=""><con:settings><con:setting 
id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:encoding>UTF-8</con:encoding><con:endpoint>http://ls-1-6:8080/perfsonar-java-xml-ls/services/Lo
 okupService</con:endpoint><con:request><![CDATA[<!-- XPath query: lookup for 
registered services of given serviceType and serviceName -->
+</script></con:config></con:testStep><con:testStep type="calltestcase" 
name="Threaded Double Reg"><con:settings/><con:config 
xsi:type="con:RunTestCaseStep" 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";><con:targetTestCase>724f833a-ee9d-46e3-a0ad-02b1d7e11205</con:targetTestCase><con:properties><con:property><con:name>ParentThread</con:name><con:value>00</con:value></con:property><con:property><con:name>Counter</con:name><con:value>0045</con:value></con:property><con:property><con:name>lsKeyA</con:name><con:value>http://s00-0020-a.load.service.geant.net:8080/perfsonar-java-rrd-ma/services/MeasurementArchiveService</con:value></con:property><con:property><con:name>lsKeyB</con:name><con:value>http://s00-0020-b.load.service.geant.net:8080/perfsonar-java-rrd-ma/services/MeasurementArchiveService</con:value></con:property><con:property><con:name>accessPointA</con:name><con:value>http://s00-0045-a.load.service.geant.net:8080/perfsonar-java-rrd-ma/services/MeasurementArchive
 
Service</con:value></con:property><con:property><con:name>accessPointB</con:name><con:value>http://s00-0045-b.load.service.geant.net:8080/perfsonar-java-rrd-ma/services/MeasurementArchiveService</con:value></con:property><con:property><con:name>ServicesCounter</con:name><con:value>2</con:value></con:property></con:properties><con:returnProperties/><con:runMode>PARALLELL</con:runMode></con:config></con:testStep><con:testStep
 type="request" name="Test Dereg Service exist"><con:settings/><con:config 
xsi:type="con:RequestStep" 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";><con:interface>LookupServiceSoap12Binding</con:interface><con:operation>message</con:operation><con:request
 name="Test Dereg Service exist" outgoingWss="" 
incomingWss=""><con:settings><con:setting 
id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:encoding>UTF-8</con:encoding><con:endpoint>http://ls-1-6:8080/perfsonar-java-xml-ls/services/Lo
 okupService</con:endpoint><con:request><![CDATA[<!-- XPath query: lookup for 
registered services of given serviceType and serviceName -->
 <soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/"; 
xmlns:xs="http://www.w3.org/2001/XMLSchema";>
    <soapenv:Header/>
    <soapenv:Body>
@@ -5309,7 +5309,7 @@
 if (prop) counter = prop.toInteger()
 else counter = 0
 ts.setPropertyValue("ServicesCounter", String.format('%d',--counter))
-</script></con:config></con:testStep><con:testStep type="calltestcase" 
name="Threaded Dereg"><con:settings/><con:config 
xsi:type="con:RunTestCaseStep" 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";><con:targetTestCase>01c061ba-e53c-42f2-b08b-6f705a53e8af</con:targetTestCase><con:properties><con:property><con:name>lsKey</con:name><con:value>http://s00-0039.load.service.geant.net:8080/perfsonar-java-rrd-ma/services/MeasurementArchiveService</con:value></con:property><con:property><con:name>ParentThread</con:name><con:value>00</con:value></con:property><con:property><con:name>Counter</con:name><con:value>0034</con:value></con:property><con:property><con:name>accessPoint</con:name><con:value>http://s00-0034.load.service.geant.net:8080/perfsonar-java-rrd-ma/services/MeasurementArchiveService</con:value></con:property><con:property><con:name>ServicesCounter</con:name><con:value>0</con:value></con:property></con:properties><con:returnProperties/><con:runMode>PARALLELL</con:r
 unMode></con:config></con:testStep><con:loadTest name="Lots of Random 
Reg-Dereg-Queries"><con:settings/><con:threadCount>4</con:threadCount><con:startDelay>0</con:startDelay><con:sampleInterval>250</con:sampleInterval><con:calculateTPSOnTimePassed>true</con:calculateTPSOnTimePassed><con:resetStatisticsOnThreadCountChange>true</con:resetStatisticsOnThreadCountChange><con:historyLimit>-1</con:historyLimit><con:testLimit>3600</con:testLimit><con:limitType>TIME</con:limitType><con:loadStrategy><con:type>Simple</con:type></con:loadStrategy><con:assertion
 type="Step Status" name="Step 
Status"/><con:maxAssertionErrors>100</con:maxAssertionErrors><con:cancelExcessiveThreads>true</con:cancelExcessiveThreads><con:strategyInterval>500</con:strategyInterval><con:setupScript>//
 Init an empty DB or keep the existing one
+</script></con:config></con:testStep><con:testStep type="calltestcase" 
name="Threaded Dereg"><con:settings/><con:config 
xsi:type="con:RunTestCaseStep" 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";><con:targetTestCase>01c061ba-e53c-42f2-b08b-6f705a53e8af</con:targetTestCase><con:properties><con:property><con:name>lsKey</con:name><con:value>http://s00-0039.load.service.geant.net:8080/perfsonar-java-rrd-ma/services/MeasurementArchiveService</con:value></con:property><con:property><con:name>ParentThread</con:name><con:value>00</con:value></con:property><con:property><con:name>Counter</con:name><con:value>0020</con:value></con:property><con:property><con:name>accessPoint</con:name><con:value>http://s00-0020.load.service.geant.net:8080/perfsonar-java-rrd-ma/services/MeasurementArchiveService</con:value></con:property></con:properties><con:returnProperties/><con:runMode>PARALLELL</con:runMode></con:config></con:testStep><con:loadTest
 name="Lots of Random Reg-Dereg-Queries">
 
<con:settings/><con:threadCount>4</con:threadCount><con:startDelay>0</con:startDelay><con:sampleInterval>250</con:sampleInterval><con:calculateTPSOnTimePassed>true</con:calculateTPSOnTimePassed><con:resetStatisticsOnThreadCountChange>true</con:resetStatisticsOnThreadCountChange><con:historyLimit>-1</con:historyLimit><con:testLimit>300</con:testLimit><con:limitType>TIME</con:limitType><con:loadStrategy><con:type>Simple</con:type></con:loadStrategy><con:assertion
 type="Step Status" name="Step 
Status"/><con:maxAssertionErrors>100</con:maxAssertionErrors><con:cancelExcessiveThreads>true</con:cancelExcessiveThreads><con:strategyInterval>500</con:strategyInterval><con:setupScript>//
 Init an empty DB or keep the existing one
 def tc = loadTestRunner.loadTest.testCase
 def initdbtc = 
tc.getTestSuite().getProject().getTestSuiteByName("Initialisation").getTestCaseByName("Empty
 DB")
 initdbtc.run(null, false)

Deleted: trunk/perfsonar-java-xml-ls/soapUI/src/log4j.properties
===================================================================
--- trunk/perfsonar-java-xml-ls/src/test/soapUI/src/log4j.properties    
2012-04-18 14:47:07 UTC (rev 5925)
+++ trunk/perfsonar-java-xml-ls/soapUI/src/log4j.properties     2012-05-08 
16:24:40 UTC (rev 5927)
@@ -1,23 +0,0 @@
-
-log4j.rootLogger=, stdout, file
-
-# Disable certain spam.
-log4j.logger.org.perfsonar=INFO
-
-#
-# Appenders
-#
-
-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.Target=System.out
-log4j.appender.stdout.Threshold=INFO
-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=%d{ABSOLUTE} %5p %c - %m%n
-
-log4j.appender.file=org.apache.log4j.FileAppender
-log4j.appender.file.File=log.log
-log4j.appender.file.Append=false
-log4j.appender.file.Threshold=DEBUG
-log4j.appender.file.Encoding=UTF-8
-log4j.appender.file.layout=org.apache.log4j.PatternLayout
-log4j.appender.file.layout.ConversionPattern=%d{ABSOLUTE} %5p %c - %m%n
\ No newline at end of file

Modified: 
trunk/perfsonar-java-xml-ls/soapUI/src/org/perfsonar/soapUI/ls/TestUtil.java
===================================================================
--- 
trunk/perfsonar-java-xml-ls/src/test/soapUI/src/org/perfsonar/soapUI/ls/TestUtil.java
       2012-04-18 14:47:07 UTC (rev 5925)
+++ 
trunk/perfsonar-java-xml-ls/soapUI/src/org/perfsonar/soapUI/ls/TestUtil.java  
      2012-05-08 16:24:40 UTC (rev 5927)
@@ -67,9 +67,10 @@
                xmlValidationTest();
        }
 
+       // TODO: remove, XML validation through XSD schema should not be 
supported
        private static void xmlValidationTest() throws FileNotFoundException, 
IOException,
                        ParserConfigurationException, SAXException {
-               String f = "src/test/soapUI/xsd/Echo/LSEchoRequest.xsd";
+               String f = "soapUI/xsd/Echo/LSEchoRequest.xsd";
                File file = new File("samples/requests/EchoRequest.xml");
                FileReader reader = new FileReader(file);
                StringBuilder sb = new StringBuilder();
@@ -83,9 +84,10 @@
                System.out.println("XSD validation: "+validateXSD(s, new 
File(f), Logger.getLogger(TestUtil.class)));
        }
 
+       // This is the preferred validation way, through RNC schema files
        private static void rncValidationTest() throws FileNotFoundException, 
IOException,
                        ParserConfigurationException, SAXException {
-               String f = "src/test/soapUI/rnc/nmbase.rnc";
+               String f = "soapUI/rnc/nmbase.rnc";
                File file = new File("samples/requests/EchoRequest.xml");
                FileReader reader = new FileReader(file);
                StringBuilder sb = new StringBuilder();

Modified: 
trunk/perfsonar-java-xml-ls/src/main/resources/perfsonar/conf/webAdminConfig.xml
===================================================================
--- 
trunk/perfsonar-java-xml-ls/src/main/resources/perfsonar/conf/webAdminConfig.xml
    2012-05-08 15:57:21 UTC (rev 5926)
+++ 
trunk/perfsonar-java-xml-ls/src/main/resources/perfsonar/conf/webAdminConfig.xml
    2012-05-08 16:24:40 UTC (rev 5927)
@@ -18,12 +18,12 @@
        
        <wa:basiclink>
                <wa:pageId>basic</wa:pageId> <!-- page identifier -->
-               <wa:title>Service settings</wa:title>
+               <wa:title>Service Settings</wa:title>
        </wa:basiclink>
        
        <wa:basiclink>
                <wa:pageId>changePassword</wa:pageId> <!-- page identifier -->
-               <wa:title>Change WA settings</wa:title>
+               <wa:title>WebAdmin Settings</wa:title>
        </wa:basiclink>
        
        <wa:basiclink>
@@ -36,11 +36,6 @@
                <wa:title>Advanced Service Settings</wa:title>
        </wa:advancedlink>
        
-       <wa:advancedlink>
-               <wa:redirectTo>/exist</wa:redirectTo>
-               <wa:title>Exist configuration</wa:title>
-       </wa:advancedlink>
-
        <wa:map>
                
<wa:url>http://service.perfsonar.org/ns/config/base/0.9/</wa:url>
                <wa:ns>ns1</wa:ns>
@@ -129,7 +124,7 @@
                                                
doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="xmlls"]/ns1:auxiliaryComponents/ns1:component[@name="existDataSource"]/ns1:option[@name="username"]/@value
                                        </wa:xpath>
                                </wa:default>
-                               <wa:title><wa:text>Exist DB 
username</wa:text></wa:title>
+                               <wa:title><wa:text>eXist DB 
username</wa:text></wa:title>
                        </wa:textbox>
                </wa:plain>
                
@@ -140,7 +135,7 @@
                                                
doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="xmlls"]/ns1:auxiliaryComponents/ns1:component[@name="existDataSource"]/ns1:option[@name="password"]/@value
                                        </wa:xpath>
                                </wa:default>
-                               <wa:title><wa:text>Exist DB 
password</wa:text></wa:title>
+                               <wa:title><wa:text>eXist DB 
password</wa:text></wa:title>
                        </wa:textbox>
                </wa:plain>
                
@@ -180,7 +175,7 @@
                                <wa:default>
                                        
<wa:xpath>doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="xmlls"]/ns1:messageHandler/ns1:message[@type="EchoRequest"]/ns1:option[@name="authN"]/@value</wa:xpath>
                                </wa:default>
-                               <wa:title><wa:text>EchoRequest message type 
should be authenticated ?</wa:text></wa:title>
+                               <wa:title><wa:text>EchoRequest message type 
should be authenticated?</wa:text></wa:title>
                                
<wa:values><wa:text>yes,no</wa:text></wa:values>
                        </wa:radio>
                </wa:plain>
@@ -190,7 +185,7 @@
                                <wa:default>
                                        
<wa:xpath>doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="xmlls"]/ns1:messageHandler/ns1:message[@type="LSRegisterRequest"]/ns1:option[@name="authN"]/@value</wa:xpath>
                                </wa:default>
-                               <wa:title><wa:text>LSRegisterRequest message 
type should be authenticated ?</wa:text></wa:title>
+                               <wa:title><wa:text>LSRegisterRequest message 
type should be authenticated?</wa:text></wa:title>
                                
<wa:values><wa:text>yes,no</wa:text></wa:values>
                        </wa:radio>
                </wa:plain>
@@ -200,7 +195,7 @@
                                <wa:default>
                                        
<wa:xpath>doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="xmlls"]/ns1:messageHandler/ns1:message[@type="LSQueryRequest"]/ns1:option[@name="authN"]/@value</wa:xpath>
                                </wa:default>
-                               <wa:title><wa:text>LSQueryRequest message 
type should be authenticated ?</wa:text></wa:title>
+                               <wa:title><wa:text>LSQueryRequest message 
type should be authenticated?</wa:text></wa:title>
                                
<wa:values><wa:text>yes,no</wa:text></wa:values>
                        </wa:radio>
                </wa:plain>
@@ -210,7 +205,7 @@
                                <wa:default>
                                        
<wa:xpath>doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="xmlls"]/ns1:messageHandler/ns1:message[@type="LSKeepaliveRequest"]/ns1:option[@name="authN"]/@value</wa:xpath>
                                </wa:default>
-                               <wa:title><wa:text>LSKeepaliveRequest message 
type should be authenticated ?</wa:text></wa:title>
+                               <wa:title><wa:text>LSKeepaliveRequest message 
type should be authenticated?</wa:text></wa:title>
                                
<wa:values><wa:text>yes,no</wa:text></wa:values>
                        </wa:radio>
                </wa:plain>
@@ -220,7 +215,7 @@
                                <wa:default>
                                        
<wa:xpath>doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="xmlls"]/ns1:messageHandler/ns1:message[@type="LSDeregisterRequest"]/ns1:option[@name="authN"]/@value</wa:xpath>
                                </wa:default>
-                               <wa:title><wa:text>LSDeregisterRequest 
message type should be authenticated ?</wa:text></wa:title>
+                               <wa:title><wa:text>LSDeregisterRequest 
message type should be authenticated?</wa:text></wa:title>
                                
<wa:values><wa:text>yes,no</wa:text></wa:values>
                        </wa:radio>
                </wa:plain>
@@ -275,7 +270,7 @@
                                                
doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="xmlls"]/ns1:auxiliaryComponents/ns1:component[@name="existDataSource"]/ns1:option[@name="url"]/@value
                                        </wa:xpath>
                                </wa:default>
-                               <wa:title><wa:text>Exist DB 
url</wa:text></wa:title>
+                               <wa:title><wa:text>eXist DB 
url</wa:text></wa:title>
                        </wa:textbox>
                </wa:plain>
                
@@ -286,7 +281,7 @@
                                                
doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="xmlls"]/ns1:auxiliaryComponents/ns1:component[@name="existDataSource"]/ns1:option[@name="username"]/@value
                                        </wa:xpath>
                                </wa:default>
-                               <wa:title><wa:text>Exist DB 
username</wa:text></wa:title>
+                               <wa:title><wa:text>eXist DB 
username</wa:text></wa:title>
                        </wa:textbox>
                </wa:plain>
                
@@ -297,7 +292,7 @@
                                                
doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="xmlls"]/ns1:auxiliaryComponents/ns1:component[@name="existDataSource"]/ns1:option[@name="password"]/@value
                                        </wa:xpath>
                                </wa:default>
-                               <wa:title><wa:text>Exist DB 
password</wa:text></wa:title>
+                               <wa:title><wa:text>eXist DB 
password</wa:text></wa:title>
                        </wa:textbox>
                </wa:plain>
                
@@ -308,7 +303,7 @@
                                                
doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="xmlls"]/ns1:auxiliaryComponents/ns1:component[@name="existDataSource"]/ns1:option[@name="usernameRO"]/@value
                                        </wa:xpath>
                                </wa:default>
-                               <wa:title><wa:text>Exist DB username 
(read-only)</wa:text></wa:title>
+                               <wa:title><wa:text>eXist DB username 
(read-only)</wa:text></wa:title>
                        </wa:textbox>
                </wa:plain>
                
@@ -319,7 +314,7 @@
                                                
doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="xmlls"]/ns1:auxiliaryComponents/ns1:component[@name="existDataSource"]/ns1:option[@name="passwordRO"]/@value
                                        </wa:xpath>
                                </wa:default>
-                               <wa:title><wa:text>Exist DB password 
(read-only)</wa:text></wa:title>
+                               <wa:title><wa:text>eXist DB password 
(read-only)</wa:text></wa:title>
                        </wa:textbox>
                </wa:plain>