Skip to Content.
Sympa Menu

perfsonar-dev - perfsonar: r2234 - in branches/JAVA-SQL-MA-STABLE: ant ant/rrdma ant/sqlma contrib contrib/ant-bundle src/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator

Subject: perfsonar development work

List archive

perfsonar: r2234 - in branches/JAVA-SQL-MA-STABLE: ant ant/rrdma ant/sqlma contrib contrib/ant-bundle src/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator


Chronological Thread 
  • From:
  • To:
  • Subject: perfsonar: r2234 - in branches/JAVA-SQL-MA-STABLE: ant ant/rrdma ant/sqlma contrib contrib/ant-bundle src/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator
  • Date: Wed, 14 Mar 2007 11:33:54 -0400
Author: roman
Date: 2007-03-14 11:33:53 -0400 (Wed, 14 Mar 2007)
New Revision: 2234

Added:
branches/JAVA-SQL-MA-STABLE/contrib/ant-bundle/
branches/JAVA-SQL-MA-STABLE/contrib/ant-bundle/ant-contrib-1.0b3.jar
branches/JAVA-SQL-MA-STABLE/contrib/ant-bundle/build-bundle.xml
branches/JAVA-SQL-MA-STABLE/contrib/ant-bundle/service-locations.properties
Removed:
branches/JAVA-SQL-MA-STABLE/contrib/ant-bundle/ant-contrib-1.0b3.jar
branches/JAVA-SQL-MA-STABLE/contrib/ant-bundle/build-bundle.xml
branches/JAVA-SQL-MA-STABLE/contrib/ant-bundle/service-locations.properties
Modified:
branches/JAVA-SQL-MA-STABLE/ant/pre-install-targets.xml
branches/JAVA-SQL-MA-STABLE/ant/rrdma/rrdma-exist-xmldb-targets.xml
branches/JAVA-SQL-MA-STABLE/ant/rrdma/rrdma-pre-install-targets.xml
branches/JAVA-SQL-MA-STABLE/ant/sqlma/sqlma-exist-xmldb-targets.xml
branches/JAVA-SQL-MA-STABLE/ant/sqlma/sqlma-pre-install-targets.xml

branches/JAVA-SQL-MA-STABLE/src/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/L2PathStatusQueryGenerator.java

branches/JAVA-SQL-MA-STABLE/src/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/L2PathStatusQueryGeneratorTMP.java
Log:

merged with the trunk

svn merge -r 2194:2232
https://svn.perfsonar.net/svn/perfsonar/trunk/perfsonar



Modified: branches/JAVA-SQL-MA-STABLE/ant/pre-install-targets.xml
===================================================================
--- branches/JAVA-SQL-MA-STABLE/ant/pre-install-targets.xml 2007-03-14
15:23:11 UTC (rev 2233)
+++ branches/JAVA-SQL-MA-STABLE/ant/pre-install-targets.xml 2007-03-14
15:33:53 UTC (rev 2234)
@@ -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/JAVA-SQL-MA-STABLE/ant/rrdma/rrdma-exist-xmldb-targets.xml
===================================================================
--- branches/JAVA-SQL-MA-STABLE/ant/rrdma/rrdma-exist-xmldb-targets.xml
2007-03-14 15:23:11 UTC (rev 2233)
+++ branches/JAVA-SQL-MA-STABLE/ant/rrdma/rrdma-exist-xmldb-targets.xml
2007-03-14 15:33:53 UTC (rev 2234)
@@ -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/JAVA-SQL-MA-STABLE/ant/rrdma/rrdma-pre-install-targets.xml
===================================================================
--- branches/JAVA-SQL-MA-STABLE/ant/rrdma/rrdma-pre-install-targets.xml
2007-03-14 15:23:11 UTC (rev 2233)
+++ branches/JAVA-SQL-MA-STABLE/ant/rrdma/rrdma-pre-install-targets.xml
2007-03-14 15:33:53 UTC (rev 2234)
@@ -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/JAVA-SQL-MA-STABLE/ant/sqlma/sqlma-exist-xmldb-targets.xml
===================================================================
--- branches/JAVA-SQL-MA-STABLE/ant/sqlma/sqlma-exist-xmldb-targets.xml
2007-03-14 15:23:11 UTC (rev 2233)
+++ branches/JAVA-SQL-MA-STABLE/ant/sqlma/sqlma-exist-xmldb-targets.xml
2007-03-14 15:33:53 UTC (rev 2234)
@@ -35,6 +35,11 @@
</target>


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

+
+
</project>


Modified: branches/JAVA-SQL-MA-STABLE/ant/sqlma/sqlma-pre-install-targets.xml
===================================================================
--- branches/JAVA-SQL-MA-STABLE/ant/sqlma/sqlma-pre-install-targets.xml
2007-03-14 15:23:11 UTC (rev 2233)
+++ branches/JAVA-SQL-MA-STABLE/ant/sqlma/sqlma-pre-install-targets.xml
2007-03-14 15:33:53 UTC (rev 2234)
@@ -18,17 +18,20 @@



+ <!-- properties -->
+
+
<property name="service.name" value="perfSONAR-SQL-MA-1.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" />


-
<!-- using xml database eXist -->



Copied: branches/JAVA-SQL-MA-STABLE/contrib/ant-bundle (from rev 2232,
trunk/perfsonar/contrib/ant-bundle)

Deleted: branches/JAVA-SQL-MA-STABLE/contrib/ant-bundle/ant-contrib-1.0b3.jar

Copied: branches/JAVA-SQL-MA-STABLE/contrib/ant-bundle/ant-contrib-1.0b3.jar
(from rev 2232, trunk/perfsonar/contrib/ant-bundle/ant-contrib-1.0b3.jar)

Deleted: branches/JAVA-SQL-MA-STABLE/contrib/ant-bundle/build-bundle.xml

Copied: branches/JAVA-SQL-MA-STABLE/contrib/ant-bundle/build-bundle.xml (from
rev 2232, trunk/perfsonar/contrib/ant-bundle/build-bundle.xml)

Deleted:
branches/JAVA-SQL-MA-STABLE/contrib/ant-bundle/service-locations.properties

Copied:
branches/JAVA-SQL-MA-STABLE/contrib/ant-bundle/service-locations.properties
(from rev 2232,
trunk/perfsonar/contrib/ant-bundle/service-locations.properties)

Modified:
branches/JAVA-SQL-MA-STABLE/src/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/L2PathStatusQueryGenerator.java
===================================================================
---
branches/JAVA-SQL-MA-STABLE/src/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/L2PathStatusQueryGenerator.java
2007-03-14 15:23:11 UTC (rev 2233)
+++
branches/JAVA-SQL-MA-STABLE/src/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/L2PathStatusQueryGenerator.java
2007-03-14 15:33:53 UTC (rev 2234)
@@ -150,7 +150,7 @@

String linkGlobalName = "";
try {
- linkGlobalName = link.getGlobalNameElement().getGlobalName();
+ linkGlobalName =
link.getGlobalNameElement().getGlobalName().trim();
} catch (Exception ex) {
;
}
@@ -225,10 +225,10 @@
String node1City = "";
String node1Institution = "";

- try { node1Name =
nodeArray[0].getNameElement().getName(); } catch (Exception ex)
{;}
- try { node1Country =
nodeArray[0].getCountryElement().getCountry(); } catch (Exception ex)
{;}
- try { node1City =
nodeArray[0].getCityElement().getCity(); } catch (Exception ex)
{;}
- try { node1Institution =
nodeArray[0].getInstitutionElement().getInstitution(); } catch (Exception ex)
{;}
+ try { node1Name =
nodeArray[0].getNameElement().getName().trim(); } catch
(Exception ex) {;}
+ try { node1Country =
nodeArray[0].getCountryElement().getCountry().trim(); } catch
(Exception ex) {;}
+ try { node1City =
nodeArray[0].getCityElement().getCity().trim(); } catch
(Exception ex) {;}
+ try { node1Institution =
nodeArray[0].getInstitutionElement().getInstitution().trim(); } catch
(Exception ex) {;}


String node2Name = "";
@@ -236,10 +236,10 @@
String node2City = "";
String node2Institution = "";

- try { node2Name =
nodeArray[1].getNameElement().getName(); } catch (Exception ex)
{;}
- try { node2Country =
nodeArray[1].getCountryElement().getCountry(); } catch (Exception ex)
{;}
- try { node2City =
nodeArray[1].getCityElement().getCity(); } catch (Exception ex)
{;}
- try { node2Institution =
nodeArray[1].getInstitutionElement().getInstitution(); } catch (Exception ex)
{;}
+ try { node2Name =
nodeArray[1].getNameElement().getName().trim(); } catch
(Exception ex) {;}
+ try { node2Country =
nodeArray[1].getCountryElement().getCountry().trim(); } catch
(Exception ex) {;}
+ try { node2City =
nodeArray[1].getCityElement().getCity().trim(); } catch
(Exception ex) {;}
+ try { node2Institution =
nodeArray[1].getInstitutionElement().getInstitution().trim(); } catch
(Exception ex) {;}



@@ -259,7 +259,7 @@
+ "
\n"
+ " let $node1_id :=
\n"
+ " if ($node1_metadata) then
\n"
- + "
fn:data($node1_metadata/nmwg:subject/nmwgtopo3:node/@id) \n"
+ + "
fn:data($node1_metadata/nmwg:subject/nmwgtopo3:node/@id) \n"
+ " else
\n"
+ " ''
\n";

@@ -332,10 +332,10 @@
String nodeCity = "";
String nodeInstitution = "";

- try { nodeName =
nodeArray[0].getNameElement().getName(); } catch (Exception ex)
{;}
- try { nodeCountry =
nodeArray[0].getCountryElement().getCountry(); } catch (Exception ex)
{;}
- try { nodeCity =
nodeArray[0].getCityElement().getCity(); } catch (Exception ex)
{;}
- try { nodeInstitution =
nodeArray[0].getInstitutionElement().getInstitution(); } catch (Exception ex)
{;}
+ try { nodeName =
nodeArray[0].getNameElement().getName().trim(); } catch
(Exception ex) {;}
+ try { nodeCountry =
nodeArray[0].getCountryElement().getCountry().trim(); } catch
(Exception ex) {;}
+ try { nodeCity =
nodeArray[0].getCityElement().getCity().trim(); } catch
(Exception ex) {;}
+ try { nodeInstitution =
nodeArray[0].getInstitutionElement().getInstitution().trim(); } catch
(Exception ex) {;}

String node = null;
if (nodeName == "" && nodeCountry == "" && nodeCity == "" &&
nodeInstitution == "")
@@ -353,7 +353,7 @@
+ "
\n"
+ " let $node_id :=
\n"
+ " if ($node_metadata) then
\n"
- + "
fn:data($node_metadata/nmwg:subject/nmwgtopo3:node/@id) \n"
+ + "
fn:data($node_metadata/nmwg:subject/nmwgtopo3:node/@id) \n"
+ " else
\n"
+ " ''
\n";
xQuery = "
\n "

Modified:
branches/JAVA-SQL-MA-STABLE/src/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/L2PathStatusQueryGeneratorTMP.java
===================================================================
---
branches/JAVA-SQL-MA-STABLE/src/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/L2PathStatusQueryGeneratorTMP.java
2007-03-14 15:23:11 UTC (rev 2233)
+++
branches/JAVA-SQL-MA-STABLE/src/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/L2PathStatusQueryGeneratorTMP.java
2007-03-14 15:33:53 UTC (rev 2234)
@@ -153,7 +153,7 @@

String linkGlobalName = "";
try {
- linkGlobalName = link.getGlobalNameElement().getGlobalName();
+ linkGlobalName =
link.getGlobalNameElement().getGlobalName().trim();
} catch (Exception ex) {
;
}
@@ -228,10 +228,10 @@
String node1City = "";
String node1Institution = "";

- try { node1Name =
nodeArray[0].getNameElement().getName(); } catch (Exception ex)
{;}
- try { node1Country =
nodeArray[0].getCountryElement().getCountry(); } catch (Exception ex)
{;}
- try { node1City =
nodeArray[0].getCityElement().getCity(); } catch (Exception ex)
{;}
- try { node1Institution =
nodeArray[0].getInstitutionElement().getInstitution(); } catch (Exception ex)
{;}
+ try { node1Name =
nodeArray[0].getNameElement().getName().trim(); } catch
(Exception ex) {;}
+ try { node1Country =
nodeArray[0].getCountryElement().getCountry().trim(); } catch
(Exception ex) {;}
+ try { node1City =
nodeArray[0].getCityElement().getCity().trim(); } catch
(Exception ex) {;}
+ try { node1Institution =
nodeArray[0].getInstitutionElement().getInstitution().trim(); } catch
(Exception ex) {;}


String node2Name = "";
@@ -239,10 +239,10 @@
String node2City = "";
String node2Institution = "";

- try { node2Name =
nodeArray[1].getNameElement().getName(); } catch (Exception ex)
{;}
- try { node2Country =
nodeArray[1].getCountryElement().getCountry(); } catch (Exception ex)
{;}
- try { node2City =
nodeArray[1].getCityElement().getCity(); } catch (Exception ex)
{;}
- try { node2Institution =
nodeArray[1].getInstitutionElement().getInstitution(); } catch (Exception ex)
{;}
+ try { node2Name =
nodeArray[1].getNameElement().getName().trim(); } catch
(Exception ex) {;}
+ try { node2Country =
nodeArray[1].getCountryElement().getCountry().trim(); } catch
(Exception ex) {;}
+ try { node2City =
nodeArray[1].getCityElement().getCity().trim(); } catch
(Exception ex) {;}
+ try { node2Institution =
nodeArray[1].getInstitutionElement().getInstitution().trim(); } catch
(Exception ex) {;}



@@ -262,7 +262,7 @@
+ "
\n"
+ " let $node1_id :=
\n"
+ " if ($node1_metadata) then
\n"
- + "
fn:data($node1_metadata/nmwg:subject/nmwgtopo3:node/@id) \n"
+ + "
fn:data($node1_metadata/nmwg:subject/nmwgtopo3:node/@id) \n"
+ " else
\n"
+ " ''
\n";

@@ -335,10 +335,10 @@
String nodeCity = "";
String nodeInstitution = "";

- try { nodeName =
nodeArray[0].getNameElement().getName(); } catch (Exception ex)
{;}
- try { nodeCountry =
nodeArray[0].getCountryElement().getCountry(); } catch (Exception ex)
{;}
- try { nodeCity =
nodeArray[0].getCityElement().getCity(); } catch (Exception ex)
{;}
- try { nodeInstitution =
nodeArray[0].getInstitutionElement().getInstitution(); } catch (Exception ex)
{;}
+ try { nodeName =
nodeArray[0].getNameElement().getName().trim(); } catch
(Exception ex) {;}
+ try { nodeCountry =
nodeArray[0].getCountryElement().getCountry().trim(); } catch
(Exception ex) {;}
+ try { nodeCity =
nodeArray[0].getCityElement().getCity().trim(); } catch
(Exception ex) {;}
+ try { nodeInstitution =
nodeArray[0].getInstitutionElement().getInstitution().trim(); } catch
(Exception ex) {;}

String node = null;
if (nodeName == "" && nodeCountry == "" && nodeCity == "" &&
nodeInstitution == "")
@@ -356,7 +356,7 @@
+ "
\n"
+ " let $node_id :=
\n"
+ " if ($node_metadata) then
\n"
- + "
fn:data($node_metadata/nmwg:subject/nmwgtopo3:node/@id) \n"
+ + "
fn:data($node_metadata/nmwg:subject/nmwgtopo3:node/@id) \n"
+ " else
\n"
+ " ''
\n";
xQuery = "
\n "


  • perfsonar: r2234 - in branches/JAVA-SQL-MA-STABLE: ant ant/rrdma ant/sqlma contrib contrib/ant-bundle src/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator, svnlog, 03/14/2007

Archive powered by MHonArc 2.6.16.

Top of Page