perfsonar development work

Author: trzaszcz
Date: 2009-12-30 04:44:43 -0500 (Wed, 30 Dec 2009)
New Revision: 5438

Added:
   branches/new-structure-with-base2/ps-mdm-web-admin/tomcat/index.jsp
   branches/new-structure-with-base2/ps-mdm-web-admin/tomcat/scripts/
   
branches/new-structure-with-base2/ps-mdm-web-admin/tomcat/scripts/Service_Admin.js
   
branches/new-structure-with-base2/ps-mdm-web-admin/tomcat/scripts/wz_tooltip.js
   branches/new-structure-with-base2/ps-mdm-web-admin/tomcat/styles/
   
branches/new-structure-with-base2/ps-mdm-web-admin/tomcat/styles/default.css
   branches/new-structure-with-base2/ps-mdm-web-admin/tomcat/styles/main.css
   branches/new-structure-with-base2/ps-mdm-web-admin/tomcat/views/
   branches/new-structure-with-base2/ps-mdm-web-admin/tomcat/views/banner.jsp
   
branches/new-structure-with-base2/ps-mdm-web-admin/tomcat/views/configurationSaved.jsp
   branches/new-structure-with-base2/ps-mdm-web-admin/tomcat/views/error.jsp
   branches/new-structure-with-base2/ps-mdm-web-admin/tomcat/views/footer.jsp
   
branches/new-structure-with-base2/ps-mdm-web-admin/tomcat/views/savedFailed.jsp
   branches/new-structure-with-base2/ps-mdm-web-admin/tomcat/views/sideBar.jsp
   branches/new-structure-with-base2/ps-mdm-web-admin/tomcat/views/welcome.jsp
Removed:
   branches/new-structure-with-base2/ps-mdm-web-admin/tomcat/META-INF/
   branches/new-structure-with-base2/ps-mdm-web-admin/tomcat/html/
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
Log:
WA structure changed

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-30 08:39:31 UTC (rev 5437)
+++ branches/new-structure-with-base2/ps-mdm-web-admin/ant/build.xml    
2009-12-30 09:44:43 UTC (rev 5438)
@@ -227,15 +227,13 @@
                        </fileset>
                </copy>
 
-               <war destfile="${build}/${warfilename}.war" 
webxml="${temp.dir.web-inf}/web.xml" excludes="${lib}/servlet/*">
-                       <fileset dir="${pages.dir}" />
-                       <metainf dir="${metainf.dir}" />
+               <war basedir="${basedir}/tomcat" 
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}" />
-                       <zipfileset dir="${graphics.dir}" prefix="graphics" />
                </war>
        </target>
        

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-30 08:39:31 UTC (rev 5437)
+++ branches/new-structure-with-base2/ps-mdm-web-admin/ant/const.properties   
  2009-12-30 09:44:43 UTC (rev 5438)
@@ -16,7 +16,7 @@
 target.server=127.0.0.1
 
 temp.dir.web-inf=${basedir}/tomcat
-pages.dir=${basedir}/tomcat/html
+pages.dir=${basedir}/tomcat/views
 graphics.dir=${basedir}/tomcat/graphics
 metainf.dir=${basedir}/tomcat/META-INF
 classes.dir=${basedir}/tomcat/classes

Added: branches/new-structure-with-base2/ps-mdm-web-admin/tomcat/index.jsp


Property changes on: 
branches/new-structure-with-base2/ps-mdm-web-admin/tomcat/index.jsp
___________________________________________________________________
Name: svn:executable
   + *

Added: 
branches/new-structure-with-base2/ps-mdm-web-admin/tomcat/scripts/Service_Admin.js


Property changes on: 
branches/new-structure-with-base2/ps-mdm-web-admin/tomcat/scripts/Service_Admin.js
___________________________________________________________________
Name: svn:executable
   + *

Added: 
branches/new-structure-with-base2/ps-mdm-web-admin/tomcat/scripts/wz_tooltip.js


Property changes on: 
branches/new-structure-with-base2/ps-mdm-web-admin/tomcat/scripts/wz_tooltip.js
___________________________________________________________________
Name: svn:executable
   + *

Added: 
branches/new-structure-with-base2/ps-mdm-web-admin/tomcat/styles/default.css


Property changes on: 
branches/new-structure-with-base2/ps-mdm-web-admin/tomcat/styles/default.css
___________________________________________________________________
Name: svn:executable
   + *

Added: 
branches/new-structure-with-base2/ps-mdm-web-admin/tomcat/styles/main.css


Property changes on: 
branches/new-structure-with-base2/ps-mdm-web-admin/tomcat/styles/main.css
___________________________________________________________________
Name: svn:executable
   + *

Added: 
branches/new-structure-with-base2/ps-mdm-web-admin/tomcat/views/banner.jsp

Added: 
branches/new-structure-with-base2/ps-mdm-web-admin/tomcat/views/configurationSaved.jsp

Added: 
branches/new-structure-with-base2/ps-mdm-web-admin/tomcat/views/error.jsp

Added: 
branches/new-structure-with-base2/ps-mdm-web-admin/tomcat/views/footer.jsp

Added: 
branches/new-structure-with-base2/ps-mdm-web-admin/tomcat/views/savedFailed.jsp

Added: 
branches/new-structure-with-base2/ps-mdm-web-admin/tomcat/views/sideBar.jsp

Added: 
branches/new-structure-with-base2/ps-mdm-web-admin/tomcat/views/welcome.jsp


Property changes on: 
branches/new-structure-with-base2/ps-mdm-web-admin/tomcat/views/welcome.jsp
___________________________________________________________________
Name: svn:executable
   + *