perfsonar development work

Author: trzaszcz
Date: 2009-05-05 08:50:28 -0400 (Tue, 05 May 2009)
New Revision: 5122

Modified:
   branches/new-structure-with-base2/ps-mdm-ls/ant/build.xml
   branches/new-structure-with-base2/ps-mdm-ls/pom.xml
   
branches/new-structure-with-base2/ps-mdm-ls/src/main/java/org/perfsonar/service/lookupservice/registration/LSSummaryRegisterDataSource.java
Log:
lib dependencies improved

Modified: branches/new-structure-with-base2/ps-mdm-ls/ant/build.xml
===================================================================
--- branches/new-structure-with-base2/ps-mdm-ls/ant/build.xml   2009-05-04 
13:22:59 UTC (rev 5121)
+++ branches/new-structure-with-base2/ps-mdm-ls/ant/build.xml   2009-05-05 
12:50:28 UTC (rev 5122)
@@ -79,11 +79,21 @@
           xmlns:artifact="urn:maven-artifact-ant">
 
         <artifact:dependencies>
+               
+               
+                <dependency groupId="perfsonar"          
artifactId="ps-mdm-base2"       version="0.0.4"/>
+                <dependency groupId="rrdjtool"           
artifactId="rrdjtool"           version="1.0"/>
+                <dependency groupId="joda-time"          
artifactId="joda-time"          version="1.4"/>
+                <dependency groupId="commons-digester"   
artifactId="commons-digester"   version="2.0"/>
+                <dependency groupId="org.apache.axis2"   
artifactId="axis2-jaxws"        version="1.4.1"/>
+
+               
+               <!--
             <dependency groupId="perfsonar"        artifactId="ps-mdm-base2" 
        version="0.0.1"/>
             <dependency groupId="commons-digester" 
artifactId="commons-digester"     version="2.0"/>
             <dependency groupId="org.apache.axis2" artifactId="axis2-jaxws"  
        version="1.4.1"/>
                <dependency groupId="org.apache.axis2" artifactId="axis2-adb" 
         version="1.4.1"/>
-               
+            -->
                
             <localRepository  refid="local.repository"/>
             <remoteRepository refid="remote.repository"/>

Modified: branches/new-structure-with-base2/ps-mdm-ls/pom.xml
===================================================================
--- branches/new-structure-with-base2/ps-mdm-ls/pom.xml 2009-05-04 13:22:59 
UTC (rev 5121)
+++ branches/new-structure-with-base2/ps-mdm-ls/pom.xml 2009-05-05 12:50:28 
UTC (rev 5122)
@@ -235,7 +235,34 @@
 
     <!-- taken from axis2 sources -->
 
+        <dependency>
+      <groupId>perfsonar</groupId>
+      <artifactId>ps-mdm-base2</artifactId>
+      <version>0.0.4</version>
+    </dependency>
+    <dependency>
+      <groupId>rrdjtool</groupId>
+      <artifactId>rrdjtool</artifactId>
+      <version>1.0</version>
+    </dependency>
+    <dependency>
+      <groupId>joda-time</groupId>
+      <artifactId>joda-time</artifactId>
+      <version>1.4</version>
+    </dependency>
+    <dependency>
+        <groupId>commons-digester</groupId>
+        <artifactId>commons-digester</artifactId>
+        <version>2.0</version>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.axis2</groupId>
+        <artifactId>axis2-jaxws</artifactId>
+        <version>1.4.1</version>
+    </dependency>
+       
 
+       <!-- 
     <dependency>
       <groupId>org.apache.axis2</groupId>
       <artifactId>axis2-scripting</artifactId>
@@ -447,7 +474,7 @@
         </exclusion>
       </exclusions>
     </dependency>
-
+       -->
     <!-- got for auth -->
     <dependency>
       <groupId>opensaml</groupId>

Modified: 
branches/new-structure-with-base2/ps-mdm-ls/src/main/java/org/perfsonar/service/lookupservice/registration/LSSummaryRegisterDataSource.java
===================================================================
--- 
branches/new-structure-with-base2/ps-mdm-ls/src/main/java/org/perfsonar/service/lookupservice/registration/LSSummaryRegisterDataSource.java
 2009-05-04 13:22:59 UTC (rev 5121)
+++ 
branches/new-structure-with-base2/ps-mdm-ls/src/main/java/org/perfsonar/service/lookupservice/registration/LSSummaryRegisterDataSource.java
 2009-05-05 12:50:28 UTC (rev 5122)
@@ -48,14 +48,15 @@
 
 
     public ServiceMessage getRegisterData() throws PerfSONARException {
-
+       logger.debug("method starded");
         logger.debug("Getting Summary register data");
 
         //get all topology information (IPs)
 
         logger.debug("Get services info from DB");
+        logger.debug("BEFORE");
         Map<String, ServiceSummary> summaries = getAllServicesSummaries();
-        
+        logger.debug("AFTER");
         //now having all data in "summaries" structure and need to summarize
         // IPs, domains separately. EventTypes will remain the same.
         
@@ -143,11 +144,14 @@
      * @return
      */
     private Map<String, ServiceSummary> getAllServicesSummaries() throws 
PerfSONARException {
-        
+      
+       
         Map<String, ServiceSummary> summaries = new HashMap<String, 
ServiceSummary>();
-
+        logger.debug("1");
         String[] ipResults = queryIpResults();
+        logger.debug("2");
         String[] domainResults = queryDomainResults();
+        logger.debug("3");
         String[] eventTypeResults = queryEventTypeResults();
         String[] keywordResults = queryKeywordResults();