Skip to Content.
Sympa Menu

perfsonar-dev - r1899 - in trunk/perfsonar: ant ant/tcmp conf conf/wsdd src/org/perfsonar/service/web/wsdd

Subject: perfsonar development work

List archive

r1899 - in trunk/perfsonar: ant ant/tcmp conf conf/wsdd src/org/perfsonar/service/web/wsdd


Chronological Thread 
  • From:
  • To:
  • Subject: r1899 - in trunk/perfsonar: ant ant/tcmp conf conf/wsdd src/org/perfsonar/service/web/wsdd
  • Date: Tue, 9 Jan 2007 08:27:17 -0500
Author: uros
Date: 2007-01-09 08:27:16 -0500 (Tue, 09 Jan 2007)
New Revision: 1899

Added:
trunk/perfsonar/ant/tcmp/tcmp-pre-install-targets.xml
trunk/perfsonar/conf/tomcat-tcmp-tmpl.xml
Modified:
trunk/perfsonar/ant/build-tcmp.xml
trunk/perfsonar/ant/tcmp/mapijni-compile-targets.xml
trunk/perfsonar/ant/tcmp/tcmp-axis-deploy-targets.xml
trunk/perfsonar/ant/tcmp/tcmp-client-run-targets.xml
trunk/perfsonar/ant/tcmp/tcmp-configure-targets.xml
trunk/perfsonar/ant/tcmp/tcmp-java-compile-targets.xml
trunk/perfsonar/conf/wsdd/tcmp-service-deploy.wsdd
trunk/perfsonar/conf/wsdd/tcmp-service-undeploy.wsdd
trunk/perfsonar/src/org/perfsonar/service/web/wsdd/tcmp-service-deploy.wsdd

trunk/perfsonar/src/org/perfsonar/service/web/wsdd/tcmp-service-undeploy.wsdd
Log:
Updated build scripts accordinly to the Roman email to perfSONAR devlist

Modified: trunk/perfsonar/ant/build-tcmp.xml
===================================================================
--- trunk/perfsonar/ant/build-tcmp.xml 2007-01-09 11:45:32 UTC (rev 1898)
+++ trunk/perfsonar/ant/build-tcmp.xml 2007-01-09 13:27:16 UTC (rev 1899)
@@ -40,7 +40,7 @@

<import file="configure-targets.xml"/>
<import file="javadoc-targets.xml"/>
- <import file="webservice-env-targets.xml"/>
+ <import file="pre-install-targets.xml"/>
<import file="java-compile-targets.xml"/>
<import file="axis-deploy-targets.xml"/>
<import file="libs-download-targets.xml"/>
@@ -49,10 +49,16 @@

<!-- Tracefile Capture MP imports -->

+ <import file="tcmp/tcmp-pre-install-targets.xml"/>
<import file="tcmp/mapijni-compile-targets.xml"/>
<import file="tcmp/tcmp-axis-deploy-targets.xml"/>
<import file="tcmp/tcmp-java-compile-targets.xml"/>
<import file="tcmp/tcmp-client-run-targets.xml"/>
+ <!--
+ <import file="tcmp/tcmp-test-run-targets.xml"/>
+ <import file="tcmp/tcmp-junit-test-targets.xml"/>
+ <import file="tcmp/tcmp-release-targets.xml"/>
+ -->
<import file="tcmp/tcmp-configure-targets.xml"/>
<import file="tcmp/tcmp-libs-download-targets.xml"/>


Modified: trunk/perfsonar/ant/tcmp/mapijni-compile-targets.xml
===================================================================
--- trunk/perfsonar/ant/tcmp/mapijni-compile-targets.xml 2007-01-09
11:45:32 UTC (rev 1898)
+++ trunk/perfsonar/ant/tcmp/mapijni-compile-targets.xml 2007-01-09
13:27:16 UTC (rev 1899)
@@ -29,12 +29,17 @@

<!-- targets -->

+ <target name="init-mapijni" depends="init">

+ <property file="ant/const.properties" />

- <target name="clean-mapijni" depends="init"
+ </target>
+
+
+ <target name="clean-mapijni" depends="init-mapijni"
description="Removes build directories.">
<echo message="Cleaning mapi-jni Java files." />
- <ant inheritAll="false" dir="contrib/mapi-jni/java"
antfile="ant/build.xml" target="clean" />
+ <ant inheritAll="false" dir="${mapijnidir}/java"
antfile="ant/build.xml" target="clean" />
</target>


@@ -43,7 +48,7 @@
description="Compiles all Java files">

<echo message="Compiling mapi-jni Java files." />
- <ant inheritAll="false" dir="contrib/mapi-jni/java"
antfile="ant/build.xml" target="compile" />
+ <ant inheritAll="false" dir="${mapijnidir}/java"
antfile="ant/build.xml" target="compile" />

</target>

@@ -52,9 +57,9 @@
<target name="jar-mapijni" depends="compile-mapijni">

<echo message="Creating mapi-jni JAR file." />
- <ant inheritAll="false" dir="contrib/mapi-jni/java"
antfile="ant/build.xml" target="dist" />
+ <ant inheritAll="false" dir="${mapijnidir}/java"
antfile="ant/build.xml" target="dist" />
<mkdir dir="lib/repository/mapi-jni" />
- <copy file="contrib/mapi-jni/java/dist/mapi-jni.jar"
todir="lib/repository/mapi-jni" />
+ <copy file="${mapijnidir}/java/dist/mapi-jni.jar"
todir="lib/repository/mapi-jni" />

</target>

@@ -62,25 +67,25 @@

<!-- this target is for LINUX platform -->

- <target name="build-native-mapijni" depends="init">
+ <target name="build-native-mapijni" depends="init-mapijni">

- <exec dir="contrib/mapi-jni/native/src" executable="/usr/bin/make">
+ <exec dir="${mapijnidir}/native/src" executable="/usr/bin/make">
<arg line="clean" />
</exec>
- <exec dir="contrib/mapi-jni/native/src" executable="/usr/bin/make">
- <arg line="MAPI_INC='-I${mapi_path}/include'
- MAPI_LIB='${mapi_path}/lib/libmapi.so'
+ <exec dir="${mapijnidir}/native/src" executable="/usr/bin/make">
+ <arg line="MAPI_INC='-I${mapi_h_path}'
+ MAPI_LIB='${mapi_lib_path}/libmapi.so'
JAVA_INC='-I${jdk_path}/include
-I${jdk_path}/include/linux'
DEBUG_OPTS=''"/>
</exec>

- <copy file="contrib/mapi-jni/native/src/dist/libmapijni.so"
todir="${mapijni_libpath}" />
+ <copy file="${mapijnidir}/native/src/dist/libmapijni.so"
todir="${mapi_lib_path}" />

<echo message="" />
<echo message="" />
<echo
message="-----------------------------------------------------------" />
<echo message="Now you need to setup LD_LIBRARY_PATH env variable
which should contain" />
- <echo message="${mapijni_libpath}" />
+ <echo message="${mapi_lib_path}" />
<echo
message="-----------------------------------------------------------" />

</target>

Modified: trunk/perfsonar/ant/tcmp/tcmp-axis-deploy-targets.xml
===================================================================
--- trunk/perfsonar/ant/tcmp/tcmp-axis-deploy-targets.xml 2007-01-09
11:45:32 UTC (rev 1898)
+++ trunk/perfsonar/ant/tcmp/tcmp-axis-deploy-targets.xml 2007-01-09
13:27:16 UTC (rev 1899)
@@ -21,22 +21,30 @@

<!-- 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="${axis.home}/WEB-INF/lib"/>
- <copy file="./lib/repository/xalan/xalan/2.7.0/xalan-2.7.0.jar"
todir="${axis.home}/WEB-INF/lib"/>
- <copy
file="./lib/repository/xerces/xercesImpl/2.6.2/xercesImpl-2.6.2.jar"
todir="${axis.home}/WEB-INF/lib"/>
- <copy
file="./lib/repository/xml-apis/xml-apis/1.3.02/xml-apis-1.3.02.jar"
todir="${axis.home}/WEB-INF/lib"/>
- <copy
file="./lib/repository/xerces/xmlParserAPIs/2.6.2/xmlParserAPIs-2.6.2.jar"
todir="${axis.home}/WEB-INF/lib"/>
- <copy
file="./lib//repository/mapi-jni/mapi-jni/1.0-0001/mapi-jni-1.0-0001.jar"
todir="${axis.home}/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="./conf/wsdd/${wsdd.file.deploy}"
+ todir="${service.home}/${deploy.root}/wsdd"/>
+ <copy file="./conf/wsdd/${wsdd.file.undeploy}"
+ todir="${service.home}/${deploy.root}/wsdd"/>
</target>


<target name="delete-jars-for-tcmp" depends="delete-jars-for-service">
- <delete file="${axis.home}/WEB-INF/lib/jdom-1.0b8.jar"/>
- <delete file="${axis.home}/WEB-INF/lib/xalan-2.7.0.jar"/>
- <delete file="${axis.home}/WEB-INF/lib/xercesImpl-2.6.2.jar"/>
- <delete file="${axis.home}/WEB-INF/lib/xml-apis-1.3.02.jar"/>
- <delete file="${axis.home}/WEB-INF/lib/xmlParserAPIs-2.6.2.jar"/>
- <delete file="${axis.home}/WEB-INF/lib/mapi-jni-1.0-0001.jar"/>
+ <delete
file="${service.home}/${deploy.root}/WEB-INF/lib/jdom-1.0b8.jar"/>
+ <delete
file="${service.home}/${deploy.root}/WEB-INF/lib/xalan-2.7.0.jar"/>
+ <delete
file="${service.home}/${deploy.root}/WEB-INF/lib/xercesImpl-2.6.2.jar"/>
+ <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}/wsdd/${wsdd.file.deploy}" />
+ <delete
file="${service.home}/${deploy.root}/wsdd/${wsdd.file.undeploy}"/>
</target>


@@ -62,8 +70,8 @@
if="jar.perfsonar.tcmp.present"
description="Copy tcmp jar to Tomcat">

- <copy file="${build}/${app.jar}" todir="${axis.home}/WEB-INF/lib"/>
- <copy file="${build}/${app.servlets.jar}"
todir="${axis.home}/WEB-INF/lib" failonerror="false"/>
+ <copy file="${build}/${app.jar}"
todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
+ <copy file="${build}/${app.servlets.jar}"
todir="${service.home}/${deploy.root}/WEB-INF/lib" failonerror="false"/>

<echo/>
<echo>------------------------------ WARNING
---------------------------</echo>
@@ -75,30 +83,107 @@
</target>


- <target name="deploy-tcmp" depends="copy-tcmp-jar, add-context-listener"
+ <target name="tomcat-start-for-tcmp-true"
+ depends="tomcat-start-question"
+ if="tomcat.start.decision">
+
+ <copy file="conf/tomcat-tcmp-tmpl.xml"
tofile="${tomcat.home}/conf/Catalina/localhost/tcmp.xml" overwrite="true"
failonerror="false"/>
+ <replace file="${tomcat.home}/conf/Catalina/localhost/tcmp.xml">
+ <replacefilter token="__PATH__" value="/${deploy.root}" />
+ <replacefilter token="__DOC_BASE__"
value="${service.home}/${service.name}" />
+ </replace>
+
+ <exec dir="${tomcat.home}/bin"
+ executable="sh"
+ output="${basedir}/log/tomcat.log"
+ error="${basedir}/log/tomcat.log">
+ <arg line="startup.sh"/>
+ <env key="PATH" path="${env.PATH}:${tomcat.home}/bin:."/>
+ <env key="LD_LIBRARY_PATH"
path="${env.LD_LIBRARY_PATH}:${mapi_lib_path}"/>
+ <env key="CATALINA_HOME" path=""/>
+ <env key="CATALINA_BASE" path=""/>
+ </exec>
+
+ <echo>Please, make sure that the Tomcat is running. Use the address
http://${target.server}:${target.port} .</echo>
+ <input message="Press Return key ..."/>
+
+ </target>
+
+
+ <target name="tomcat-start-for-tcmp-false"
+ unless="tomcat.start.decision">
+
+ <echo>Please, create the following configuration file </echo>
+ <echo>'${tomcat.home}/conf/Catalina/localhost/tcmp.xml'</echo>
+ <echo>containing the following text:</echo>
+ <echo></echo>
+ <echo message=" &lt;Context path='/${deploy.root}'"/>
+ <echo message="
docBase='${service.home}/${service.name}'&gt;"/>
+ <echo message=" &lt;/Context&gt;"/>
+ <echo></echo>
+ <echo>Please, do it now. I will wait for you.</echo>
+ <input message="Press Return key ..."/>
+
+
+ <echo>${line.separator}You have to manually set up the env variable
LD_LIBRARY_PATH</echo>
+ <echo>which should be seen by the Tomcat instance.</echo>
+ <echo></echo>
+ <echo>After setting up the variable (re)start the Tomcat.</echo>
+
+ <echo>${line.separator}Example:</echo>
+ <echo> export
LD_LIBRARY_PATH=$LD_LIBRARY_PATH:${mapi_lib_path}</echo>
+ <echo>${line.separator} Please, do it now. I will wait for
you.</echo>
+
+ <input message="Press Return key ..."/>
+
+ </target>
+
+
+ <target name="tomcat-start-for-tcmp"
+ depends="tomcat-start-for-tcmp-true,tomcat-start-for-tcmp-false"
/>
+
+
+ <target name="deploy" depends="copy-tcmp-jar, add-context-listener"
description="Deploys TC MP service">
+
+ <echo>Deploying the service...</echo>
+
+ <antcall target="tomcat-start-for-tcmp" />
+
+ <antcall target="deploy-adminclient" />
+
+ <!--
<java classname="org.apache.axis.client.AdminClient">
<arg line="-l ${adminService} &quot;${deployFile}&quot;"/>
<classpath refid="classpath"/>
</java>
+ -->
+
</target>


- <target name="undeploy-tcmp"
+ <target name="undeploy"
description="Undeploys TC MP service">

+ <echo>Undeploying the service...</echo>
+
+ <antcall target="undeploy-adminclient" />
+
+ <!--
<java classname="org.apache.axis.client.AdminClient">
<arg line="-l ${adminService} &quot;${undeployFile}&quot;"/>
<classpath refid="classpath"/>
</java>
+ -->

<antcall target="rem-context-listener" />
<antcall target="delete-jars-for-tcmp"/>

- <delete file="${axis.home}/WEB-INF/lib/perfSONAR-generic.jar"/>
- <delete file="${axis.home}/WEB-INF/lib/perfSONAR-tcmp.jar"/>
- <delete file="${axis.home}/WEB-INF/lib/perfSONAR-tcmp-servlets.jar"
failonerror="false"/>
- <delete file="${axis.home}/WEB-INF/lib/perfSONAR.jar"/>
+ <delete
file="${service.home}/${deploy.root}/WEB-INF/lib/perfSONAR-generic.jar"/>
+ <delete
file="${service.home}/${deploy.root}/WEB-INF/lib/perfSONAR-tcmp.jar"/>
+ <delete
file="${service.home}/${deploy.root}/WEB-INF/lib/perfSONAR-tcmp-servlets.jar"
failonerror="false"/>
+ <delete
file="${service.home}/${deploy.root}/WEB-INF/lib/perfSONAR.jar"/>
+ <delete file="${tomcat.home}/conf/Catalina/localhost/tcmp.xml"/>

</target>


Modified: trunk/perfsonar/ant/tcmp/tcmp-client-run-targets.xml
===================================================================
--- trunk/perfsonar/ant/tcmp/tcmp-client-run-targets.xml 2007-01-09
11:45:32 UTC (rev 1898)
+++ trunk/perfsonar/ant/tcmp/tcmp-client-run-targets.xml 2007-01-09
13:27:16 UTC (rev 1899)
@@ -24,12 +24,12 @@
<property name="ma.abilene"
value="http://thunderbird.internet2.edu:8080/axis/services/MeasurementArchiveService"/>
-->

- <property name="mp.local"
value="http://${target.server}:${target.port}/axis/services/TCMPService"/>
+ <property name="mp.local"
value="http://${target.server}:${target.port}/${service.name}/services/${webservice.name}"/>


<!-- make measurement request -->

- <target name="run-tcmp-client" description="Runs TCMP measurement
request test">
+ <target name="run-client" description="Runs TCMP measurement request
test">
<java classname="org.perfsonar.client.testHarness.SOAPClient"
classpathref="classpath" fork="true">
<arg value="${mp.local}"/>
@@ -38,7 +38,7 @@
</java>
</target>

- <target name="run-tcmp-demo" description="Runs TCMP measurement request
demo presented at GEANT2 conference">
+ <target name="run-demo" description="Runs TCMP measurement request demo
presented at GEANT2 conference">
<java classname="org.perfsonar.client.testHarness.SOAPClientMulti"
classpathref="classpath" fork="true">
<arg value="${mp.local}"/>

Modified: trunk/perfsonar/ant/tcmp/tcmp-configure-targets.xml
===================================================================
--- trunk/perfsonar/ant/tcmp/tcmp-configure-targets.xml 2007-01-09 11:45:32
UTC (rev 1898)
+++ trunk/perfsonar/ant/tcmp/tcmp-configure-targets.xml 2007-01-09 13:27:16
UTC (rev 1899)
@@ -14,84 +14,51 @@

<project name="tcmp-configure-targets">

- <target name="get-mapi-path">
- <input message="Set the path of MAPI installation directory
[/opt/mapi]:"
- addproperty="mapi.path"
- defaultvalue="/opt/mapi"
- />
- <echo message="Accepted MAPI installation directory: ${mapi.path}"/>
- </target>

- <target name="get-mapijni-libpath">
- <input message="Set the path of MAPI-JNI library (should be in
loader path) [/opt/mapi/lib]:"
- addproperty="mapijni.libpath"
- defaultvalue="/opt/mapi/lib"
- />
- <echo message="Accepted MAPI-JNI library path: ${mapijni.libpath}"/>
- </target>
+ <property file="ant/const.properties" />

- <target name="get-tomcat-path">
- <input message="Set the path of Tomcat home directory
[/opt/jakarta-tomcat-5.0.28]:"
- addproperty="tomcat.path"
- defaultvalue="/opt/jakarta-tomcat-5.0.28"
- />
- <echo message="Accepted Tomcat home directory: ${tomcat.path}"/>
- </target>
+ <property name="deploy.root" value="${service.name}" />

- <target name="get-current-path-tcmp">
- <dirname property="current.path.tcmp" file="."/>
- </target>
+ <target name="__get-tcmp-config-file">

-
- <target name="__get-config-file">
- <input message="Enter the path of metadata config file
[${basedir}/conf/tcmp-service-content.xml]:"
- addproperty="config.file"
+ <input message="TCMP metadata configuration file is required. More
information about this is available in the installation guide. It is
suggested that you use the TEST metadata configuration file for now and you
can change it later on with your own file. Enter the path of rrd metadata
configuration file [${basedir}/conf/tcmp-service-content.xml]:"
+ addproperty="tcmp.config.file"
defaultvalue="${basedir}/conf/tcmp-service-content.xml"/>
- <available file="${config.file}" property="config.file.present"/>
+ <available file="${tcmp.config.file}"
property="tcmp.config.file.present"/>
+
</target>

- <target name="_get-config-file_1" depends="__get-config-file"
if="config.file.present">
- <echo message="Accepted metadata config file: ${config.file}"/>
+ <target name="_get-tcmp-config-file_1"
+ depends="__get-tcmp-config-file" if="tcmp.config.file.present">
</target>

- <target name="_get-config-file_2" depends="__get-config-file"
unless="config.file.present">
- <echo message="!!!!!! ERROR: Provided metadata config file does not
exist !!!!!!"/>
- <property name="config.file" value="xxxxxxxx"/>
+ <target name="_get-tcmp-config-file_2"
+ depends="__get-tcmp-config-file" unless="tcmp.config.file.present">
+
+ <echo message="!!!!!! ERROR: Provided tcmp metadata config file does
not exist !!!!!!"/>
+ <property name="tcmp.config.file" value="xxxxxxxx"/>
+
</target>

- <target name="get-config-file" depends="_get-config-file_1,
_get-config-file_2">
+ <target name="get-tcmp-config-file"
+ depends="_get-tcmp-config-file_1, _get-tcmp-config-file_2">
</target>

<!-- creating const.properties file -->

- <target name="set-const-properties-for-tcmp"
- depends="get-message-1,
- get-current-path,
- get-java-path,
- get-mapi-path,
- get-mapijni-libpath,
- get-tomcat-path,
- get-axis-path,
- get-server-address">
+ <target name="set-const-properties-for-tcmp">

<propertyfile file="ant/const.properties"
- comment="This file was created by the ant script.">
+ comment="This file was created by the Ant
configuration script.">

- <entry key="tomcat.home" value="${tomcat.path}"/>
- <entry key="axis.home" value="${axis.path}"/>
- <entry key="jdk_path" value="${java.path}"/>
- <entry key="mapi_path" value="${mapi.path}"/>
- <entry key="mapijni_libpath" value="${mapijni.libpath}"/>
- <entry key="target.server" value="${server.address}"/>
- <entry key="target.port" value="8080"/>
- <entry key="webservice.name" value="TCMPService"/>
+ <entry key="service.name" value="${service.name}"/>
+ <entry key="deploy.root" value="${deploy.root}"/>
+ <entry key="webservice.name" value="MeasurementPointService"/>
<entry key="build" value="build"/>
<entry key="package.root" value="org/perfsonar"/>
<entry key="package.nmwg.root" value="org/ggf"/>
- <entry key="wsdd.home" value="service/web/wsdd"/>
<entry key="wsdd.file.deploy" value="tcmp-service-deploy.wsdd"/>
<entry key="wsdd.file.undeploy"
value="tcmp-service-undeploy.wsdd"/>
- <entry key="wsdd.path" value="org/perfsonar/service/web/wsdd"/>
<entry key="api.location" value="doc/api"/>
<entry key="api.title" value="perfSONAR"/>
<entry key="api.windowtitle" value="perfSONAR"/>
@@ -99,9 +66,6 @@

</propertyfile>

- <echo message="const.properties file created"/>
- <input message="Press Return key ..."/>
-
</target>


@@ -143,28 +107,26 @@
<!-- creating service.properties file -->

<target name="set-service-properties-for-tcmp"
- depends="get-message-2,
- get-current-path,
- get-current-path-tcmp,
- get-server-address,
- get-pcap-storage-dir,
+ depends="get-tcmp-config-file,
get-local-ifs,
get-remote-ifs,
- get-config-file">
+ get-pcap-storage-dir">

+ <property file="ant/const.properties" />
+
<propertyfile file="conf/service.properties"
- comment="This file was created by the ant script.">
+ comment="This file was created by the Ant
configuration script.">

<entry key="service.r.type" value="mp"/>
- <entry key="service.r.access_point"
value="http://${server.address}:8080/axis/services/TCMPService"/>
+ <entry key="service.r.access_point"
value="http://${target.server}:${target.port}/${deploy.root}/services/${webservice.name}"/>
<entry key="service.r.service_name" value="Java TC MP"/>
<entry key="service.r.service_type" value="TC MP"/>
<entry key="service.r.service_description" value="Java TC MP,
perfSONAR project"/>

- <entry key="service.conf_file" value="${config.file}"/>
+ <entry key="service.mp.conf_file" value="${tcmp.config.file}"/>

- <entry key="service.log.log4j.config"
value="${current.path.tcmp}/perfsonar/conf/log4j.properties"/>
- <entry key="service.sax_parser.config"
value="${current.path.tcmp}/perfsonar/src/objects.config"/>
+ <entry key="service.log.log4j.config"
value="${basedir}/conf/log4j.properties"/>
+ <entry key="service.sax_parser.config"
value="${basedir}/src/objects.config"/>

<entry key="service.mp.message_types" value="SetupDataRequest"/>
<entry key="service.mp.class_name"
value="org.perfsonar.service.measurementPoint.tracefileCaptureType.TCMPTypeServiceEngine"/>
@@ -179,25 +141,54 @@

</propertyfile>

- <echo message="service.properties file created"/>
- <input message="Press Return key ..."/>
+ </target>

+
+ <target name="copy-components-properties">
+
+ <copy file="conf/components.properties.mp"
tofile="conf/components.properties" overwrite="true" failonerror="false"/>
+
</target>

+ <!-- configuring LS register functionality -->

- <target name="copy-initconfig-for-tcmp">
- <copy file="ant/const.properties.tcmp" tofile="ant/const.properties"
overwrite="true" failonerror="false"/>
- <copy file="conf/components.properties.mp"
tofile="conf/components.properties" overwrite="true" failonerror="false"/>
+
+ <target name="register-fuctionality-for-tcmp"
+ depends="register-fuctionality"
+ if="functionality.register.decision">
+
+ <propertyfile file="conf/service.properties"
+ comment="This file was created by the Ant configuration script.">
+
+ <entry key="service.r.service_name" value="${service.name}"/>
+ <entry key="service.r.service_type" value="MP"/>
+ <entry key="component.registrator.scheduler_component"
value="scheduler"/>
+
+ </propertyfile>
+
+ <!--
+ <replace file="conf/components.properties"
+
token="#ma_scheduler=org.perfsonar.commons.auxiliary.components.simplescheduler.Scheduler"
+
value="ma_scheduler=org.perfsonar.commons.auxiliary.components.simplescheduler.Scheduler"/>
+
+ <replace file="conf/components.properties"
+
token="#registrator=org.perfsonar.service.measurementArchive.register.LSRegistrationComponent"
+
value="registrator=org.perfsonar.service.measurementArchive.register.LSRegistrationComponent"/>
+ -->
+
</target>


- <target name="configure-tcmp">
- <antcall target="copy-properties"/>
- <antcall target="copy-initconfig-for-tcmp"/>
+ <target name="configure">
+
+ <echo>Configuring...</echo>
+
+ <antcall target="copy-components-properties"/>
<antcall target="set-const-properties-for-tcmp"/>
<antcall target="set-service-properties-for-tcmp"/>
<antcall target="set-log4j-properties"/>
- <antcall target="set-tomcat-properties"/>
+ <antcall target="register-fuctionality-for-tcmp"/>
+
</target>



Modified: trunk/perfsonar/ant/tcmp/tcmp-java-compile-targets.xml
===================================================================
--- trunk/perfsonar/ant/tcmp/tcmp-java-compile-targets.xml 2007-01-09
11:45:32 UTC (rev 1898)
+++ trunk/perfsonar/ant/tcmp/tcmp-java-compile-targets.xml 2007-01-09
13:27:16 UTC (rev 1899)
@@ -38,6 +38,7 @@
<include name="org/perfsonar/service/web/**" />
<exclude
name="org/perfsonar/service/measurementPoint/tracefileCaptureType/servlets/**"
/>
<classpath refid="classpath"/>
+ <!-- <compilerarg line="-Xlint:unchecked" /> -->
</javac>
<copy failonerror="false"
todir="${build}/${package.root}/${wsdd.home}">
<fileset dir="src/${package.root}/${wsdd.home}">
@@ -60,14 +61,6 @@
</target>


- <target name="build-tcmp"
- description="Builds TC MP.">
- <antcall target="clean-all"/>
- <antcall target="jar-generic"/>
- <antcall target="jar-tcmp"/>
- </target>
-
-
<!-- TCMP Servlets -->

<property name="app.servlets.jar" value="perfSONAR-tcmp-servlets.jar" />
@@ -100,7 +93,7 @@
</target>


- <target name="build-tcmp-servlets"
+ <target name="build-servlets"
description="Builds TC MP Servlets.">
<antcall target="clean-jar-tcmp-servlets"/>
<antcall target="jar-tcmp-servlets"/>
@@ -159,6 +152,16 @@

<echo>------------------------------------------------------------------</echo>
</target>

+ <!-- the main target -->
+
+ <target name="build"
+ description="Builds TC MP.">
+ <antcall target="clean-all"/>
+ <antcall target="jar-generic"/>
+ <antcall target="jar-tcmp"/>
+ </target>
+
+
</project>



Added: trunk/perfsonar/ant/tcmp/tcmp-pre-install-targets.xml


Property changes on: trunk/perfsonar/ant/tcmp/tcmp-pre-install-targets.xml
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native

Added: trunk/perfsonar/conf/tomcat-tcmp-tmpl.xml


Property changes on: trunk/perfsonar/conf/tomcat-tcmp-tmpl.xml
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native

Modified: trunk/perfsonar/conf/wsdd/tcmp-service-deploy.wsdd
===================================================================
--- trunk/perfsonar/conf/wsdd/tcmp-service-deploy.wsdd 2007-01-09 11:45:32
UTC (rev 1898)
+++ trunk/perfsonar/conf/wsdd/tcmp-service-deploy.wsdd 2007-01-09 13:27:16
UTC (rev 1899)
@@ -1,7 +1,7 @@
<deployment xmlns="http://xml.apache.org/axis/wsdd/";
xmlns:java="http://xml.apache.org/axis/wsdd/providers/java";>

-<service name="TCMPService" style="message">
+<service name="MeasurementPointService" style="message">
<Documentation>Defines the name of the service and the type of service. The
style if message which for some reason makes communication cleaner and does
not affect anything. It implicitly uses Document style </Documentation>

<parameter name="className"
value="org.perfsonar.service.web.RequestHandler"/>

Modified: trunk/perfsonar/conf/wsdd/tcmp-service-undeploy.wsdd
===================================================================
--- trunk/perfsonar/conf/wsdd/tcmp-service-undeploy.wsdd 2007-01-09
11:45:32 UTC (rev 1898)
+++ trunk/perfsonar/conf/wsdd/tcmp-service-undeploy.wsdd 2007-01-09
13:27:16 UTC (rev 1899)
@@ -1,3 +1,3 @@
<undeployment xmlns="http://xml.apache.org/axis/wsdd/";>
- <service name="TCMPService"/>
+ <service name="MeasurementPointService"/>
</undeployment>

Modified:
trunk/perfsonar/src/org/perfsonar/service/web/wsdd/tcmp-service-deploy.wsdd
===================================================================
---
trunk/perfsonar/src/org/perfsonar/service/web/wsdd/tcmp-service-deploy.wsdd
2007-01-09 11:45:32 UTC (rev 1898)
+++
trunk/perfsonar/src/org/perfsonar/service/web/wsdd/tcmp-service-deploy.wsdd
2007-01-09 13:27:16 UTC (rev 1899)
@@ -1,7 +1,7 @@
<deployment xmlns="http://xml.apache.org/axis/wsdd/";
xmlns:java="http://xml.apache.org/axis/wsdd/providers/java";>

-<service name="TCMPService" style="message">
+<service name="MeasurementPointService" style="message">
<Documentation>Defines the name of the service and the type of service. The
style if message which for some reason makes communication cleaner and does
not affect anything. It implicitly uses Document style </Documentation>

<parameter name="className"
value="org.perfsonar.service.web.RequestHandler"/>

Modified:
trunk/perfsonar/src/org/perfsonar/service/web/wsdd/tcmp-service-undeploy.wsdd
===================================================================
---
trunk/perfsonar/src/org/perfsonar/service/web/wsdd/tcmp-service-undeploy.wsdd
2007-01-09 11:45:32 UTC (rev 1898)
+++
trunk/perfsonar/src/org/perfsonar/service/web/wsdd/tcmp-service-undeploy.wsdd
2007-01-09 13:27:16 UTC (rev 1899)
@@ -1,3 +1,3 @@
<undeployment xmlns="http://xml.apache.org/axis/wsdd/";>
- <service name="TCMPService"/>
+ <service name="MeasurementPointService"/>
</undeployment>


  • r1899 - in trunk/perfsonar: ant ant/tcmp conf conf/wsdd src/org/perfsonar/service/web/wsdd, svnlog, 01/09/2007

Archive powered by MHonArc 2.6.16.

Top of Page