perfsonar development work

Author: roman
Date: 2008-02-04 07:00:49 -0500 (Mon, 04 Feb 2008)
New Revision: 3296

Modified:
   trunk/perfsonar_base/ant/build.xml
   trunk/perfsonar_base/ant/const.properties
   trunk/perfsonar_base/src/main/java/org/perfsonar/base/ant/antlib.xml
Log:

web admin stuff (downloading libraries and deploying a service with web admin 
functionality) moved to the base




Modified: trunk/perfsonar_base/ant/build.xml
===================================================================
--- trunk/perfsonar_base/ant/build.xml  2008-02-04 10:14:42 UTC (rev 3295)
+++ trunk/perfsonar_base/ant/build.xml  2008-02-04 12:00:49 UTC (rev 3296)
@@ -51,13 +51,18 @@
                 classdir="${build}"/>
   </target>
 
+
   <target name="class-ac-jar"
           depends="compile"
           xmlns:psbase="psbase:/base.perfsonar.org">
-    <jar 
destfile="${basedir}/${build}/${jarfilename}-ac_authn-${version}.jar" 
basedir="${build}" includes="org/perfsonar/base/exceptions/** 
org/perfsonar/base/auxiliary/components/authn/** 
org/perfsonar/client/base/authn/**" 
excludes="org/perfsonar/client/base/authn/AuthNSAMLData.class 
org/perfsonar/client/base/authn/WSSAuthNSAMLData.class 
org/perfsonar/client/base/authn/edugain/** 
org/perfsonar/client/base/authn/saslca/**">
+    <jar 
destfile="${basedir}/${build}/${jarfilename}-ac_authn-${version}.jar"
+         basedir="${build}"
+         includes="org/perfsonar/base/exceptions/** 
org/perfsonar/base/auxiliary/components/authn/** 
org/perfsonar/client/base/authn/**"
+         excludes="org/perfsonar/client/base/authn/AuthNSAMLData.class 
org/perfsonar/client/base/authn/WSSAuthNSAMLData.class 
org/perfsonar/client/base/authn/edugain/** 
org/perfsonar/client/base/authn/saslca/**">
     </jar>
   </target>
 
+
   <property name="maven.jar"  
value="${basedir}/lib/misc/maven-artifact-ant-2.0.4-dep.jar"/>
 
   <target name="init-urnmaven">

Modified: trunk/perfsonar_base/ant/const.properties
===================================================================
--- trunk/perfsonar_base/ant/const.properties   2008-02-04 10:14:42 UTC (rev 
3295)
+++ trunk/perfsonar_base/ant/const.properties   2008-02-04 12:00:49 UTC (rev 
3296)
@@ -13,4 +13,4 @@
 # name of jar file to be created
 jarfilename=perfsonar-base
 # version of the product (will be included in the final name of jar file)
-version=1.0.20080115
+version=1.0.20080204

Modified: trunk/perfsonar_base/src/main/java/org/perfsonar/base/ant/antlib.xml
===================================================================
--- trunk/perfsonar_base/src/main/java/org/perfsonar/base/ant/antlib.xml      
  2008-02-04 10:14:42 UTC (rev 3295)
+++ trunk/perfsonar_base/src/main/java/org/perfsonar/base/ant/antlib.xml      
  2008-02-04 12:00:49 UTC (rev 3296)
@@ -162,62 +162,66 @@
   <macrodef name="lib-dependencies"
             xmlns:artifact="urn:maven-artifact-ant">
     <sequential>
-        <artifact:dependencies>
-      <dependency groupId="axis"                artifactId="axis"            
    version="1.4"/>
-      <dependency groupId="axis"                artifactId="axis-jaxrpc"     
    version="1.4"/>
-      <dependency groupId="axis"                artifactId="axis-saaj"       
    version="1.4"/>
-      <dependency groupId="axis"                artifactId="axis-ant"        
    version="1.4"/>
-      <dependency groupId="xerces"              artifactId="xercesImpl"      
    version="2.8.0"/>
-      <dependency groupId="xerces"              artifactId="xerces-xml-apis" 
    version="2.8.0"/>
-      <dependency groupId="xml-apis"            artifactId="xml-apis"        
    version="1.3.02"/>
-      <dependency groupId="jdom"                artifactId="jdom"            
    version="1.0b8"/>
-      <dependency groupId="urbanophile"         artifactId="java-getopt"     
    version="1.0.9"/>
-      <dependency groupId="junit"               artifactId="junit"           
    version="4.0"/>
-      <dependency groupId="xalan"               artifactId="xalan"           
    version="2.7.0"/>
-      <dependency groupId="xalan"                              
artifactId="xalan-serializer"    version="2.7.0"/>
-      <dependency groupId="commons-pool"        artifactId="commons-pool"    
    version="1.1"/>
-      <dependency groupId="commons-collections" 
artifactId="commons-collections" version="3.2"/>
-      <dependency groupId="commons-beanutils"   
artifactId="commons-beanutils"   version="1.7.0"/>
-      <dependency groupId="commons-digester"    
artifactId="commons-digester"    version="1.7"/>
-      <dependency groupId="commons-logging"     artifactId="commons-logging" 
    version="1.0.4"/>
-      <dependency groupId="commons-lang"       artifactId="commons-lang"     
   version="2.3"/>
+      <artifact:dependencies>
+        <dependency groupId="axis"                artifactId="axis"          
      version="1.4"/>
+        <dependency groupId="axis"                artifactId="axis-jaxrpc"   
      version="1.4"/>
+        <dependency groupId="axis"                artifactId="axis-saaj"     
      version="1.4"/>
+        <dependency groupId="axis"                artifactId="axis-ant"      
      version="1.4"/>
+        <dependency groupId="xerces"              artifactId="xercesImpl"    
      version="2.8.0"/>
+        <dependency groupId="xerces"              
artifactId="xerces-xml-apis"     version="2.8.0"/>
+        <dependency groupId="xml-apis"            artifactId="xml-apis"      
      version="1.3.02"/>
+        <dependency groupId="jdom"                artifactId="jdom"          
      version="1.0b8"/>
+        <dependency groupId="urbanophile"         artifactId="java-getopt"   
      version="1.0.9"/>
+        <dependency groupId="junit"               artifactId="junit"         
      version="4.0"/>
+        <dependency groupId="xalan"               artifactId="xalan"         
      version="2.7.0"/>
+        <dependency groupId="xalan"               
artifactId="xalan-serializer"    version="2.7.0"/>
+        <dependency groupId="commons-pool"        artifactId="commons-pool"  
      version="1.1"/>
+        <dependency groupId="commons-collections" 
artifactId="commons-collections" version="3.2"/>
+        <dependency groupId="commons-beanutils"   
artifactId="commons-beanutils"   version="1.7.0"/>
+        <dependency groupId="commons-digester"    
artifactId="commons-digester"    version="1.7"/>
+        <dependency groupId="commons-logging"     
artifactId="commons-logging"     version="1.0.4"/>
+        <dependency groupId="commons-lang"        artifactId="commons-lang"  
      version="2.3"/>
 
-      <dependency groupId="javax.activation"    artifactId="activation"      
    version="1.0.2"/>
-      <dependency groupId="javax.mail"          artifactId="mail"            
    version="1.3.2"/>
+        <dependency groupId="javax.activation"    artifactId="activation"    
      version="1.0.2"/>
+        <dependency groupId="javax.mail"          artifactId="mail"          
      version="1.3.2"/>
 
-      <dependency groupId="tomcat"              artifactId="servlet-api"     
    version="5.0.28"/>
+        <dependency groupId="tomcat"              artifactId="servlet-api"   
      version="5.0.28"/>
 
-      <dependency groupId="log4j"               artifactId="log4j"           
    version="1.2.12"/>
+        <dependency groupId="log4j"               artifactId="log4j"         
      version="1.2.12"/>
 
-      <dependency groupId="exist"               artifactId="exist-xmldb"     
    version="1.0rc"/>
-      <dependency groupId="exist"               artifactId="exist-db"        
    version="1.0rc"/>
-      <dependency groupId="exist"               artifactId="exist-xmlrpc"    
    version="1.0rc"/>
-      <dependency groupId="exist"               artifactId="exist-optional"  
    version="1.0rc"/>
+        <dependency groupId="exist"               artifactId="exist-xmldb"   
      version="1.0rc"/>
+        <dependency groupId="exist"               artifactId="exist-db"      
      version="1.0rc"/>
+        <dependency groupId="exist"               artifactId="exist-xmlrpc"  
      version="1.0rc"/>
+        <dependency groupId="exist"               
artifactId="exist-optional"      version="1.0rc"/>
 
-      <dependency groupId="antlr"               artifactId="antlr"           
    version="2.7.7"/>
+        <dependency groupId="antlr"               artifactId="antlr"         
      version="2.7.7"/>
 
-      <dependency groupId="xml-security"        artifactId="xmlsec"          
    version="1.3.0"/>
-      <dependency groupId="bouncycastle"        artifactId="bcprov-jdk15"    
    version="124"/>
-      <dependency groupId="wss4j"               artifactId="wss4j"           
    version="1.5.1"/>
-         <dependency groupId="javolution"                      
artifactId="javolution"                  version="3.7"/>
-      <dependency groupId="opensaml"                   artifactId="opensaml" 
                   version="2.0-TP2-jdk-1.5"/>
-      <dependency groupId="xmltooling"                 
artifactId="xmltooling"                  version="1.0-TP2-jdk-1.5"/>
-      <dependency groupId="opensaml"                   
artifactId="opensaml1"                   version="1.1"/>
-      <dependency groupId="edugain"                    artifactId="edugain"  
                   version="0.6"/>
-      <dependency groupId="sasl-ca"                    artifactId="sasl-ca"  
                   version="1.0"/>
-      <dependency groupId="codec"                              
artifactId="codec"                               version="1.0"/>
+        <dependency groupId="xml-security"        artifactId="xmlsec"        
      version="1.3.0"/>
+        <dependency groupId="bouncycastle"        artifactId="bcprov-jdk15"  
      version="124"/>
+        <dependency groupId="wss4j"               artifactId="wss4j"         
      version="1.5.1"/>
+        <dependency groupId="javolution"          artifactId="javolution"    
      version="3.7"/>
+        <dependency groupId="opensaml"            artifactId="opensaml"      
      version="2.0-TP2-jdk-1.5"/>
+        <dependency groupId="xmltooling"          artifactId="xmltooling"    
      version="1.0-TP2-jdk-1.5"/>
+        <dependency groupId="opensaml"            artifactId="opensaml1"     
      version="1.1"/>
+        <dependency groupId="edugain"             artifactId="edugain"       
      version="0.6"/>
+        <dependency groupId="sasl-ca"             artifactId="sasl-ca"       
      version="1.0"/>
+        <dependency groupId="codec"               artifactId="codec"         
      version="1.0"/>
 
-      <dependency groupId="joda-time"           artifactId="joda-time"       
    version="1.4"/>
+        <dependency groupId="joda-time"           artifactId="joda-time"     
      version="1.4"/>
 
-      <dependency groupId="com.ibatis"          artifactId="ibatis-common"   
    version="2.1.7.597"/>
+        <dependency groupId="com.ibatis"          artifactId="ibatis-common" 
      version="2.1.7.597"/>
 
-      <dependency groupId="net.sf.saxon"        artifactId="saxon"           
    version="8.7"/>
-      <dependency groupId="net.sf.saxon"        artifactId="saxon-jdom"      
    version="8.7"/>
-      <dependency groupId="net.sf.saxon"        artifactId="saxon-dom"       
    version="8.7"/>
+        <dependency groupId="net.sf.saxon"        artifactId="saxon"         
      version="8.7"/>
+        <dependency groupId="net.sf.saxon"        artifactId="saxon-jdom"    
      version="8.7"/>
+        <dependency groupId="net.sf.saxon"        artifactId="saxon-dom"     
      version="8.7"/>
 
-      <localRepository refid="local.repository"/>
-      <remoteRepository refid="remote.repository"/>
-    </artifact:dependencies>
+        <dependency groupId="commons-io"          artifactId="commons-io"    
      version="1.2"/>
+        <dependency groupId="commons-codec"       artifactId="commons-codec" 
      version="1.3"/>
+        <dependency groupId="commons-fileupload"  
artifactId="commons-fileupload"  version="1.2"/>
+
+        <localRepository refid="local.repository"/>
+        <remoteRepository refid="remote.repository"/>
+      </artifact:dependencies>
     </sequential>
   </macrodef>
 
@@ -638,6 +642,7 @@
   <macrodef name="copy-axis-config">
     <attribute name="dest-conf-path"/>
     <sequential>
+
       <copy file="${basedir}/conf/axis-1.4/fingerprint.jsp"                  
   todir="@{dest-conf-path}"/>
       <copy file="${basedir}/conf/axis-1.4/happyaxis.jsp"                    
   todir="@{dest-conf-path}"/>
       <copy file="${basedir}/conf/axis-1.4/i18nLib.jsp"                      
   todir="@{dest-conf-path}"/>
@@ -653,6 +658,16 @@
       <copy file="${basedir}/conf/components.properties"                     
   todir="@{dest-conf-path}/WEB-INF/classes/perfsonar/conf"/>
       <copy file="${basedir}/conf/log4j.properties"                          
   todir="@{dest-conf-path}/WEB-INF/classes/perfsonar/conf"/>
       <copy file="${basedir}/conf/objects.config"                            
   todir="@{dest-conf-path}/WEB-INF/classes/perfsonar/conf"/>
+
+      <copy file="${basedir}/conf/axis-1.4/main.css"                         
   todir="@{dest-conf-path}" failonerror="false" />
+      <copy file="${basedir}/conf/axis-1.4/default.css"                      
   todir="@{dest-conf-path}" failonerror="false" />
+      <copy file="${basedir}/conf/axis-1.4/perfsonar_logo.gif"               
   todir="@{dest-conf-path}" failonerror="false" />
+      <copy file="${basedir}/conf/axis-1.4/partners.gif"                     
   todir="@{dest-conf-path}" failonerror="false"/>
+
+      <copy file="${basedir}/conf/servlet.properties"                        
   todir="@{dest-conf-path}/WEB-INF/classes/perfsonar/conf" 
failonerror="false" />
+      <copy file="${basedir}/conf/wizard.properties"                         
   todir="@{dest-conf-path}/WEB-INF/classes/perfsonar/conf" 
failonerror="false" />
+      <copy file="${basedir}/conf/wizardproperties.dtd"                      
   todir="@{dest-conf-path}/WEB-INF/classes/perfsonar/conf" 
failonerror="false"/>
+
     </sequential>
   </macrodef>
 
@@ -667,7 +682,7 @@
       <copy 
file="${basedir}/lib/repository/axis/axis-wsdl4j/1.5.1/axis-wsdl4j-1.5.1.jar" 
                            todir="@{dest-jars-path}/WEB-INF/lib"/>
 
       <copy 
file="${basedir}/lib/repository/xerces/xercesImpl/2.8.0/xercesImpl-2.8.0.jar" 
                            todir="@{dest-jars-path}/WEB-INF/lib"/>
-      <copy 
file="${basedir}/lib/repository/xerces/xerces-xml-apis/2.8.0/xerces-xml-apis-2.8.0.jar"
                     todir="@{dest-jars-path}/WEB-INF/lib"/>
+      <copy 
file="${basedir}/lib/repository/xerces/xerces-xml-apis/2.8.0/xerces-xml-apis-2.8.0.jar"
                   todir="@{dest-jars-path}/WEB-INF/lib"/>
 
       <copy 
file="${basedir}/lib/repository/xml-apis/xml-apis/1.3.02/xml-apis-1.3.02.jar" 
                            todir="@{dest-jars-path}/WEB-INF/lib"/>
 
@@ -676,7 +691,7 @@
       <copy 
file="${basedir}/lib/repository/xalan/xalan/2.7.0/xalan-2.7.0.jar"            
                            todir="@{dest-jars-path}/WEB-INF/lib"/>
       <copy 
file="${basedir}/lib/repository/xalan/xalan-serializer/2.7.0/xalan-serializer-2.7.0.jar"
                  todir="@{dest-jars-path}/WEB-INF/lib"/>
 
-      <copy 
file="${basedir}/lib/repository/commons-pool/commons-pool/1.1/commons-pool-1.1.jar"
                       todir="@{dest-jars-path}/WEB-INF/lib"/>    
+      <copy 
file="${basedir}/lib/repository/commons-pool/commons-pool/1.1/commons-pool-1.1.jar"
                       todir="@{dest-jars-path}/WEB-INF/lib"/>
       <copy 
file="${basedir}/lib/repository/commons-collections/commons-collections/3.2/commons-collections-3.2.jar"
  todir="@{dest-jars-path}/WEB-INF/lib"/>
       <copy 
file="${basedir}/lib/repository/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.jar"
    todir="@{dest-jars-path}/WEB-INF/lib"/>
       <copy 
file="${basedir}/lib/repository/commons-digester/commons-digester/1.7/commons-digester-1.7.jar"
           todir="@{dest-jars-path}/WEB-INF/lib"/>
@@ -712,6 +727,11 @@
       <copy 
file="${basedir}/lib/repository/net/sf/saxon/saxon/8.7/saxon-8.7.jar"         
                            todir="@{dest-jars-path}/WEB-INF/lib"/>
       <copy 
file="${basedir}/lib/repository/net/sf/saxon/saxon-jdom/8.7/saxon-jdom-8.7.jar"
                           todir="@{dest-jars-path}/WEB-INF/lib"/>
       <copy 
file="${basedir}/lib/repository/net/sf/saxon/saxon-dom/8.7/saxon-dom-8.7.jar" 
                            todir="@{dest-jars-path}/WEB-INF/lib"/>
+
+      <copy 
file="${basedir}/lib/repository/commons-io/commons-io/1.2/commons-io-1.2.jar" 
                            todir="@{dest-jars-path}/WEB-INF/lib"/>
+      <copy 
file="${basedir}/lib/repository/commons-codec/commons-codec/1.3/commons-codec-1.3.jar"
                    todir="@{dest-jars-path}/WEB-INF/lib"/>
+      <copy 
file="${basedir}/lib/repository/commons-fileupload/commons-fileupload/1.2/commons-fileupload-1.2.jar"
     todir="@{dest-jars-path}/WEB-INF/lib"/>
+
     </sequential>
   </macrodef>
 
@@ -752,7 +772,7 @@
           <fileset dir="${basedir}/lib/repository">
             <include name="**/*.jar"/>
           </fileset>
-        </classpath>    
+        </classpath>
       </java>
     </sequential>
   </macrodef>
@@ -768,7 +788,7 @@
           <fileset dir="${basedir}/lib/repository">
             <include name="**/*.jar"/>
           </fileset>
-        </classpath>    
+        </classpath>
       </java>
     </sequential>
   </macrodef>