perfsonar development work

Author: mac
Date: 2008-10-23 07:34:01 -0400 (Thu, 23 Oct 2008)
New Revision: 4662

Modified:
   trunk/packaging/deb/geant2-java-xml-ls/changelog
   trunk/packaging/deb/geant2-java-xml-ls/conffiles
   trunk/packaging/deb/geant2-java-xml-ls/install
   trunk/packaging/deb/geant2-java-xml-ls/postinst
   trunk/packaging/deb/geant2-java-xml-ls/postrm
   trunk/packaging/deb/geant2-java-xml-ls/rules
Log:
new dirs



Modified: trunk/packaging/deb/geant2-java-xml-ls/changelog
===================================================================
--- trunk/packaging/deb/geant2-java-xml-ls/changelog    2008-10-23 11:32:48 
UTC (rev 4661)
+++ trunk/packaging/deb/geant2-java-xml-ls/changelog    2008-10-23 11:34:01 
UTC (rev 4662)
@@ -1,15 +1,21 @@
 geant2-java-xml-ls (1.3-1) stable; urgency=low
 
+  * New: WebAdmin wizard script improvements
+  * New: Support for OWAMP
+  * New: Support for more eventTypes
+  * New: XQuery supports 'escaped' parameter, rejects other
+  * New: XQuery return eventType
+  * New: LSDiscovery for hLS
   * New: Global LS implementation
   * New: Registration to LS (hLS to gLS) 
   * New: IP addresses summarization (hLS)
   * New: Self test implemented
   * New: Packaging (DEB+RPM)
   * New: Authentication
-  * Change: nmwg-jar-ver=1.0.20080630
+  * Change: nmwg-jar=nmwg-1.0.20081015.jar
   * Change: ps-antxml-ver=1.0.20080204
-  * Change: ps-jar-ver=1.0.20080717
-  * Change: ps-webadmin=0.8.3b
+  * Change: ps-jar-ver=1.0.20080924
+  * Change: ps-webadmin=0.9.8b
 
- -- Maciej Glowiak 
<>
  Thu, 7 Aug 2008 14:00:00 +0200
+ -- Maciej Glowiak 
<>
  Mon, 20 Oct 2008 14:00:00 +0200
 

Modified: trunk/packaging/deb/geant2-java-xml-ls/conffiles
===================================================================
--- trunk/packaging/deb/geant2-java-xml-ls/conffiles    2008-10-23 11:32:48 
UTC (rev 4661)
+++ trunk/packaging/deb/geant2-java-xml-ls/conffiles    2008-10-23 11:34:01 
UTC (rev 4662)
@@ -1,12 +1,11 @@
-/var/lib/tomcat5.5/webapps/geant2-java-xml-ls/WEB-INF/classes/perfsonar/conf/components.properties
-/var/lib/tomcat5.5/webapps/geant2-java-xml-ls/WEB-INF/classes/perfsonar/conf/log4j.properties
-/var/lib/tomcat5.5/webapps/geant2-java-xml-ls/WEB-INF/classes/perfsonar/conf/log4j.syslog.properties
-/var/lib/tomcat5.5/webapps/geant2-java-xml-ls/WEB-INF/classes/perfsonar/conf/LSStore-control.xml
-/var/lib/tomcat5.5/webapps/geant2-java-xml-ls/WEB-INF/classes/perfsonar/conf/LSStore.xml
-/var/lib/tomcat5.5/webapps/geant2-java-xml-ls/WEB-INF/classes/perfsonar/conf/objects.config
-/var/lib/tomcat5.5/webapps/geant2-java-xml-ls/WEB-INF/classes/perfsonar/conf/service.properties
-/var/lib/tomcat5.5/webapps/geant2-java-xml-ls/WEB-INF/classes/perfsonar/conf/servlet.properties
-/var/lib/tomcat5.5/webapps/geant2-java-xml-ls/WEB-INF/classes/perfsonar/conf/wizard.properties
-/var/lib/tomcat5.5/webapps/geant2-java-xml-ls/WEB-INF/classes/perfsonar/conf/wizardproperties.dtd
-/var/lib/tomcat5.5/webapps/geant2-java-xml-ls/WEB-INF/server-config.wsdd
-/var/lib/tomcat5.5/webapps/geant2-java-xml-ls/WEB-INF/web.xml
+/usr/lib/perfsonar/services/geant2-java-xml-ls/WEB-INF/classes/perfsonar/conf/components.properties
+/usr/lib/perfsonar/services/geant2-java-xml-ls/WEB-INF/classes/perfsonar/conf/log4j.properties
+/usr/lib/perfsonar/services/geant2-java-xml-ls/WEB-INF/classes/perfsonar/conf/log4j.syslog.properties
+/usr/lib/perfsonar/services/geant2-java-xml-ls/WEB-INF/classes/perfsonar/conf/LSStore-control.xml
+/usr/lib/perfsonar/services/geant2-java-xml-ls/WEB-INF/classes/perfsonar/conf/LSStore.xml
+/usr/lib/perfsonar/services/geant2-java-xml-ls/WEB-INF/classes/perfsonar/conf/objects.config
+/usr/lib/perfsonar/services/geant2-java-xml-ls/WEB-INF/classes/perfsonar/conf/service.properties
+/usr/lib/perfsonar/services/geant2-java-xml-ls/WEB-INF/classes/perfsonar/conf/servlet.properties
+/usr/lib/perfsonar/services/geant2-java-xml-ls/WEB-INF/classes/perfsonar/conf/wizard.properties
+/usr/lib/perfsonar/services/geant2-java-xml-ls/WEB-INF/server-config.wsdd
+/usr/lib/perfsonar/services/geant2-java-xml-ls/WEB-INF/web.xml

Modified: trunk/packaging/deb/geant2-java-xml-ls/install
===================================================================
--- trunk/packaging/deb/geant2-java-xml-ls/install      2008-10-23 11:32:48 
UTC (rev 4661)
+++ trunk/packaging/deb/geant2-java-xml-ls/install      2008-10-23 11:34:01 
UTC (rev 4662)
@@ -1,5 +1,5 @@
-build/geant2-java-xml-ls/* /var/lib/tomcat5.5/webapps/geant2-java-xml-ls
-doc/* /usr/share/doc/geant2-java-xml-ls
+build/geant2-java-xml-ls/* /usr/lib/perfsonar/services/geant2-java-xml-ls
+doc /usr/lib/perfsonar/services/geant2-java-xml-ls/WEB-INF
+samples /usr/lib/perfsonar/services/geant2-java-xml-ls/WEB-INF
 
 
-

Modified: trunk/packaging/deb/geant2-java-xml-ls/postinst
===================================================================
--- trunk/packaging/deb/geant2-java-xml-ls/postinst     2008-10-23 11:32:48 
UTC (rev 4661)
+++ trunk/packaging/deb/geant2-java-xml-ls/postinst     2008-10-23 11:34:01 
UTC (rev 4662)
@@ -17,21 +17,42 @@
 # for details, see http://www.debian.org/doc/debian-policy/ or
 # the debian-policy package
 
+SERVICENAME="geant2-java-xml-ls"
+SERVICEPATH="/usr/lib/perfsonar/services"
 
+
+
 case "$1" in
     configure)
-    if [ -h /etc/geant2-java-xml-ls ]
+    if [ -h /var/lib/tomcat5.5/webapps/$SERVICENAME ]
     then
-        rm /etc/geant2-java-xml-ls
+        rm /var/lib/tomcat5.5/webapps/$SERVICENAME
     fi
-    ln -sf 
/var/lib/tomcat5.5/webapps/geant2-java-xml-ls/WEB-INF/classes/perfsonar/conf 
/etc/geant2-java-xml-ls || true
-    if [ -h /var/log/geant2-java-xml-ls ]
+    ln -sf $SERVICEPATH/$SERVICENAME /var/lib/tomcat5.5/webapps/$SERVICENAME 
|| true
+    if [ -h /etc/$SERVICENAME ]
     then
-        rm /var/log/geant2-java-xml-ls
+        rm /etc/$SERVICENAME
     fi
-    ln -s /var/log/tomcat5.5 /var/log/geant2-java-xml-ls || true
-    chown -R tomcat55 
/var/lib/tomcat5.5/webapps/geant2-java-xml-ls/WEB-INF/classes/perfsonar/conf/*
-    /etc/init.d/tomcat5.5 restart
+    ln -sf $SERVICEPATH/$SERVICENAME/WEB-INF/classes/perfsonar/conf 
/etc/$SERVICENAME || true
+
+    if [ -h /var/log/$SERVICENAME ]
+    then
+        rm /var/log/$SERVICENAME
+    fi
+    mkdir -p $SERVICEPATH/$SERVICENAME/WEB-INF/log
+    ln -sf $SERVICEPATH/$SERVICENAME/WEB-INF/log /var/log/$SERVICENAME || 
true
+
+    if [ -h /usr/share/doc/$SERVICENAME/spec ]
+    then
+        rm /usr/share/doc/$SERVICENAME/spec
+    fi
+    ln -sf $SERVICEPATH/$SERVICENAME/WEB-INF/doc 
/usr/share/doc/$SERVICENAME/spec || true
+
+    chown -R tomcat55 
$SERVICEPATH/$SERVICENAME/WEB-INF/classes/perfsonar/conf
+    chown tomcat55 /var/run/$SERVICENAME
+    chown tomcat55 $SERVICEPATH/$SERVICENAME/WEB-INF/log
+
+    /etc/init.d/geant2-tomcat5.5 restart
     ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)

Modified: trunk/packaging/deb/geant2-java-xml-ls/postrm
===================================================================
--- trunk/packaging/deb/geant2-java-xml-ls/postrm       2008-10-23 11:32:48 
UTC (rev 4661)
+++ trunk/packaging/deb/geant2-java-xml-ls/postrm       2008-10-23 11:34:01 
UTC (rev 4662)
@@ -19,17 +19,32 @@
 # the debian-policy package
 
 
+SERVICENAME="geant2-java-xml-ls"
+SERVICEPATH="/usr/lib/perfsonar/services"
+
+
 case "$1" in
     purge)
-    if [ -h /etc/geant2-java-xml-ls ]
+    if [ -h /var/lib/tomcat5.5/webapps/$SERVICENAME ]
     then
-        rm /etc/geant2-java-xml-ls
+        rm /var/lib/tomcat5.5/webapps/$SERVICENAME
     fi
-    if [ -h /var/log/geant2-java-xml-ls ]
+
+    if [ -h /etc/$SERVICENAME ]
     then
-        rm /var/log/geant2-java-xml-ls
+        rm /etc/$SERVICENAME
     fi
-    rm -fr /usr/share/doc/geant2-java-xml-ls
+
+    if [ -h /var/log/$SERVICENAME ]
+    then
+        rm /var/log/$SERVICENAME
+    fi
+    rm -fr $SERVICEPATH/$SERVICENAME/WEB-INF/log
+
+    if [ -h /usr/share/doc/$SERVICENAME/spec ]
+    then
+        rm /usr/share/doc/$SERVICENAME/spec
+    fi
     ;;
 
     remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)

Modified: trunk/packaging/deb/geant2-java-xml-ls/rules
===================================================================
--- trunk/packaging/deb/geant2-java-xml-ls/rules        2008-10-23 11:32:48 
UTC (rev 4661)
+++ trunk/packaging/deb/geant2-java-xml-ls/rules        2008-10-23 11:34:01 
UTC (rev 4662)
@@ -19,9 +19,9 @@
        dh_testdir
        ( \
             echo Copying files from webapps ; \
-            mkdir build; \
-            cp ../webapps/`ls ../webapps` build/ -r ; \
-            mv build/`ls ../webapps` build/geant2-java-xml-ls -v ; \
+            mkdir -v build; \
+            cp -v ../webapps/`ls ../webapps | grep ^xml-ls` build/ -r ; \
+            mv -v build/`ls ../webapps | grep ^xml-ls` 
build/geant2-java-xml-ls -v ; \
         )
        touch $@