svn commit: r987652 - /pivot/branches/1.5.x/build.xml

[gb...@apache.org]

Author: gbrown
Date: Fri Aug 20 22:21:06 2010
New Revision: 987652

URL: http://svn.apache.org/viewvc?rev=987652&view=rev
Log:
Resolve issue PIVOT-601.

Modified:
    pivot/branches/1.5.x/build.xml

Modified: pivot/branches/1.5.x/build.xml
URL: http://svn.apache.org/viewvc/pivot/branches/1.5.x/build.xml?rev=987652&r1=987651&r2=987652&view=diff
==============================================================================
--- pivot/branches/1.5.x/build.xml (original)
+++ pivot/branches/1.5.x/build.xml Fri Aug 20 22:21:06 2010
@@ -68,6 +68,7 @@ limitations under the License.
     <property name="jar.charts.sources" value="${ant.project.name}-charts-${version}-sources.jar" />
     <property name="jar.core.sources" value="${ant.project.name}-core-${version}-sources.jar" />
     <property name="jar.web.sources" value="${ant.project.name}-web-${version}-sources.jar" />
+    <property name="jar.web-server.sources" value="${ant.project.name}-web-server-${version}-sources.jar" />
     <property name="jar.wtk.sources" value="${ant.project.name}-wtk-${version}-sources.jar" />
     <property name="jar.wtk-terra.sources" value="${ant.project.name}-wtk-terra-${version}-sources.jar" />
 
@@ -131,6 +132,7 @@ limitations under the License.
             <mkdir dir="@{project}/${folder.bin}"/>
             <javac destDir="@{project}/${folder.bin}"
                 includejavaruntime="true"
+                includeantruntime="true"
                 deprecation="${compiler.deprecation}"
                 debug="${compiler.debug}"
                 target="${compiler.target}"
@@ -294,7 +296,8 @@ limitations under the License.
     <target name="package-sources" description="Packages all projects into JAR files" depends="trim-whitespace">
         <package-sources project="charts" jarFile="${jar.charts.sources}" title="Charts"/>
         <package-sources project="core" jarFile="${jar.core.sources}" title="Core"/>
-        <package-sources project="web" jarFile="${jar.web.sources}" title="Web Queries"/>
+        <package-sources project="web" jarFile="${jar.web.sources}" title="Web"/>
+        <package-sources project="web-server" jarFile="${jar.web-server.sources}" title="Web Server"/>
         <package-sources project="wtk" jarFile="${jar.wtk.sources}" title="WTK"/>
         <package-sources project="wtk-terra" jarFile="${jar.wtk-terra.sources}" title="WTK Terra Theme Provider"/>
     </target>
@@ -666,6 +669,10 @@ limitations under the License.
             <artifact:pom file="web/pom.xml"/>
             <attach file="lib/${jar.web.sources}" classifier="sources" />
         </artifact:install>
+        <artifact:install file="lib/${jar.web-server}">
+            <artifact:pom file="web-server/pom.xml"/>
+            <attach file="lib/${jar.web-server.sources}" classifier="sources" />
+        </artifact:install>
         <artifact:install file="lib/${jar.wtk}">
             <artifact:pom file="wtk/pom.xml"/>
             <attach file="lib/${jar.wtk.sources}" classifier="sources" />