perfsonar development work

Author: psnc.trzaszczka
Date: 2010-05-27 11:19:49 +0100 (Thu, 27 May 2010)
New Revision: 5680

Modified:
   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/rpm/perfsonar-java-xml-ls.specs
Log:
dep/rpm packaging scripts improved - service-context-redirection integration

Modified: trunk/perfsonar-java-xml-ls/packaging/deb/dirs
===================================================================
--- trunk/perfsonar-java-xml-ls/packaging/deb/dirs      2010-05-27 09:59:20 
UTC (rev 5679)
+++ trunk/perfsonar-java-xml-ls/packaging/deb/dirs      2010-05-27 10:19:49 
UTC (rev 5680)
@@ -1,3 +1,4 @@
 /usr/lib/perfsonar/services/perfsonar-java-xml-ls
+# servlet-context-redirector
 /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 09:59:20 
UTC (rev 5679)
+++ trunk/perfsonar-java-xml-ls/packaging/deb/install   2010-05-27 10:19:49 
UTC (rev 5680)
@@ -1,4 +1,5 @@
 build/perfsonar-java-xml-ls/* 
/usr/lib/perfsonar/services/perfsonar-java-xml-ls
+# servlet-context-redirector
 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 09:59:20 
UTC (rev 5679)
+++ trunk/perfsonar-java-xml-ls/packaging/deb/postinst  2010-05-27 10:19:49 
UTC (rev 5680)
@@ -48,7 +48,7 @@
         rm  -rf /usr/share/doc/$SERVICENAME/spec
     fi
     ln -sf $SERVICEPATH/$SERVICENAME/doc /usr/share/doc/$SERVICENAME/spec || 
true
-    
+    # servlet-context-redirector
     ln -sf $SERVICEPATH/$OLD_SERVICENAME 
/var/lib/tomcat5.5/webapps/$OLD_SERVICENAME
        
     chown -R tomcat55 
$SERVICEPATH/$SERVICENAME/WEB-INF/classes/perfsonar/conf

Modified: trunk/perfsonar-java-xml-ls/packaging/deb/rules
===================================================================
--- trunk/perfsonar-java-xml-ls/packaging/deb/rules     2010-05-27 09:59:20 
UTC (rev 5679)
+++ trunk/perfsonar-java-xml-ls/packaging/deb/rules     2010-05-27 10:19:49 
UTC (rev 5680)
@@ -21,6 +21,7 @@
             echo Copying files from webapps ; \
             mkdir -v build; \
             cp -v ../webapps/`ls ../webapps | grep ^perfsonar` build/ -r ; \
+            # servlet-context-redirector
             cp -v ../webapps/`ls ../webapps | grep ^geant` build/ -r ; \
         )
        touch $@

Modified: 
trunk/perfsonar-java-xml-ls/packaging/rpm/perfsonar-java-xml-ls.specs
===================================================================
--- trunk/perfsonar-java-xml-ls/packaging/rpm/perfsonar-java-xml-ls.specs     
  2010-05-27 09:59:20 UTC (rev 5679)
+++ trunk/perfsonar-java-xml-ls/packaging/rpm/perfsonar-java-xml-ls.specs     
  2010-05-27 10:19:49 UTC (rev 5680)
@@ -1,5 +1,6 @@
 %define prefix /usr/lib/perfsonar/services/%{name}
 %define old_name geant2-java-xml-ls
+%define old_prefix /usr/lib/perfsonar/services/%{old_name}
 
 Name: perfsonar-java-xml-ls
 Version: 1.5
@@ -51,6 +52,8 @@
 # copy the service content to the tomcat webapps directory
 pushd ${RPM_BUILD_DIR}
     %{__cp} -a  %{name}-%{version}/* ${RPM_BUILD_ROOT}%{prefix}
+    # servlet-context-redirector
+    %{__cp} -a  %{old_name}/* ${RPM_BUILD_ROOT}%{old_prefix}
 popd
 
 pushd ${RPM_BUILD_DIR}/%{name}-%{version}/doc
@@ -70,6 +73,9 @@
 if [ ! -e %{_var}/lib/tomcat5/webapps/%{name} ]; then
        %{__ln_s} -f %{prefix} %{_var}/lib/tomcat5/webapps/%{name} || true
 fi
+if [ ! -e %{_var}/lib/tomcat5/webapps/%{old_name} ]; then
+       %{__ln_s} -f %{old_prefix} %{_var}/lib/tomcat5/webapps/%{old_name} || 
true
+fi
 
 ## workaround - to create link to old name - geant2-...
 sh %{prefix}/temp/link_creator.sh %{prefix} 
%{_var}/lib/tomcat5/webapps/%{old_name} &