perfsonar development work

Author: gijs
Date: 2008-05-09 10:10:48 -0400 (Fri, 09 May 2008)
New Revision: 3832

Modified:
   trunk/surfnet_java-flowsubscription-mp/
   
trunk/surfnet_java-flowsubscription-mp/conf/axis-1.4/WEB-INF/classes/i18n.properties
   
trunk/surfnet_java-flowsubscription-mp/conf/axis-1.4/WEB-INF/server-config.wsdd
   trunk/surfnet_java-flowsubscription-mp/conf/components.properties
   trunk/surfnet_java-flowsubscription-mp/conf/service.properties
   trunk/surfnet_java-flowsubscription-mp/conf/wizard.properties
   trunk/surfnet_java-flowsubscription-mp/conf/wsdd/service-deploy.wsdd
   trunk/surfnet_java-flowsubscription-mp/conf/wsdd/service-undeploy.wsdd
   trunk/surfnet_java-flowsubscription-mp/contrib/client/config.py
Log:



Property changes on: trunk/surfnet_java-flowsubscription-mp
___________________________________________________________________
Name: svn:ignore
   + build
.settings
.pydevproject


Modified: 
trunk/surfnet_java-flowsubscription-mp/conf/axis-1.4/WEB-INF/classes/i18n.properties
===================================================================
--- 
trunk/surfnet_java-flowsubscription-mp/conf/axis-1.4/WEB-INF/classes/i18n.properties
        2008-05-09 10:50:42 UTC (rev 3831)
+++ 
trunk/surfnet_java-flowsubscription-mp/conf/axis-1.4/WEB-INF/classes/i18n.properties
        2008-05-09 14:10:48 UTC (rev 3832)
@@ -51,7 +51,7 @@
 soapMonitorFootnote=[disabled by default for security reasons]
 
 # Sidenote
-sideNote=This installation of axis runs a flowsa-ma
+sideNote=This installation of axis runs a flowsubscription-mp
 
 ### Validating Axis ###
 #

Modified: 
trunk/surfnet_java-flowsubscription-mp/conf/axis-1.4/WEB-INF/server-config.wsdd
===================================================================
--- 
trunk/surfnet_java-flowsubscription-mp/conf/axis-1.4/WEB-INF/server-config.wsdd
     2008-05-09 10:50:42 UTC (rev 3831)
+++ 
trunk/surfnet_java-flowsubscription-mp/conf/axis-1.4/WEB-INF/server-config.wsdd
     2008-05-09 14:10:48 UTC (rev 3832)
@@ -5,9 +5,9 @@
   <parameter name="enableNamespacePrefixOptimization" value="false"/>
   <parameter name="dotNetSoapEncFix" value="true"/>
   <parameter name="disablePrettyXML" value="true"/>
+  <parameter name="sendMultiRefs" value="true"/>
+  <parameter name="sendXsiTypes" value="true"/>
   <parameter name="attachments.implementation" 
value="org.apache.axis.attachments.AttachmentsImpl"/>
-  <parameter name="sendXsiTypes" value="true"/>
-  <parameter name="sendMultiRefs" value="true"/>
   <parameter name="sendXMLDeclaration" value="true"/>
   <requestFlow>
    <handler type="java:org.apache.axis.handlers.JWSHandler">
@@ -29,7 +29,11 @@
   <parameter name="className" value="org.apache.axis.utils.Admin"/>
   <namespace>http://xml.apache.org/axis/wsdd/</namespace>
  </service>
- <service name="FlowsaMeasurementArchiveService" provider="java:MSG" 
style="message" use="literal">
+ <service name="Version" provider="java:RPC">
+  <parameter name="allowedMethods" value="getVersion"/>
+  <parameter name="className" value="org.apache.axis.Version"/>
+ </service>
+ <service name="FlowsubscriptionMeasurementPointService" provider="java:MSG" 
style="message" use="literal">
   <requestFlow>
    <handler name="soapmonitor" 
type="java:org.apache.axis.handlers.SOAPMonitorHandler"/>
   </requestFlow>
@@ -39,13 +43,9 @@
   <parameter name="allowedMethods" value="acceptCall"/>
   <parameter name="className" 
value="org.perfsonar.service.base.web.RequestHandler"/>
   <namespace>
-                       http://perfsonar.org/services/measurementArchive
+                       http://perfsonar.org/services/measurementpoint
                </namespace>
  </service>
- <service name="Version" provider="java:RPC">
-  <parameter name="allowedMethods" value="getVersion"/>
-  <parameter name="className" value="org.apache.axis.Version"/>
- </service>
  <transport name="http">
   <requestFlow>
    <handler type="URLMapper"/>

Modified: trunk/surfnet_java-flowsubscription-mp/conf/components.properties
===================================================================
--- trunk/surfnet_java-flowsubscription-mp/conf/components.properties   
2008-05-09 10:50:42 UTC (rev 3831)
+++ trunk/surfnet_java-flowsubscription-mp/conf/components.properties   
2008-05-09 14:10:48 UTC (rev 3832)
@@ -14,7 +14,7 @@
 
context=org.perfsonar.base.auxiliary.components.context.inMemory.InMemoryContext
 
 # workaround helper
-ls_Helper=org.perfsonar.service.measurementArchive.flowsa.LSHelper
+ls_Helper=org.perfsonar.service.measurementPoint.flowsubscription.LSHelper
 
 # - DO NOT USE - Registration in LS
 # - DO NOT USE - the service will load this component depending on 
service.r.ls_url has a valid value in service.properties 

Modified: trunk/surfnet_java-flowsubscription-mp/conf/service.properties
===================================================================
--- trunk/surfnet_java-flowsubscription-mp/conf/service.properties      
2008-05-09 10:50:42 UTC (rev 3831)
+++ trunk/surfnet_java-flowsubscription-mp/conf/service.properties      
2008-05-09 14:10:48 UTC (rev 3832)
@@ -16,7 +16,7 @@
 
 # === Measurement Archive general properties ===
 #Group=MaGeneral
-service.ma.class_name=org.perfsonar.service.measurementArchive.flowsa.FlowsaMAServiceEngine
+service.ma.class_name=org.perfsonar.service.measurementPoint.flowsubscription.FlowsubscriptionMPServiceEngine
 #Group=MaGeneral
 service.ma.message_types=SetupDataRequest
 #Group=MaGeneral

Modified: trunk/surfnet_java-flowsubscription-mp/conf/wizard.properties
===================================================================
--- trunk/surfnet_java-flowsubscription-mp/conf/wizard.properties       
2008-05-09 10:50:42 UTC (rev 3831)
+++ trunk/surfnet_java-flowsubscription-mp/conf/wizard.properties       
2008-05-09 14:10:48 UTC (rev 3832)
@@ -43,7 +43,7 @@
   <property>
     <entry key="service.r.service_name" required="true">Cynet RRD MA</entry>
     <Comment>Enter the service name</Comment>
-    <ProposedValue>Company X Flowsa MA</ProposedValue>
+    <ProposedValue>Company X Flow Subscription MP</ProposedValue>
     <Group order="2">LS</Group>
   </property>
   <property>
@@ -55,7 +55,7 @@
   <property>
     <entry key="service.r.service_description">RRD MA</entry>
     <Comment>Give a description of the  service</Comment>
-    <ProposedValue>Flowsa MA</ProposedValue>
+    <ProposedValue>Flow Subscription MP</ProposedValue>
     <Group order="4">LS</Group>
   </property>
   <property>
@@ -83,7 +83,7 @@
     <Group order="8">LS</Group>
   </property>
   <property>
-    <entry key="service.r.access_point" 
required="true">http://YOUR-HOST/flowsa-ma-0.9.1</entry>
+    <entry key="service.r.access_point" 
required="true">http://YOUR-HOST/flowsubscription-mp</entry>
     <Comment>Give the service access point</Comment>
     <ProposedValue>http://somewhere</ProposedValue>
     <Group order="9">LS</Group>
@@ -97,97 +97,36 @@
   </property>
   
   <property>
-    <entry key="service.ma.flowsa.query.timeout">60</entry>
+    <entry key="service.mp.flowsubscription.query.timeout">60</entry>
     <Comment>timeout/max execution time of a query (value is in 
seconds)</Comment>
     <ProposedValue>60</ProposedValue>
     <Group order="1">Query</Group>
   </property>  
   <property>
-    <entry key="service.ma.flowsa.query.max-results">1000</entry>
+    <entry key="service.mp.flowsubscription.query.max-results">1000</entry>
     <Comment>if more then &lt;value&gt; results are encountered stop 
processing</Comment>
     <ProposedValue>1000</ProposedValue>
     <Group order="2">Query</Group>
   </property>
   
   <property>
-    <entry key="service.ma.flowsa.nfdump.source">/var/nfdump/flows</entry>
+    <entry 
key="service.mp.flowsubscription.nfdump.source">/var/nfdump/flows</entry>
     <Comment>location of nfcapd files</Comment>
     <ProposedValue>/var/nfdump/flows</ProposedValue>
     <Group order="1">nfdump</Group>
   </property>
   <property>
-    <entry 
key="service.ma.flowsa.nfdump.location">/usr/local/bin/nfdump</entry>
+    <entry 
key="service.mp.flowsubscription.nfdump.location">/usr/local/bin/nfdump</entry>
     <Comment>the location of the nfdump executable (including nfdump 
filename)</Comment>
     <ProposedValue>/usr/local/bin/nfdump</ProposedValue>
     <Group order="2">nfdump</Group>
   </property>
   <property>
-    <entry 
key="service.ma.flowsa.nfdump.ouputreader">org.perfsonar.service.measurementArchive.flowsa.nfdump.outputreaders.Nfdump1_5_5OutputReaderFactory</entry>
+    <entry 
key="service.mp.flowsubscription.nfdump.ouputreader">org.perfsonar.service.measurementArchive.flowsa.nfdump.outputreaders.Nfdump1_5_5OutputReaderFactory</entry>
     <Comment>fully qualified name of the class used for output reading 
(expects a class implementing NfdumpOutputReader)</Comment>
-    
<ProposedValue>org.perfsonar.service.measurementArchive.flowsa.nfdump.outputreaders.Nfdump1_5_5OutputReaderFactory</ProposedValue>
+    
<ProposedValue>org.perfsonar.service.measurementPoint.flowsubscription.nfdump.outputreaders.Nfdump1_5_5OutputReaderFactory</ProposedValue>
     <Group order="3">nfdump</Group>
   </property>
   
-  <property>
-    <entry key="service.ma.flowsa.exporters">1</entry>
-    <Comment>The number of exporters</Comment>
-    <ProposedValue>1</ProposedValue>
-    <Group order="1">Exporters</Group>
-  </property>
-    
-  <property>
-    <entry key="service.ma.wizzard.flowsa.exporter1" 
required="true">yes</entry>
-    <Comment>Use exporter 1</Comment>
-    <ProposedValue>no</ProposedValue>
-    <Group order="1" check="true">Exporter1</Group>
-    <AcceptedValue>yes</AcceptedValue> 
-    <AcceptedValue>no</AcceptedValue>         
-  </property>
-  <property>
-    <entry key="service.ma.flowsa.exporter1.hostname" 
required="true">1</entry>
-    <Comment>Hostname</Comment>
-    <ProposedValue>1</ProposedValue>
-    <Group order="2">Exporter1</Group>
-  </property>
-  <property>
-    <entry key="service.ma.flowsa.exporter1.port" required="true">1</entry>
-    <Comment>Port</Comment>
-    <ProposedValue>1</ProposedValue>
-    <Group order="3">Exporter1</Group>
-  </property>
-  <property>
-    <entry key="service.ma.flowsa.exporter1.description" 
required="true">description</entry>
-    <Comment>Description</Comment>
-    <ProposedValue>1</ProposedValue>
-    <Group order="4">Exporter1</Group>
-  </property>
-  
-  <property>
-    <entry key="service.ma.wizzard.flowsa.exporter2" 
required="true">no</entry>
-    <Comment>Use exporter 2</Comment>
-    <ProposedValue>no</ProposedValue>
-    <Group order="1" check="true">Exporter2</Group>
-    <AcceptedValue>yes</AcceptedValue>
-    <AcceptedValue>no</AcceptedValue>    
-  </property>
-  <property>
-    <entry key="service.ma.flowsa.exporter2.hostname" 
required="true">1</entry>
-    <Comment>Hostname</Comment>
-    <ProposedValue>1</ProposedValue>
-    <Group order="2">Exporter2</Group>
-  </property>
-  <property>
-    <entry key="service.ma.flowsa.exporter2.port" required="true">1</entry>
-    <Comment>Port</Comment>
-    <ProposedValue>1</ProposedValue>
-    <Group order="3">Exporter2</Group>
-  </property>
-  <property>
-    <entry key="service.ma.flowsa.exporter2.description" 
required="true">description</entry>
-    <Comment>Description</Comment>
-    <ProposedValue>1</ProposedValue>
-    <Group order="4">Exporter2</Group>
-  </property>
-
 </properties>
 

Modified: trunk/surfnet_java-flowsubscription-mp/conf/wsdd/service-deploy.wsdd
===================================================================
--- trunk/surfnet_java-flowsubscription-mp/conf/wsdd/service-deploy.wsdd      
  2008-05-09 10:50:42 UTC (rev 3831)
+++ trunk/surfnet_java-flowsubscription-mp/conf/wsdd/service-deploy.wsdd      
  2008-05-09 14:10:48 UTC (rev 3832)
@@ -1,6 +1,6 @@
 <deployment xmlns="http://xml.apache.org/axis/wsdd/";
        xmlns:java="http://xml.apache.org/axis/wsdd/providers/java";>
-       <service name="FlowsaMeasurementArchiveService" style="message">
+       <service name="FlowsubscriptionMeasurementPointService" 
style="message">
                <Documentation>
                        Defines the name of the service and the type of 
service. The
                        style if message which for some reason makes 
communication
@@ -19,7 +19,7 @@
                        for now and that is acceptCall
                </Documentation>
                <namespace>
-                       http://perfsonar.org/services/measurementArchive
+                       http://perfsonar.org/services/measurementpoint
                </namespace>
                <Documentation>
                        namespace associated with the service

Modified: 
trunk/surfnet_java-flowsubscription-mp/conf/wsdd/service-undeploy.wsdd
===================================================================
--- trunk/surfnet_java-flowsubscription-mp/conf/wsdd/service-undeploy.wsdd    
  2008-05-09 10:50:42 UTC (rev 3831)
+++ trunk/surfnet_java-flowsubscription-mp/conf/wsdd/service-undeploy.wsdd    
  2008-05-09 14:10:48 UTC (rev 3832)
@@ -1,3 +1,3 @@
 <undeployment xmlns="http://xml.apache.org/axis/wsdd/";>
-  <service name="MeasurementArchiveService"/>
+  <service name="MeasurementPointService"/>
 </undeployment>

Modified: trunk/surfnet_java-flowsubscription-mp/contrib/client/config.py
===================================================================
--- trunk/surfnet_java-flowsubscription-mp/contrib/client/config.py     
2008-05-09 10:50:42 UTC (rev 3831)
+++ trunk/surfnet_java-flowsubscription-mp/contrib/client/config.py     
2008-05-09 14:10:48 UTC (rev 3832)
@@ -3,7 +3,7 @@
 serveraddress="localhost"
 #serveraddress="192.168.1.99"
 serverport="8180"
-servicepath="/flowsubscription-mp/services/MeasurementPointService"
+servicepath="/flowsubscription-mp/services/FlowsubscriptionMeasurementPointService"
 
 # don't change this
 serviceurl="http://%s:%s%s"; % (serveraddress, serverport, servicepath)