Skip to Content.
Sympa Menu

perfsonar-dev - perfsonar: r3150 - branches/sql-ma-clmp-changes/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator

Subject: perfsonar development work

List archive

perfsonar: r3150 - branches/sql-ma-clmp-changes/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator


Chronological Thread 
  • From:
  • To:
  • Subject: perfsonar: r3150 - branches/sql-ma-clmp-changes/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator
  • Date: Tue, 18 Dec 2007 14:02:31 -0500
Author: fernandes
Date: 2007-12-18 14:02:30 -0500 (Tue, 18 Dec 2007)
New Revision: 3150

Modified:

branches/sql-ma-clmp-changes/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/BwctlQueryGenerator.java

branches/sql-ma-clmp-changes/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/OwampQueryGenerator.java

branches/sql-ma-clmp-changes/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/PingQueryGenerator.java
Log:
correcting imports because of new structure

Modified:
branches/sql-ma-clmp-changes/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/BwctlQueryGenerator.java
===================================================================
---
branches/sql-ma-clmp-changes/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/BwctlQueryGenerator.java
2007-12-18 19:01:13 UTC (rev 3149)
+++
branches/sql-ma-clmp-changes/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/BwctlQueryGenerator.java
2007-12-18 19:02:30 UTC (rev 3150)
@@ -1,26 +1,19 @@
package
org.perfsonar.service.measurementArchive.metadataConfig.queryGenerator;


-import org.perfsonar.commons.auxiliary.AuxiliaryComponentManager;
-import org.perfsonar.commons.auxiliary.ComponentNames;
-import org.perfsonar.commons.auxiliary.components.logger.LoggerComponent;
-
-import org.perfsonar.service.commons.exceptions.SystemException;
-import org.perfsonar.service.commons.exceptions.RequestException;
-
import org.ggf.ns.nmwg.base.v2_0.Message;
-import org.ggf.ns.nmwg.base.v2_0.Metadata;
-import org.ggf.ns.nmwg.base.v2_0.Parameters;
+import org.ggf.ns.nmwg.base.v2_0.Metadata;
import org.ggf.ns.nmwg.base.v2_0.Parameter;
-
+import org.ggf.ns.nmwg.base.v2_0.Parameters;
+import org.ggf.ns.nmwg.tools.bwctl.v2_0.Subject;
import org.ggf.ns.nmwg.topology.v2_0.EndPointPair;
-import org.ggf.ns.nmwg.topology.v2_0.Dst;
-import org.ggf.ns.nmwg.topology.v2_0.Src;
+import org.perfsonar.base.auxiliary.AuxiliaryComponentManager;
+import org.perfsonar.base.auxiliary.ComponentNames;
+import org.perfsonar.base.auxiliary.components.logger.LoggerComponent;
+import org.perfsonar.base.exceptions.PerfSONARException;

-import org.ggf.ns.nmwg.tools.bwctl.v2_0.Subject;


-
/**
* Transforms nmwg message into xquery/xpath
* (query to fetch metadata with bwctl data)
@@ -45,7 +38,7 @@



- public BwctlQueryGenerator() throws SystemException {
+ public BwctlQueryGenerator() throws PerfSONARException {

try {

@@ -53,9 +46,9 @@
AuxiliaryComponentManager.
getInstance().
getComponent(ComponentNames.LOGGER);
- } catch (SystemException e) {
+ } catch (PerfSONARException e) {

- throw new SystemException(
+ throw new PerfSONARException(
"error.common.no_logger",
"BwctlQueryGenerator.constructor: "
+ "Cannot get logger component");
@@ -75,11 +68,11 @@
* stored in Message object.
*/
public String getMetadataQuery(Message query)
- throws SystemException, RequestException {
+ throws PerfSONARException {


if (query == null)
- throw new SystemException(
+ throw new PerfSONARException(
"error.ma.query",
"BwctlQueryGenerator.getMetadataQuery: "
+ "Input message is null");
@@ -99,7 +92,7 @@
logger.error(
"BwctlQueryGenerator.getMetadataQuery: "
+ "Unable to get metadata from the message");
- throw new RequestException(
+ throw new PerfSONARException(
"error.ma.query",
"BwctlQueryGenerator.getMetadataQuery: "
+ "Unable to get metadata from the message; "

Modified:
branches/sql-ma-clmp-changes/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/OwampQueryGenerator.java
===================================================================
---
branches/sql-ma-clmp-changes/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/OwampQueryGenerator.java
2007-12-18 19:01:13 UTC (rev 3149)
+++
branches/sql-ma-clmp-changes/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/OwampQueryGenerator.java
2007-12-18 19:02:30 UTC (rev 3150)
@@ -1,26 +1,19 @@
package
org.perfsonar.service.measurementArchive.metadataConfig.queryGenerator;


-import org.perfsonar.commons.auxiliary.AuxiliaryComponentManager;
-import org.perfsonar.commons.auxiliary.ComponentNames;
-import org.perfsonar.commons.auxiliary.components.logger.LoggerComponent;
-
-import org.perfsonar.service.commons.exceptions.SystemException;
-import org.perfsonar.service.commons.exceptions.RequestException;
-
import org.ggf.ns.nmwg.base.v2_0.Message;
-import org.ggf.ns.nmwg.base.v2_0.Metadata;
-import org.ggf.ns.nmwg.base.v2_0.Parameters;
+import org.ggf.ns.nmwg.base.v2_0.Metadata;
import org.ggf.ns.nmwg.base.v2_0.Parameter;
-
+import org.ggf.ns.nmwg.base.v2_0.Parameters;
+import org.ggf.ns.nmwg.tools.owamp.v2_0.Subject;
import org.ggf.ns.nmwg.topology.v2_0.EndPointPair;
-import org.ggf.ns.nmwg.topology.v2_0.Dst;
-import org.ggf.ns.nmwg.topology.v2_0.Src;
+import org.perfsonar.base.auxiliary.AuxiliaryComponentManager;
+import org.perfsonar.base.auxiliary.ComponentNames;
+import org.perfsonar.base.auxiliary.components.logger.LoggerComponent;
+import org.perfsonar.base.exceptions.PerfSONARException;

-import org.ggf.ns.nmwg.tools.owamp.v2_0.Subject;


-
/**
* Transforms nmwg message into xquery/xpath
* (query to fetch metadata with owamp data)
@@ -45,7 +38,7 @@



- public OwampQueryGenerator() throws SystemException {
+ public OwampQueryGenerator() throws PerfSONARException {

try {

@@ -53,9 +46,9 @@
AuxiliaryComponentManager.
getInstance().
getComponent(ComponentNames.LOGGER);
- } catch (SystemException e) {
+ } catch (PerfSONARException e) {

- throw new SystemException(
+ throw new PerfSONARException(
"error.common.no_logger",
"OwampQueryGenerator.constructor: "
+ "Cannot get logger component");
@@ -75,11 +68,11 @@
* stored in Message object.
*/
public String getMetadataQuery(Message query)
- throws SystemException, RequestException {
+ throws PerfSONARException {


if (query == null)
- throw new SystemException(
+ throw new PerfSONARException(
"error.ma.query",
"OwampQueryGenerator.getMetadataQuery: "
+ "Input message is null");
@@ -98,7 +91,7 @@
logger.error(
"OwampQueryGenerator.getMetadataQuery: "
+ "Unable to get metadata from the message");
- throw new RequestException(
+ throw new PerfSONARException(
"error.ma.query",
"OwampQueryGenerator.getMetadataQuery: "
+ "Unable to get metadata from the message; "

Modified:
branches/sql-ma-clmp-changes/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/PingQueryGenerator.java
===================================================================
---
branches/sql-ma-clmp-changes/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/PingQueryGenerator.java
2007-12-18 19:01:13 UTC (rev 3149)
+++
branches/sql-ma-clmp-changes/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/PingQueryGenerator.java
2007-12-18 19:02:30 UTC (rev 3150)
@@ -7,11 +7,10 @@
import org.ggf.ns.nmwg.base.v2_0.Parameters;
import org.ggf.ns.nmwg.tools.ping.v2_0.Subject;
import org.ggf.ns.nmwg.topology.v2_0.EndPointPair;
-import org.perfsonar.commons.auxiliary.AuxiliaryComponentManager;
-import org.perfsonar.commons.auxiliary.ComponentNames;
-import org.perfsonar.commons.auxiliary.components.logger.LoggerComponent;
-import org.perfsonar.service.commons.exceptions.RequestException;
-import org.perfsonar.service.commons.exceptions.SystemException;
+import org.perfsonar.base.auxiliary.AuxiliaryComponentManager;
+import org.perfsonar.base.auxiliary.ComponentNames;
+import org.perfsonar.base.auxiliary.components.logger.LoggerComponent;
+import org.perfsonar.base.exceptions.PerfSONARException;



@@ -40,7 +39,7 @@



- public PingQueryGenerator() throws SystemException {
+ public PingQueryGenerator() throws PerfSONARException {

try {

@@ -48,9 +47,9 @@
AuxiliaryComponentManager.
getInstance().
getComponent(ComponentNames.LOGGER);
- } catch (SystemException e) {
+ } catch (PerfSONARException e) {

- throw new SystemException(
+ throw new PerfSONARException(
"error.common.no_logger",
"OwampQueryGenerator.constructor: "
+ "Cannot get logger component");
@@ -70,11 +69,11 @@
* stored in Message object.
*/
public String getMetadataQuery(Message query)
- throws SystemException, RequestException {
+ throws PerfSONARException {


if (query == null)
- throw new SystemException(
+ throw new PerfSONARException(
"error.ma.query",
"PingQueryGenerator.getMetadataQuery: "
+ "Input message is null");
@@ -93,7 +92,7 @@
logger.error(
"PingQueryGenerator.getMetadataQuery: "
+ "Unable to get metadata from the message");
- throw new RequestException(
+ throw new PerfSONARException(
"error.ma.query",
"PingQueryGenerator.getMetadataQuery: "
+ "Unable to get metadata from the message; "


  • perfsonar: r3150 - branches/sql-ma-clmp-changes/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator, svnlog, 12/18/2007

Archive powered by MHonArc 2.6.16.

Top of Page