perfsonar development work

Author: roman
Date: 2007-09-13 04:39:36 -0400 (Thu, 13 Sep 2007)
New Revision: 2828

Modified:
   branches/geant2_java-rrd-ma-extra/ant/const.properties.template
   branches/geant2_java-rrd-ma-extra/ant/install-targets.xml
   branches/geant2_java-rrd-ma-extra/conf/service.properties.template
Log:
setting service port number improved




Modified: branches/geant2_java-rrd-ma-extra/ant/const.properties.template
===================================================================
--- branches/geant2_java-rrd-ma-extra/ant/const.properties.template     
2007-09-12 16:10:08 UTC (rev 2827)
+++ branches/geant2_java-rrd-ma-extra/ant/const.properties.template     
2007-09-13 08:39:36 UTC (rev 2828)
@@ -12,8 +12,8 @@
 service.home=${basedir}/server/jetty-6.1.3/webapps
 
 
-jarfilename=perfsonar-rrd-ma
-version=2.3-20070912-extra
+jarfilename=geant2_java-rrd-ma
+version=2.3-20070913-extra
 
 wsdd.file.deploy=service-deploy.wsdd
 wsdd.file.undeploy=service-undeploy.wsdd

Modified: branches/geant2_java-rrd-ma-extra/ant/install-targets.xml
===================================================================
--- branches/geant2_java-rrd-ma-extra/ant/install-targets.xml   2007-09-12 
16:10:08 UTC (rev 2827)
+++ branches/geant2_java-rrd-ma-extra/ant/install-targets.xml   2007-09-13 
08:39:36 UTC (rev 2828)
@@ -37,6 +37,13 @@
   </target>
 
 
+  <target name="set-server-port-in-service-conf">
+    <replace file="${basedir}/conf/service.properties"
+             token="__PORT__"
+             value="${target.port}"/>
+  </target>
+
+
   <!-- 
===================================================================================
 -->
   <!-- getting java path -->
 
@@ -393,12 +400,15 @@
 
     <psbase:template-use template-file="ant/const.properties.template"
                          dest-file="ant/const.properties"/>
+
+    <antcall target="get-server-port"/>
+    <property file="${basedir}/ant/const.properties"/>  <!-- loading 
service.name property -->
+
     <psbase:template-use template-file="conf/service.properties.template"
                          dest-file="conf/service.properties"/>
 
-    <antcall target="get-server-port"/>
+    <antcall target="set-server-port-in-service-conf"/>
 
-    <property file="${basedir}/ant/const.properties"/>  <!-- loading 
service.name property -->
     <antcall target="rrdjtool"/>
 
     <psbase:template-use template-file="conf/components.properties.template"

Modified: branches/geant2_java-rrd-ma-extra/conf/service.properties.template
===================================================================
--- branches/geant2_java-rrd-ma-extra/conf/service.properties.template  
2007-09-12 16:10:08 UTC (rev 2827)
+++ branches/geant2_java-rrd-ma-extra/conf/service.properties.template  
2007-09-13 08:39:36 UTC (rev 2828)
@@ -1,4 +1,9 @@
 
+# $Id$
+# project: perfSONAR
+# author: romradz
+
+
 service.r.type=ma
 
 
service.ma.class_name=org.perfsonar.service.measurementArchive.rrdType.RRDTypeMAServiceEngine
@@ -9,8 +14,8 @@
 component.ma.xmldb.db_status=on
 #component.ma.xmldb.db_access=xmlrpc
 component.ma.xmldb.db_access=http
-component.ma.xmldb.db_uri=http://localhost:8080/exist/rest/db/rrdmaconfig
-component.ma.xmldb.db_uri.xmlrpc=xmldb:exist://localhost:8080/exist/xmlrpc/db/rrdmaconfig
+component.ma.xmldb.db_uri=http://localhost:__PORT__/exist/rest/db/rrdmaconfig
+component.ma.xmldb.db_uri.xmlrpc=xmldb:exist://localhost:__PORT__/exist/xmlrpc/db/rrdmaconfig
 component.ma.xmldb.db_username=rrdmaservice
 component.ma.xmldb.db_password=rrdmaservice
 component.ma.xmldb.type=webapp