Skip to Content.
Sympa Menu

perfsonar-dev - [pS-dev] [GEANT/SA2/ps-java-services] r6256 - in trunk: parent perfsonar-java-rrd-ma-SQL_backend per fsonar-java-rrd-ma-SQL_backend/doc perfsonar-java-rrd-ma -SQL_backend/src/deb/control perfsonar-java-web-admin/pe rfsonar-java-web-admin-exampleservice perfsonar-java-web-a dmin/perfsonar-java-web-admin-exampleservice/src/main/weba pp/WEB-INF/classes/perfsonar/conf perfsonar-java-xml-ls pe rfsonar-java-xml-ls/src/main/resources/perfsonar/conf

Subject: perfsonar development work

List archive

[pS-dev] [GEANT/SA2/ps-java-services] r6256 - in trunk: parent perfsonar-java-rrd-ma-SQL_backend per fsonar-java-rrd-ma-SQL_backend/doc perfsonar-java-rrd-ma -SQL_backend/src/deb/control perfsonar-java-web-admin/pe rfsonar-java-web-admin-exampleservice perfsonar-java-web-a dmin/perfsonar-java-web-admin-exampleservice/src/main/weba pp/WEB-INF/classes/perfsonar/conf perfsonar-java-xml-ls pe rfsonar-java-xml-ls/src/main/resources/perfsonar/conf


Chronological Thread 
  • From:
  • To:
  • Subject: [pS-dev] [GEANT/SA2/ps-java-services] r6256 - in trunk: parent perfsonar-java-rrd-ma-SQL_backend per fsonar-java-rrd-ma-SQL_backend/doc perfsonar-java-rrd-ma -SQL_backend/src/deb/control perfsonar-java-web-admin/pe rfsonar-java-web-admin-exampleservice perfsonar-java-web-a dmin/perfsonar-java-web-admin-exampleservice/src/main/weba pp/WEB-INF/classes/perfsonar/conf perfsonar-java-xml-ls pe rfsonar-java-xml-ls/src/main/resources/perfsonar/conf
  • Date: Wed, 24 Apr 2013 21:40:01 +0100 (BST)
  • Authentication-results: sfpop-ironport02.merit.edu; dkim=neutral (message not signed) header.i=none
Author: dante.delvaux
Date: 2013-04-24 21:40:01 +0100 (Wed, 24 Apr 2013)
New Revision: 6256

Modified:
trunk/parent/pom.xml
trunk/perfsonar-java-rrd-ma-SQL_backend/doc/License.txt
trunk/perfsonar-java-rrd-ma-SQL_backend/doc/configure.authN.txt
trunk/perfsonar-java-rrd-ma-SQL_backend/doc/configure.ls-registration.txt
trunk/perfsonar-java-rrd-ma-SQL_backend/pom.xml
trunk/perfsonar-java-rrd-ma-SQL_backend/src/deb/control/changelog

trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-exampleservice/pom.xml

trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-exampleservice/src/main/webapp/WEB-INF/classes/perfsonar/conf/webAdminConfig.xml
trunk/perfsonar-java-xml-ls/pom.xml

trunk/perfsonar-java-xml-ls/src/main/resources/perfsonar/conf/webAdminConfig.xml
Log:
WebAdmin: using the resources plugin to generate title and service version.
RRD MA: documentation, adding info about LS and AuthN status.
Parent: re-organising plugins and adding the versions-maven-plugin.

Modified: trunk/parent/pom.xml
===================================================================
--- trunk/parent/pom.xml 2013-04-22 12:39:19 UTC (rev 6255)
+++ trunk/parent/pom.xml 2013-04-24 20:40:01 UTC (rev 6256)
@@ -125,6 +125,7 @@
<pluginManagement>
<plugins>

+ <!-- Compilation and build plugins -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
@@ -153,7 +154,15 @@
<version>2.6</version>
</plugin>

+ <!-- Release management plugins -->
<plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>versions-maven-plugin</artifactId>
+ <version>2.0</version>
+ </plugin>
+
+ <!-- Packaging plugins -->
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>2.4</version>
@@ -180,6 +189,56 @@
</plugin>

<plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <version>2.3.5</version>
+ <extensions>true</extensions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.vafer</groupId>
+ <artifactId>jdeb</artifactId>
+ <version>1.0.1</version>
+ <configuration>
+ <verbose>false</verbose>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>rpm-maven-plugin</artifactId>
+ <version>2.1-alpha-2</version>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>attached-rpm</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <copyright>GÉANT Standard Open Source Software
Outward License</copyright>
+ <distribution>perfSONAR</distribution>
+ <group>Network/Web service</group>
+ <changelogFile>src/rpm/changelog</changelogFile>
+ <preinstallScriptlet>
+ <scriptFile>src/rpm/pre</scriptFile>
+ </preinstallScriptlet>
+ <postinstallScriptlet>
+ <scriptFile>src/rpm/post</scriptFile>
+ </postinstallScriptlet>
+ <preremoveScriptlet>
+ <scriptFile>src/rpm/preun</scriptFile>
+ </preremoveScriptlet>
+ <postremoveScriptlet>
+ <scriptFile>src/rpm/postun</scriptFile>
+ </postremoveScriptlet>
+ <classifier></classifier>
+ </configuration>
+ </plugin>
+
+ <!-- Testing plugins -->
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.12.4</version>
@@ -189,6 +248,25 @@
</plugin>

<plugin>
+ <groupId>org.apache.tomcat.maven</groupId>
+ <artifactId>tomcat6-maven-plugin</artifactId>
+ <version>2.1</version>
+ <executions>
+ <execution>
+ <id>run-war</id>
+ <!-- We link this plugin to some non default
phase so that we can disable it in some modules. -->
+ <!-- You might need to increase Maven allocated
memory for this plugin to work properly. -->
+ <!-- MAVEN_OPTS="-Xmx1024m -XX:MaxPermSize=512m"
-->
+ <phase>integration-test</phase>
+ <goals>
+ <goal>run-war</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
+ <!-- QA and reporting plugins -->
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<version>2.9.1</version>
@@ -238,73 +316,6 @@
<version>3.2</version>
</plugin>

- <plugin>
- <groupId>org.vafer</groupId>
- <artifactId>jdeb</artifactId>
- <version>1.0.1</version>
- <configuration>
- <verbose>false</verbose>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>rpm-maven-plugin</artifactId>
- <version>2.1-alpha-2</version>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>attached-rpm</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <copyright>GÉANT Standard Open Source Software
Outward License</copyright>
- <distribution>perfSONAR</distribution>
- <group>Network/Web service</group>
- <changelogFile>src/rpm/changelog</changelogFile>
- <preinstallScriptlet>
- <scriptFile>src/rpm/pre</scriptFile>
- </preinstallScriptlet>
- <postinstallScriptlet>
- <scriptFile>src/rpm/post</scriptFile>
- </postinstallScriptlet>
- <preremoveScriptlet>
- <scriptFile>src/rpm/preun</scriptFile>
- </preremoveScriptlet>
- <postremoveScriptlet>
- <scriptFile>src/rpm/postun</scriptFile>
- </postremoveScriptlet>
- <classifier></classifier>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.apache.felix</groupId>
-
<artifactId>maven-bundle-plugin</artifactId>
- <version>2.3.5</version>
- <extensions>true</extensions>
- </plugin>
-
- <plugin>
-
<groupId>org.apache.tomcat.maven</groupId>
-
<artifactId>tomcat6-maven-plugin</artifactId>
- <version>2.1</version>
- <executions>
- <execution>
- <id>run-war</id>
- <!-- We link this plugin to
some non default phase so that we can disable it in some modules. -->
- <!-- You might need to
increase Maven allocated memory for this plugin to work properly. -->
- <!-- MAVEN_OPTS="-Xmx1024m
-XX:MaxPermSize=512m" -->
- <phase>integration-test</phase>
- <goals>
- <goal>run-war</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
</plugins>
</pluginManagement>
</build>
@@ -381,10 +392,15 @@
</configuration>
</plugin>

- <!--
- <plugin> <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-changelog-plugin</artifactId> </plugin>
- -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-changes-plugin</artifactId>
+ <version>2.9</version>
+ <configuration>
+ <component>${jira-component-id}</component>
+ </configuration>
+ </plugin>
+
</plugins>
</reporting>


Modified: trunk/perfsonar-java-rrd-ma-SQL_backend/doc/License.txt
===================================================================
--- trunk/perfsonar-java-rrd-ma-SQL_backend/doc/License.txt 2013-04-22
12:39:19 UTC (rev 6255)
+++ trunk/perfsonar-java-rrd-ma-SQL_backend/doc/License.txt 2013-04-24
20:40:01 UTC (rev 6256)
@@ -1,4 +1,4 @@
- Copyright (c) 2008-2012, DANTE on behalf of the GEANT NRENs
+ Copyright (c) 2008-2013, DANTE on behalf of the GEANT NRENs
All rights reserved

GÉANT Standard Open Source Software Outward Licence

Modified: trunk/perfsonar-java-rrd-ma-SQL_backend/doc/configure.authN.txt
===================================================================
--- trunk/perfsonar-java-rrd-ma-SQL_backend/doc/configure.authN.txt
2013-04-22 12:39:19 UTC (rev 6255)
+++ trunk/perfsonar-java-rrd-ma-SQL_backend/doc/configure.authN.txt
2013-04-24 20:40:01 UTC (rev 6256)
@@ -1,3 +1,8 @@
+********
+* Note *
+********
+As of RRD MA version 3.4 and upper, the AuthN component is not supported
anymore.
+Work is in progress to provide a replacement.

Configuration of AuthN component

----------------------------------------------------------------------------------------------------

Modified:
trunk/perfsonar-java-rrd-ma-SQL_backend/doc/configure.ls-registration.txt
===================================================================
--- trunk/perfsonar-java-rrd-ma-SQL_backend/doc/configure.ls-registration.txt
2013-04-22 12:39:19 UTC (rev 6255)
+++ trunk/perfsonar-java-rrd-ma-SQL_backend/doc/configure.ls-registration.txt
2013-04-24 20:40:01 UTC (rev 6256)
@@ -1,3 +1,8 @@
+********
+* Note *
+********
+As of RRD MA version 3.4 and upper, the AuthN component is not supported
anymore.
+Work is in progress to provide a replacement.

Configuration of LS registration component

----------------------------------------------------------------------------------------------------

Modified: trunk/perfsonar-java-rrd-ma-SQL_backend/pom.xml
===================================================================
--- trunk/perfsonar-java-rrd-ma-SQL_backend/pom.xml 2013-04-22 12:39:19
UTC (rev 6255)
+++ trunk/perfsonar-java-rrd-ma-SQL_backend/pom.xml 2013-04-24 20:40:01
UTC (rev 6256)
@@ -22,6 +22,7 @@
<version.nmwg-sql-converter>1.0.1</version.nmwg-sql-converter>
<installName>${project.artifactId}</installName>
<installPath>/usr/lib/perfsonar/services/${installName}</installPath>
+ <jira-component-id>10666</jira-component-id>
</properties>

<build>
@@ -38,6 +39,7 @@

<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
</plugin>

@@ -204,7 +206,7 @@
</dependency>

</dependencies>
-
+
<profiles>
<profile>
<id>development</id>

Modified: trunk/perfsonar-java-rrd-ma-SQL_backend/src/deb/control/changelog
===================================================================
--- trunk/perfsonar-java-rrd-ma-SQL_backend/src/deb/control/changelog
2013-04-22 12:39:19 UTC (rev 6255)
+++ trunk/perfsonar-java-rrd-ma-SQL_backend/src/deb/control/changelog
2013-04-24 20:40:01 UTC (rev 6256)
@@ -1,3 +1,11 @@
+perfsonar-java-rrd-ma (3.4.2-1) testing; urgency=low
+
+ * WebAdmin restored and updated
+ * WebAdmin: added a page to empty the metadata DB
+ * Updated project documentation
+
+ -- Antoine Delvaux
<>
Tue, 23 Apr 2013 18:37:01 +0000
+
perfsonar-java-rrd-ma (3.4-7) testing; urgency=low

* Updated external dependencies to newer versions

Modified:
trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-exampleservice/pom.xml
===================================================================
---
trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-exampleservice/pom.xml
2013-04-22 12:39:19 UTC (rev 6255)
+++
trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-exampleservice/pom.xml
2013-04-24 20:40:01 UTC (rev 6256)
@@ -1,17 +1,16 @@
<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";>
<modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>net.geant.perfsonar</groupId>
+ <artifactId>web-admin</artifactId>
+ <version>1.1-SNAPSHOT</version>
+ <relativePath>..</relativePath>
+ </parent>
+
<artifactId>web-admin-exampleservice</artifactId>
<packaging>war</packaging>
<name>perfSONAR Web Admin Example Service</name>
-
- <parent>
- <groupId>net.geant.perfsonar</groupId>
- <artifactId>web-admin</artifactId>
- <version>1.1-SNAPSHOT</version>
- <relativePath>..</relativePath>
- </parent>
-
<description>This is a example of how a perfSONAR service project can
add the WebAdmin WAR as an overlay. New servlet and JSP pages can be added
in the service itself.

Servlet can extend the BasicServlet and then have the WebAdmin object map at
finger tips.
@@ -42,7 +41,20 @@
<build>
<finalName>${project.artifactId}</finalName>

+ <resources>
+ <resource>
+ <!-- The webAdminConfig.xml must be filtered to have the
name and version filled in -->
+ <directory>src/main/resources/perfsonar/conf</directory>
+ <filtering>true</filtering>
+ </resource>
+ </resources>
+
<plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ </plugin>
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>

Modified:
trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-exampleservice/src/main/webapp/WEB-INF/classes/perfsonar/conf/webAdminConfig.xml
===================================================================
---
trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-exampleservice/src/main/webapp/WEB-INF/classes/perfsonar/conf/webAdminConfig.xml
2013-04-22 12:39:19 UTC (rev 6255)
+++
trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-exampleservice/src/main/webapp/WEB-INF/classes/perfsonar/conf/webAdminConfig.xml
2013-04-24 20:40:01 UTC (rev 6256)
@@ -6,8 +6,8 @@
purpose) and accessPoint - selfTest -->
<wa:serviceInformation>

<wa:accessPoint>http://localhost:8080/perfsonar-java-service/ExampleService</wa:accessPoint>
- <wa:serviceName>Example Service Name</wa:serviceName>
- <wa:version>1.2.3</wa:version>
+ <wa:serviceName>${name}</wa:serviceName>
+ <wa:version>${version}</wa:version>
</wa:serviceInformation>

<!-- credential for WA -->

Modified: trunk/perfsonar-java-xml-ls/pom.xml
===================================================================
--- trunk/perfsonar-java-xml-ls/pom.xml 2013-04-22 12:39:19 UTC (rev 6255)
+++ trunk/perfsonar-java-xml-ls/pom.xml 2013-04-24 20:40:01 UTC (rev 6256)
@@ -55,7 +55,11 @@
<finalName>${project.artifactId}</finalName>

<plugins>
-
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ </plugin>
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
@@ -237,7 +241,7 @@

<directory>${basedir}/src/main/resources</directory>
<includes>
<include>*.xml</include>
- </includes>
+ </includes>
<excludes>
<exclude>log4j.xml</exclude>
</excludes>
@@ -255,6 +259,8 @@
<includes>
<include>*.xml</include>
</includes>
+ <!-- The webAdminConfig.xml must be filtered to have the
name and version filled in -->
+ <filtering>true</filtering>
</resource>
</resources>
</build>

Modified:
trunk/perfsonar-java-xml-ls/src/main/resources/perfsonar/conf/webAdminConfig.xml
===================================================================
---
trunk/perfsonar-java-xml-ls/src/main/resources/perfsonar/conf/webAdminConfig.xml
2013-04-22 12:39:19 UTC (rev 6255)
+++
trunk/perfsonar-java-xml-ls/src/main/resources/perfsonar/conf/webAdminConfig.xml
2013-04-24 20:40:01 UTC (rev 6256)
@@ -5,8 +5,8 @@
<!-- service information consists of name and version (only for
displaying purpose) and accessPoint - selfTest -->
<wa:serviceInformation>

<wa:accessPoint>http://localhost:%PORT%/perfsonar-java-xml-ls/services/LookupService</wa:accessPoint>
- <wa:serviceName>Lookup service</wa:serviceName>
- <wa:version>1.7 beta</wa:version>
+ <wa:serviceName>${name}</wa:serviceName>
+ <wa:version>${version}</wa:version>
</wa:serviceInformation>

<!-- credential for WA -->


  • [pS-dev] [GEANT/SA2/ps-java-services] r6256 - in trunk: parent perfsonar-java-rrd-ma-SQL_backend per fsonar-java-rrd-ma-SQL_backend/doc perfsonar-java-rrd-ma -SQL_backend/src/deb/control perfsonar-java-web-admin/pe rfsonar-java-web-admin-exampleservice perfsonar-java-web-a dmin/perfsonar-java-web-admin-exampleservice/src/main/weba pp/WEB-INF/classes/perfsonar/conf perfsonar-java-xml-ls pe rfsonar-java-xml-ls/src/main/resources/perfsonar/conf, svn-noreply, 04/24/2013

Archive powered by MHonArc 2.6.16.

Top of Page