perfsonar development work

Author: psnc.pikusa
Date: 2010-09-24 10:55:16 +0100 (Fri, 24 Sep 2010)
New Revision: 5754

Added:
   branches/geant2-java-sql-ma-stable-2.3-0/
Modified:
   
branches/geant2-java-sql-ma-stable-2.3-0/conf/axis-1.4/WEB-INF/server-config.wsdd
   branches/geant2-java-sql-ma-stable-2.3-0/packaging/deb/changelog
   branches/geant2-java-sql-ma-stable-2.3-0/packaging/deb/postinst
Log:
Creating stabilization branch


Copied: branches/geant2-java-sql-ma-stable-2.3-0 (from rev 5753, 
trunk/geant2-java-sql-ma)

Modified: 
branches/geant2-java-sql-ma-stable-2.3-0/conf/axis-1.4/WEB-INF/server-config.wsdd
===================================================================
--- trunk/geant2-java-sql-ma/conf/axis-1.4/WEB-INF/server-config.wsdd   
2010-09-22 18:51:31 UTC (rev 5753)
+++ 
branches/geant2-java-sql-ma-stable-2.3-0/conf/axis-1.4/WEB-INF/server-config.wsdd
   2010-09-24 09:55:16 UTC (rev 5754)
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <deployment xmlns="http://xml.apache.org/axis/wsdd/"; 
xmlns:java="http://xml.apache.org/axis/wsdd/providers/java";>
  <globalConfiguration>
-  <parameter name="sendMultiRefs" value="true"/>
-  <parameter name="disablePrettyXML" value="true"/>
   <parameter name="adminPassword" value="admin"/>
+  <parameter name="enableNamespacePrefixOptimization" value="false"/>
   <parameter name="dotNetSoapEncFix" value="true"/>
-  <parameter name="enableNamespacePrefixOptimization" value="false"/>
+  <parameter name="disablePrettyXML" 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"/>
-  <parameter name="sendXsiTypes" value="true"/>
-  <parameter name="attachments.implementation" 
value="org.apache.axis.attachments.AttachmentsImpl"/>
   <requestFlow>
    <handler type="java:org.apache.axis.handlers.JWSHandler">
     <parameter name="scope" value="session"/>
@@ -19,9 +19,14 @@
    </handler>
   </requestFlow>
  </globalConfiguration>
+ <handler name="URLMapper" 
type="java:org.apache.axis.handlers.http.URLMapper"/>
  <handler name="LocalResponder" 
type="java:org.apache.axis.transport.local.LocalResponder"/>
- <handler name="URLMapper" 
type="java:org.apache.axis.handlers.http.URLMapper"/>
  <handler name="Authenticate" 
type="java:org.apache.axis.handlers.SimpleAuthenticationHandler"/>
+ <service name="MeasurementArchiveService" provider="java:MSG" 
style="message" use="literal">
+  <parameter name="allowedMethods" value="acceptCall"/>
+  <parameter name="className" 
value="org.perfsonar.service.base.web.RequestHandler"/>
+  <namespace>http://perfsonar.org/services/measurementArchive</namespace>
+ </service>
  <service name="AdminService" provider="java:MSG">
   <parameter name="allowedMethods" value="AdminService"/>
   <parameter name="enableRemoteAdmin" value="false"/>
@@ -32,11 +37,6 @@
   <parameter name="allowedMethods" value="getVersion"/>
   <parameter name="className" value="org.apache.axis.Version"/>
  </service>
- <service name="MeasurementArchiveService" provider="java:MSG" 
style="message" use="literal">
-  <parameter name="allowedMethods" value="acceptCall"/>
-  <parameter name="className" 
value="org.perfsonar.service.base.web.RequestHandler"/>
-  <namespace>http://perfsonar.org/services/measurementArchive</namespace>
- </service>
  <transport name="http">
   <requestFlow>
    <handler type="URLMapper"/>

Modified: branches/geant2-java-sql-ma-stable-2.3-0/packaging/deb/changelog
===================================================================
--- trunk/geant2-java-sql-ma/packaging/deb/changelog    2010-09-22 18:51:31 
UTC (rev 5753)
+++ branches/geant2-java-sql-ma-stable-2.3-0/packaging/deb/changelog    
2010-09-24 09:55:16 UTC (rev 5754)
@@ -1,4 +1,4 @@
-perfsonar-java-sql-ma (2.2.1) stable; urgency=low
+perfsonar-java-sql-ma (2.3-0rc1) stable; urgency=low
 
   * Changed dependencies. Removed tomcat5.5-exist. Included tomcat5.5, exist 
and java6-runtime
 

Modified: branches/geant2-java-sql-ma-stable-2.3-0/packaging/deb/postinst
===================================================================
--- trunk/geant2-java-sql-ma/packaging/deb/postinst     2010-09-22 18:51:31 
UTC (rev 5753)
+++ branches/geant2-java-sql-ma-stable-2.3-0/packaging/deb/postinst     
2010-09-24 09:55:16 UTC (rev 5754)
@@ -53,11 +53,11 @@
     chown -R tomcat55 
$SERVICEPATH/$SERVICENAME/WEB-INF/classes/perfsonar/conf
     chown tomcat55 $SERVICEPATH/$SERVICENAME/WEB-INF/log
 
-    cp  /var/lib/tomcat5.5/webapps/exist/WEB-INF/lib/resolver-1.2.jar 
/usr/share/tomcat5.5/common/endorsed/
-    cp  /var/lib/tomcat5.5/webapps/exist/WEB-INF/lib/serializer-2.9.1.jar 
/usr/share/tomcat5.5/common/endorsed/
-    cp  /var/lib/tomcat5.5/webapps/exist/WEB-INF/lib/xalan-2.7.1.jar 
/usr/share/tomcat5.5/common/endorsed/
-    cp  /var/lib/tomcat5.5/webapps/exist/WEB-INF/lib/xercesImpl-2.9.1.jar 
/usr/share/tomcat5.5/common/endorsed/
-    cp  /var/lib/tomcat5.5/webapps/exist/WEB-INF/lib/xml-apis.jar 
/usr/share/tomcat5.5/common/endorsed/
+    #cp  /var/lib/tomcat5.5/webapps/exist/WEB-INF/lib/resolver-1.2.jar 
/usr/share/tomcat5.5/common/endorsed/
+    #cp  /var/lib/tomcat5.5/webapps/exist/WEB-INF/lib/serializer-2.9.1.jar 
/usr/share/tomcat5.5/common/endorsed/
+    #cp  /var/lib/tomcat5.5/webapps/exist/WEB-INF/lib/xalan-2.7.1.jar 
/usr/share/tomcat5.5/common/endorsed/
+    #cp  /var/lib/tomcat5.5/webapps/exist/WEB-INF/lib/xercesImpl-2.9.1.jar 
/usr/share/tomcat5.5/common/endorsed/
+    #cp  /var/lib/tomcat5.5/webapps/exist/WEB-INF/lib/xml-apis.jar 
/usr/share/tomcat5.5/common/endorsed/
 
 
     /etc/init.d/tomcat5.5 restart