perfsonar development work

Author: trzaszcz
Date: 2009-09-28 07:53:06 -0400 (Mon, 28 Sep 2009)
New Revision: 5287

Added:
   branches/new-structure-with-base2/ps-mdm-ls/src/main/resources/perfsonar/
   
branches/new-structure-with-base2/ps-mdm-ls/src/main/resources/perfsonar/conf/
   
branches/new-structure-with-base2/ps-mdm-ls/src/main/resources/perfsonar/conf/configuration-rules.xml
   
branches/new-structure-with-base2/ps-mdm-ls/src/main/resources/perfsonar/conf/configuration.xml
Removed:
   branches/new-structure-with-base2/ps-mdm-ls/conf/configuration-rules.xml
   branches/new-structure-with-base2/ps-mdm-ls/conf/configuration.xml
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:
refactoring

Modified: branches/new-structure-with-base2/ps-mdm-ls/ant/build.xml
===================================================================
--- branches/new-structure-with-base2/ps-mdm-ls/ant/build.xml   2009-09-23 
08:58:39 UTC (rev 5286)
+++ branches/new-structure-with-base2/ps-mdm-ls/ant/build.xml   2009-09-28 
11:53:06 UTC (rev 5287)
@@ -188,8 +188,8 @@
       </copy>
 
       <copy file="${build.dir}/${jar.name}.aar"            
todir="${temp}/WEB-INF/services" />
-      <copy file="${basedir}/conf/${config.file.name}"     
tofile="${temp}/WEB-INF/classes/perfsonar/conf/configuration.xml" />
-      <copy file="${basedir}/conf/configuration-rules.xml" 
todir="${temp}/WEB-INF/classes/perfsonar/conf" />
+      <copy 
file="${basedir}/src/main/resources/perfsonar/conf/${config.file.name}"     
tofile="${temp}/WEB-INF/classes/perfsonar/conf/configuration.xml" />
+      <copy 
file="${basedir}/src/main/resources/perfsonar/conf/configuration-rules.xml" 
todir="${temp}/WEB-INF/classes/perfsonar/conf" />
       <copy file="${basedir}/conf/log4j.properties"        
todir="${temp}/WEB-INF/classes" />
       <copy file="${basedir}/conf/log4j.xml"               
todir="${temp}/WEB-INF/classes" />
 
@@ -258,8 +258,8 @@
                
                <echo>aar created</echo>
                
-               <copy file="${basedir}/conf/${config.file.name}"     
tofile="${build.dir}/perfsonar/conf/configuration.xml" />
-               <copy file="${basedir}/conf/configuration-rules.xml" 
todir="${build.dir}/perfsonar/conf" />
+               <copy 
file="${basedir}/src/main/resources/perfsonar/conf/${config.file.name}"     
tofile="${build.dir}/perfsonar/conf/configuration.xml" />
+               <copy 
file="${basedir}/src/main/resources/perfsonar/conf/configuration-rules.xml" 
todir="${build.dir}/perfsonar/conf" />
        </target>
        
        <target name="build.base2">

Deleted: 
branches/new-structure-with-base2/ps-mdm-ls/conf/configuration-rules.xml

Deleted: branches/new-structure-with-base2/ps-mdm-ls/conf/configuration.xml

Modified: branches/new-structure-with-base2/ps-mdm-ls/pom.xml
===================================================================
--- branches/new-structure-with-base2/ps-mdm-ls/pom.xml 2009-09-23 08:58:39 
UTC (rev 5286)
+++ branches/new-structure-with-base2/ps-mdm-ls/pom.xml 2009-09-28 11:53:06 
UTC (rev 5287)
@@ -1,13 +1,11 @@
 <project>
 
-
   <properties>
     <configurationFile>configuration.xml</configurationFile>
     <axis2Id>axis2-1.4.1</axis2Id>
     <packageName>perfsonar-java-xml-ls</packageName>
   </properties>
 
-
   <modelVersion>4.0.0</modelVersion>
   <groupId>perfsonar</groupId>
   <artifactId>ps-mdm-ls</artifactId>
@@ -48,14 +46,6 @@
           <execution>
             <id>create-configuration</id>
             <phase>process-resources</phase>
-            <configuration>
-              <tasks>
-                <delete dir="${basedir}/conf/tmp" failonerror="false"/>
-                <copy file="${basedir}/conf/${configurationFile}" 
todir="${basedir}/conf/tmp"/>
-                <move file="${basedir}/conf/tmp/${configurationFile}" 
tofile="${basedir}/conf/tmp/configuration.xml"/>
-                <copy file="${basedir}/conf/configuration-rules.xml" 
todir="${basedir}/conf/tmp"/>
-              </tasks>
-            </configuration>
             <goals>
               <goal>run</goal>
             </goals>
@@ -73,7 +63,7 @@
                 </copy>
                 <mkdir dir="${project.build.directory}"/>
                 <jar destfile="${basedir}/build/${aar.name}.aar">
-                  <fileset includes="**/PerfsonarService.class **/*.xml" 
dir="${basedir}/bin"/>
+                  <fileset includes="**/PerfsonarService.class 
**/services.xml" dir="${basedir}/bin"/>
                 </jar>
               </tasks>
             </configuration>
@@ -89,13 +79,6 @@
         <configuration>
           <webResources>
             <resource>
-              <directory>${basedir}/conf/tmp</directory>
-              <includes>
-                <include>**/*</include>
-              </includes>
-              <targetPath>WEB-INF/classes/perfsonar/conf</targetPath>
-            </resource>
-            <resource>
               <directory>${basedir}/build</directory>
               <includes>
                 <include>**/*.aar</include>
@@ -144,10 +127,8 @@
         </configuration>
       </plugin>
     </plugins>
-
   </build>
 
-
   <repositories>
 
     <repository>

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-09-23 08:58:39 UTC (rev 5286)
+++ 
branches/new-structure-with-base2/ps-mdm-ls/src/main/java/org/perfsonar/service/lookupservice/registration/LSSummaryRegisterDataSource.java
 2009-09-28 11:53:06 UTC (rev 5287)
@@ -1,19 +1,11 @@
 package org.perfsonar.service.lookupservice.registration;
 
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-
-import javax.xml.stream.XMLStreamException;
-
 import org.apache.log4j.Logger;
 import org.perfsonar.base2.service.exceptions.PerfSONARException;
 import org.perfsonar.base2.service.registration.RegisterDataSource;
 import org.perfsonar.base2.service.requesthandler.ServiceMessage;
 import org.perfsonar.base2.service.storage.xml.XMLDBResult;
 import org.perfsonar.base2.xml.Element;
-import org.perfsonar.base2.xml.ElementSerializer;
 import org.perfsonar.base2.xml.nmwg.Message;
 import org.perfsonar.service.lookupservice.dao.ISummarizationDAO;
 import org.perfsonar.service.lookupservice.storage.LookupServiceDAOFactory;
@@ -52,25 +44,6 @@
                        message.addChild(element);
                }
                
-//             ElementSerializer es=new ElementSerializer();
-//             File file=new File("/home/czacha/Desktop/glsRequest.txt");
-//             
-//             FileOutputStream fos;
-//             try {
-//                     fos = new FileOutputStream(file);
-//                     es.write(fos, message);
-//             } catch (FileNotFoundException e) {
-//                     // TODO Auto-generated catch block
-//                     e.printStackTrace();
-//             } catch (XMLStreamException e) {
-//                     // TODO Auto-generated catch block
-//                     e.printStackTrace();
-//             } catch (IOException e) {
-//                     // TODO Auto-generated catch block
-//                     e.printStackTrace();
-//             }
-//             
-               
                return new ServiceMessage(message);
        }
 

Added: 
branches/new-structure-with-base2/ps-mdm-ls/src/main/resources/perfsonar/conf/configuration-rules.xml


Property changes on: 
branches/new-structure-with-base2/ps-mdm-ls/src/main/resources/perfsonar/conf/configuration-rules.xml
___________________________________________________________________
Name: svn:executable
   + *

Added: 
branches/new-structure-with-base2/ps-mdm-ls/src/main/resources/perfsonar/conf/configuration.xml


Property changes on: 
branches/new-structure-with-base2/ps-mdm-ls/src/main/resources/perfsonar/conf/configuration.xml
___________________________________________________________________
Name: svn:executable
   + *