perfsonar development work

Author: trzaszcz
Date: 2010-01-04 03:13:11 -0500 (Mon, 04 Jan 2010)
New Revision: 5449

Added:
   branches/new-structure-with-base2/ps-mdm-web-admin/log4j/
   branches/new-structure-with-base2/ps-mdm-web-admin/log4j/production/
   
branches/new-structure-with-base2/ps-mdm-web-admin/log4j/production/log4j.properties
   branches/new-structure-with-base2/ps-mdm-web-admin/log4j/test/
   
branches/new-structure-with-base2/ps-mdm-web-admin/log4j/test/log4j.properties
Modified:
   branches/new-structure-with-base2/ps-mdm-web-admin/ant/build.xml
Log:
log4j added

Modified: branches/new-structure-with-base2/ps-mdm-web-admin/ant/build.xml
===================================================================
--- branches/new-structure-with-base2/ps-mdm-web-admin/ant/build.xml    
2009-12-31 11:49:00 UTC (rev 5448)
+++ branches/new-structure-with-base2/ps-mdm-web-admin/ant/build.xml    
2010-01-04 08:13:11 UTC (rev 5449)
@@ -51,7 +51,7 @@
 
        <target name="get-repo" depends="init-lib-dependencies" 
xmlns:artifact="urn:maven-artifact-ant">
                <artifact:dependencies>
-                       
+
                        <dependency groupId="tomcat" artifactId="servlet-api" 
version="5.0.28" />
                        <dependency groupId="Validation" artifactId="msv" 
version="1.0" />
                        <dependency groupId="Validation" artifactId="xsdlib" 
version="1.0" />
@@ -61,8 +61,8 @@
                        <dependency groupId="xalan" artifactId="xalan" 
version="2.7.0" />
                        <dependency groupId="xalan" artifactId="serializer" 
version="2.7.1" />
                        <dependency groupId="org.apache.httpcomponents" 
artifactId="httpclient" version="4.0" />
-                       
-                       
+
+
                        <localRepository refid="local.repository" />
                        <remoteRepository refid="remote.repository" />
                </artifact:dependencies>
@@ -132,7 +132,7 @@
                                <include name="**/*.jar" />
                        </fileset>
                        <fileset dir="${basedir}/lib/repository">
-                                       <include name="**/*.jar" />
+                               <include name="**/*.jar" />
                        </fileset>
                        <fileset dir="${servlet.dir}">
                                <include name="*.jar" />
@@ -234,38 +234,43 @@
                                <exclude name="xmldb" />
                        </fileset>
                        <fileset dir="${basedir}/lib/repository">
-                                                               <include 
name="**/*.jar" />
+                               <include name="**/*.jar" />
                        </fileset>
-                       <fileset dir="build" includes="*.jar"/>
+                       <fileset dir="build" includes="*.jar" />
                </copy>
-               
-               <delete dir="build/war" includeemptydirs="true"/>
-               
-               <mkdir dir="build/war/WEB-INF/lib"/>
-               <mkdir dir="build/war/WEB-INF/classes/perfsonar/conf"/>
-               
+
+               <delete dir="build/war" includeemptydirs="true" />
+
+               <mkdir dir="build/war/WEB-INF/lib" />
+               <mkdir dir="build/war/WEB-INF/classes/perfsonar/conf" />
+
                <copy todir="build/war">
-                       <fileset dir="tomcat" excludes="web.xml"/>
+                       <fileset dir="tomcat" excludes="web.xml" />
                </copy>
-               
+
                <copy todir="build/war/WEB-INF/classes/perfsonar/conf">
-                       <fileset dir="conf/"/>
+                       <fileset dir="conf/" />
                </copy>
 
+               <copy todir="build/war/WEB-INF/classes">
+                       <fileset dir="log4j/test" />
+               </copy>
+
                <war basedir="${basedir}/build/war" 
destfile="${build}/${warfilename}.war" webxml="${temp.dir.web-inf}/web.xml" 
excludes="${lib}/servlet/*">
-                       
+
                        <lib dir="${build}/flatten">
                                <exclude name="${lib}/servlet/*" />
                        </lib>
                </war>
-               
-               <delete dir="build/war"/>
+               <!--
+               <delete dir="build/war" />
+               -->
        </target>
-       
+
        <target name="war-deploy" depends="war">
-               <delete dir="${tomcat.dir}/webapps/${warfilename}" 
includes="**/**/*" includeemptydirs="true"/>
-               <delete file="${tomcat.dir}/webapps/${warfilename}.war"/>
-               <copy todir="${tomcat.dir}/webapps/" 
file="build/${warfilename}.war"/>
+               <delete dir="${tomcat.dir}/webapps/${warfilename}" 
includes="**/**/*" includeemptydirs="true" />
+               <delete file="${tomcat.dir}/webapps/${warfilename}.war" />
+               <copy todir="${tomcat.dir}/webapps/" 
file="build/${warfilename}.war" />
        </target>
 
 

Added: 
branches/new-structure-with-base2/ps-mdm-web-admin/log4j/production/log4j.properties


Property changes on: 
branches/new-structure-with-base2/ps-mdm-web-admin/log4j/production/log4j.properties
___________________________________________________________________
Name: svn:executable
   + *

Added: 
branches/new-structure-with-base2/ps-mdm-web-admin/log4j/test/log4j.properties


Property changes on: 
branches/new-structure-with-base2/ps-mdm-web-admin/log4j/test/log4j.properties
___________________________________________________________________
Name: svn:executable
   + *