perfsonar development work

Author: dante.delvaux
Date: 2013-02-13 11:57:31 +0000 (Wed, 13 Feb 2013)
New Revision: 6134

Modified:
   trunk/parent/pom.xml
   trunk/perfsonar-java-rrd-ma-SQL_backend/pom.xml
   
trunk/perfsonar-java-rrd-ma-SQL_backend/resources/axis2-1.4.1/webapp/WEB-INF/web.xml
Log:
Minor changes before the migration to psBase3.

Modified: trunk/parent/pom.xml
===================================================================
--- trunk/parent/pom.xml        2013-02-07 15:18:18 UTC (rev 6133)
+++ trunk/parent/pom.xml        2013-02-13 11:57:31 UTC (rev 6134)
@@ -31,7 +31,7 @@
                                <role>architect</role>
                                <role>developer</role>
                        </roles>
-                       <timezone>+1</timezone>
+                       <timezone>0</timezone>
                </developer>
                <developer>
                        <id>blazej.pietrzak</id>
@@ -96,7 +96,7 @@
             
<url>https://artifactory.geant.net/artifactory/geant-repo/net/geant/3rdparty/</url>
         </repository>
         
-        <!-- XMLDog -->
+        <!-- XMLDog, see http://code.google.com/p/jlibs/wiki/XMLDog -->
                <repository>
                        <id>jlibs-repository</id>
                        <name>JLibs Repository</name>

Modified: trunk/perfsonar-java-rrd-ma-SQL_backend/pom.xml
===================================================================
--- trunk/perfsonar-java-rrd-ma-SQL_backend/pom.xml     2013-02-07 15:18:18 
UTC (rev 6133)
+++ trunk/perfsonar-java-rrd-ma-SQL_backend/pom.xml     2013-02-13 11:57:31 
UTC (rev 6134)
@@ -16,7 +16,7 @@
     <version>3.4.2-SNAPSHOT</version>
 
     <name>RRD Measurement Archive</name>
-    <description>PerfSONAR Round Robin Database</description>
+    <description>perfSONAR Round Robin Database</description>
     <inceptionYear>2009</inceptionYear>
 
     <properties>
@@ -24,6 +24,7 @@
         <axis2Id>axis2-1.4.1</axis2Id>
         <aar.name>${project.artifactId}</aar.name>
         
<version.nmwg-sql-converter>1.0.1-SNAPSHOT</version.nmwg-sql-converter>
+        <slf4j.version>1.6.6</slf4j.version>
         <installName>perfsonar-java-rrd-ma</installName>
         <installPath>/usr/lib/perfsonar/services/${installName}</installPath>
     </properties>
@@ -192,7 +193,7 @@
             <dependency>
                 <groupId>org.slf4j</groupId>
                 <artifactId>slf4j-simple</artifactId>
-                <version>1.6.6</version>
+                <version>${slf4j.version}</version>
             </dependency>
 
             <dependency>
@@ -204,7 +205,7 @@
             <dependency>
                 <groupId>org.slf4j</groupId>
                 <artifactId>jcl-over-slf4j</artifactId>
-                <version>1.6.6</version>
+                <version>${slf4j.version}</version>
             </dependency>
 
         </dependencies>
@@ -215,7 +216,7 @@
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
-            <version>1.6.6</version>
+            <version>${slf4j.version}</version>
         </dependency>
 
         <dependency>
@@ -388,7 +389,7 @@
                         <artifactId>rpm-maven-plugin</artifactId>
                         <configuration>
                             <name>${installName}</name>
-                            <packager>Gerd Behrmann 
&lt;&gt;</packager>
+                            <packager>Antoine Delvaux 
&lt;&gt;</packager>
                             <defineStatements>
                                 <defineStatement>prefix 
${installPath}</defineStatement>
                             </defineStatements>

Modified: 
trunk/perfsonar-java-rrd-ma-SQL_backend/resources/axis2-1.4.1/webapp/WEB-INF/web.xml
===================================================================
--- 
trunk/perfsonar-java-rrd-ma-SQL_backend/resources/axis2-1.4.1/webapp/WEB-INF/web.xml
        2013-02-07 15:18:18 UTC (rev 6133)
+++ 
trunk/perfsonar-java-rrd-ma-SQL_backend/resources/axis2-1.4.1/webapp/WEB-INF/web.xml
        2013-02-13 11:57:31 UTC (rev 6134)
@@ -1,37 +1,17 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
+<web-app xmlns="http://java.sun.com/xml/ns/javaee"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+    xsi:schemaLocation="http://java.sun.com/xml/ns/javaee 
http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd";
+    version="2.5">
 
-<!--
-  ~ Licensed to the Apache Software Foundation (ASF) under one
-  ~ or more contributor license agreements. See the NOTICE file
-  ~ distributed with this work for additional information
-  ~ regarding copyright ownership. The ASF licenses this file
-  ~ to you under the Apache License, Version 2.0 (the
-  ~ "License"); you may not use this file except in compliance
-  ~ with the License. You may obtain a copy of the License at
-  ~
-  ~ http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing,
-  ~ software distributed under the License is distributed on an
-  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  ~ KIND, either express or implied. See the License for the
-  ~ specific language governing permissions and limitations
-  ~ under the License.
-  -->
+    <display-name>GEANT RRD MA</display-name>
 
-<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 
2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd";>
-
-<web-app>
-    
        <session-config>
                <!-- Default to 5 minute session timeouts -->
                <session-timeout>5</session-timeout>
        </session-config>
 
-
     <servlet>
         <servlet-name>AxisServlet</servlet-name>
-        <display-name>Apache-Axis Servlet</display-name>
         
<servlet-class>org.apache.axis2.transport.http.AxisServlet</servlet-class>
         <!--<init-param>-->
         <!--<param-name>axis2.xml.path</param-name>-->
@@ -47,7 +27,6 @@
     </servlet>
     <servlet>
         <servlet-name>AxisAdminServlet</servlet-name>
-        <display-name>Apache-Axis AxisAdmin Servlet (Web 
Admin)</display-name>
         <servlet-class>
             org.apache.axis2.transport.http.AxisAdminServlet</servlet-class>
     </servlet>