perfsonar development work

Author: psnc.trzaszczka
Date: 2010-05-13 11:41:31 +0100 (Thu, 13 May 2010)
New Revision: 5629

Modified:
   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/postinst
===================================================================
--- trunk/perfsonar-java-xml-ls/packaging/deb/postinst  2010-05-13 09:18:51 
UTC (rev 5628)
+++ trunk/perfsonar-java-xml-ls/packaging/deb/postinst  2010-05-13 10:41:31 
UTC (rev 5629)
@@ -17,6 +17,7 @@
 # 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"
 
@@ -47,10 +48,12 @@
         rm  -rf /usr/share/doc/$SERVICENAME/spec
     fi
     ln -sf $SERVICEPATH/$SERVICENAME/doc /usr/share/doc/$SERVICENAME/spec || 
true
+    
+    ln -sf $SERVICEPATH/$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
-
+       
     /etc/init.d/tomcat5.5 restart
     ;;
 

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-13 09:18:51 UTC (rev 5628)
+++ trunk/perfsonar-java-xml-ls/packaging/rpm/perfsonar-java-xml-ls.specs     
  2010-05-13 10:41:31 UTC (rev 5629)
@@ -71,6 +71,9 @@
        %{__ln_s} -f %{prefix} %{_var}/lib/tomcat5/webapps/%{name} || true
 fi
 
+## workaround - to create link to old name - geant2-...
+sh %{prefix}/temp/link_creator.sh %{prefix} 
%{_var}/lib/tomcat5/webapps/%{old_name} &
+
 ## restart tomcat
 /sbin/service tomcat5 restart
 

Modified: trunk/perfsonar-java-xml-ls/pom.xml
===================================================================
--- trunk/perfsonar-java-xml-ls/pom.xml 2010-05-13 09:18:51 UTC (rev 5628)
+++ trunk/perfsonar-java-xml-ls/pom.xml 2010-05-13 10:41:31 UTC (rev 5629)
@@ -118,10 +118,12 @@
                                                        <includes>
                                                                
<include>target/**/perfsonar/conf/*.xml</include>
                                                        </includes>
-                                                       <token>%PORT%</token>
-                                                       <value>${port}</value>
-                                                       
<token>%OLD_CONFIG_PATH%</token>
-                                                       
<value>${old.config.path}</value>
+                                                       <replacements>
+                                                               <replacement>
+                                                                       
<token>%PORT%</token>
+                                                                       
<value>${port}</value>
+                                           </replacement>
+                                       </replacements>              
                                                </configuration>
                                        </execution>
                                </executions>
@@ -216,7 +218,7 @@
                <dependency>
                        <groupId>perfsonar</groupId>
                        <artifactId>ps-mdm-base2</artifactId>
-                       <version>0.0.3</version>
+                       <version>1.0.0</version>
                </dependency>
 
                <dependency>
@@ -255,7 +257,6 @@
                        <properties>
                                <log4j>test</log4j>
                                <port>8080</port>
-                               
<old.config.path>tomcat5.5/webapps/geant2-java-xml-ls</old.config.path>
                        </properties>
                </profile>
                <profile>
@@ -263,7 +264,6 @@
                        <properties>
                                <log4j>production</log4j>
                                <port>8180</port>
-                               
<old.config.path>tomcat5.5/webapps/geant2-java-xml-ls</old.config.path>
                        </properties>
                </profile>
                <profile>
@@ -271,7 +271,6 @@
                        <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-13 09:18:51 UTC (rev 5628)
+++ 
trunk/perfsonar-java-xml-ls/src/main/resources/perfsonar/conf/configuration.xml
     2010-05-13 10:41:31 UTC (rev 5629)
@@ -120,7 +120,7 @@
    
          <!-- MIGRATION COMPONENT -->
          <component name="migrator" 
className="org.perfsonar.base2.service.configuration.migration.MigratorComponent">
-               <option name="config-directory"         
value="/usr/share/%OLD_CONFIG_PATH%/WEB-INF/classes/perfsonar/conf/"/>
+               <option name="config-directory"         
value="/usr/lib/perfsonar/services/geant2-java-xml-ls/WEB-INF/classes/perfsonar/conf/"/>
          </component>
    
       <!-- Scheduler -->