perfsonar development work

Author: gijs
Date: 2008-07-02 07:25:26 -0400 (Wed, 02 Jul 2008)
New Revision: 4095

Removed:
   trunk/ps-mdm-flowsub-mp/contrib/manager/
Modified:
   trunk/ps-mdm-flowsub-mp/.project
   trunk/ps-mdm-flowsub-mp/conf/axis-1.4/WEB-INF/classes/i18n.properties
   trunk/ps-mdm-flowsub-mp/conf/log4j.properties
   trunk/ps-mdm-flowsub-mp/conf/service.properties
   trunk/ps-mdm-flowsub-mp/conf/wizard.properties
   trunk/ps-mdm-flowsub-mp/contrib/client/config.py
   trunk/ps-mdm-flowsub-mp/pom.xml
Log:


Modified: trunk/ps-mdm-flowsub-mp/.project
===================================================================
--- trunk/ps-mdm-flowsub-mp/.project    2008-07-02 11:23:14 UTC (rev 4094)
+++ trunk/ps-mdm-flowsub-mp/.project    2008-07-02 11:25:26 UTC (rev 4095)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-       <name>surfnet_java-flowsubscription-mp</name>
+       <name>ps-mdm-flowsub-mp</name>
        <comment></comment>
        <projects>
        </projects>

Modified: 
trunk/ps-mdm-flowsub-mp/conf/axis-1.4/WEB-INF/classes/i18n.properties
===================================================================
--- trunk/ps-mdm-flowsub-mp/conf/axis-1.4/WEB-INF/classes/i18n.properties     
  2008-07-02 11:23:14 UTC (rev 4094)
+++ trunk/ps-mdm-flowsub-mp/conf/axis-1.4/WEB-INF/classes/i18n.properties     
  2008-07-02 11:25:26 UTC (rev 4095)
@@ -51,7 +51,7 @@
 soapMonitorFootnote=[disabled by default for security reasons]
 
 # Sidenote
-sideNote=This installation of axis runs a flowsubscription-mp
+sideNote=This installation of axis runs a ps-mdm-flowsub-mp
 
 ### Validating Axis ###
 #

Modified: trunk/ps-mdm-flowsub-mp/conf/log4j.properties
===================================================================
--- trunk/ps-mdm-flowsub-mp/conf/log4j.properties       2008-07-02 11:23:14 
UTC (rev 4094)
+++ trunk/ps-mdm-flowsub-mp/conf/log4j.properties       2008-07-02 11:25:26 
UTC (rev 4095)
@@ -2,14 +2,14 @@
 log4j.threshhold=DEBUG
 
 log4j.appender.rootAppender.MaxBackupIndex=10
-log4j.appender.rootAppender.File=${catalina.home}/logs/surfnet_java-flowsubscription-mp-root.log
+log4j.appender.rootAppender.File=${catalina.home}/logs/ps-mdm-flowsub-mp-root.log
 log4j.appender.rootAppender.layout=org.apache.log4j.PatternLayout
 log4j.appender.rootAppender.layout.ConversionPattern=%d %5p - %m%n
 log4j.appender.rootAppender.MaxFileSize=500KB
 log4j.appender.rootAppender=org.apache.log4j.RollingFileAppender
 
 log4j.appender.FILE=org.apache.log4j.RollingFileAppender 
-log4j.appender.FILE.File=${catalina.home}/logs/surfnet_java-flowsubscription-mp.log
 
+log4j.appender.FILE.File=${catalina.home}/logs/ps-mdm-flowsub-mp.log 
 log4j.appender.FILE.MaxFileSize=10MB 
 log4j.appender.FILE.MaxBackupIndex=10 
 log4j.appender.FILE.layout=org.apache.log4j.PatternLayout 

Modified: trunk/ps-mdm-flowsub-mp/conf/service.properties
===================================================================
--- trunk/ps-mdm-flowsub-mp/conf/service.properties     2008-07-02 11:23:14 
UTC (rev 4094)
+++ trunk/ps-mdm-flowsub-mp/conf/service.properties     2008-07-02 11:25:26 
UTC (rev 4095)
@@ -18,7 +18,7 @@
 
 # Group=ServiceType
 # Description= Type should be MP
-service.r.access_point=http://sonar1.amsterdam.surfnet.nl:8080/flowsubscription-mp/services/flowsubscriptionMeasurementArchiveService
+service.r.access_point=http://sonar1.amsterdam.surfnet.nl:8080/ps-mdm-flowsub-mp/services/flowsubscriptionMeasurementArchiveService
 
 # === Measurement Archive general properties ===
 

Modified: trunk/ps-mdm-flowsub-mp/conf/wizard.properties
===================================================================
--- trunk/ps-mdm-flowsub-mp/conf/wizard.properties      2008-07-02 11:23:14 
UTC (rev 4094)
+++ trunk/ps-mdm-flowsub-mp/conf/wizard.properties      2008-07-02 11:25:26 
UTC (rev 4095)
@@ -83,9 +83,9 @@
     <Group order="8">LS</Group>
   </property>
   <property>
-    <entry key="service.r.access_point" 
required="true">http://YOUR-HOST/flowsubscription-mp/services/flowsubscriptionMeasurementArchiveService</entry>
+    <entry key="service.r.access_point" 
required="true">http://YOUR-HOST/ps-mdm-flowsub-mp/services/flowsubscriptionMeasurementArchiveService</entry>
     <Comment>Give the service access point</Comment>
-    
<ProposedValue>http://YOUR-HOST/flowsubscription-mp/services/flowsubscriptionMeasurementArchiveService</ProposedValue>
+    
<ProposedValue>http://YOUR-HOST/ps-mdm-flowsub-mp/services/flowsubscriptionMeasurementArchiveService</ProposedValue>
     <Group order="9">LS</Group>
   </property>
   <property>

Modified: trunk/ps-mdm-flowsub-mp/contrib/client/config.py
===================================================================
--- trunk/ps-mdm-flowsub-mp/contrib/client/config.py    2008-07-02 11:23:14 
UTC (rev 4094)
+++ trunk/ps-mdm-flowsub-mp/contrib/client/config.py    2008-07-02 11:25:26 
UTC (rev 4095)
@@ -4,8 +4,8 @@
 #serveraddress="sonar1.amsterdam.surfnet.nl"
 #serveraddress="192.168.1.99"
 serverport="8080"
-#servicepath="/surfnet_java-flowsubscription-mp/services/FlowsubscriptionMeasurementPointService"
-servicepath="/surfnet_java-flowsubscription-mp/services/FlowsubscriptionMeasurementPointService"
+#servicepath="/ps-mdm-flowsub-mp/services/FlowsubscriptionMeasurementPointService"
+servicepath="/ps-mdm-flowsub-mp/services/FlowsubscriptionMeasurementPointService"
 
 # don't change this
 serviceurl="http://%s:%s%s"; % (serveraddress, serverport, servicepath)

Modified: trunk/ps-mdm-flowsub-mp/pom.xml
===================================================================
--- trunk/ps-mdm-flowsub-mp/pom.xml     2008-07-02 11:23:14 UTC (rev 4094)
+++ trunk/ps-mdm-flowsub-mp/pom.xml     2008-07-02 11:25:26 UTC (rev 4095)
@@ -2,7 +2,7 @@
 <project>
        <modelVersion>4.0.0</modelVersion>
        <groupId>perfsonar</groupId>
-       <artifactId>flowsubscription-mp</artifactId>
+       <artifactId>ps-mdm-flowsub-mp</artifactId>
        <packaging>war</packaging>
        <name>Flowsubscription Measurement Archive</name>
        <version>0.1</version>
@@ -54,7 +54,7 @@
                </testSourceDirectory>
                <outputDirectory>${basedir}/bin</outputDirectory>
                <directory>${basedir}/build</directory>
-               <finalName>surfnet_java-flowsubscription-mp</finalName>
+               <finalName>ps-mdm-flowsub-mp</finalName>
                <plugins>
                        <plugin>
                                <artifactId>maven-compiler-plugin</artifactId>