perfsonar development work

Author: trzaszcz
Date: 2009-12-31 06:34:34 -0500 (Thu, 31 Dec 2009)
New Revision: 5447

Added:
   branches/new-structure-with-base2/ps-mdm-web-admin/conf/
   branches/new-structure-with-base2/ps-mdm-web-admin/conf/configls.xml
   branches/new-structure-with-base2/ps-mdm-web-admin/conf/wa.xml
Removed:
   branches/new-structure-with-base2/ps-mdm-web-admin/tomcat/classes/
Modified:
   branches/new-structure-with-base2/ps-mdm-web-admin/ant/build.xml
   branches/new-structure-with-base2/ps-mdm-web-admin/ant/const.properties
   
branches/new-structure-with-base2/ps-mdm-web-admin/src/main/java/org/perfsonar/webadmin/base2/servlet/util/ConfigurationServletHelper.java
Log:
change WA structure

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 10:53:37 UTC (rev 5446)
+++ branches/new-structure-with-base2/ps-mdm-web-admin/ant/build.xml    
2009-12-31 11:34:34 UTC (rev 5447)
@@ -236,16 +236,30 @@
                        <fileset dir="${basedir}/lib/repository">
                                                                <include 
name="**/*.jar" />
                        </fileset>
+                       <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"/>
+               
+               <copy todir="build/war">
+                       <fileset dir="tomcat" excludes="web.xml"/>
+               </copy>
+               
+               <copy todir="build/war/WEB-INF/classes/perfsonar/conf">
+                       <fileset dir="conf/"/>
+               </copy>
 
-               <war basedir="${basedir}/tomcat" 
destfile="${build}/${warfilename}.war" webxml="${temp.dir.web-inf}/web.xml" 
excludes="${lib}/servlet/*">
+               <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>
-                       <lib file="${build}/${jarfilename}-${version}.jar" />
-                       <classes dir="${classes.dir}" />
                </war>
+               
+               <delete dir="build/war"/>
        </target>
        
        <target name="war-deploy" depends="war">

Modified: 
branches/new-structure-with-base2/ps-mdm-web-admin/ant/const.properties
===================================================================
--- branches/new-structure-with-base2/ps-mdm-web-admin/ant/const.properties   
  2009-12-31 10:53:37 UTC (rev 5446)
+++ branches/new-structure-with-base2/ps-mdm-web-admin/ant/const.properties   
  2009-12-31 11:34:34 UTC (rev 5447)
@@ -5,7 +5,7 @@
 libext=${basedir}/lib/libext
 
 schema=${basedir}/schema
-xml.file=../tomcat/classes/perfsonar/conf/wa.xml
+xml.file=../conf/wa.xml
 
 version=0.1
 wa.version=20090201

Added: branches/new-structure-with-base2/ps-mdm-web-admin/conf/configls.xml


Property changes on: 
branches/new-structure-with-base2/ps-mdm-web-admin/conf/configls.xml
___________________________________________________________________
Name: svn:executable
   + *

Added: branches/new-structure-with-base2/ps-mdm-web-admin/conf/wa.xml

Modified: 
branches/new-structure-with-base2/ps-mdm-web-admin/src/main/java/org/perfsonar/webadmin/base2/servlet/util/ConfigurationServletHelper.java
===================================================================
--- 
branches/new-structure-with-base2/ps-mdm-web-admin/src/main/java/org/perfsonar/webadmin/base2/servlet/util/ConfigurationServletHelper.java
  2009-12-31 10:53:37 UTC (rev 5446)
+++ 
branches/new-structure-with-base2/ps-mdm-web-admin/src/main/java/org/perfsonar/webadmin/base2/servlet/util/ConfigurationServletHelper.java
  2009-12-31 11:34:34 UTC (rev 5447)
@@ -44,6 +44,7 @@
                        return ret;
                // TODO: Fix Unix-paths
                String basePath = servletContext.getRealPath("/") + 
"/WEB-INF";
+               System.out.println(basePath);
                ret = new ObjectMap(basePath, WA_CONFIG_PATH, WA_FILE_NAME);
                servletContext.setAttribute("ObjectMap", ret);
                return ret;