Skip to Content.
Sympa Menu

perfsonar-dev - perfsonar: r4901 - in branches/simple-service-with-base2: . conf src/main/java/org/perfsonar/base2/service/registration src/main/java/org/perfsonar/base2/xml/nmwg

Subject: perfsonar development work

List archive

perfsonar: r4901 - in branches/simple-service-with-base2: . conf src/main/java/org/perfsonar/base2/service/registration src/main/java/org/perfsonar/base2/xml/nmwg


Chronological Thread 
  • From:
  • To:
  • Subject: perfsonar: r4901 - in branches/simple-service-with-base2: . conf src/main/java/org/perfsonar/base2/service/registration src/main/java/org/perfsonar/base2/xml/nmwg
  • Date: Thu, 22 Jan 2009 07:41:39 -0500
Author: roman
Date: 2009-01-22 07:41:38 -0500 (Thu, 22 Jan 2009)
New Revision: 4901

Modified:
branches/simple-service-with-base2/conf/configuration-ma.xml
branches/simple-service-with-base2/pom.xml

branches/simple-service-with-base2/src/main/java/org/perfsonar/base2/service/registration/DumbRegisterDataSource.java

branches/simple-service-with-base2/src/main/java/org/perfsonar/base2/service/registration/GenericLSRegistrator.java

branches/simple-service-with-base2/src/main/java/org/perfsonar/base2/service/registration/LSRegistrationAction.java

branches/simple-service-with-base2/src/main/java/org/perfsonar/base2/xml/nmwg/NMWGNamespaceFactory.java
Log:


Modified: branches/simple-service-with-base2/conf/configuration-ma.xml
===================================================================
--- branches/simple-service-with-base2/conf/configuration-ma.xml
2009-01-21 15:52:14 UTC (rev 4900)
+++ branches/simple-service-with-base2/conf/configuration-ma.xml
2009-01-22 12:41:38 UTC (rev 4901)
@@ -14,9 +14,9 @@

<lookupInformation>

- <option name="accessPoint"
value="http://localhost:8080/axis2/services/SimpleService"/>
- <option name="name" value="perfSONAR Java RRD MA"/>
- <option name="type" value="MeasurementArchive"/>
+ <option name="accessPoint"
value="http://localhost:8180/axis2/services/SimpleService"/>
+ <option name="serviceName" value="perfSONAR Java RRD MA"/>
+ <option name="serviceType" value="MeasurementArchive"/>

</lookupInformation>

@@ -55,16 +55,14 @@

<auxiliaryComponents>

- <!--
<component name="exist"

className="org.perfsonar.base2.service.storage.xml.XMLDBComponent">
<option name="dataStorageClassName"

value="org.perfsonar.base2.service.storage.xml.exist.ExistHTTPDataStorage"/>
- <option name="uri"
value="http://vaja.man.poznan.pl:8090/exist/rest/db/rrdmaconfig"/>
+ <option name="uri"
value="http://localhost:8180/exist/rest/db/rrdmaconfig"/>
<option name="username" value="rrdmaservice"/>
<option name="password" value="rrdmaservice"/>
</component>
- -->

<component name="queryGeneratorManager"

className="org.perfsonar.service.measurementArchive.rrdType.storage.exist.QueryGeneratorManager">
@@ -105,26 +103,26 @@
<option name="xxx">yyyy</option>
</action>
<action name="test2"
className="org.perfsonar.base2.service.scheduler.SimpleAction"/>
- -->
-
+ -->
<action name="registration"
className="org.perfsonar.base2.service.registration.LSRegistrationAction">
- <!--
- <option name="registerDataSource"
-
value="org.perfsonar.base2.service.registration.ExistDBRegisterDataSource"/>
- -->
- <option name="registerDataSource"
-
value="org.perfsonar.base2.service.registration.DumbRegisterDataSource"/>
- <option name="registrator"
-
value="org.perfsonar.base2.service.registration.GenericLSRegistrator"/>
- <option name="lsAddress-1"
-
value="http://test-ls.net:8080/axis2/services/LookupService"/>
- <!--
- <option name ="lsAddress-2"></option>
- <option name ="lsAddress-3"></option>
- <option name ="lsAddress-4"></option>
- <option name ="lsAddress-5"></option>
- <option name ="lsAddress-6"></option>
- -->
+
+ <option name="registerDataSource"
+
value="org.perfsonar.base2.service.registration.ExistDBRegisterDataSource"/>
+ <!--
+ <option name="registerDataSource"
+
value="org.perfsonar.base2.service.registration.DumbRegisterDataSource"/>
+ -->
+ <option name="registrator"
+
value="org.perfsonar.base2.service.registration.GenericLSRegistrator"/>
+ <option name="lsAddress-1"
+
value="http://localhost:8180/geant2-java-xml-ls/services/LookupService"/>
+ <!--
+ <option name ="lsAddress-2"></option>
+ <option name ="lsAddress-3"></option>
+ <option name ="lsAddress-4"></option>
+ <option name ="lsAddress-5"></option>
+ <option name ="lsAddress-6"></option>
+ -->
</action>

</actions>
@@ -135,7 +133,7 @@


<extension name="registerDataSource">
- <option name="exist-config" value="exist"/>
+ <option name="exist-config" value="exist"/>
</extension>



Modified: branches/simple-service-with-base2/pom.xml
===================================================================
--- branches/simple-service-with-base2/pom.xml 2009-01-21 15:52:14 UTC (rev
4900)
+++ branches/simple-service-with-base2/pom.xml 2009-01-22 12:41:38 UTC (rev
4901)
@@ -4,7 +4,7 @@


<properties>
- <configurationFile>configuration-as.xml</configurationFile>
+ <configurationFile>configuration-ma.xml</configurationFile>
<axis2Id>axis2-1.4.1</axis2Id>
</properties>

@@ -136,7 +136,7 @@
</configuration>
</plugin>

- <!-- execution: mvn jetty:run-war -->
+ <!-- execution: mvn -Djetty.port=9999 jetty:run-war -->
<plugin>
<groupId>org.mortbay.jetty</groupId>
<artifactId>maven-jetty-plugin</artifactId>

Modified:
branches/simple-service-with-base2/src/main/java/org/perfsonar/base2/service/registration/DumbRegisterDataSource.java
===================================================================
---
branches/simple-service-with-base2/src/main/java/org/perfsonar/base2/service/registration/DumbRegisterDataSource.java
2009-01-21 15:52:14 UTC (rev 4900)
+++
branches/simple-service-with-base2/src/main/java/org/perfsonar/base2/service/registration/DumbRegisterDataSource.java
2009-01-22 12:41:38 UTC (rev 4901)
@@ -28,7 +28,8 @@
Parameters parameters = new Parameters();

Parameter parameter = new Parameter();
- parameter.setParameter("dumb", "dumb");
+ parameter.setParameter("name", "attr-testing");
+ parameter.setText("val-testing");
parameters.addParameter(parameter);
metadata.addChild(parameters);


Modified:
branches/simple-service-with-base2/src/main/java/org/perfsonar/base2/service/registration/GenericLSRegistrator.java
===================================================================
---
branches/simple-service-with-base2/src/main/java/org/perfsonar/base2/service/registration/GenericLSRegistrator.java
2009-01-21 15:52:14 UTC (rev 4900)
+++
branches/simple-service-with-base2/src/main/java/org/perfsonar/base2/service/registration/GenericLSRegistrator.java
2009-01-22 12:41:38 UTC (rev 4901)
@@ -68,11 +68,11 @@

for (int i = 0; i < lsUrl.length; i++) {

-logger.debug("===========: " + requestElement.toString());
-
responseElement = client.send(lsUrl[i].toString(),
requestElement);
serviceResponseMessage[i] = new
ServiceMessage(responseElement.getCopy());

+ logger.debug("Register request sent to the LS " +
lsUrl[i].toString());
+
}

return serviceResponseMessage;
@@ -90,7 +90,6 @@
serviceMessage.setElement(message);

//metadata
-
Metadata metadata = new Metadata();
metadata.setId("serviceLookupInfo");
message.setMetadata(metadata);

Modified:
branches/simple-service-with-base2/src/main/java/org/perfsonar/base2/service/registration/LSRegistrationAction.java
===================================================================
---
branches/simple-service-with-base2/src/main/java/org/perfsonar/base2/service/registration/LSRegistrationAction.java
2009-01-21 15:52:14 UTC (rev 4900)
+++
branches/simple-service-with-base2/src/main/java/org/perfsonar/base2/service/registration/LSRegistrationAction.java
2009-01-22 12:41:38 UTC (rev 4901)
@@ -25,7 +25,7 @@
// ----------------------------------------------------------- Variables


- //public final String DEFAULT_SERVICE_CONTENT = "XXXXXX";
+ private static final String DEFAULT_REGISTER_DATA_SOURCE =
"org.perfsonar.base2.service.registration.DumbRegisterDataSource";

private static final Logger logger =
Logger.getLogger(LSRegistrationAction.class.getName());

@@ -54,8 +54,6 @@

org.perfsonar.base2.service.requesthandler.ServiceMessage sm[] =
registrator.register();

-logger.debug("+++++++++++sent response: " + sm[0].getElement().toString());
-
} catch (PerfSONARException psex) {

logger.warn(
@@ -70,7 +68,14 @@

protected RegisterDataSource getRegisterDataSource() throws
PerfSONARException {

- String className = getOption("registerDataSource").getValue();
+ String className = DEFAULT_REGISTER_DATA_SOURCE;
+ try {
+ className = getOption("registerDataSource").getValue();
+ if (className == null || className.trim().equals(""))
+ logger.warn("registerDataSource option of register action is
empty");
+ } catch (PerfSONARException pex) {
+ logger.warn("registerDataSource option of register action is
missing");
+ }

RegisterDataSource registerDataSource = null;
try {

Modified:
branches/simple-service-with-base2/src/main/java/org/perfsonar/base2/xml/nmwg/NMWGNamespaceFactory.java
===================================================================
---
branches/simple-service-with-base2/src/main/java/org/perfsonar/base2/xml/nmwg/NMWGNamespaceFactory.java
2009-01-21 15:52:14 UTC (rev 4900)
+++
branches/simple-service-with-base2/src/main/java/org/perfsonar/base2/xml/nmwg/NMWGNamespaceFactory.java
2009-01-22 12:41:38 UTC (rev 4901)
@@ -11,6 +11,8 @@

static {
namespaces.put("nmwg", "http://ggf.org/ns/nmwg/base/2.0/";);
+ namespaces.put("perfsonar",
"http://ggf.org/ns/nmwg/tools/org/perfsonar/1.0/";);
+ namespaces.put("psservice",
"http://ggf.org/ns/nmwg/tools/org/perfsonar/service/1.0/";);
//..........
}



  • perfsonar: r4901 - in branches/simple-service-with-base2: . conf src/main/java/org/perfsonar/base2/service/registration src/main/java/org/perfsonar/base2/xml/nmwg, svnlog, 01/22/2009

Archive powered by MHonArc 2.6.16.

Top of Page