perfsonar development work

Author: psnc.trzaszczka
Date: 2010-05-28 13:22:18 +0100 (Fri, 28 May 2010)
New Revision: 5681

Modified:
   trunk/perfsonar-java-xml-ls/packaging/deb/dirs
   trunk/perfsonar-java-xml-ls/packaging/deb/install
   trunk/perfsonar-java-xml-ls/packaging/deb/rules
   trunk/perfsonar-java-xml-ls/packaging/package.sh
   trunk/perfsonar-java-xml-ls/packaging/rpm/perfsonar-java-xml-ls.specs
   
trunk/perfsonar-java-xml-ls/src/main/resources/perfsonar/conf/webAdminConfig.xml
Log:


Modified: trunk/perfsonar-java-xml-ls/packaging/deb/dirs
===================================================================
--- trunk/perfsonar-java-xml-ls/packaging/deb/dirs      2010-05-27 10:19:49 
UTC (rev 5680)
+++ trunk/perfsonar-java-xml-ls/packaging/deb/dirs      2010-05-28 12:22:18 
UTC (rev 5681)
@@ -1,4 +1,3 @@
 /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 10:19:49 
UTC (rev 5680)
+++ trunk/perfsonar-java-xml-ls/packaging/deb/install   2010-05-28 12:22:18 
UTC (rev 5681)
@@ -1,5 +1,4 @@
 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/rules
===================================================================
--- trunk/perfsonar-java-xml-ls/packaging/deb/rules     2010-05-27 10:19:49 
UTC (rev 5680)
+++ trunk/perfsonar-java-xml-ls/packaging/deb/rules     2010-05-28 12:22:18 
UTC (rev 5681)
@@ -21,7 +21,6 @@
             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/package.sh
===================================================================
--- trunk/perfsonar-java-xml-ls/packaging/package.sh    2010-05-27 10:19:49 
UTC (rev 5680)
+++ trunk/perfsonar-java-xml-ls/packaging/package.sh    2010-05-28 12:22:18 
UTC (rev 5681)
@@ -30,6 +30,7 @@
        
        pwd
        unzip ../target/$SERVICE_NAME.war -d temp/webapps/$SERVICE_NAME
+       # servlet-context-redirector
        unzip ../target/geant2-java-xml-ls.war -d 
temp/webapps/geant2-java-xml-ls
        echo "war unziped"      
        
@@ -124,6 +125,7 @@
        echo "[ ] Copy tarball into SOURCES"
        pwd
        mv -v webapps/$SERVICE_NAME-$RPM_VERSION.tar.gz rpm/rpmbuild/SOURCES
+       cp -r webapps/geant2-java-xml-ls rpm/rpmbuild/BUILD
        echo "[ ] Copy RPM .specs file"
        cp -v ../rpm/$RPM_SPEC_NAME rpm/rpmbuild
        echo

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 10:19:49 UTC (rev 5680)
+++ trunk/perfsonar-java-xml-ls/packaging/rpm/perfsonar-java-xml-ls.specs     
  2010-05-28 12:22:18 UTC (rev 5681)
@@ -5,7 +5,7 @@
 Name: perfsonar-java-xml-ls
 Version: 1.5
 License: Modified BSD
-Release: rc3
+Release: rc4
 Summary: perfSONAR Lookup Service
 Source0: %{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}
@@ -38,6 +38,7 @@
 # make the directory
 rm -rf $RPM_BUILD_ROOT
 %{__install} -d -m 755 ${RPM_BUILD_ROOT}%{prefix}
+%{__install} -d -m 755 ${RPM_BUILD_ROOT}%{old_prefix}
 %{__install} -d -m 755 ${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}
 %{__install} -d -m 755 ${RPM_BUILD_ROOT}/usr/share/doc/%{name}
 %{__install} -d -m 755 ${RPM_BUILD_ROOT}/usr/share/doc/%{name}/schema
@@ -126,6 +127,7 @@
 %attr(755,tomcat,tomcat) %{prefix}/WEB-INF/log
 %attr(640,tomcat,tomcat) %config(noreplace) 
%{prefix}/WEB-INF/classes/perfsonar/conf/*.xml
 %{prefix}
+%{old_prefix}
 %{_sysconfdir}/%{name}
 /usr/share/doc/%{name}
 /usr/share/doc/%{name}/schema

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
    2010-05-27 10:19:49 UTC (rev 5680)
+++ 
trunk/perfsonar-java-xml-ls/src/main/resources/perfsonar/conf/webAdminConfig.xml
    2010-05-28 12:22:18 UTC (rev 5681)
@@ -8,7 +8,7 @@
        <wa:serviceInformation>
                
<wa:accessPoint>http://localhost:%PORT%/perfsonar-java-xml-ls/services/LookupService</wa:accessPoint>
                <wa:serviceName>Lookup service</wa:serviceName>
-               <wa:version>1.5-1RC3</wa:version>
+               <wa:version>1.5-1rc4</wa:version>
        </wa:serviceInformation>
        
        <!-- credential for WA -->