perfsonar development work

Author: psnc.trzaszczka
Date: 2010-05-27 10:55:36 +0100 (Thu, 27 May 2010)
New Revision: 5678

Modified:
   trunk/perfsonar-java-xml-ls/packaging/deb/changelog
   trunk/perfsonar-java-xml-ls/packaging/deb/dirs
   trunk/perfsonar-java-xml-ls/packaging/deb/install
   trunk/perfsonar-java-xml-ls/packaging/deb/postinst
   trunk/perfsonar-java-xml-ls/packaging/deb/rules
   trunk/perfsonar-java-xml-ls/packaging/package.sh
Log:


Modified: trunk/perfsonar-java-xml-ls/packaging/deb/changelog
===================================================================
--- trunk/perfsonar-java-xml-ls/packaging/deb/changelog 2010-05-27 08:21:56 
UTC (rev 5677)
+++ trunk/perfsonar-java-xml-ls/packaging/deb/changelog 2010-05-27 09:55:36 
UTC (rev 5678)
@@ -1,3 +1,9 @@
+perfsonar-java-xml-ls (1.5-0rc4) stable; urgency=low
+  
+  * Fixes: bugs fixes PSSERVICES-503
+  * New: old naming policy supported geant2-java-xml-ls - improved
+ -- Slawomir Trzaszczka 
<>
  Thu, 27 May 2010 10:00:00 +0200
+
 perfsonar-java-xml-ls (1.5-0rc3) stable; urgency=low
   
   * Fixes: bugs fixes PSSERVICES-443, PSSERVICES-479

Modified: trunk/perfsonar-java-xml-ls/packaging/deb/dirs
===================================================================
--- trunk/perfsonar-java-xml-ls/packaging/deb/dirs      2010-05-27 08:21:56 
UTC (rev 5677)
+++ trunk/perfsonar-java-xml-ls/packaging/deb/dirs      2010-05-27 09:55:36 
UTC (rev 5678)
@@ -1,2 +1,3 @@
 /usr/lib/perfsonar/services/perfsonar-java-xml-ls
+/usr/lib/perfsonar/services/geant2-java-xml-ls
 /var/run/perfsonar-java-xml-ls

Modified: trunk/perfsonar-java-xml-ls/packaging/deb/install
===================================================================
--- trunk/perfsonar-java-xml-ls/packaging/deb/install   2010-05-27 08:21:56 
UTC (rev 5677)
+++ trunk/perfsonar-java-xml-ls/packaging/deb/install   2010-05-27 09:55:36 
UTC (rev 5678)
@@ -1,4 +1,5 @@
 build/perfsonar-java-xml-ls/* 
/usr/lib/perfsonar/services/perfsonar-java-xml-ls
+build/geant2-java-xml-ls/* /usr/lib/perfsonar/services/geant2-java-xml-ls
 doc/* /usr/lib/perfsonar/services/perfsonar-java-xml-ls/doc
 samples/* /usr/lib/perfsonar/services/perfsonar-java-xml-ls/samples
 

Modified: trunk/perfsonar-java-xml-ls/packaging/deb/postinst
===================================================================
--- trunk/perfsonar-java-xml-ls/packaging/deb/postinst  2010-05-27 08:21:56 
UTC (rev 5677)
+++ trunk/perfsonar-java-xml-ls/packaging/deb/postinst  2010-05-27 09:55:36 
UTC (rev 5678)
@@ -49,7 +49,7 @@
     fi
     ln -sf $SERVICEPATH/$SERVICENAME/doc /usr/share/doc/$SERVICENAME/spec || 
true
     
-    ln -sf $SERVICEPATH/$SERVICENAME 
/var/lib/tomcat5.5/webapps/$OLD_SERVICENAME
+    ln -sf $SERVICEPATH/$OLD_SERVICENAME 
/var/lib/tomcat5.5/webapps/$OLD_SERVICENAME
        
     chown -R tomcat55 
$SERVICEPATH/$SERVICENAME/WEB-INF/classes/perfsonar/conf
     chown tomcat55 $SERVICEPATH/$SERVICENAME/WEB-INF/log

Modified: trunk/perfsonar-java-xml-ls/packaging/deb/rules
===================================================================
--- trunk/perfsonar-java-xml-ls/packaging/deb/rules     2010-05-27 08:21:56 
UTC (rev 5677)
+++ trunk/perfsonar-java-xml-ls/packaging/deb/rules     2010-05-27 09:55:36 
UTC (rev 5678)
@@ -21,6 +21,7 @@
             echo Copying files from webapps ; \
             mkdir -v build; \
             cp -v ../webapps/`ls ../webapps | grep ^perfsonar` build/ -r ; \
+            cp -v ../webapps/`ls ../webapps | grep ^geant` build/ -r ; \
         )
        touch $@
 

Modified: trunk/perfsonar-java-xml-ls/packaging/package.sh
===================================================================
--- trunk/perfsonar-java-xml-ls/packaging/package.sh    2010-05-27 08:21:56 
UTC (rev 5677)
+++ trunk/perfsonar-java-xml-ls/packaging/package.sh    2010-05-27 09:55:36 
UTC (rev 5678)
@@ -30,6 +30,7 @@
        
        pwd
        unzip ../target/$SERVICE_NAME.war -d temp/webapps/$SERVICE_NAME
+       unzip ../target/geant2-java-xml-ls.war -d 
temp/webapps/geant2-java-xml-ls
        echo "war unziped"      
        
        echo "done !"