Skip to Content.
Sympa Menu

perfsonar-dev - perfsonar: r2222 - in branches/XML-LS-RELEASE-1.1: ant ant/flowmp ant/rrdma ant/sqlma ant/xmlls conf

Subject: perfsonar development work

List archive

perfsonar: r2222 - in branches/XML-LS-RELEASE-1.1: ant ant/flowmp ant/rrdma ant/sqlma ant/xmlls conf


Chronological Thread 
  • From:
  • To:
  • Subject: perfsonar: r2222 - in branches/XML-LS-RELEASE-1.1: ant ant/flowmp ant/rrdma ant/sqlma ant/xmlls conf
  • Date: Tue, 13 Mar 2007 10:16:15 -0400
Author: mac
Date: 2007-03-13 10:16:14 -0400 (Tue, 13 Mar 2007)
New Revision: 2222

Removed:
branches/XML-LS-RELEASE-1.1/ant/flowmp/flowTypeMP-axis-deploy-targets.xml
branches/XML-LS-RELEASE-1.1/ant/flowmp/flowTypeMP-configure-targets.xml
branches/XML-LS-RELEASE-1.1/ant/flowmp/flowTypeMP-doc-targets.xml
branches/XML-LS-RELEASE-1.1/ant/flowmp/flowTypeMP-java-compile-targets.xml
branches/XML-LS-RELEASE-1.1/ant/flowmp/flowTypeMP-release-targets.xml
branches/XML-LS-RELEASE-1.1/ant/flowmp/flowTypeMP-test-targets.xml
Modified:
branches/XML-LS-RELEASE-1.1/ant/flowmp/flowmp-configure-targets.xml
branches/XML-LS-RELEASE-1.1/ant/flowmp/flowmp-java-compile-targets.xml
branches/XML-LS-RELEASE-1.1/ant/pre-install-targets.xml
branches/XML-LS-RELEASE-1.1/ant/rrdma/rrdma-exist-xmldb-targets.xml
branches/XML-LS-RELEASE-1.1/ant/rrdma/rrdma-pre-install-targets.xml
branches/XML-LS-RELEASE-1.1/ant/sqlma/sqlma-exist-xmldb-targets.xml
branches/XML-LS-RELEASE-1.1/ant/xmlls/deploy-targets.xml
branches/XML-LS-RELEASE-1.1/ant/xmlls/pre-install-targets.xml
branches/XML-LS-RELEASE-1.1/conf/components.properties.flowmp
branches/XML-LS-RELEASE-1.1/conf/service.properties.flowmp
Log:
merging from trunk




Deleted:
branches/XML-LS-RELEASE-1.1/ant/flowmp/flowTypeMP-axis-deploy-targets.xml

Deleted:
branches/XML-LS-RELEASE-1.1/ant/flowmp/flowTypeMP-configure-targets.xml

Deleted: branches/XML-LS-RELEASE-1.1/ant/flowmp/flowTypeMP-doc-targets.xml

Deleted:
branches/XML-LS-RELEASE-1.1/ant/flowmp/flowTypeMP-java-compile-targets.xml

Deleted: branches/XML-LS-RELEASE-1.1/ant/flowmp/flowTypeMP-release-targets.xml

Deleted: branches/XML-LS-RELEASE-1.1/ant/flowmp/flowTypeMP-test-targets.xml

Modified: branches/XML-LS-RELEASE-1.1/ant/flowmp/flowmp-configure-targets.xml
===================================================================
--- branches/XML-LS-RELEASE-1.1/ant/flowmp/flowmp-configure-targets.xml
2007-03-13 13:57:38 UTC (rev 2221)
+++ branches/XML-LS-RELEASE-1.1/ant/flowmp/flowmp-configure-targets.xml
2007-03-13 14:16:14 UTC (rev 2222)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project name="rrdma-configure-targets">
+<project name="flowmp-configure-targets">

<property file="ant/const.properties" />
<property name="deploy.root" value="${service.name}" />
@@ -51,7 +51,7 @@

<entry key="service.r.ls_url"
value=""/>
<entry key="component.registrator.interval"
value="30000"/>
- <entry key="component.registrator.scheduler_component"
value="ma_scheduler"/>
+ <entry key="component.registrator.scheduler_component"
value="mp_scheduler"/>

</propertyfile>

@@ -71,15 +71,21 @@
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="ma_scheduler"/>
+ <entry key="component.registrator.scheduler_component"
value="mp_scheduler"/>
</propertyfile>

<propertyfile file="conf/components.properties"
comment="This file was created by the Ant configuration script.">
- <entry key="ma_scheduler"
value="org.perfsonar.commons.auxiliary.components.simplescheduler.Scheduler"/>
- <entry key="registrator"
value="org.perfsonar.service.measurementArchive.register.LSRegistrationComponent"/>
+ <entry key="mp_scheduler"
value="org.perfsonar.commons.auxiliary.components.simplescheduler.Scheduler"/>
+ <entry key="registrator"
value="org.perfsonar.service.measurementPoint.register.LSRegistrationComponent"/>
</propertyfile>
+ <replace file="conf/components.properties"
+
token="#mp_scheduler=org.perfsonar.commons.auxiliary.components.simplescheduler.Scheduler"
+
value="mp_scheduler=org.perfsonar.commons.auxiliary.components.simplescheduler.Scheduler"/>

+ <replace file="conf/components.properties"
+
token="#registrator=org.perfsonar.service.measurementPoint.register.LSRegistrationComponent"
+
value="registrator=org.perfsonar.service.measurementPoint.register.LSRegistrationComponent"/>
</target>



Modified:
branches/XML-LS-RELEASE-1.1/ant/flowmp/flowmp-java-compile-targets.xml
===================================================================
--- branches/XML-LS-RELEASE-1.1/ant/flowmp/flowmp-java-compile-targets.xml
2007-03-13 13:57:38 UTC (rev 2221)
+++ branches/XML-LS-RELEASE-1.1/ant/flowmp/flowmp-java-compile-targets.xml
2007-03-13 14:16:14 UTC (rev 2222)
@@ -23,14 +23,10 @@

<target name="compile-flowmp"
description="Compiles Java files of FLOW MP">
- <javac srcdir="src" destdir="${build}" deprecation="yes">
+ <javac srcdir="src" destdir="${build}" deprecation="yes"
debug="true">
<include
name="org/perfsonar/service/measurementPoint/flowType/**" />
+ <include
name="org/perfsonar/service/measurementPoint/register/**" />
<include name="org/perfsonar/service/web/**" />
- <!--
- <include
name="org/perfsonar/service/testHarness/MetadataConfigurationStorageManagerTester.java"
/>
- <include
name="org/perfsonar/service/testHarness/MetadataConfigurationStorageManagerTester.java"
/>
- <include
name="org/perfsonar/service/testHarness/RRDStorageManagerTester.java" />
- -->
<classpath refid="classpath"/>
</javac>

@@ -47,14 +43,11 @@
description="Creates JAR file for FLOW MP">
<jar destfile="${build}/perfSONAR-flowmp.jar">
<fileset dir="${build}">
- <include
name="org/perfsonar/service/measurementPoint/flowType/**" />
- <include name="org/perfsonar/service/web/**" />
- <!--
- <include
name="org/perfsonar/service/testHarness/MetadataConfigurationStorageManagerTester.class"
/>
- <include
name="org/perfsonar/service/testHarness/MetadataConfigurationStorageManagerTester.class"
/>
- <include
name="org/perfsonar/service/testHarness/RRDStorageManagerTester.class" />
- -->
+ <include name="**" />
</fileset>
+ <fileset dir="src">
+ <include name="**/*.java" />
+ </fileset>
</jar>
</target>


Modified: branches/XML-LS-RELEASE-1.1/ant/pre-install-targets.xml
===================================================================
--- branches/XML-LS-RELEASE-1.1/ant/pre-install-targets.xml 2007-03-13
13:57:38 UTC (rev 2221)
+++ branches/XML-LS-RELEASE-1.1/ant/pre-install-targets.xml 2007-03-13
14:16:14 UTC (rev 2222)
@@ -17,14 +17,14 @@



- <!-- Download URLs -->
+ <!-- properties -->

+
<property name="_tomcat.download.url"
-
value="http://apache.forall.pl/tomcat/tomcat-6/v6.0.7/bin/apache-tomcat-6.0.7.tar.gz";
/>
+
value="http://www.perfsonar.net/download/dependencies/preinstall_download.php?product=tomcat&amp;version=6.0.7";
/>
+
<property name="tomcat.dir" value="apache-tomcat-6.0.7" />

- <property name="exist.war.file" value="exist-1.0.1.war" />
-
<property file="ant/const.properties" />


@@ -134,7 +134,7 @@

<target name="get-tomcat" depends="get-tomcat-download-url">

- <basename property="tomcat.name" file="${tomcat.download.url}" />
+ <basename property="tomcat.name" file="tomcat.tar.gz" />
<get src="${tomcat.download.url}"
dest="${tomcat.name}"
verbose="true"

Modified: branches/XML-LS-RELEASE-1.1/ant/rrdma/rrdma-exist-xmldb-targets.xml
===================================================================
--- branches/XML-LS-RELEASE-1.1/ant/rrdma/rrdma-exist-xmldb-targets.xml
2007-03-13 13:57:38 UTC (rev 2221)
+++ branches/XML-LS-RELEASE-1.1/ant/rrdma/rrdma-exist-xmldb-targets.xml
2007-03-13 14:16:14 UTC (rev 2222)
@@ -241,13 +241,16 @@
defaultvalue=""/>

<input message="Enter eXist username []?"
- addproperty="username"/>
+ addproperty="username"
+ defaultvalue=""/>

<input message="Enter new password for ${username} []?"
- addproperty="password"/>
+ addproperty="password"
+ defaultvalue=""/>

<input message="Enter the URL of eXist
[xmldb:exist://${target.server}:${target.port}/exist/xmlrpc/db]?"
- addproperty="url"/>
+ addproperty="url"
+
defaultvalue="xmldb:exist://${target.server}:${target.port}/exist/xmlrpc/db"/>

<xquery
uri="${url}"

Modified: branches/XML-LS-RELEASE-1.1/ant/rrdma/rrdma-pre-install-targets.xml
===================================================================
--- branches/XML-LS-RELEASE-1.1/ant/rrdma/rrdma-pre-install-targets.xml
2007-03-13 13:57:38 UTC (rev 2221)
+++ branches/XML-LS-RELEASE-1.1/ant/rrdma/rrdma-pre-install-targets.xml
2007-03-13 14:16:14 UTC (rev 2222)
@@ -18,11 +18,15 @@



+ <!-- properties -->
+
+
<property name="service.name" value="perfSONAR-RRD-MA-2.0-beta" />


<property name="_exist.war.download.url"
-
value="http://prdownloads.sourceforge.net/exist/exist-1.0.1.war"; />
+
value="http://www.perfsonar.net/download/dependencies/preinstall_download.php?product=exist-war&amp;version=1.0.1";
/>
+
<property name="exist.war.file" value="exist-1.0.1.war" />

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

Modified: branches/XML-LS-RELEASE-1.1/ant/sqlma/sqlma-exist-xmldb-targets.xml
===================================================================
--- branches/XML-LS-RELEASE-1.1/ant/sqlma/sqlma-exist-xmldb-targets.xml
2007-03-13 13:57:38 UTC (rev 2221)
+++ branches/XML-LS-RELEASE-1.1/ant/sqlma/sqlma-exist-xmldb-targets.xml
2007-03-13 14:16:14 UTC (rev 2222)
@@ -35,6 +35,11 @@
</target>


+ <target name="xmldb-password-sqlma">
+ <antcall target="xmldb-password-rrdma"/>
+ </target>

+
+
</project>


Modified: branches/XML-LS-RELEASE-1.1/ant/xmlls/deploy-targets.xml
===================================================================
--- branches/XML-LS-RELEASE-1.1/ant/xmlls/deploy-targets.xml 2007-03-13
13:57:38 UTC (rev 2221)
+++ branches/XML-LS-RELEASE-1.1/ant/xmlls/deploy-targets.xml 2007-03-13
14:16:14 UTC (rev 2222)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="deploy">
-
+
<property file="conf/service.properties" />
<property file="ant/const.properties" />
<!-- the main targets -->

Modified: branches/XML-LS-RELEASE-1.1/ant/xmlls/pre-install-targets.xml
===================================================================
--- branches/XML-LS-RELEASE-1.1/ant/xmlls/pre-install-targets.xml
2007-03-13 13:57:38 UTC (rev 2221)
+++ branches/XML-LS-RELEASE-1.1/ant/xmlls/pre-install-targets.xml
2007-03-13 14:16:14 UTC (rev 2222)
@@ -15,7 +15,7 @@
<!-- Official Tomcat -->

<property name="tomcat.download.url"
-
value="http://archive.apache.org/dist/tomcat/tomcat-5/v5.5.20/bin/apache-tomcat-5.5.20.tar.gz";
/>
+
value="http://www.perfsonar.net/download/dependencies/preinstall_download.php?product=tomcat&amp;version=6.0.7";
/>


<!-- property name="tomcat.download.url"
@@ -23,7 +23,7 @@
<!-- property name="tomcat.download.url"
value="http://monstera.man.poznan.pl/tomcat.tar.gz"; /-->

- <property name="tomcat.tempfile" value="apache-tomcat-5.5.20"/> <!--
without .tar.gz -->
+ <property name="tomcat.tempfile" value="apache-tomcat-6.0.7"/> <!--
without .tar.gz -->

<property environment="env"/> <!-- env variables -->

@@ -46,9 +46,11 @@
<echo> 4. JAVA_HOME environment variable set to your Java
directory</echo>
<echo> Now, your JAVA_HOME is [${env.JAVA_HOME}]</echo>
<echo/>
+
<input message="Do you want to proceed? Just press ENTER to
continue. Otherwise CTRL-C stops the process immediately"/>

<echo>Preparing the installation of XML Lookup Service...</echo>
+ <delete file="${basedir}/ant/const.properties" />
<echo></echo>
<echo>Answer to all questions. If you go wrong, cancel (ctrl-c) and
start again.</echo>
<echo></echo>
@@ -59,6 +61,7 @@
<target name="get-inputs">
<!-- tomcat -->

+
<input message="Do you want to download Tomcat webserver
automatically (say N if you've already got Tomcat)?"
addproperty="tomcat.install.answer"
validargs="y,n"
@@ -193,4 +196,4 @@


</target>
-</project>
\ No newline at end of file
+</project>

Modified: branches/XML-LS-RELEASE-1.1/conf/components.properties.flowmp
===================================================================
--- branches/XML-LS-RELEASE-1.1/conf/components.properties.flowmp
2007-03-13 13:57:38 UTC (rev 2221)
+++ branches/XML-LS-RELEASE-1.1/conf/components.properties.flowmp
2007-03-13 14:16:14 UTC (rev 2222)
@@ -9,11 +9,13 @@

logger=org.perfsonar.commons.auxiliary.components.logger.log4j.Log4jLoggerComponent

# Simple scheduler
-scheduler=org.perfsonar.commons.auxiliary.components.simplescheduler.Scheduler
+#mp_scheduler=org.perfsonar.commons.auxiliary.components.simplescheduler.Scheduler

# Registration in LS
-registrator=org.perfsonar.service.measurementPoint.register.LSRegistrationComponent
+#registrator=org.perfsonar.service.measurementPoint.register.LSRegistrationComponent

#Service specific components
+
#...

+

Modified: branches/XML-LS-RELEASE-1.1/conf/service.properties.flowmp
===================================================================
--- branches/XML-LS-RELEASE-1.1/conf/service.properties.flowmp 2007-03-13
13:57:38 UTC (rev 2221)
+++ branches/XML-LS-RELEASE-1.1/conf/service.properties.flowmp 2007-03-13
14:16:14 UTC (rev 2222)
@@ -25,7 +25,7 @@
service.mp.flow.sample_rate = 100

# in what directory does FlowFork life
-service.mp.flow.base_dir=/usr/local/gijs/flowfork
+service.mp.flow.base_dir=/home/gijs/flowfork

# where are the client xml files with connection data
service.mp.flow.client_dir=/home/lingo/clients/
@@ -75,3 +75,14 @@
# data (and listen for reverse connection setup from server)
service.mp.flow.betweenPort=22220

+### registration in LS
+#registration lookup service URL
+service.r.ls_url=http://selena.acad.bg:8070/axis/services/LookupService
+
+#registrator component loader
+#time in milliseconds (60000 means 60 sec)
+component.registrator.interval=30000
+component.registrator.scheduler_component=mp_scheduler
+
+# location of log4j configuration file
+service.log.log4j.config=/opt/sonar/perfsonar/conf/log4j.properties


  • perfsonar: r2222 - in branches/XML-LS-RELEASE-1.1: ant ant/flowmp ant/rrdma ant/sqlma ant/xmlls conf, svnlog, 03/13/2007

Archive powered by MHonArc 2.6.16.

Top of Page