perfsonar development work

Author: michael.bischoff
Date: 2008-05-13 10:45:53 -0400 (Tue, 13 May 2008)
New Revision: 3836

Modified:
   trunk/surfnet_java-flowsa-ma/conf/axis-1.4/WEB-INF/server-config.wsdd
   trunk/surfnet_java-flowsa-ma/conf/axis-1.4/WEB-INF/web.xml
Log:


Modified: 
trunk/surfnet_java-flowsa-ma/conf/axis-1.4/WEB-INF/server-config.wsdd
===================================================================
--- trunk/surfnet_java-flowsa-ma/conf/axis-1.4/WEB-INF/server-config.wsdd     
  2008-05-13 13:00:46 UTC (rev 3835)
+++ trunk/surfnet_java-flowsa-ma/conf/axis-1.4/WEB-INF/server-config.wsdd     
  2008-05-13 14:45:53 UTC (rev 3836)
@@ -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,6 +29,10 @@
   <parameter name="className" value="org.apache.axis.utils.Admin"/>
   <namespace>http://xml.apache.org/axis/wsdd/</namespace>
  </service>
+ <service name="Version" provider="java:RPC">
+  <parameter name="allowedMethods" value="getVersion"/>
+  <parameter name="className" value="org.apache.axis.Version"/>
+ </service>
  <service name="FlowsaMeasurementArchiveService" provider="java:MSG" 
style="message" use="literal">
   <requestFlow>
    <handler name="soapmonitor" 
type="java:org.apache.axis.handlers.SOAPMonitorHandler"/>
@@ -42,10 +46,6 @@
                        http://perfsonar.org/services/measurementArchive
                </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-flowsa-ma/conf/axis-1.4/WEB-INF/web.xml
===================================================================
--- trunk/surfnet_java-flowsa-ma/conf/axis-1.4/WEB-INF/web.xml  2008-05-13 
13:00:46 UTC (rev 3835)
+++ trunk/surfnet_java-flowsa-ma/conf/axis-1.4/WEB-INF/web.xml  2008-05-13 
14:45:53 UTC (rev 3836)
@@ -12,7 +12,11 @@
                <init-param>
                        <param-name>ips</param-name>
                        <param-value>
+<<<<<<< .mine
+                               127.0.0.1 62.131.17.150 78.27.8.39 
192.87.102.* 192.87.109.* 192.87.117.*
+=======
                                127.0.0.1 62.131.17.150 78.27.8.39 
192.87.102.* 192.87.109.* 192.87.117.*
+>>>>>>> .r3835
                        </param-value>
                        <description>
                                A space separated list of ips that are 
allowed to access