perfsonar development work

Author: dante.delvaux
Date: 2013-04-22 13:39:19 +0100 (Mon, 22 Apr 2013)
New Revision: 6255

Modified:
   trunk/perfsonar-java-rrd-ma-SQL_backend/pom.xml
   
trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/resources/perfsonar/conf/webAdminConfig.xml
   
trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-component/src/main/webapp/index.jsp
Log:
RRD MA: make the Web Admin use the name and version of the service coming 
from the pom.

Modified: trunk/perfsonar-java-rrd-ma-SQL_backend/pom.xml
===================================================================
--- trunk/perfsonar-java-rrd-ma-SQL_backend/pom.xml     2013-04-22 12:07:43 
UTC (rev 6254)
+++ trunk/perfsonar-java-rrd-ma-SQL_backend/pom.xml     2013-04-22 12:39:19 
UTC (rev 6255)
@@ -28,8 +28,20 @@
     
         <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>
+                <artifactId>maven-resources-plugin</artifactId>
+            </plugin>
+        
+            <plugin>
                 <artifactId>maven-war-plugin</artifactId>
                 <configuration>
                     <overlays>
@@ -214,6 +226,7 @@
                             
<include>perfsonar/conf/webAdminConfig.xml</include>
                             <include>**/*.sql</include>
                         </includes>
+                        <filtering>true</filtering>
                     </resource>
                 </resources>
             </build>

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-04-22 12:07:43 UTC (rev 6254)
+++ 
trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/resources/perfsonar/conf/webAdminConfig.xml
        2013-04-22 12:39:19 UTC (rev 6255)
@@ -4,8 +4,8 @@
        <!-- service information consists of name, version (only for 
displaying purpose) and accessPoint -->
        <wa:serviceInformation>
                
<wa:accessPoint>http://localhost:8080/perfsonar-java-rrd-ma/services/MeasurementArchiveService</wa:accessPoint>
-               <wa:serviceName>perfSONAR RRD MA</wa:serviceName>
-               <wa:version>to be filled in auto?</wa:version>
+               <wa:serviceName>${name}</wa:serviceName>
+               <wa:version>${version}</wa:version>
        </wa:serviceInformation>
        
        <!-- credential for WA -->

Modified: 
trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-component/src/main/webapp/index.jsp
===================================================================
--- 
trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-component/src/main/webapp/index.jsp
 2013-04-22 12:07:43 UTC (rev 6254)
+++ 
trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-component/src/main/webapp/index.jsp
 2013-04-22 12:39:19 UTC (rev 6255)
@@ -8,7 +8,7 @@
    String serviceName = htmlGenerator.getServiceName(map);
    String serviceVersion = htmlGenerator.getVersion(map);
 %>
-        <title>perfSONAR <% out.println(serviceName + " - " + 
serviceVersion); %> - Administration</title>
+        <title><% out.println(serviceName + " - " + serviceVersion); %> - 
Administration</title>
         <link rel="stylesheet" type="text/css" href="wa/styles/main.css"/>
         <link rel="stylesheet" type="text/css" href="wa/styles/default.css"/>
         <meta http-equiv="Content-Type" content="text/html; 
charset=iso-8859-1">