perfsonar development work

Author: trzaszcz
Date: 2009-12-14 08:56:44 -0500 (Mon, 14 Dec 2009)
New Revision: 5413

Added:
   branches/new-structure-with-base2/ps-mdm-ls/packaging/package.conf
   branches/new-structure-with-base2/ps-mdm-ls/packaging/package.sh
Removed:
   branches/new-structure-with-base2/ps-mdm-ls/packaging/deb/compat
Modified:
   branches/new-structure-with-base2/ps-mdm-ls/packaging/deb/changelog
   branches/new-structure-with-base2/ps-mdm-ls/packaging/deb/conffiles
   branches/new-structure-with-base2/ps-mdm-ls/packaging/deb/control
   branches/new-structure-with-base2/ps-mdm-ls/packaging/deb/dirs
   branches/new-structure-with-base2/ps-mdm-ls/packaging/deb/docs
   branches/new-structure-with-base2/ps-mdm-ls/packaging/deb/files
   branches/new-structure-with-base2/ps-mdm-ls/packaging/deb/install
   branches/new-structure-with-base2/ps-mdm-ls/packaging/deb/postinst
   branches/new-structure-with-base2/ps-mdm-ls/packaging/deb/postrm
   branches/new-structure-with-base2/ps-mdm-ls/packaging/deb/preinst
   branches/new-structure-with-base2/ps-mdm-ls/packaging/deb/prerm
   branches/new-structure-with-base2/ps-mdm-ls/packaging/deb/rules
Log:
deb packaging enhancement

Modified: branches/new-structure-with-base2/ps-mdm-ls/packaging/deb/changelog
===================================================================
--- branches/new-structure-with-base2/ps-mdm-ls/packaging/deb/changelog 
2009-12-14 10:31:47 UTC (rev 5412)
+++ branches/new-structure-with-base2/ps-mdm-ls/packaging/deb/changelog 
2009-12-14 13:56:44 UTC (rev 5413)
@@ -1,4 +1,4 @@
-ps-mdm-ls (2.0-1) stable; urgency=low
+perfsonar-java-xml-ls (2.0-1) stable; urgency=low
 
   * first package of LS on base2
 

Deleted: branches/new-structure-with-base2/ps-mdm-ls/packaging/deb/compat

Modified: branches/new-structure-with-base2/ps-mdm-ls/packaging/deb/conffiles
===================================================================
--- branches/new-structure-with-base2/ps-mdm-ls/packaging/deb/conffiles 
2009-12-14 10:31:47 UTC (rev 5412)
+++ branches/new-structure-with-base2/ps-mdm-ls/packaging/deb/conffiles 
2009-12-14 13:56:44 UTC (rev 5413)
@@ -1,7 +1,6 @@
-/usr/lib/perfsonar/services/ps-mdm-ls/WEB-INF/classes/perfsonar/conf/configuration.xml
-/usr/lib/perfsonar/services/ps-mdm-ls/WEB-INF/classes/perfsonar/conf/configuration-rules.xml
-/usr/lib/perfsonar/services/ps-mdm-ls/WEB-INF/classes/log4j.properties
-/usr/lib/perfsonar/services/ps-mdm-ls/WEB-INF/classes/log4j.xml
-/usr/lib/perfsonar/services/ps-mdm-ls/WEB-INF/conf/axis2.xml
-/usr/lib/perfsonar/services/ps-mdm-ls/WEB-INF/web.xml
+/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/log4j.properties
+/usr/lib/perfsonar/services/perfsonar-java-xml-ls/WEB-INF/conf/axis2.xml
+/usr/lib/perfsonar/services/perfsonar-java-xml-ls/WEB-INF/web.xml
 

Modified: branches/new-structure-with-base2/ps-mdm-ls/packaging/deb/control
===================================================================
--- branches/new-structure-with-base2/ps-mdm-ls/packaging/deb/control   
2009-12-14 10:31:47 UTC (rev 5412)
+++ branches/new-structure-with-base2/ps-mdm-ls/packaging/deb/control   
2009-12-14 13:56:44 UTC (rev 5413)
@@ -1,11 +1,11 @@
-Source: ps-mdm-ls
+Source: perfsonar-java-xml-ls
 Section: web
 Priority: extra
 Maintainer: Maciej Glowiak 
<>
 Build-Depends: debhelper (>= 5), maven2
 Standards-Version: 3.7.2
 
-Package: ps-mdm-ls
+Package: perfsonar-java-xml-ls
 Architecture: all
 Depends: ${shlibs:Depends}, ${misc:Depends}, tomcat5.5-exist
 Description: perfSONAR Lookup Service

Modified: branches/new-structure-with-base2/ps-mdm-ls/packaging/deb/dirs
===================================================================
--- branches/new-structure-with-base2/ps-mdm-ls/packaging/deb/dirs      
2009-12-14 10:31:47 UTC (rev 5412)
+++ branches/new-structure-with-base2/ps-mdm-ls/packaging/deb/dirs      
2009-12-14 13:56:44 UTC (rev 5413)
@@ -1,2 +1,2 @@
-/usr/lib/perfsonar/services/ps-mdm-ls
-/var/run/ps-mdm-ls
+/usr/lib/perfsonar/services/perfsonar-java-xml-ls
+/var/run/perfsonar-java-xml-ls

Modified: branches/new-structure-with-base2/ps-mdm-ls/packaging/deb/docs
===================================================================
--- branches/new-structure-with-base2/ps-mdm-ls/packaging/deb/docs      
2009-12-14 10:31:47 UTC (rev 5412)
+++ branches/new-structure-with-base2/ps-mdm-ls/packaging/deb/docs      
2009-12-14 13:56:44 UTC (rev 5413)
@@ -1 +0,0 @@
-

Modified: branches/new-structure-with-base2/ps-mdm-ls/packaging/deb/files
===================================================================
--- branches/new-structure-with-base2/ps-mdm-ls/packaging/deb/files     
2009-12-14 10:31:47 UTC (rev 5412)
+++ branches/new-structure-with-base2/ps-mdm-ls/packaging/deb/files     
2009-12-14 13:56:44 UTC (rev 5413)
@@ -1 +1 @@
-ps-mdm-ls_2.0-1_all.deb web extra
+perfsonar-java-xml-ls_2.0-1_all.deb web extra

Modified: branches/new-structure-with-base2/ps-mdm-ls/packaging/deb/install
===================================================================
--- branches/new-structure-with-base2/ps-mdm-ls/packaging/deb/install   
2009-12-14 10:31:47 UTC (rev 5412)
+++ branches/new-structure-with-base2/ps-mdm-ls/packaging/deb/install   
2009-12-14 13:56:44 UTC (rev 5413)
@@ -1,6 +1,5 @@
-build/ps-mdm-ls/* /usr/lib/perfsonar/services/ps-mdm-ls
-doc /usr/lib/perfsonar/services/ps-mdm-ls/WEB-INF
-samples /usr/lib/perfsonar/services/ps-mdm-ls/WEB-INF
+build/perfsonar-java-xml-ls/* 
/usr/lib/perfsonar/services/perfsonar-java-xml-ls
+doc* /usr/lib/perfsonar/services/perfsonar-java-xml-ls/WEB-INF
+samples* /usr/lib/perfsonar/services/perfsonar-java-xml-ls/WEB-INF
 
 
-

Modified: branches/new-structure-with-base2/ps-mdm-ls/packaging/deb/postinst
===================================================================
--- branches/new-structure-with-base2/ps-mdm-ls/packaging/deb/postinst  
2009-12-14 10:31:47 UTC (rev 5412)
+++ branches/new-structure-with-base2/ps-mdm-ls/packaging/deb/postinst  
2009-12-14 13:56:44 UTC (rev 5413)
@@ -1,5 +1,5 @@
 #!/bin/sh
-# postinst script for ps-mdm-ls
+# postinst script for geant2-java-xml-ls
 #
 # see: dh_installdeb(1)
 
@@ -17,7 +17,7 @@
 # for details, see http://www.debian.org/doc/debian-policy/ or
 # the debian-policy package
 
-SERVICENAME="ps-mdm-ls"
+SERVICENAME="perfsonar-java-xml-ls"
 SERVICEPATH="/usr/lib/perfsonar/services"
 
 
@@ -49,9 +49,14 @@
     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
 
+    cp -v /var/lib/tomcat5.5/webapps/exist/WEB-INF/lib/resolver-1.2.jar 
/usr/share/tomcat5.5/common/endorsed
+    cp -v /var/lib/tomcat5.5/webapps/exist/WEB-INF/lib/xalan-2.7.1.jar 
/usr/share/tomcat5.5/common/endorsed
+    cp -v /var/lib/tomcat5.5/webapps/exist/WEB-INF/lib/xml-apis.jar 
/usr/share/tomcat5.5/common/endorsed
+    cp -v /var/lib/tomcat5.5/webapps/exist/WEB-INF/lib/serializer-2.9.1.jar 
/usr/share/tomcat5.5/common/endorsed
+    cp -v 
/var/lib/tomcat5.5/webapps/perfsonar-java-xml-ls/WEB-INF/lib/xercesImpl-2.8.0.jar
 /usr/share/tomcat5.5/common/endorsed
+
     /etc/init.d/tomcat5.5 restart
     ;;
 

Modified: branches/new-structure-with-base2/ps-mdm-ls/packaging/deb/postrm
===================================================================
--- branches/new-structure-with-base2/ps-mdm-ls/packaging/deb/postrm    
2009-12-14 10:31:47 UTC (rev 5412)
+++ branches/new-structure-with-base2/ps-mdm-ls/packaging/deb/postrm    
2009-12-14 13:56:44 UTC (rev 5413)
@@ -1,5 +1,5 @@
 #!/bin/sh
-# postrm script for ps-mdm-ls
+# postrm script for geant2-java-xml-ls
 #
 # see: dh_installdeb(1)
 
@@ -19,7 +19,7 @@
 # the debian-policy package
 
 
-SERVICENAME="ps-mdm-ls"
+SERVICENAME="perfsonar-java-xml-ls"
 SERVICEPATH="/usr/lib/perfsonar/services"
 
 

Modified: branches/new-structure-with-base2/ps-mdm-ls/packaging/deb/preinst
===================================================================
--- branches/new-structure-with-base2/ps-mdm-ls/packaging/deb/preinst   
2009-12-14 10:31:47 UTC (rev 5412)
+++ branches/new-structure-with-base2/ps-mdm-ls/packaging/deb/preinst   
2009-12-14 13:56:44 UTC (rev 5413)
@@ -1,5 +1,5 @@
 #!/bin/sh
-# preinst script for ps-mdm-ls
+# preinst script for geant2-java-xml-ls
 #
 # see: dh_installdeb(1)
 

Modified: branches/new-structure-with-base2/ps-mdm-ls/packaging/deb/prerm
===================================================================
--- branches/new-structure-with-base2/ps-mdm-ls/packaging/deb/prerm     
2009-12-14 10:31:47 UTC (rev 5412)
+++ branches/new-structure-with-base2/ps-mdm-ls/packaging/deb/prerm     
2009-12-14 13:56:44 UTC (rev 5413)
@@ -1,5 +1,5 @@
 #!/bin/sh
-# prerm script for ps-mdm-ls
+# prerm script for geant2-java-xml-ls
 #
 # see: dh_installdeb(1)
 

Modified: branches/new-structure-with-base2/ps-mdm-ls/packaging/deb/rules
===================================================================
--- branches/new-structure-with-base2/ps-mdm-ls/packaging/deb/rules     
2009-12-14 10:31:47 UTC (rev 5412)
+++ branches/new-structure-with-base2/ps-mdm-ls/packaging/deb/rules     
2009-12-14 13:56:44 UTC (rev 5413)
@@ -17,8 +17,11 @@
 
 build-stamp: configure-stamp 
        dh_testdir
-       mvn package
-
+       ( \
+            echo Copying files from webapps ; \
+            mkdir -v build; \
+            cp -v ../webapps/`ls ../webapps | grep ^perfsonar` build/ -r ; \
+        )
        touch $@
 
 clean:
@@ -34,7 +37,6 @@
        dh_clean -k 
        dh_installdirs
 
-
 # Build architecture-independent files here.
 binary-indep: build install
 # We have nothing to do by default.
@@ -61,4 +63,4 @@
        dh_builddeb
 
 binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
+.PHONY: build clean binary-indep binary-arch binary install configure
\ No newline at end of file

Added: branches/new-structure-with-base2/ps-mdm-ls/packaging/package.conf


Property changes on: 
branches/new-structure-with-base2/ps-mdm-ls/packaging/package.conf
___________________________________________________________________
Name: svn:executable
   + *

Added: branches/new-structure-with-base2/ps-mdm-ls/packaging/package.sh


Property changes on: 
branches/new-structure-with-base2/ps-mdm-ls/packaging/package.sh
___________________________________________________________________
Name: svn:executable
   + *