Skip to Content.
Sympa Menu

perfsonar-dev - perfsonar: r5063 - in branches/new-structure-with-base2/ps-mdm-rrd-ma: . conf

Subject: perfsonar development work

List archive

perfsonar: r5063 - in branches/new-structure-with-base2/ps-mdm-rrd-ma: . conf


Chronological Thread 
  • From:
  • To:
  • Subject: perfsonar: r5063 - in branches/new-structure-with-base2/ps-mdm-rrd-ma: . conf
  • Date: Thu, 12 Mar 2009 13:09:05 -0400
Author: rodriguez
Date: 2009-03-12 13:09:04 -0400 (Thu, 12 Mar 2009)
New Revision: 5063

Modified:
branches/new-structure-with-base2/ps-mdm-rrd-ma/conf/configuration-ma.xml
branches/new-structure-with-base2/ps-mdm-rrd-ma/pom.xml
Log:
- Adding support for authN/authR component

Modified:
branches/new-structure-with-base2/ps-mdm-rrd-ma/conf/configuration-ma.xml
===================================================================
--- branches/new-structure-with-base2/ps-mdm-rrd-ma/conf/configuration-ma.xml
2009-03-12 15:12:20 UTC (rev 5062)
+++ branches/new-structure-with-base2/ps-mdm-rrd-ma/conf/configuration-ma.xml
2009-03-12 17:09:04 UTC (rev 5063)
@@ -30,24 +30,24 @@
<message type="EchoRequest"

handler="org.perfsonar.base2.service.messages.GenericMessageHandler">
<!--
- <option name="ServiceEngine"
+ <option name="ServiceEngine"

value="org.perfsonar.base2.service.requesthandler.EchoServiceEngine" />
-->
- <option name="ServiceEngine"
+ <option name="ServiceEngine"

value="org.perfsonar.service.measurementArchive.rrdType.EchoServiceEngine" />
<option name="authN" value="no" />
</message>

<message type="MetadataKeyRequest"

handler="org.perfsonar.base2.service.messages.GenericMessageHandler">
- <option name="ServiceEngine"
+ <option name="ServiceEngine"

value="org.perfsonar.service.measurementArchive.rrdType.MetadataKeyServiceEngine"
/>
<option name="authN" value="no" />
</message>

<message type="SetupDataRequest"

handler="org.perfsonar.base2.service.messages.GenericMessageHandler">
- <option name="ServiceEngine"
+ <option name="ServiceEngine"

value="org.perfsonar.service.measurementArchive.rrdType.SetupDataServiceEngine"
/>
<option name="authN" value="no" />
</message>
@@ -62,7 +62,7 @@

<component name="exist"

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

value="org.perfsonar.base2.service.storage.xml.exist.ExistHTTPDataStorage"/>
<option name="uri"
value="http://localhost:8180/exist/rest/db/rrdmaconfig"/>
<option name="username" value="rrdmaservice"/>
@@ -95,13 +95,13 @@

</component>

- <component name="metadataStorageDAO"
+ <component name="metadataStorageDAO"

className="org.perfsonar.service.measurementArchive.rrdType.storage.exist.ExistMetadataStorageDAOImpl">
<option name="exist-config" value="exist"/> <!-- reference to eXist
DB XML component config-->
<option name="queryGeneratorManager-config"
value="queryGeneratorManager"/> <!-- reference to queryGeneratorManager
component config-->
</component>

- <component name="dataStorageDAO"
+ <component name="dataStorageDAO"

className="org.perfsonar.service.measurementArchive.rrdType.storage.rrd.RRDDataStorageDAOImpl">
<option
name="eventType::http://ggf.org/ns/nmwg/characteristic/utilization/2.0";

value="org.perfsonar.service.measurementArchive.rrdType.storage.rrd.UtilizationResponseGenerator"/>
@@ -146,6 +146,13 @@
</actions>
</component>

+ <!-- auth configuration -->
+ <!-- <component name="auth"
+
className="org.perfsonar.base2.service.authn.component.wssec.WSSecAuthNComponent">
+ <option name="as_endpoint"
value="http://homer.rediris.es:8080/geant2-java-as-1.2/services/SimpleService"/>
+ <option name="comp_id" value="urn:compId"/>
+ </component> -->
+
</auxiliaryComponents>


@@ -169,37 +176,37 @@

<!-- default mapping -->
<element name="*"
- mapping="org.perfsonar.base2.xml.Element"/>
+ mapping="org.perfsonar.base2.xml.Element"/>

<!-- general mappings -->
- <element name="{http://ggf.org/ns/nmwg/base/2.0/}message";
+ <element name="{http://ggf.org/ns/nmwg/base/2.0/}message";
mapping="org.perfsonar.base2.xml.nmwg.Message"/>
- <element name="{http://ggf.org/ns/nmwg/base/2.0/}metadata";
+ <element name="{http://ggf.org/ns/nmwg/base/2.0/}metadata";
mapping="org.perfsonar.base2.xml.nmwg.Metadata"/>
- <element name="{http://ggf.org/ns/nmwg/base/2.0/}eventType";
+ <element name="{http://ggf.org/ns/nmwg/base/2.0/}eventType";
mapping="org.perfsonar.base2.xml.nmwg.EventType"/>
- <element name="{http://ggf.org/ns/nmwg/base/2.0/}data";
+ <element name="{http://ggf.org/ns/nmwg/base/2.0/}data";
mapping="org.perfsonar.base2.xml.nmwg.Data"/>
- <element name="{http://ggf.org/ns/nmwg/base/2.0/}parameters";
+ <element name="{http://ggf.org/ns/nmwg/base/2.0/}parameters";
mapping="org.perfsonar.base2.xml.nmwg.Parameters"/>
- <element name="{http://ggf.org/ns/nmwg/base/2.0/}parameter";
+ <element name="{http://ggf.org/ns/nmwg/base/2.0/}parameter";
mapping="org.perfsonar.base2.xml.nmwg.Parameter"/>
- <element name="{http://ggf.org/ns/nmwg/base/2.0/}key";
+ <element name="{http://ggf.org/ns/nmwg/base/2.0/}key";
mapping="org.perfsonar.base2.xml.nmwg.Key"/>

- <element name="{http://ggf.org/ns/nmwg/base/2.0/}subject";
+ <element name="{http://ggf.org/ns/nmwg/base/2.0/}subject";
mapping="org.perfsonar.base2.xml.nmwg.Subject"/>
- <element
name="{http://ggf.org/ns/nmwg/characteristic/utilization/2.0/}subject";
+ <element
name="{http://ggf.org/ns/nmwg/characteristic/utilization/2.0/}subject";
mapping="org.perfsonar.base2.xml.nmwg.Subject"/>
- <element
name="{http://ggf.org/ns/nmwg/characteristic/errors/2.0/}subject";
+ <element
name="{http://ggf.org/ns/nmwg/characteristic/errors/2.0/}subject";
mapping="org.perfsonar.base2.xml.nmwg.Subject"/>
- <element
name="{http://ggf.org/ns/nmwg/characteristic/discards/2.0/}subject";
+ <element
name="{http://ggf.org/ns/nmwg/characteristic/discards/2.0/}subject";
mapping="org.perfsonar.base2.xml.nmwg.Subject"/>
- <element name="{http://ggf.org/ns/nmwg/ops/select/2.0/}subject";
+ <element name="{http://ggf.org/ns/nmwg/ops/select/2.0/}subject";
mapping="org.perfsonar.base2.xml.nmwg.Subject"/>
- <element name="{http://ggf.org/ns/nmwg/ops/select/2.0/}parameters";
+ <element name="{http://ggf.org/ns/nmwg/ops/select/2.0/}parameters";
mapping="org.perfsonar.base2.xml.nmwg.Parameters"/>
- <element name="{http://ggf.org/ns/nmwg/time/2.0/}time";
+ <element name="{http://ggf.org/ns/nmwg/time/2.0/}time";
mapping="org.perfsonar.base2.xml.Element"/>

</protocolMappings>

Modified: branches/new-structure-with-base2/ps-mdm-rrd-ma/pom.xml
===================================================================
--- branches/new-structure-with-base2/ps-mdm-rrd-ma/pom.xml 2009-03-12
15:12:20 UTC (rev 5062)
+++ branches/new-structure-with-base2/ps-mdm-rrd-ma/pom.xml 2009-03-12
17:09:04 UTC (rev 5063)
@@ -31,7 +31,7 @@
<description>Round Robin Database Measurement Archive for
perfSONAR. For more information see the
wiki-page.</description>

<url>http://wiki.perfsonar.net/jra1-wiki/index.php/PerfSONAR_Java_RRD_MA_release_candidate</url>
-
+
<issueManagement>
<system>bugzilla</system>
<url>http://bugzilla.perfsonar.net</url>
@@ -80,11 +80,6 @@
<copy file="${basedir}/conf/base2/configuration-rules.xml"
todir="${basedir}/conf/tmp"/>
<copy file="${basedir}/conf/${configurationFile}"
todir="${basedir}/conf/tmp"/>
<move file="${basedir}/conf/tmp/${configurationFile}"
tofile="${basedir}/conf/tmp/configuration.xml"/>
- <!--
- <copy file="${basedir}/conf/as/perfSONARtruststore.jks"
todir="${basedir}/conf/tmp"/>
- <copy file="${basedir}/conf/as/ASValidComponentsFile"
todir="${basedir}/conf/tmp"/>
- <copy file="${basedir}/conf/as/basic_policy.xml"
todir="${basedir}/conf/tmp"/>
- -->
</tasks>
</configuration>
<goals>
@@ -231,7 +226,6 @@
</dependency>

<!-- got for auth -->
- <!--
<dependency>
<groupId>opensaml</groupId>
<artifactId>opensaml1</artifactId>
@@ -250,7 +244,7 @@
<dependency>
<groupId>edugain</groupId>
<artifactId>edugain</artifactId>
- <version>0.7alpha</version>
+ <version>1.0-RC2</version>
</dependency>
<dependency>
<groupId>perfsonar</groupId>
@@ -258,31 +252,6 @@
<version>0.5</version>
</dependency>
<dependency>
- <groupId>sasl-ca</groupId>
- <artifactId>sasl-ca</artifactId>
- <version>1.0</version>
- </dependency>
- <dependency>
- <groupId>codec</groupId>
- <artifactId>codec</artifactId>
- <version>1.0</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>1.0.1</version>
- </dependency>
- <dependency>
- <groupId>opensaml</groupId>
- <artifactId>opensaml</artifactId>
- <version>2.0-TP2-jdk-1.5</version>
- </dependency>
- <dependency>
- <groupId>xmltooling</groupId>
- <artifactId>xmltooling</artifactId>
- <version>1.0-TP2-jdk-1.5</version>
- </dependency>
- <dependency>
<groupId>wss4j</groupId>
<artifactId>wss4j</artifactId>
<version>1.5.1</version>
@@ -317,7 +286,6 @@
<artifactId>sunxacml</artifactId>
<version>1.2</version>
</dependency>
- -->

</dependencies>



  • perfsonar: r5063 - in branches/new-structure-with-base2/ps-mdm-rrd-ma: . conf, svnlog, 03/12/2009

Archive powered by MHonArc 2.6.16.

Top of Page