perfsonar-dev - perfsonar: r4892 - in branches/simple-service-with-base2: conf src/main/java/org/perfsonar/base2/service/registration
Subject: perfsonar development work
List archive
perfsonar: r4892 - in branches/simple-service-with-base2: conf src/main/java/org/perfsonar/base2/service/registration
Chronological Thread
- From:
- To:
- Subject: perfsonar: r4892 - in branches/simple-service-with-base2: conf src/main/java/org/perfsonar/base2/service/registration
- Date: Mon, 19 Jan 2009 08:38:44 -0500
Author: roman
Date: 2009-01-19 08:38:44 -0500 (Mon, 19 Jan 2009)
New Revision: 4892
Added:
branches/simple-service-with-base2/src/main/java/org/perfsonar/base2/service/registration/DumbRegisterDataSource.java
Modified:
branches/simple-service-with-base2/conf/configuration-ma.xml
branches/simple-service-with-base2/conf/configuration-rules.xml
branches/simple-service-with-base2/src/main/java/org/perfsonar/base2/service/registration/GenericLSRegistrator.java
Log:
Modified: branches/simple-service-with-base2/conf/configuration-ma.xml
===================================================================
--- branches/simple-service-with-base2/conf/configuration-ma.xml
2009-01-19 12:25:41 UTC (rev 4891)
+++ branches/simple-service-with-base2/conf/configuration-ma.xml
2009-01-19 13:38:44 UTC (rev 4892)
@@ -55,14 +55,16 @@
<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://localhost:8090/exist/rest/db/rrdmaconfig"/>
+ <option name="uri"
value="http://vaja.man.poznan.pl:8090/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">
@@ -98,21 +100,24 @@
value="org.perfsonar.base2.service.scheduler.SimpleScheduler"/>
<option name="interval" value="5000"/>
<actions>
+ <!--
<action name="test1"
className="org.perfsonar.base2.service.scheduler.SimpleAction">
<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>
@@ -120,23 +125,22 @@
<option name ="lsAddress-5"></option>
<option name ="lsAddress-6"></option>
-->
- <!--
</action>
- -->
+
</actions>
</component>
</auxiliaryComponents>
- <!--
+
<extension name="registerDataSource">
<option name="exist-config" value="exist"/>
</extension>
- -->
+
<!--
....................................................................................
-->
<!-- Protocol mappings, XML elements and their bingings -->
Modified: branches/simple-service-with-base2/conf/configuration-rules.xml
===================================================================
--- branches/simple-service-with-base2/conf/configuration-rules.xml
2009-01-19 12:25:41 UTC (rev 4891)
+++ branches/simple-service-with-base2/conf/configuration-rules.xml
2009-01-19 13:38:44 UTC (rev 4892)
@@ -133,6 +133,19 @@
</pattern>
+ <pattern
value="configuration/service/auxiliaryComponents/component/actions/action/option">
+ <object-create-rule
+ classname="org.perfsonar.base2.service.configuration.Option" />
+ <set-properties-rule>
+ <alias attr-name="name" prop-name="name"/>
+ </set-properties-rule>
+ <set-properties-rule>
+ <alias attr-name="value" prop-name="value"/>
+ </set-properties-rule>
+ <set-next-rule methodname="addOption" />
+ </pattern>
+
+
<!-- protocolMappings -->
<pattern value="configuration/service/protocolMappings">
Added:
branches/simple-service-with-base2/src/main/java/org/perfsonar/base2/service/registration/DumbRegisterDataSource.java
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-19 12:25:41 UTC (rev 4891)
+++
branches/simple-service-with-base2/src/main/java/org/perfsonar/base2/service/registration/GenericLSRegistrator.java
2009-01-19 13:38:44 UTC (rev 4892)
@@ -67,9 +67,12 @@
Client client = new Axis2Client();
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());
+
}
return serviceResponseMessage;
@@ -100,7 +103,7 @@
subject.setId("commonParameters");
metadata.setSubject(subject);
- Element service = new Element("service", "perfsonar",
NMWGNamespaceFactory.getNamespace("perfsonar"));
+ Element service = new Element("service", "psservice",
NMWGNamespaceFactory.getNamespace("psservice"));
service.setId("serviceParameters");
subject.addChild(service);
@@ -113,14 +116,12 @@
}
+ /*
Data data = new Data();
- //Element data = new Element("data", "nmwg",
NMWGNamespaceFactory.getNamespace("nmwg"));
data.setMetadataIdRef(metadata.getId());
- //data.addAttribute("metadataIdRef", metadata.getId());
message.setData(data);
- //message.addChild(data);
+ */
-/*
Data data = null;
Message msg = (Message)dataSource.getRegisterData().getElement();
Collection<Metadata> c = msg.getMetadataCollection();
@@ -130,7 +131,7 @@
data.addChild(m);
message.setData(data);
}
-*/
+
return serviceMessage;
}
- perfsonar: r4892 - in branches/simple-service-with-base2: conf src/main/java/org/perfsonar/base2/service/registration, svnlog, 01/19/2009
Archive powered by MHonArc 2.6.16.