perfsonar development work

Author: trzaszcz
Date: 2009-10-02 06:35:52 -0400 (Fri, 02 Oct 2009)
New Revision: 5296

Modified:
   
branches/new-structure-with-base2/ps-mdm-ls/contrib/SOAPRequestAuxilary/src/pl/psnc/Main.py
   
branches/new-structure-with-base2/ps-mdm-ls/src/main/java/org/perfsonar/service/lookupservice/LSRegisterServiceEngine.java
   
branches/new-structure-with-base2/ps-mdm-ls/src/main/java/org/perfsonar/service/lookupservice/registerService/LSRegisterServiceHelper.java
   
branches/new-structure-with-base2/ps-mdm-ls/src/main/java/org/perfsonar/service/lookupservice/registration/LsTTLParameterStatus.java
Log:
eventType enchancement

Modified: 
branches/new-structure-with-base2/ps-mdm-ls/contrib/SOAPRequestAuxilary/src/pl/psnc/Main.py
===================================================================
--- 
branches/new-structure-with-base2/ps-mdm-ls/contrib/SOAPRequestAuxilary/src/pl/psnc/Main.py
 2009-10-02 08:47:49 UTC (rev 5295)
+++ 
branches/new-structure-with-base2/ps-mdm-ls/contrib/SOAPRequestAuxilary/src/pl/psnc/Main.py
 2009-10-02 10:35:52 UTC (rev 5296)
@@ -13,11 +13,9 @@
     
     soap_content=f.read()
     
-    auxiliary=pl.psnc.trzaszczka.auxiliary.Auxiliary.Sender("127.0.0.1:8081")
+    auxiliary=pl.psnc.trzaszczka.auxiliary.Auxiliary.Sender("127.0.0.1:8080")
     auxiliary.connect()
     
-    print 
+    print auxiliary.send("/perfsonar-java-xml-ls/services/LookupService", 
soap_content)
     
-    auxiliary.send("/axis2/services/LookupService", soap_content)
-    
     pass
\ No newline at end of file

Modified: 
branches/new-structure-with-base2/ps-mdm-ls/src/main/java/org/perfsonar/service/lookupservice/LSRegisterServiceEngine.java
===================================================================
--- 
branches/new-structure-with-base2/ps-mdm-ls/src/main/java/org/perfsonar/service/lookupservice/LSRegisterServiceEngine.java
  2009-10-02 08:47:49 UTC (rev 5295)
+++ 
branches/new-structure-with-base2/ps-mdm-ls/src/main/java/org/perfsonar/service/lookupservice/LSRegisterServiceEngine.java
  2009-10-02 10:35:52 UTC (rev 5296)
@@ -84,7 +84,6 @@
                                }
                        } catch (Exception ex) {
                                ttlParameterStatus = 
LsTTLParameterStatus.NOT_A_NUMBER;
-                               ex.getCause();
                        }
                }
 

Modified: 
branches/new-structure-with-base2/ps-mdm-ls/src/main/java/org/perfsonar/service/lookupservice/registerService/LSRegisterServiceHelper.java
===================================================================
--- 
branches/new-structure-with-base2/ps-mdm-ls/src/main/java/org/perfsonar/service/lookupservice/registerService/LSRegisterServiceHelper.java
  2009-10-02 08:47:49 UTC (rev 5295)
+++ 
branches/new-structure-with-base2/ps-mdm-ls/src/main/java/org/perfsonar/service/lookupservice/registerService/LSRegisterServiceHelper.java
  2009-10-02 10:35:52 UTC (rev 5296)
@@ -269,8 +269,8 @@
                                subject.setMetadataIdRef(metadataId);
                                EventType eventType = new EventType();
                                eventType
-                                               
.setText("http://ggf.org/ns/nmwg/result/2.0/warinig/ls/";
-                                                               + 
ttlParameterStatus.name());
+                                               
.setText(PerfSONARException.RESULT_CODE_PREFIX+"warning/ls/lsTTLParameter/"
+                                                               + 
ttlParameterStatus);
 
                                Data data = new Data();
                                Datum datum = new Datum();

Modified: 
branches/new-structure-with-base2/ps-mdm-ls/src/main/java/org/perfsonar/service/lookupservice/registration/LsTTLParameterStatus.java
===================================================================
--- 
branches/new-structure-with-base2/ps-mdm-ls/src/main/java/org/perfsonar/service/lookupservice/registration/LsTTLParameterStatus.java
        2009-10-02 08:47:49 UTC (rev 5295)
+++ 
branches/new-structure-with-base2/ps-mdm-ls/src/main/java/org/perfsonar/service/lookupservice/registration/LsTTLParameterStatus.java
        2009-10-02 10:35:52 UTC (rev 5296)
@@ -4,5 +4,10 @@
        NONE,
        ACCEPTED,
        OUT_OF_BOUND,
-       NOT_A_NUMBER
+       NOT_A_NUMBER;
+       
+       
+       public String toString(){
+               return this.name().toLowerCase();
+       }
 }