[ogsa-dai svn] SF.net SVN: ogsa-dai:[1558] ogsa-dai/trunk/release-scripts/ogsa-dai/globus/ 4.2

[<mik...@us...>]

Revision: 1558
          http://ogsa-dai.svn.sourceforge.net/ogsa-dai/?rev=1558&view=rev
Author:   mikej888
Date:     2010-11-15 17:18:32 +0000 (Mon, 15 Nov 2010)

Log Message:
-----------
Now bundles Java web-app DTD in source and binary releases and uses this when applying DTD

Modified Paths:
--------------
    ogsa-dai/trunk/release-scripts/ogsa-dai/globus/4.2/binary-ant/build.xml
    ogsa-dai/trunk/release-scripts/ogsa-dai/globus/4.2/build.xml
    ogsa-dai/trunk/release-scripts/ogsa-dai/globus/4.2/source-ant/build.xml

Modified: ogsa-dai/trunk/release-scripts/ogsa-dai/globus/4.2/binary-ant/build.xml
===================================================================
--- ogsa-dai/trunk/release-scripts/ogsa-dai/globus/4.2/binary-ant/build.xml	2010-11-15 17:17:19 UTC (rev 1557)
+++ ogsa-dai/trunk/release-scripts/ogsa-dai/globus/4.2/binary-ant/build.xml	2010-11-15 17:18:32 UTC (rev 1558)
@@ -100,6 +100,10 @@
     <xslt in="${base.dir}/web-bak.xml" 
           out="${web.xml}" 
           style="${base.dir}/deploy/insertDAIServlets.xsl">
+      <xmlcatalog>
+        <dtd publicId="-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" 
+             location="${base.dir}/deploy/web-app_2_3.dtd"/>
+      </xmlcatalog>
       <param name="urlPattern" 
              expression="/services/${gar.name}/DataSourceRetrievalServlet"/>
     </xslt>

Modified: ogsa-dai/trunk/release-scripts/ogsa-dai/globus/4.2/build.xml
===================================================================
--- ogsa-dai/trunk/release-scripts/ogsa-dai/globus/4.2/build.xml	2010-11-15 17:17:19 UTC (rev 1557)
+++ ogsa-dai/trunk/release-scripts/ogsa-dai/globus/4.2/build.xml	2010-11-15 17:18:32 UTC (rev 1558)
@@ -106,6 +106,7 @@
     <copyDependency path="joda-time/joda-time/1.6"/>
     <copyDependency path="antlr/antlrworks/1.1.5"/>
     <copyDependency path="com/sun/xml/bind/jaxb-xjc/2.1.12"/>
+    <copyDependency path="com/sun/java/dtd/web-app/2.3"/>
     <copyDependency path="net/sf/jung/jung-api/2.0"/>
     <copyDependency path="net/sf/jung/jung-graph-impl/2.0"/>
     <copyDependency path="net/sourceforge/collections/collections-generic/4.01"/>

Modified: ogsa-dai/trunk/release-scripts/ogsa-dai/globus/4.2/source-ant/build.xml
===================================================================
--- ogsa-dai/trunk/release-scripts/ogsa-dai/globus/4.2/source-ant/build.xml	2010-11-15 17:17:19 UTC (rev 1557)
+++ ogsa-dai/trunk/release-scripts/ogsa-dai/globus/4.2/source-ant/build.xml	2010-11-15 17:18:32 UTC (rev 1558)
@@ -400,6 +400,16 @@
     <move file="${build.dir}/ogsadai-context-tmp.xml"
           tofile="${spring.file}"/>
 
+    <!--
+      Copy Java web-app DTD.
+    -->
+    <copy todir="${release.deploy.dir}"
+          flatten="true">
+      <fileset dir="${dependencies.dir}/com/sun/java/dtd/web-app">
+        <include name="**/*dtd"/>
+      </fileset>
+    </copy>
+
     <!-- Build JavaDoc. -->
     <antcall target="javadoc"/>
   </target>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.