perfsonar development work

Author: stijn
Date: 2007-01-29 05:46:19 -0500 (Mon, 29 Jan 2007)
New Revision: 1994

Added:
   branches/SSHTelnet-MP-STABLE/conf/org/
   branches/SSHTelnet-MP-STABLE/conf/org/perfsonar/
   branches/SSHTelnet-MP-STABLE/conf/org/perfsonar/service/
   branches/SSHTelnet-MP-STABLE/conf/org/perfsonar/service/measurementPoint/
   
branches/SSHTelnet-MP-STABLE/conf/org/perfsonar/service/measurementPoint/lookingGlassType/
   
branches/SSHTelnet-MP-STABLE/conf/org/perfsonar/service/measurementPoint/lookingGlassType/engine/
   
branches/SSHTelnet-MP-STABLE/conf/org/perfsonar/service/measurementPoint/lookingGlassType/engine/adapters/
   
branches/SSHTelnet-MP-STABLE/conf/org/perfsonar/service/measurementPoint/lookingGlassType/engine/adapters/ServicePropertiesConfigurator.class
Modified:
   branches/SSHTelnet-MP-STABLE/ant/build-nmsmp.xml
   branches/SSHTelnet-MP-STABLE/ant/build-snmpmp.xml
   branches/SSHTelnet-MP-STABLE/ant/build-sshtelnet.xml
   branches/SSHTelnet-MP-STABLE/ant/const.properties
   branches/SSHTelnet-MP-STABLE/ant/ssh/sshtelnetMP-axis-deploy-targets.xml
   branches/SSHTelnet-MP-STABLE/ant/ssh/sshtelnetMP-configure-targets.xml
   branches/SSHTelnet-MP-STABLE/ant/ssh/sshtelnetMP-release-targets.xml
   
branches/SSHTelnet-MP-STABLE/src/org/perfsonar/service/measurementPoint/lookingGlassType/engine/adapters/ServicePropertiesConfigurator.java
Log:
release target enhancement

Modified: branches/SSHTelnet-MP-STABLE/ant/build-nmsmp.xml
===================================================================
--- branches/SSHTelnet-MP-STABLE/ant/build-nmsmp.xml    2007-01-26 14:49:50 
UTC (rev 1993)
+++ branches/SSHTelnet-MP-STABLE/ant/build-nmsmp.xml    2007-01-29 10:46:19 
UTC (rev 1994)
@@ -4,7 +4,7 @@
 <!-- ===================================================================
     <description>
        
-    $Id:$
+    $Id$
     project: perfSONAR
     author: loukik
     

Modified: branches/SSHTelnet-MP-STABLE/ant/build-snmpmp.xml
===================================================================
--- branches/SSHTelnet-MP-STABLE/ant/build-snmpmp.xml   2007-01-26 14:49:50 
UTC (rev 1993)
+++ branches/SSHTelnet-MP-STABLE/ant/build-snmpmp.xml   2007-01-29 10:46:19 
UTC (rev 1994)
@@ -4,7 +4,7 @@
 <!-- ===================================================================
     <description>
     
-    $Id:$
+    $Id$
     project: perfSONAR
     author: loukik
     

Modified: branches/SSHTelnet-MP-STABLE/ant/build-sshtelnet.xml
===================================================================
--- branches/SSHTelnet-MP-STABLE/ant/build-sshtelnet.xml        2007-01-26 
14:49:50 UTC (rev 1993)
+++ branches/SSHTelnet-MP-STABLE/ant/build-sshtelnet.xml        2007-01-29 
10:46:19 UTC (rev 1994)
@@ -52,6 +52,7 @@
 
 
 
+
     <!-- SSH/Telnet MP imports -->
 
     <import file="ssh/sshtelnetMP-pre-install-targets.xml"/>
@@ -60,6 +61,7 @@
     <import file="ssh/sshtelnetMP-configure-targets.xml"/>
     <import file="ssh/sshtelnetMP-test-targets.xml"/>
     <import file="ssh/sshtelnetMP-libs-download-targets.xml"/>
+    <import file="ssh/sshtelnetMP-release-targets.xml"/>
 
 
 </project>

Modified: branches/SSHTelnet-MP-STABLE/ant/const.properties
===================================================================
--- branches/SSHTelnet-MP-STABLE/ant/const.properties   2007-01-26 14:49:50 
UTC (rev 1993)
+++ branches/SSHTelnet-MP-STABLE/ant/const.properties   2007-01-29 10:46:19 
UTC (rev 1994)
@@ -1,23 +1,23 @@
-#This file was created by the ant script.
-#Wed Dec 13 13:11:51 CET 2006
-package.root=org/perfsonar
-service.home=/opt/apache-tomcat-5.5.20/webapps
-target.port=8080
-api.windowtitle=perfSONAR
-release.basename=perfSONAR
-deploy.root=TelnetSSHMP
-service.name=TelnetSSHMP
-api.bottom=JRA1 GEANT2 Project
-wsdd.path=org/perfsonar/service/web/wsdd
-release.servicename=TelnetSSHMP
-build=build
-api.title=perfSONAR
-tomcat.home=/opt/apache-tomcat-5.5.20
-wsdd.home=service/web/wsdd
-package.nmwg.root=org/ggf
-api.location=doc/api
-wsdd.file.undeploy=sshtelnetmp-service-undeploy.wsdd
-webservice.name=MeasurementPointService
-release.version=1.0
-wsdd.file.deploy=sshtelnetmp-service-deploy.wsdd
-target.server=localhost
+#This file was created by the Ant configuration script.
+#Mon Jan 29 11:08:42 CET 2007
+package.root=org/perfsonar
+service.home=/opt/apache-tomcat-5.5.20/webapps
+target.port=8080
+api.windowtitle=perfSONAR
+release.basename=perfSONAR
+deploy.root=TelnetSSHMP
+service.name=TelnetSSHMP
+api.bottom=JRA1 GEANT2 Project
+wsdd.path=org/perfsonar/service/web/wsdd
+release.servicename=TelnetSSHMP
+build=build
+api.title=perfSONAR
+tomcat.home=/opt/apache-tomcat-5.5.20
+wsdd.home=service/web/wsdd
+package.nmwg.root=org/ggf
+api.location=doc/api
+wsdd.file.undeploy=sshtelnetmp-service-undeploy.wsdd
+webservice.name=MeasurementPointService
+release.version=1.0
+target.server=localhost
+wsdd.file.deploy=sshtelnetmp-service-deploy.wsdd

Modified: 
branches/SSHTelnet-MP-STABLE/ant/ssh/sshtelnetMP-axis-deploy-targets.xml
===================================================================
--- branches/SSHTelnet-MP-STABLE/ant/ssh/sshtelnetMP-axis-deploy-targets.xml  
  2007-01-26 14:49:50 UTC (rev 1993)
+++ branches/SSHTelnet-MP-STABLE/ant/ssh/sshtelnetMP-axis-deploy-targets.xml  
  2007-01-29 10:46:19 UTC (rev 1994)
@@ -39,6 +39,19 @@
 
     </target>
 
+        <target name="copywsdd-sshtelnetmp"
+                description="Copy wsdd for ssh telnet">
+        <echo>${service.home}/${deploy.root}/wsdd/</echo>
+               <echo>src/${package.root}/${wsdd.home}</echo>
+
+        <copy failonerror="false" 
todir="${service.home}/${deploy.root}/wsdd/">
+            <fileset dir="conf/wsdd">
+                <include name="sshtelnetmp-*.wsdd" />
+            </fileset>
+        </copy>
+
+    </target>
+       
     <!-- sshtelnetMP -->
 
     <available file="${build}/perfSONAR-sshtelnetMP.jar"   
property="jar.perfsonar.sshtelnetmp.present"/>
@@ -131,6 +144,7 @@
 
         <echo>Deploying the service...</echo>
         <antcall target="tomcat-start-for-sshtelnetmp" />
+               <antcall target="copywsdd-sshtelnetmp" />
         <antcall target="deploy-adminclient" />
 
     </target>

Modified: 
branches/SSHTelnet-MP-STABLE/ant/ssh/sshtelnetMP-configure-targets.xml
===================================================================
--- branches/SSHTelnet-MP-STABLE/ant/ssh/sshtelnetMP-configure-targets.xml    
  2007-01-26 14:49:50 UTC (rev 1993)
+++ branches/SSHTelnet-MP-STABLE/ant/ssh/sshtelnetMP-configure-targets.xml    
  2007-01-29 10:46:19 UTC (rev 1994)
@@ -75,7 +75,7 @@
 
        <java 
classname="org.perfsonar.service.measurementPoint.lookingGlassType.engine.adapters.ServicePropertiesConfigurator">
                <classpath>
-                       <pathelement location="src"/>
+                       <pathelement location="conf"/>
                        <pathelement path="${java.class.path}"/>
                </classpath>
                <arg value="../conf/service.properties"/>

Modified: branches/SSHTelnet-MP-STABLE/ant/ssh/sshtelnetMP-release-targets.xml
===================================================================
--- branches/SSHTelnet-MP-STABLE/ant/ssh/sshtelnetMP-release-targets.xml      
  2007-01-26 14:49:50 UTC (rev 1993)
+++ branches/SSHTelnet-MP-STABLE/ant/ssh/sshtelnetMP-release-targets.xml      
  2007-01-29 10:46:19 UTC (rev 1994)
@@ -29,7 +29,7 @@
    </target>
 
     <target name="release"
-       depends="init-release, build"
+       depends="libs, init-release, build"
        description="Build the release.">
 
        <property file="ant/const.properties" />
@@ -41,6 +41,9 @@
        </copy>
        <delete dir="tmp/${service.name}/perfsonar/tmp"/>
 
+          <copy 
todir="tmp/${service.name}/perfsonar/conf/org/perfsonar/service/measurementPoint/lookingGlassType/engine/adapters">
+                 <fileset 
file="D:/Geant2/20070125/build/org/perfsonar/service/measurementPoint/lookingGlassType/engine/adapters/ServicePropertiesConfigurator.class"/>
+          </copy>
        <delete dir="tmp/${service.name}/perfsonar/src/org"/>
        <delete dir="tmp/${service.name}/perfsonar/doc"/>
        <delete dir="tmp/${service.name}/perfsonar/test"/>
@@ -54,7 +57,7 @@
        <delete file="tmp/${service.name}/perfsonar/ant/changes-sshtelnetmp"/>
 
        <delete dir="tmp/${service.name}/perfsonar/ant/clmp"/>
-       <delete dir="tmp/${service.name}/perfsonar/ant/ssh"/>
+       <delete dir="tmp/${service.name}/perfsonar/ant/rrdma"/>
        <delete dir="tmp/${service.name}/perfsonar/ant/nmsmp"/>
        <delete dir="tmp/${service.name}/perfsonar/ant/snmpmp"/>
        <delete dir="tmp/${service.name}/perfsonar/ant/sqlma"/>
@@ -65,22 +68,24 @@
        <delete dir="tmp/${service.name}/perfsonar/conf/template"/>
 
        <delete dir="tmp/${service.name}/perfsonar/lib/rrd"/>
+          <delete dir="tmp/${service.name}/perfsonar/lib/misc"/>
+          <delete dir="tmp/${service.name}/perfsonar/lib/repository"/>
 
-       <move file="tmp/${service.name}/perfsonar/ant/build-sshtelnetmp.xml" 
tofile="tmp/${service.name}/perfsonar/ant/build.xml"/>
+       <move file="tmp/${service.name}/perfsonar/ant/build-sshtelnet.xml" 
tofile="tmp/${service.name}/perfsonar/ant/build.xml"/>
 
        <delete>
 
           <fileset dir="tmp/${service.name}/perfsonar/log" 
includes="**/*.log"/>
 
           <fileset dir="tmp/${service.name}/perfsonar/ant" 
includes="**/*.cl"/>
-          <fileset dir="tmp/${service.name}/perfsonar/ant" 
includes="**/*.ssh"/>
+          <fileset dir="tmp/${service.name}/perfsonar/ant" 
includes="**/*.rrdma"/>
           <fileset dir="tmp/${service.name}/perfsonar/ant" 
includes="**/*.mp"/>
           <fileset dir="tmp/${service.name}/perfsonar/ant" 
includes="**/*.sqlma"/>
           <fileset dir="tmp/${service.name}/perfsonar/ant" 
includes="**/*.tops"/>
           <fileset dir="tmp/${service.name}/perfsonar/ant" 
includes="**/*.tcmp"/>
 
           <fileset dir="tmp/${service.name}/perfsonar/conf" 
includes="**/*.cl"/>
-          <fileset dir="tmp/${service.name}/perfsonar/conf" 
includes="**/*.ssh"/>
+          <fileset dir="tmp/${service.name}/perfsonar/conf" 
includes="**/*.rrdma"/>
           <fileset dir="tmp/${service.name}/perfsonar/conf" 
includes="**/*.mp"/>
           <fileset dir="tmp/${service.name}/perfsonar/conf" 
includes="**/*.sqlma"/>
           <fileset dir="tmp/${service.name}/perfsonar/conf" 
includes="**/*.tops"/>
@@ -92,7 +97,7 @@
           <fileset dir="tmp/${service.name}/perfsonar/conf" 
includes="**/*-old.*"/>
 
           <fileset dir="tmp/${service.name}/perfsonar/conf/wsdd" 
includes="**/clmp-*.wsdd"/>
-          <fileset dir="tmp/${service.name}/perfsonar/conf/wsdd" 
includes="**/sshtelnetmp-*.wsdd"/>
+          <fileset dir="tmp/${service.name}/perfsonar/conf/wsdd" 
includes="**/rrdma-*.wsdd"/>
           <fileset dir="tmp/${service.name}/perfsonar/conf/wsdd" 
includes="**/ls-*.wsdd"/>
           <fileset dir="tmp/${service.name}/perfsonar/conf/wsdd" 
includes="**/mp-*.wsdd"/>
           <fileset dir="tmp/${service.name}/perfsonar/conf/wsdd" 
includes="**/tops-*.wsdd"/>

Added: 
branches/SSHTelnet-MP-STABLE/conf/org/perfsonar/service/measurementPoint/lookingGlassType/engine/adapters/ServicePropertiesConfigurator.class


Property changes on: 
branches/SSHTelnet-MP-STABLE/conf/org/perfsonar/service/measurementPoint/lookingGlassType/engine/adapters/ServicePropertiesConfigurator.class
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: 
branches/SSHTelnet-MP-STABLE/src/org/perfsonar/service/measurementPoint/lookingGlassType/engine/adapters/ServicePropertiesConfigurator.java
===================================================================
--- 
branches/SSHTelnet-MP-STABLE/src/org/perfsonar/service/measurementPoint/lookingGlassType/engine/adapters/ServicePropertiesConfigurator.java
 2007-01-26 14:49:50 UTC (rev 1993)
+++ 
branches/SSHTelnet-MP-STABLE/src/org/perfsonar/service/measurementPoint/lookingGlassType/engine/adapters/ServicePropertiesConfigurator.java
 2007-01-29 10:46:19 UTC (rev 1994)
@@ -2,8 +2,6 @@
 
 import java.io.BufferedReader;
 import java.io.BufferedWriter;
-import java.io.File;
-import java.io.FileInputStream;
 import java.io.FileReader;
 import java.io.FileWriter;
 import java.io.IOException;
@@ -11,23 +9,7 @@
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
-import java.util.Properties;
-import java.util.StringTokenizer;
 
-import org.apache.xml.serialize.OutputFormat;
-import org.apache.xml.serialize.XMLSerializer;
-import org.ggf.ns.nmwg.base.v2_0.Data;
-import org.ggf.ns.nmwg.base.v2_0.EventType;
-import org.ggf.ns.nmwg.base.v2_0.Metadata;
-import org.ggf.ns.nmwg.base.v2_0.Parameter;
-import org.ggf.ns.nmwg.base.v2_0.Parameters;
-import org.ggf.ns.nmwg.base.v2_0.Store;
-import org.ggf.ns.nmwg.base.v2_0.Subject;
-import org.ggf.ns.nmwg.result.v2_0.Datum;
-import org.perfsonar.commons.util.XMLUtils;
-import org.perfsonar.service.commons.exceptions.PerfSONARException;
-import org.w3c.dom.Document;
-
 public class ServicePropertiesConfigurator {
 
        public static void doStuff(String propertiesfilename) {
@@ -543,7 +525,7 @@
                }
 
        }
-
+/*
        public static void createServiceStorageXML(String propertiesFileName,
                        String outputFileName) {
 
@@ -676,7 +658,7 @@
                        try {
                                // convert response Message into Document
                                responseDocument = 
XMLUtils.convertMessageToDOM(store);
-                       } catch (PerfSONARException e) {
+                       } catch (Exception e) {
                                // TODO Auto-generated catch block
                                e.printStackTrace();
                        }
@@ -729,7 +711,7 @@
                }
 
        }
-
+*/
        public static void main(String[] args) {
 
                if (args.length != 1) {