perfsonar development work

Author: uros
Date: 2007-01-10 10:51:39 -0500 (Wed, 10 Jan 2007)
New Revision: 1900

Added:
   
trunk/perfsonar/src/org/perfsonar/service/measurementPoint/tracefileCaptureType/db/
   
trunk/perfsonar/src/org/perfsonar/service/measurementPoint/tracefileCaptureType/db/SqlManager.java
   
trunk/perfsonar/src/org/perfsonar/service/measurementPoint/tracefileCaptureType/db/mysql/
   
trunk/perfsonar/src/org/perfsonar/service/measurementPoint/tracefileCaptureType/db/mysql/MySqlManager.java
   
trunk/perfsonar/src/org/perfsonar/service/measurementPoint/tracefileCaptureType/security/
   
trunk/perfsonar/src/org/perfsonar/service/measurementPoint/tracefileCaptureType/security/Credentials.java
Modified:
   trunk/perfsonar/ant/tcmp/tcmp-axis-deploy-targets.xml
   trunk/perfsonar/ant/tcmp/tcmp-client-run-targets.xml
   trunk/perfsonar/ant/tcmp/tcmp-libs-download-targets.xml
   trunk/perfsonar/ant/tcmp/tcmp-pre-install-targets.xml
Log:
Started adding support for temporary authentication/authorization support.

Modified: trunk/perfsonar/ant/tcmp/tcmp-axis-deploy-targets.xml
===================================================================
--- trunk/perfsonar/ant/tcmp/tcmp-axis-deploy-targets.xml       2007-01-09 
13:27:16 UTC (rev 1899)
+++ trunk/perfsonar/ant/tcmp/tcmp-axis-deploy-targets.xml       2007-01-10 
15:51:39 UTC (rev 1900)
@@ -18,15 +18,22 @@
 <project name="tcmp-axis-deploy-targets">
 
 
-
     <!-- Copy mapi and other required jars -->
     <target name="copy-jars-for-tcmp" depends="copy-jars-for-service">
-        <copy file="./lib/repository/jdom/jdom/1.0b8/jdom-1.0b8.jar"         
      todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
-        <copy file="./lib/repository/xalan/xalan/2.7.0/xalan-2.7.0.jar"      
        todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
-        <copy 
file="./lib/repository/xerces/xercesImpl/2.6.2/xercesImpl-2.6.2.jar"         
todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
-        <copy 
file="./lib/repository/xml-apis/xml-apis/1.3.02/xml-apis-1.3.02.jar"          
 todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
-        <copy 
file="./lib/repository/xerces/xmlParserAPIs/2.6.2/xmlParserAPIs-2.6.2.jar"    
  todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
-        <copy 
file="./lib//repository/mapi-jni/mapi-jni/1.0-0001/mapi-jni-1.0-0001.jar"     
 todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
+        <copy file="./lib/repository/jdom/jdom/1.0b8/jdom-1.0b8.jar"
+            todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
+        <copy file="./lib/repository/xalan/xalan/2.7.0/xalan-2.7.0.jar"
+            todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
+        <copy 
file="./lib/repository/xerces/xercesImpl/2.6.2/xercesImpl-2.6.2.jar"
+            todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
+        <copy 
file="./lib/repository/xml-apis/xml-apis/1.3.02/xml-apis-1.3.02.jar"
+            todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
+        <copy 
file="./lib/repository/xerces/xmlParserAPIs/2.6.2/xmlParserAPIs-2.6.2.jar"
+            todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
+        <copy 
file="./lib//repository/mapi-jni/mapi-jni/1.0-0001/mapi-jni-1.0-0001.jar"
+            todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
+        <copy 
file="./lib//repository/mysql/mysql-connector-java/5.0.3/mysql-connector-java-5.0.3.jar"
+            todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
 
         <copy file="./conf/wsdd/${wsdd.file.deploy}"
                                 todir="${service.home}/${deploy.root}/wsdd"/>
@@ -42,6 +49,7 @@
         <delete 
file="${service.home}/${deploy.root}/WEB-INF/lib/xml-apis-1.3.02.jar"/>
         <delete 
file="${service.home}/${deploy.root}/WEB-INF/lib/xmlParserAPIs-2.6.2.jar"/>
         <delete 
file="${service.home}/${deploy.root}/WEB-INF/lib/mapi-jni-1.0-0001.jar"/>
+        <delete 
file="${service.home}/${deploy.root}/WEB-INF/lib/mysql-connector-java-5.0.3.jar"/>
 
         <delete 
file="${service.home}/${deploy.root}/wsdd/${wsdd.file.deploy}" />
         <delete 
file="${service.home}/${deploy.root}/wsdd/${wsdd.file.undeploy}"/>

Modified: trunk/perfsonar/ant/tcmp/tcmp-client-run-targets.xml
===================================================================
--- trunk/perfsonar/ant/tcmp/tcmp-client-run-targets.xml        2007-01-09 
13:27:16 UTC (rev 1899)
+++ trunk/perfsonar/ant/tcmp/tcmp-client-run-targets.xml        2007-01-10 
15:51:39 UTC (rev 1900)
@@ -33,8 +33,8 @@
         <java classname="org.perfsonar.client.testHarness.SOAPClient"
                 classpathref="classpath" fork="true">
             <arg value="${mp.local}"/>
-            <arg 
value="${basedir}/schema/example-instances/sonar/TCMPCaptureRequest-measurement.xml"/>
-            <arg 
value="${basedir}/schema/example-instances/sonar/response.xml"/>
+            <arg 
value="${basedir}/schema/example-instances/perfSONAR/TCMPCaptureRequest-measurement.xml"/>
+            <arg 
value="${basedir}/schema/example-instances/perfSONAR/response.xml"/>
         </java>
     </target>
 
@@ -42,11 +42,11 @@
         <java classname="org.perfsonar.client.testHarness.SOAPClientMulti"
                 classpathref="classpath" fork="true">
             <arg value="${mp.local}"/>
-            <arg 
value="${basedir}/schema/example-instances/sonar/TCMPCaptureRequest-measurement.xml"/>
-            <arg 
value="${basedir}/schema/example-instances/sonar/response1.xml"/>
+            <arg 
value="${basedir}/schema/example-instances/perfSONAR/TCMPCaptureRequest-measurement.xml"/>
+            <arg 
value="${basedir}/schema/example-instances/perfSONAR/response1.xml"/>
             <arg 
value="http://jra1-2.cesnet.cz:8080/axis/services/TCMPService"/>
-            <arg 
value="${basedir}/schema/example-instances/sonar/TCMPCaptureRequest-measurement.xml"/>
-            <arg 
value="${basedir}/schema/example-instances/sonar/response2.xml"/>
+            <arg 
value="${basedir}/schema/example-instances/perfSONAR/TCMPCaptureRequest-measurement.xml"/>
+            <arg 
value="${basedir}/schema/example-instances/perfSONAR/response2.xml"/>
         </java>
     </target>
 

Modified: trunk/perfsonar/ant/tcmp/tcmp-libs-download-targets.xml
===================================================================
--- trunk/perfsonar/ant/tcmp/tcmp-libs-download-targets.xml     2007-01-09 
13:27:16 UTC (rev 1899)
+++ trunk/perfsonar/ant/tcmp/tcmp-libs-download-targets.xml     2007-01-10 
15:51:39 UTC (rev 1900)
@@ -32,6 +32,8 @@
             <dependency groupId="exist"     artifactId="exist-db"       
version="1.0rc"/>
             <dependency groupId="exist"     artifactId="exist-xmlrpc"   
version="1.0rc"/>
             <dependency groupId="exist"     artifactId="exist-optional" 
version="1.0rc"/>
+
+            <dependency groupId="mysql"     
artifactId="mysql-connector-java"    version="5.0.3"/>
             
             <localRepository refid="local.repository"/>
             <remoteRepository refid="remote.repository"/>
@@ -42,7 +44,7 @@
 
 
 
-    <target name="libs-tcmp">
+    <target name="lib">
 
         <antcall target="libs-generic"/>
         <antcall target="libs-for-tcmp"/>

Modified: trunk/perfsonar/ant/tcmp/tcmp-pre-install-targets.xml
===================================================================
--- trunk/perfsonar/ant/tcmp/tcmp-pre-install-targets.xml       2007-01-09 
13:27:16 UTC (rev 1899)
+++ trunk/perfsonar/ant/tcmp/tcmp-pre-install-targets.xml       2007-01-10 
15:51:39 UTC (rev 1900)
@@ -201,6 +201,47 @@
     </target>
 
 
+    <!-- using MySQL database -->
+
+
+    <target name="mysql-questions">
+
+        <echo></echo>
+        <echo>Now, provide some information which will be used to access the 
MySQL database.</echo>
+        <echo></echo>
+
+        <input message="Enter the host name of MySQL database [localhost]:"
+            addproperty="_mysql.hostname"
+            defaultvalue="localhost" />
+
+        <input message="Enter the port number of MySQL database [3306]:"
+            addproperty="_mysql.port"
+            defaultvalue="3306" />
+
+        <input message="Enter the database name of MySQL database 
[gn2_jra1_tcmp]:"
+            addproperty="_mysql.dbname"
+            defaultvalue="gn2_jra1_tcmp" />
+
+        <input message="Enter the user name for accessing MySQL database 
[tcmp]:"
+            addproperty="_mysql.username"
+            defaultvalue="tcmp" />
+
+        <input message="Enter the pasword for accessing MySQL database []:"
+            addproperty="_mysql.password"/>
+
+        <propertyfile file="conf/service.properties" 
+            comment="This file was created by the Ant configuration script.">
+            
+            <entry  key="component.mp.mysql.db_hostname" 
value="${_mysql.hostname}"/>
+            <entry  key="component.mp.mysql.db_port" value="${_mysql.port}"/>
+            <entry  key="component.mp.mysql.db_dbname" 
value="${_mysql.dbname}"/>
+            <entry  key="component.mp.mysql.db_username" 
value="${_mysql.username}"/>
+            <entry  key="component.mp.mysql.db_password" 
value="${_mysql.password}"/>
+
+        </propertyfile>
+
+    </target>
+
     <!-- using xml database eXist -->
 
 
@@ -601,6 +642,8 @@
         <antcall target="get-server-address"/>
         <antcall target="get-server-port"/>
 
+        <antcall target="mysql-questions"/>
+
         <antcall target="mapijni"/>
 
         <!--

Added: 
trunk/perfsonar/src/org/perfsonar/service/measurementPoint/tracefileCaptureType/db/SqlManager.java


Property changes on: 
trunk/perfsonar/src/org/perfsonar/service/measurementPoint/tracefileCaptureType/db/SqlManager.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Added: 
trunk/perfsonar/src/org/perfsonar/service/measurementPoint/tracefileCaptureType/db/mysql/MySqlManager.java


Property changes on: 
trunk/perfsonar/src/org/perfsonar/service/measurementPoint/tracefileCaptureType/db/mysql/MySqlManager.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Added: 
trunk/perfsonar/src/org/perfsonar/service/measurementPoint/tracefileCaptureType/security/Credentials.java


Property changes on: 
trunk/perfsonar/src/org/perfsonar/service/measurementPoint/tracefileCaptureType/security/Credentials.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native