Skip to Content.
Sympa Menu

perfsonar-dev - [pS-dev] [GEANT/SA2/ps-java-services] r6383 - in trunk: parent perfsonar-java-rrd-ma-SQL_backend perfsonar-java-rrd-ma-SQL_backend/src/main/resources/perfsonar/conf perfsonar-java-rrd-ma-SQL_backend/src/test/resources/perfsonar/conf

Subject: perfsonar development work

List archive

[pS-dev] [GEANT/SA2/ps-java-services] r6383 - in trunk: parent perfsonar-java-rrd-ma-SQL_backend perfsonar-java-rrd-ma-SQL_backend/src/main/resources/perfsonar/conf perfsonar-java-rrd-ma-SQL_backend/src/test/resources/perfsonar/conf


Chronological Thread 
  • From:
  • To:
  • Subject: [pS-dev] [GEANT/SA2/ps-java-services] r6383 - in trunk: parent perfsonar-java-rrd-ma-SQL_backend perfsonar-java-rrd-ma-SQL_backend/src/main/resources/perfsonar/conf perfsonar-java-rrd-ma-SQL_backend/src/test/resources/perfsonar/conf
  • Date: Fri, 17 May 2013 14:45:13 +0100 (BST)
  • Authentication-results: sfpop-ironport01.merit.edu; dkim=neutral (message not signed) header.i=none
Author: dante.delvaux
Date: 2013-05-17 14:45:13 +0100 (Fri, 17 May 2013)
New Revision: 6383

Modified:
trunk/parent/pom.xml
trunk/perfsonar-java-rrd-ma-SQL_backend/pom.xml

trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/resources/perfsonar/conf/configuration.xml

trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/resources/perfsonar/conf/webAdminConfig.xml

trunk/perfsonar-java-rrd-ma-SQL_backend/src/test/resources/perfsonar/conf/configuration.xml
Log:
RRD MA: correcting RPM packaging.

Modified: trunk/parent/pom.xml
===================================================================
--- trunk/parent/pom.xml 2013-05-16 17:24:24 UTC (rev 6382)
+++ trunk/parent/pom.xml 2013-05-17 13:45:13 UTC (rev 6383)
@@ -308,6 +308,8 @@
<artifactId>jdeb</artifactId>
<version>1.0.1</version>
<configuration>
+
<deb>[[buildDir]]/[[artifactId]]_[[version]]_all.[[extension]]</deb>
+ <timestamped>true</timestamped>
<verbose>false</verbose>
</configuration>
</plugin>

Modified: trunk/perfsonar-java-rrd-ma-SQL_backend/pom.xml
===================================================================
--- trunk/perfsonar-java-rrd-ma-SQL_backend/pom.xml 2013-05-16 17:24:24
UTC (rev 6382)
+++ trunk/perfsonar-java-rrd-ma-SQL_backend/pom.xml 2013-05-17 13:45:13
UTC (rev 6383)
@@ -242,9 +242,6 @@
<goal>jdeb</goal>
</goals>
<configuration>
-
<deb>[[buildDir]]/${project.artifactId}_[[version]]_all.[[extension]]</deb>
- <timestamped>true</timestamped>
- <verbose>false</verbose>
<dataSet>
<data>

<src>${project.build.directory}/${project.build.finalName}</src>
@@ -335,7 +332,7 @@
<name>${project.artifactId}</name>
<packager>Antoine Delvaux
&lt;&gt;</packager>
<defineStatements>
- <defineStatement>prefix
${installPath}</defineStatement>
+ <defineStatement>prefix
${installPath}/${project.artifactId}</defineStatement>
</defineStatements>
<requires>
<require>jre >= 1.6</require>
@@ -351,7 +348,7 @@

<mappings>
<mapping>
- <directory>${installPath}</directory>
+
<directory>${installPath}/${project.artifactId}</directory>
<filemode>640</filemode>
<username>tomcat</username>
<groupname>tomcat</groupname>
@@ -367,7 +364,7 @@
</sources>
</mapping>
<mapping>
- <directory>${installPath}</directory>
+
<directory>${installPath}/${project.artifactId}</directory>

<recurseDirectories>false</recurseDirectories>
<sources>
<source>
@@ -390,7 +387,7 @@
</sources>
</mapping>
<mapping>
-
<directory>${installPath}/WEB-INF/samples</directory>
+
<directory>${installPath}/${project.artifactId}/WEB-INF/samples</directory>

<recurseDirectories>false</recurseDirectories>
<sources>
<source>

Modified:
trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/resources/perfsonar/conf/configuration.xml
===================================================================
---
trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/resources/perfsonar/conf/configuration.xml
2013-05-16 17:24:24 UTC (rev 6382)
+++
trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/resources/perfsonar/conf/configuration.xml
2013-05-17 13:45:13 UTC (rev 6383)
@@ -49,7 +49,7 @@
</component>

<component name="migrator"
className="org.perfsonar.base2.service.configuration.migration.MigratorComponent">
- <option name ="config-directory"
value="/usr/lib/perfsonar/services/geant2-java-rrd-ma/WEB-INF/classes/perfsonar/conf"/>

+ <option name="config-directory"
value="/usr/lib/perfsonar/services/geant2-java-rrd-ma/WEB-INF/classes/perfsonar/conf"/>

</component>

<component
className="org.perfsonar.service.measurementArchive.rrdType.storage.sql.MysqlMetadataStorageDAOImpl"
name="metadataStorageDAO2">

Modified:
trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/resources/perfsonar/conf/webAdminConfig.xml
===================================================================
---
trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/resources/perfsonar/conf/webAdminConfig.xml
2013-05-16 17:24:24 UTC (rev 6382)
+++
trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/resources/perfsonar/conf/webAdminConfig.xml
2013-05-17 13:45:13 UTC (rev 6383)
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wa:WebAdminInterface
xmlns:wa="http://webadmin.perfsonar.org/waschema/v20130205";>
+<?xml version="1.0" encoding="UTF-8"?><wa:WebAdminInterface
xmlns:wa="http://webadmin.perfsonar.org/waschema/v20130205";>

<!-- service information consists of name, version (only for displaying
purpose) and accessPoint -->
<wa:serviceInformation>

Modified:
trunk/perfsonar-java-rrd-ma-SQL_backend/src/test/resources/perfsonar/conf/configuration.xml
===================================================================
---
trunk/perfsonar-java-rrd-ma-SQL_backend/src/test/resources/perfsonar/conf/configuration.xml
2013-05-16 17:24:24 UTC (rev 6382)
+++
trunk/perfsonar-java-rrd-ma-SQL_backend/src/test/resources/perfsonar/conf/configuration.xml
2013-05-17 13:45:13 UTC (rev 6383)
@@ -49,7 +49,7 @@
</component>

<component name="migrator"
className="org.perfsonar.base2.service.configuration.migration.MigratorComponent">
- <option name ="config-directory"
value="/usr/lib/perfsonar/services/geant2-java-rrd-ma/WEB-INF/classes/perfsonar/conf"/>

+ <option name="config-directory"
value="/usr/lib/perfsonar/services/geant2-java-rrd-ma/WEB-INF/classes/perfsonar/conf"/>

</component>

<component
className="org.perfsonar.service.measurementArchive.rrdType.storage.sql.MysqlMetadataStorageDAOImpl"
name="metadataStorageDAO2">


  • [pS-dev] [GEANT/SA2/ps-java-services] r6383 - in trunk: parent perfsonar-java-rrd-ma-SQL_backend perfsonar-java-rrd-ma-SQL_backend/src/main/resources/perfsonar/conf perfsonar-java-rrd-ma-SQL_backend/src/test/resources/perfsonar/conf, svn-noreply, 05/17/2013

Archive powered by MHonArc 2.6.16.

Top of Page