perfsonar development work

Author: psnc.trzaszczka
Date: 2010-05-12 13:53:41 +0100 (Wed, 12 May 2010)
New Revision: 5625

Modified:
   trunk/perfsonar-java-xml-ls/packaging/deb/control
   trunk/perfsonar-java-xml-ls/packaging/deb/postinst
   trunk/perfsonar-java-xml-ls/packaging/rpm/perfsonar-java-xml-ls.specs
   trunk/perfsonar-java-xml-ls/pom.xml
   
trunk/perfsonar-java-xml-ls/src/main/resources/perfsonar/conf/configuration.xml
Log:


Modified: trunk/perfsonar-java-xml-ls/packaging/deb/control
===================================================================
--- trunk/perfsonar-java-xml-ls/packaging/deb/control   2010-05-12 12:40:19 
UTC (rev 5624)
+++ trunk/perfsonar-java-xml-ls/packaging/deb/control   2010-05-12 12:53:41 
UTC (rev 5625)
@@ -7,6 +7,6 @@
 
 Package: perfsonar-java-xml-ls
 Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, exist
+Depends: ${shlibs:Depends}, ${misc:Depends}, exist, java6-runtime
 Description: perfSONAR Lookup Service
 

Modified: trunk/perfsonar-java-xml-ls/packaging/deb/postinst
===================================================================
--- trunk/perfsonar-java-xml-ls/packaging/deb/postinst  2010-05-12 12:40:19 
UTC (rev 5624)
+++ trunk/perfsonar-java-xml-ls/packaging/deb/postinst  2010-05-12 12:53:41 
UTC (rev 5625)
@@ -17,7 +17,6 @@
 # for details, see http://www.debian.org/doc/debian-policy/ or
 # the debian-policy package
 
-OLD_SERVICENAME="geant2-java-xml-ls"
 SERVICENAME="perfsonar-java-xml-ls"
 SERVICEPATH="/usr/lib/perfsonar/services"
 
@@ -49,8 +48,6 @@
     fi
     ln -sf $SERVICEPATH/$SERVICENAME/doc /usr/share/doc/$SERVICENAME/spec || 
true
        
-       ln -sf $SERVICEPATH/$SERVICENAME 
/usr/share/tomcat5.5/webapps/$OLD_SERVICENAME || true
-       
     chown -R tomcat55 
$SERVICEPATH/$SERVICENAME/WEB-INF/classes/perfsonar/conf
     chown tomcat55 $SERVICEPATH/$SERVICENAME/WEB-INF/log
 

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-12 12:40:19 UTC (rev 5624)
+++ trunk/perfsonar-java-xml-ls/packaging/rpm/perfsonar-java-xml-ls.specs     
  2010-05-12 12:53:41 UTC (rev 5625)
@@ -70,9 +70,6 @@
 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 %{prefix} %{_var}/lib/tomcat5/webapps/%{old_name}  || 
true
-fi
 
 ## restart tomcat
 /sbin/service tomcat5 restart
@@ -88,9 +85,6 @@
 if [  -e %{_var}/lib/tomcat5/webapps/%{name} ]; then
        %{__rm} -rf %{_var}/lib/tomcat5/webapps/%{name} || true
 fi
-if [  -e %{_var}/lib/tomcat5/webapps/%{old_name} ]; then
-       %{__rm} -rf %{_var}/lib/tomcat5/webapps/%{old_name} || true
-fi
 
 
 %postun

Modified: trunk/perfsonar-java-xml-ls/pom.xml
===================================================================
--- trunk/perfsonar-java-xml-ls/pom.xml 2010-05-12 12:40:19 UTC (rev 5624)
+++ trunk/perfsonar-java-xml-ls/pom.xml 2010-05-12 12:53:41 UTC (rev 5625)
@@ -120,6 +120,8 @@
                                                        </includes>
                                                        <token>%PORT%</token>
                                                        <value>${port}</value>
+                                                       
<token>%OLD_CONFIG_PATH%</token>
+                                                       
<value>${old.config.path}</value>
                                                </configuration>
                                        </execution>
                                </executions>
@@ -253,19 +255,15 @@
                        <properties>
                                <log4j>test</log4j>
                                <port>8080</port>
+                               
<old.config.path>tomcat5.5/webapps/geant2-java-xml-ls</old.config.path>
                        </properties>
                </profile>
                <profile>
-                       <id>production</id>
-                       <properties>
-                               <log4j>production</log4j>
-                       </properties>
-               </profile>
-               <profile>
                        <id>deb</id>
                        <properties>
                                <log4j>production</log4j>
                                <port>8180</port>
+                               
<old.config.path>tomcat5.5/webapps/geant2-java-xml-ls</old.config.path>
                        </properties>
                </profile>
                <profile>
@@ -273,6 +271,7 @@
                        <properties>
                                <log4j>production</log4j>
                                <port>8080</port>
+                               
<old.config.path>tomcat5/webapps/geant2-java-xml-ls</old.config.path>
                        </properties>
                </profile>
        </profiles>

Modified: 
trunk/perfsonar-java-xml-ls/src/main/resources/perfsonar/conf/configuration.xml
===================================================================
--- 
trunk/perfsonar-java-xml-ls/src/main/resources/perfsonar/conf/configuration.xml
     2010-05-12 12:40:19 UTC (rev 5624)
+++ 
trunk/perfsonar-java-xml-ls/src/main/resources/perfsonar/conf/configuration.xml
     2010-05-12 12:53:41 UTC (rev 5625)
@@ -120,7 +120,7 @@
    
          <!-- MIGRATION COMPONENT -->
          <component name="migrator" 
className="org.perfsonar.base2.service.configuration.migration.MigratorComponent">
-               <option name="config-directory"         
value="/usr/share/tomcat5.5/webapps/geant2-java-xml-ls/WEB-INF/classes/perfsonar/conf/"/>
+               <option name="config-directory"         
value="/usr/share/%OLD_CONFIG_PATH%/WEB-INF/classes/perfsonar/conf/"/>
          </component>
    
       <!-- Scheduler -->