perfsonar development work

Author: dante.delvaux
Date: 2012-04-03 16:43:58 +0100 (Tue, 03 Apr 2012)
New Revision: 5912

Modified:
   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/ant/tomcat.properties
Log:
Making webadmin compatible with Tomcat 6 (servlet-api 6.0.35).

Modified: branches/perfsonar-java-web-admin-1.0-stable/ant/build.xml
===================================================================
--- branches/perfsonar-java-web-admin-1.0-stable/ant/build.xml  2012-03-28 
09:54:29 UTC (rev 5911)
+++ branches/perfsonar-java-web-admin-1.0-stable/ant/build.xml  2012-04-03 
15:43:58 UTC (rev 5912)
@@ -48,16 +48,16 @@
 
        <target name="get-repo" depends="init-lib-dependencies" 
xmlns:artifact="urn:maven-artifact-ant">
                <artifact:dependencies>
-                       <dependency groupId="tomcat" artifactId="servlet-api" 
version="5.5.23" />
+                       <dependency groupId="org.apache.tomcat" 
artifactId="servlet-api" version="6.0.35" />
                        <dependency groupId="Validation" artifactId="msv" 
version="1.0" />
                        <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="xalan" artifactId="xalan" 
version="2.7.0" />
+                       <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.9" />
+                       <dependency groupId="log4j" artifactId="log4j" 
version="1.2.14" />
                        <dependency groupId="dom4j" artifactId="dom4j" 
version="1.6" />
                        <dependency groupId="jaxen" artifactId="jaxen" 
version="1.1" />
                        <dependency groupId="junit" artifactId="junit" 
version="4.7" />

Modified: branches/perfsonar-java-web-admin-1.0-stable/ant/const.properties
===================================================================
--- branches/perfsonar-java-web-admin-1.0-stable/ant/const.properties   
2012-03-28 09:54:29 UTC (rev 5911)
+++ branches/perfsonar-java-web-admin-1.0-stable/ant/const.properties   
2012-04-03 15:43:58 UTC (rev 5912)
@@ -29,9 +29,9 @@
 #api.title=perfSONAR
 #api.windowtitle=perfSONAR
 #api.bottom=perfSONAR
-servlet.dir=${basedir}/lib/repository/tomcat/servlet-api/5.5.23
+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.0/xalan-2.7.0.jar
+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
 msv.dir=${basedir}/lib/repository/Validation/msv/1.0
 
isorelax.jar=${basedir}/lib/repository/Validation/isorelax/1.0/isorelax-1.0.jar

Modified: branches/perfsonar-java-web-admin-1.0-stable/ant/tomcat.properties
===================================================================
--- branches/perfsonar-java-web-admin-1.0-stable/ant/tomcat.properties  
2012-03-28 09:54:29 UTC (rev 5911)
+++ branches/perfsonar-java-web-admin-1.0-stable/ant/tomcat.properties  
2012-04-03 15:43:58 UTC (rev 5912)
@@ -1,7 +1,7 @@
 # Properties for Tomcat Server
 
 
-tomcat.dir=/usr/local/apache-tomcat-5.5.27/
+tomcat.dir=/usr/local/apache-tomcat-6.0.18/
 tomcat.server=127.0.0.1
 tomcat.manager.url=http://127.0.0.1:8080/manager
 tomcat.username=tomcat