perfsonar development work

Author: dante.delvaux
Date: 2012-04-18 14:27:08 +0100 (Wed, 18 Apr 2012)
New Revision: 5920

Modified:
   branches/perfsonar-java-web-admin-1.0-stable/.classpath
   branches/perfsonar-java-web-admin-1.0-stable/ant/build.xml
   branches/perfsonar-java-web-admin-1.0-stable/ant/const.properties
   branches/perfsonar-java-web-admin-1.0-stable/tomcat/web.xml
Log:
Aligning versions of jar used with the ones from the XML-LS.

Modified: branches/perfsonar-java-web-admin-1.0-stable/.classpath
===================================================================
--- branches/perfsonar-java-web-admin-1.0-stable/.classpath     2012-04-10 
19:47:01 UTC (rev 5919)
+++ branches/perfsonar-java-web-admin-1.0-stable/.classpath     2012-04-18 
13:27:08 UTC (rev 5920)
@@ -9,8 +9,7 @@
        <classpathentry kind="lib" 
path="lib/repository/Validation/msv/1.0/msv-1.0.jar"/>
        <classpathentry kind="lib" 
path="lib/repository/Validation/relaxngDatatype/1.0/relaxngDatatype-1.0.jar"/>
        <classpathentry kind="lib" 
path="lib/repository/Validation/xsdlib/1.0/xsdlib-1.0.jar"/>
-       <classpathentry kind="lib" 
path="lib/repository/xalan/xalan/2.7.0/xalan-2.7.0.jar" 
sourcepath="lib/repository/xalan/xalan/2.7.0/xalan-2.7.0.jar"/>
-       <classpathentry kind="lib" 
path="lib/repository/xerces/xercesImpl/2.8.0/xercesImpl-2.8.0.jar"/>
+       <classpathentry kind="lib" 
path="lib/repository/xerces/xercesImpl/2.9.1/xercesImpl-2.9.1.jar"/>
        <classpathentry kind="lib" 
path="lib/libext/jaxme2/jaxmejs-0.5.2.jar"/>
        <classpathentry kind="lib" path="lib/libext/rngconv/rngconv.jar"/>
        <classpathentry kind="lib" path="lib/libext/trang/trang.jar"/>
@@ -21,9 +20,10 @@
        <classpathentry kind="lib" 
path="lib/librt/xmldb/xmldb-xupdate-20040205.jar"/>
        <classpathentry kind="lib" 
path="lib/repository/org/apache/httpcomponents/httpclient/4.0/httpclient-4.0.jar"/>
        <classpathentry kind="lib" 
path="lib/repository/org/apache/httpcomponents/httpcore/4.0.1/httpcore-4.0.1.jar"/>
-       <classpathentry kind="lib" 
path="lib/repository/log4j/log4j/1.2.9/log4j-1.2.9.jar"/>
-       <classpathentry kind="lib" 
path="lib/repository/dom4j/dom4j/1.6/dom4j-1.6.jar"/>
+       <classpathentry kind="lib" 
path="lib/repository/dom4j/dom4j/1.6.1/dom4j-1.6.1.jar"/>
        <classpathentry kind="lib" 
path="lib/repository/jaxen/jaxen/1.1/jaxen-1.1.jar"/>
        <classpathentry kind="lib" 
path="lib/repository/junit/junit/4.7/junit-4.7.jar"/>
+       <classpathentry kind="lib" 
path="lib/repository/log4j/log4j/1.2.14/log4j-1.2.14.jar"/>
+       <classpathentry kind="lib" 
path="lib/repository/xalan/xalan/2.7.1/xalan-2.7.1.jar"/>
        <classpathentry kind="output" path="bin"/>
 </classpath>

Modified: branches/perfsonar-java-web-admin-1.0-stable/ant/build.xml
===================================================================
--- branches/perfsonar-java-web-admin-1.0-stable/ant/build.xml  2012-04-10 
19:47:01 UTC (rev 5919)
+++ branches/perfsonar-java-web-admin-1.0-stable/ant/build.xml  2012-04-18 
13:27:08 UTC (rev 5920)
@@ -53,12 +53,12 @@
                        <dependency groupId="Validation" artifactId="xsdlib" 
version="1.0" />
                        <dependency groupId="Validation" 
artifactId="isorelax" version="1.0" />
                        <dependency groupId="Validation" 
artifactId="relaxngDatatype" version="1.0" />
-                       <dependency groupId="xerces" artifactId="xercesImpl" 
version="2.8.0" />
+                       <dependency groupId="xerces" artifactId="xercesImpl" 
version="2.9.1" />
                        <dependency groupId="xalan" artifactId="xalan" 
version="2.7.1" />
                        <dependency groupId="xalan" artifactId="serializer" 
version="2.7.1" />
                        <dependency groupId="org.apache.httpcomponents" 
artifactId="httpclient" version="4.0" />
                        <dependency groupId="log4j" artifactId="log4j" 
version="1.2.14" />
-                       <dependency groupId="dom4j" artifactId="dom4j" 
version="1.6" />
+                       <dependency groupId="dom4j" artifactId="dom4j" 
version="1.6.1" />
                        <dependency groupId="jaxen" artifactId="jaxen" 
version="1.1" />
                        <dependency groupId="junit" artifactId="junit" 
version="4.7" />
             <dependency groupId="net.jcip" artifactId="jcip-annotations" 
version="1.0" />

Modified: branches/perfsonar-java-web-admin-1.0-stable/ant/const.properties
===================================================================
--- branches/perfsonar-java-web-admin-1.0-stable/ant/const.properties   
2012-04-10 19:47:01 UTC (rev 5919)
+++ branches/perfsonar-java-web-admin-1.0-stable/ant/const.properties   
2012-04-18 13:27:08 UTC (rev 5920)
@@ -32,7 +32,7 @@
 servlet.dir=${basedir}/lib/repository/org/apache/tomcat/servlet-api/6.0.35
 jaxme.version=0.5.2
 xalan.jar=${basedir}/lib/repository/xalan/xalan/2.7.1/xalan-2.7.1.jar
-xerces.jar=${basedir}/lib/repository/xerces/xercesImpl/2.8.0/xercesImpl-2.8.0.jar
+xerces.jar=${basedir}/lib/repository/xerces/xercesImpl/2.9.1/xercesImpl-2.9.1.jar
 msv.dir=${basedir}/lib/repository/Validation/msv/1.0
 
isorelax.jar=${basedir}/lib/repository/Validation/isorelax/1.0/isorelax-1.0.jar
 
relaxngDatatype.jar=${basedir}/lib/repository/Validation/relaxngDatatype/1.0/relaxngDatatype-1.0.jar

Modified: branches/perfsonar-java-web-admin-1.0-stable/tomcat/web.xml
===================================================================
--- branches/perfsonar-java-web-admin-1.0-stable/tomcat/web.xml 2012-04-10 
19:47:01 UTC (rev 5919)
+++ branches/perfsonar-java-web-admin-1.0-stable/tomcat/web.xml 2012-04-18 
13:27:08 UTC (rev 5920)
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<!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 xmlns="http://java.sun.com/xml/ns/j2ee";
+     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+     xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee 
http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd";
+     version="2.4">
 
-<web-app>
-
        <display-name>perfsonar web admin</display-name>
 
        <session-config>