Skip to Content.
Sympa Menu

perfsonar-dev - perfsonar: r4425 - in branches/GEANT2-JAVA-SQL-MA-STABLE: . ant src/main/java/org/perfsonar/service/measurementArchive/sqlType/store

Subject: perfsonar development work

List archive

perfsonar: r4425 - in branches/GEANT2-JAVA-SQL-MA-STABLE: . ant src/main/java/org/perfsonar/service/measurementArchive/sqlType/store


Chronological Thread 
  • From:
  • To:
  • Subject: perfsonar: r4425 - in branches/GEANT2-JAVA-SQL-MA-STABLE: . ant src/main/java/org/perfsonar/service/measurementArchive/sqlType/store
  • Date: Mon, 1 Sep 2008 07:18:11 -0400
Author: roman
Date: 2008-09-01 07:18:10 -0400 (Mon, 01 Sep 2008)
New Revision: 4425

Modified:
branches/GEANT2-JAVA-SQL-MA-STABLE/ant/axis-deploy-targets.xml
branches/GEANT2-JAVA-SQL-MA-STABLE/ant/libs-download-targets.xml
branches/GEANT2-JAVA-SQL-MA-STABLE/ant/webapp-package-targets.xml
branches/GEANT2-JAVA-SQL-MA-STABLE/pom.xml

branches/GEANT2-JAVA-SQL-MA-STABLE/src/main/java/org/perfsonar/service/measurementArchive/sqlType/store/L2PathStatusStoreRequestProcess.java
Log:
merged with the trunk (-r 4415:4423)



Modified: branches/GEANT2-JAVA-SQL-MA-STABLE/ant/axis-deploy-targets.xml
===================================================================
--- branches/GEANT2-JAVA-SQL-MA-STABLE/ant/axis-deploy-targets.xml
2008-09-01 11:00:29 UTC (rev 4424)
+++ branches/GEANT2-JAVA-SQL-MA-STABLE/ant/axis-deploy-targets.xml
2008-09-01 11:18:10 UTC (rev 4425)
@@ -45,8 +45,8 @@
<target name="copy-dep-service-jars"
depends="copy-dep-base-service-jars">

- <copy
file="${basedir}/lib/repository/perfsonar/perfsonar-base/1.0.20080822/perfsonar-base-1.0.20080822.jar"
todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
- <copy
file="${basedir}/lib/repository/perfsonar/perfsonar-web-admin/0.9.1b/perfsonar-web-admin-0.9.1b.jar"
todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
+ <copy
file="${basedir}/lib/repository/perfsonar/perfsonar-base/1.0.20080901/perfsonar-base-1.0.20080901.jar"
todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
+ <copy
file="${basedir}/lib/repository/perfsonar/perfsonar-web-admin/0.9.1b/perfsonar-web-admin-0.9.1b.jar"
todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
<copy
file="${basedir}/lib/repository/perfsonar/perfsonar-rrd-ma/3.1/perfsonar-rrd-ma-3.1.jar"
todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
<copy
file="${basedir}/lib/repository/nmwg/nmwg/1.0.20080630/nmwg-1.0.20080630.jar"

todir="${service.home}/${deploy.root}/WEB-INF/lib"/>

@@ -288,8 +288,8 @@

<copy file="${basedir}/${build}/${jarfilename}-${version}.jar"
todir="${tmpdir}/WEB-INF/lib"/>

- <copy
file="${basedir}/lib/repository/perfsonar/perfsonar-base/1.0.20080822/perfsonar-base-1.0.20080822.jar"
todir="${tmpdir}/WEB-INF/lib"/>
- <copy
file="${basedir}/lib/repository/perfsonar/perfsonar-web-admin/0.9.1b/perfsonar-web-admin-0.9.1b.jar"
todir="${tmpdir}/WEB-INF/lib"/>
+ <copy
file="${basedir}/lib/repository/perfsonar/perfsonar-base/1.0.20080901/perfsonar-base-1.0.20080901.jar"
todir="${tmpdir}/WEB-INF/lib"/>
+ <copy
file="${basedir}/lib/repository/perfsonar/perfsonar-web-admin/0.9.1b/perfsonar-web-admin-0.9.1b.jar"
todir="${tmpdir}/WEB-INF/lib"/>
<copy
file="${basedir}/lib/repository/perfsonar/perfsonar-rrd-ma/3.1/perfsonar-rrd-ma-3.1.jar"
todir="${tmpdir}/WEB-INF/lib"/>
<copy
file="${basedir}/lib/repository/nmwg/nmwg/1.0.20080630/nmwg-1.0.20080630.jar"
todir="${tmpdir}/WEB-INF/lib"/>


Modified: branches/GEANT2-JAVA-SQL-MA-STABLE/ant/libs-download-targets.xml
===================================================================
--- branches/GEANT2-JAVA-SQL-MA-STABLE/ant/libs-download-targets.xml
2008-09-01 11:00:29 UTC (rev 4424)
+++ branches/GEANT2-JAVA-SQL-MA-STABLE/ant/libs-download-targets.xml
2008-09-01 11:18:10 UTC (rev 4425)
@@ -54,7 +54,7 @@

<artifact:dependencies>

- <dependency groupId="perfsonar" artifactId="perfsonar-base"
version="1.0.20080822"/>
+ <dependency groupId="perfsonar" artifactId="perfsonar-base"
version="1.0.20080901"/>
<dependency groupId="perfsonar" artifactId="perfsonar-web-admin"
version="0.9.1b"/>
<dependency groupId="perfsonar" artifactId="perfsonar-rrd-ma"
version="3.1"/>
<dependency groupId="nmwg" artifactId="nmwg"
version="1.0.20080630"/>

Modified: branches/GEANT2-JAVA-SQL-MA-STABLE/ant/webapp-package-targets.xml
===================================================================
--- branches/GEANT2-JAVA-SQL-MA-STABLE/ant/webapp-package-targets.xml
2008-09-01 11:00:29 UTC (rev 4424)
+++ branches/GEANT2-JAVA-SQL-MA-STABLE/ant/webapp-package-targets.xml
2008-09-01 11:18:10 UTC (rev 4425)
@@ -80,8 +80,8 @@

<!-- copy jar files -->
<copy file="${basedir}/${build}/${jarfilename}-${version}.jar"
todir="${tmpdir}/WEB-INF/lib"/>
- <copy
file="${basedir}/lib/repository/perfsonar/perfsonar-base/1.0.20080822/perfsonar-base-1.0.20080822.jar"
todir="${tmpdir}/WEB-INF/lib"/>
- <copy
file="${basedir}/lib/repository/perfsonar/perfsonar-web-admin/0.9.1b/perfsonar-web-admin-0.9.1b.jar"
todir="${tmpdir}/WEB-INF/lib"/>
+ <copy
file="${basedir}/lib/repository/perfsonar/perfsonar-base/1.0.20080901/perfsonar-base-1.0.20080901.jar"
todir="${tmpdir}/WEB-INF/lib"/>
+ <copy
file="${basedir}/lib/repository/perfsonar/perfsonar-web-admin/0.9.1b/perfsonar-web-admin-0.9.1b.jar"
todir="${tmpdir}/WEB-INF/lib"/>
<copy
file="${basedir}/lib/repository/perfsonar/perfsonar-rrd-ma/3.1/perfsonar-rrd-ma-3.1.jar"
todir="${tmpdir}/WEB-INF/lib"/>
<copy
file="${basedir}/lib/repository/nmwg/nmwg/1.0.20080630/nmwg-1.0.20080630.jar"
todir="${tmpdir}/WEB-INF/lib"/>
<copy
file="${basedir}/lib/repository/rrdjtool/rrdjtool/1.0/rrdjtool-1.0.jar"
todir="${tmpdir}/WEB-INF/lib"/>

Modified: branches/GEANT2-JAVA-SQL-MA-STABLE/pom.xml
===================================================================
--- branches/GEANT2-JAVA-SQL-MA-STABLE/pom.xml 2008-09-01 11:00:29 UTC (rev
4424)
+++ branches/GEANT2-JAVA-SQL-MA-STABLE/pom.xml 2008-09-01 11:18:10 UTC (rev
4425)
@@ -128,7 +128,7 @@
<dependency>
<groupId>perfsonar</groupId>
<artifactId>perfsonar-base</artifactId>
- <version>1.0.20080822</version>
+ <version>1.0.20080901</version>
</dependency>
<dependency>
<groupId>perfsonar</groupId>

Modified:
branches/GEANT2-JAVA-SQL-MA-STABLE/src/main/java/org/perfsonar/service/measurementArchive/sqlType/store/L2PathStatusStoreRequestProcess.java
===================================================================
---
branches/GEANT2-JAVA-SQL-MA-STABLE/src/main/java/org/perfsonar/service/measurementArchive/sqlType/store/L2PathStatusStoreRequestProcess.java
2008-09-01 11:00:29 UTC (rev 4424)
+++
branches/GEANT2-JAVA-SQL-MA-STABLE/src/main/java/org/perfsonar/service/measurementArchive/sqlType/store/L2PathStatusStoreRequestProcess.java
2008-09-01 11:18:10 UTC (rev 4425)
@@ -11,6 +11,7 @@
import org.ggf.ns.nmwg.base.v2_0.Element;
import org.ggf.ns.nmwg.event.status.base.v2_0.Datum;

+import org.perfsonar.base.util.TimeDateUtil;
import org.perfsonar.base.exceptions.PerfSONARException;

/**
@@ -40,7 +41,32 @@

public Map prepareStoreParameters(Element datum, Map ibatisParams) {

+ String timeType = ((Datum)datum).getTimeType();
String timeValue = ((Datum)datum).getTimeValue();
+
+ if (timeType == null) {
+ handleUnixTimeValue(timeValue, ibatisParams);
+ } else if (timeType.trim().equalsIgnoreCase("iso")) {
+ handleIsoTimeValue(timeValue, ibatisParams);
+ } else if (timeType.trim().equalsIgnoreCase("unix")) {
+ handleUnixTimeValue(timeValue, ibatisParams);
+ } else if (timeType.trim().equals("")) {
+ handleUnixTimeValue(timeValue, ibatisParams);
+ } else
+ handleUnixTimeValue(timeValue, ibatisParams);
+
+ String stateAdmin = ((Datum)datum).getStateAdmin().getStateAdmin();
+ String stateOper = ((Datum)datum).getStateOper().getStateOper();
+
+ ibatisParams.put("stateAdmin", stateAdmin);
+ ibatisParams.put("stateOper", stateOper);
+
+ return ibatisParams;
+
+ }
+
+ protected void handleUnixTimeValue(String timeValue, Map ibatisParams) {
+
int timeValueInt;
if (timeValue.equals("")) {
timeValueInt = (int)((new Date()).getTime() / 1000);
@@ -49,14 +75,20 @@
ibatisParams.put("timeValue", Integer.parseInt(timeValue));
}

- String stateAdmin = ((Datum)datum).getStateAdmin().getStateAdmin();
- String stateOper = ((Datum)datum).getStateOper().getStateOper();
+ }

- ibatisParams.put("stateAdmin", stateAdmin);
- ibatisParams.put("stateOper", stateOper);

- return ibatisParams;
+ protected void handleIsoTimeValue(String timeValue, Map ibatisParams) {

+ try {
+
+ long timeValueLong = TimeDateUtil.getUnixTime(timeValue);
+ ibatisParams.put("timeValue", (int)timeValueLong);
+
+ } catch (Exception ex) {
+ ;
+ }
+
}




  • perfsonar: r4425 - in branches/GEANT2-JAVA-SQL-MA-STABLE: . ant src/main/java/org/perfsonar/service/measurementArchive/sqlType/store, svnlog, 09/01/2008

Archive powered by MHonArc 2.6.16.

Top of Page