Skip to Content.
Sympa Menu

perfsonar-dev - [pS-dev] [GEANT/SA2/ps-java-services] r6427 - in branches/perfsonar-java-rrd-ma-stable-3.3.1-1: . samples/metadata_configuration_files

Subject: perfsonar development work

List archive

[pS-dev] [GEANT/SA2/ps-java-services] r6427 - in branches/perfsonar-java-rrd-ma-stable-3.3.1-1: . samples/metadata_configuration_files


Chronological Thread 
  • From:
  • To:
  • Subject: [pS-dev] [GEANT/SA2/ps-java-services] r6427 - in branches/perfsonar-java-rrd-ma-stable-3.3.1-1: . samples/metadata_configuration_files
  • Date: Tue, 28 May 2013 18:29:51 +0100 (BST)
  • Authentication-results: sfpop-ironport05.merit.edu; dkim=neutral (message not signed) header.i=none
Author: dante.delvaux
Date: 2013-05-28 18:29:51 +0100 (Tue, 28 May 2013)
New Revision: 6427

Modified:
branches/perfsonar-java-rrd-ma-stable-3.3.1-1/
branches/perfsonar-java-rrd-ma-stable-3.3.1-1/pom.xml

branches/perfsonar-java-rrd-ma-stable-3.3.1-1/samples/metadata_configuration_files/rrd_database_test.xml
Log:
RRD MA 3.3.1 stable branch: copying what was left from trunk.


Property changes on: branches/perfsonar-java-rrd-ma-stable-3.3.1-1
___________________________________________________________________
Added: svn:ignore
+ .project


Modified: branches/perfsonar-java-rrd-ma-stable-3.3.1-1/pom.xml
===================================================================
--- branches/perfsonar-java-rrd-ma-stable-3.3.1-1/pom.xml 2013-05-28
16:34:30 UTC (rev 6426)
+++ branches/perfsonar-java-rrd-ma-stable-3.3.1-1/pom.xml 2013-05-28
17:29:51 UTC (rev 6427)
@@ -15,7 +15,7 @@

<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>>
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>

<properties>
<configurationFile>configuration-ma.xml</configurationFile>
@@ -176,37 +176,35 @@

</build>

- <repositories>
- <repository>
- <id>ibiblio</id>
- <name>ibiblio repository</name>
- <url>http://www.ibiblio.org/maven2</url>
- </repository>
- <repository>
- <id>personar</id>
- <name>personar repository</name>
-
<url>http://svn.geant.net/GEANT/SA2/ps-java-services/trunk/jar-repository</url>
- </repository>
- <repository>
- <id>personar_leg</id>
- <name>personar repository</name>
-
<url>http://svn.geant.net/GEANT/SA2/ps-java-services/trunk/jar-repository</url>
- <layout>legacy</layout>
- </repository>
- <repository>
- <id>codehaus-release-repo</id>
- <name>Codehaus Release Repo</name>
- <url>http://repository.codehaus.org</url>
- </repository>
- <repository>
- <id>geant-repository</id>
- <name>perfSONAR repository</name>
- <url>http://maven.geant.net/repo</url>
- </repository>
+ <repositories>
+ <repository>
+ <id>ibiblio</id>
+ <name>ibiblio repository</name>
+ <url>http://mirrors.ibiblio.org/pub/mirrors/maven2/</url>
+ </repository>
+ <repository>
+ <id>personar</id>
+ <name>personar repository</name>
+
<url>http://svn.geant.net/GEANT/SA2/ps-java-services/trunk/jar-repository</url>
+ </repository>
+ <repository>
+ <id>codehaus-release-repo</id>
+ <name>Codehaus Release Repo</name>
+ <url>http://repository.codehaus.org</url>
+ </repository>
+ <repository>
+ <id>geant-repository</id>
+ <name>perfSONAR repository</name>
+ <url>https://artifactory.geant.net/artifactory/geant-repo/</url>
+ </repository>
+ <repository>
+ <id>jboss-repository</id>
+ <name>jboss repository</name>
+
<url>http://repository.jboss.org/nexus/content/groups/public-jboss/</url>
+ </repository>
+ </repositories>

- </repositories>

-
<distributionManagement>
<repository>
<id>geant-developers-repository</id>
@@ -221,7 +219,7 @@
<dependency>
<groupId>net.geant.perfsonar</groupId>
<artifactId>ps-mdm-base2</artifactId>
- <version>1.0.5</version>
+ <version>1.0.6</version>
</dependency>
<dependency>
<groupId>rrdjtool</groupId>
@@ -279,6 +277,20 @@
<groupId>org.apache.rampart</groupId>
<artifactId>rampart-core</artifactId>
<version>1.4</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>opensaml</artifactId>
+ <groupId>opensaml</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>bcprov-jdk13</artifactId>
+ <groupId>bouncycastle</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>xmlsec</artifactId>
+ <groupId>org.apache.santuario</groupId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>xerces</groupId>

Modified:
branches/perfsonar-java-rrd-ma-stable-3.3.1-1/samples/metadata_configuration_files/rrd_database_test.xml
===================================================================
---
branches/perfsonar-java-rrd-ma-stable-3.3.1-1/samples/metadata_configuration_files/rrd_database_test.xml
2013-05-28 16:34:30 UTC (rev 6426)
+++
branches/perfsonar-java-rrd-ma-stable-3.3.1-1/samples/metadata_configuration_files/rrd_database_test.xml
2013-05-28 17:29:51 UTC (rev 6427)
@@ -31,7 +31,7 @@
<nmwg:data id="data1" metadataIdRef="meta1">
<nmwg:key>
<nmwg:parameters>
- <nmwg:parameter
name="file">/usr/lib/perfsonar/services/ps-mdm-rrd-ma/WEB-INF/samples/rrd/test.rrd</nmwg:parameter>
+ <nmwg:parameter
name="file">/usr/lib/perfsonar/services/perfsonar-java-rrd-ma/WEB-INF/samples/rrd/test.rrd</nmwg:parameter>
<nmwg:parameter name="dataSource">inoctets</nmwg:parameter>
<nmwg:parameter name="valueUnits">Bps</nmwg:parameter>

@@ -70,7 +70,7 @@
<nmwg:data id="data2" metadataIdRef="meta2">
<nmwg:key>
<nmwg:parameters>
- <nmwg:parameter
name="file">/usr/lib/perfsonar/services/ps-mdm-rrd-ma/WEB-INF/samples/rrd/test.rrd</nmwg:parameter>
+ <nmwg:parameter
name="file">/usr/lib/perfsonar/services/perfsonar-java-rrd-ma/WEB-INF/samples/rrd/test.rrd</nmwg:parameter>
<nmwg:parameter name="dataSource">outoctets</nmwg:parameter>
<nmwg:parameter name="valueUnits">Bps</nmwg:parameter>

@@ -112,7 +112,7 @@
<nmwg:data id="data3" metadataIdRef="meta3">
<nmwg:key>
<nmwg:parameters>
- <nmwg:parameter
name="file">/usr/lib/perfsonar/services/ps-mdm-rrd-ma/WEB-INF/samples/rrd/test.rrd</nmwg:parameter>
+ <nmwg:parameter
name="file">/usr/lib/perfsonar/services/perfsonar-java-rrd-ma/WEB-INF/samples/rrd/test.rrd</nmwg:parameter>
<nmwg:parameter name="dataSource">inerrors</nmwg:parameter>
<nmwg:parameter name="valueUnits">Eps</nmwg:parameter>

@@ -154,7 +154,7 @@
<nmwg:data id="data4" metadataIdRef="meta4">
<nmwg:key>
<nmwg:parameters>
- <nmwg:parameter
name="file">/usr/lib/perfsonar/services/ps-mdm-rrd-ma/WEB-INF/samples/rrd/test.rrd</nmwg:parameter>
+ <nmwg:parameter
name="file">/usr/lib/perfsonar/services/perfsonar-java-rrd-ma/WEB-INF/samples/rrd/test.rrd</nmwg:parameter>
<nmwg:parameter name="dataSource">indiscards</nmwg:parameter>
<nmwg:parameter name="valueUnits">Dps</nmwg:parameter>

@@ -172,4 +172,4 @@
</nmwg:data>


-</nmwg:store>
\ No newline at end of file
+</nmwg:store>


  • [pS-dev] [GEANT/SA2/ps-java-services] r6427 - in branches/perfsonar-java-rrd-ma-stable-3.3.1-1: . samples/metadata_configuration_files, svn-noreply, 05/28/2013

Archive powered by MHonArc 2.6.16.

Top of Page