struts-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From craig...@apache.org
Subject svn commit: r371824 - in /struts/shale/trunk: blank/build.xml blank/xdocs/ blank/xdocs/navigation.xml build.xml use-cases/build.xml use-cases/ext/ use-cases/lib/
Date Tue, 24 Jan 2006 05:35:03 GMT
Author: craigmcc
Date: Mon Jan 23 21:34:42 2006
New Revision: 371824

URL: http://svn.apache.org/viewcvs?rev=371824&view=rev
Log:
Refine the artifacts created by the global "release" target to be of three
types:

* shale-framework-VVVVVVV.{tar.gz,zip} - All sources and javadocs, plus the
  binaries of the Shale provided libraries, for version or nightly build
  VVVVVV.

* shale-dependencies-VVVVVVVV.{tar.gz,zip} - A snapshot of the dependencies
  downloaded by the "ant download-dependencies" command, suitable for
  unpacking in the top level directory of a Shale framework release.

* shale-XXXXXXXX-VVVVVVVV.war - Executable web application archive for
  appication XXXXXXXX that can be dropped in to a servet container.
  Initially, two applications (blank and use-cases) are supported.


Added:
    struts/shale/trunk/blank/xdocs/
    struts/shale/trunk/blank/xdocs/navigation.xml   (with props)
    struts/shale/trunk/use-cases/ext/
    struts/shale/trunk/use-cases/lib/
Modified:
    struts/shale/trunk/blank/build.xml
    struts/shale/trunk/build.xml
    struts/shale/trunk/use-cases/build.xml

Modified: struts/shale/trunk/blank/build.xml
URL: http://svn.apache.org/viewcvs/struts/shale/trunk/blank/build.xml?rev=371824&r1=371823&r2=371824&view=diff
==============================================================================
--- struts/shale/trunk/blank/build.xml (original)
+++ struts/shale/trunk/blank/build.xml Mon Jan 23 21:34:42 2006
@@ -34,8 +34,6 @@
   <path id="search.classpath">
     <fileset                        dir="${lib.dir}"
                                includes="**/*.jar"/>
-    <fileset                        dir="${shale.dir}/dist"
-                               includes="**/*.jar"/>
   </path>
 
 

Added: struts/shale/trunk/blank/xdocs/navigation.xml
URL: http://svn.apache.org/viewcvs/struts/shale/trunk/blank/xdocs/navigation.xml?rev=371824&view=auto
==============================================================================
--- struts/shale/trunk/blank/xdocs/navigation.xml (added)
+++ struts/shale/trunk/blank/xdocs/navigation.xml Mon Jan 23 21:34:42 2006
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<project name="Struts Framework"
+         href="http://struts.apache.org"
+        image="/images/struts.gif">
+
+    <title>Shale Blank Starter App</title>
+  <body>
+
+    <menu name="Quick Links">
+        <item name="Struts"             href="../../index.html"/>
+        <item name="Shale"             href="../index.html"/>
+        <item name="JavaServer Faces"   href="http://java.sun.com/j2ee/javaserverfaces"/>
+        <item name="Struts-Faces Integration Library" href="../../struts-faces/index.html"/>
+    </menu>
+
+    <menu name="Sub-Project Documentation">
+        <item name="Overview"           href="../projects-overview.html">
+          <item name="Core Library"       href="../shale-core/index.html"/>
+          <item name="Test Framework"     href="../shale-test/index.html"/>
+          <item name="Clay Plugin"        href="../shale-clay/index.html"/>
+          <item name="Use Cases"          href="../shale-usecases/index.html"/>
+          <item name="Mailreader"         href="../shale-mailreader/index.html"/>
+          <item name="Tiles Integration"  href="../shale-tiles/index.html"/>
+          <item name="Spring Integration" href="../shale-spring/index.html"/>
+          <item name="Tiger Extensions"   href="../shale-tiger/index.html"/>
+          <item name="Core Library Tests" href="../shale-core-test/index.html"/>
+        </item>
+    </menu>
+
+  </body>
+</project>
+
+
+
+
+
+

Propchange: struts/shale/trunk/blank/xdocs/navigation.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: struts/shale/trunk/blank/xdocs/navigation.xml
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Modified: struts/shale/trunk/build.xml
URL: http://svn.apache.org/viewcvs/struts/shale/trunk/build.xml?rev=371824&r1=371823&r2=371824&view=diff
==============================================================================
--- struts/shale/trunk/build.xml (original)
+++ struts/shale/trunk/build.xml Mon Jan 23 21:34:42 2006
@@ -356,7 +356,30 @@
   </target>
 
 
+  <target        name="dist.libraries"
+          description="Execute 'dist' on all library modules">
+
+    <antcall   target="execute.libraries">
+      <param     name="target"
+                value="dist"/>
+    </antcall>
+
+  </target>
+
+
+  <target        name="dist.examples"
+          description="Execute 'dist' on all example modules">
+
+    <antcall   target="execute.examples">
+      <param     name="target"
+                value="dist"/>
+    </antcall>
+
+  </target>
+
+
   <target        name="dist"
+              depends="dist.libraries,release.14.libraries,release.15.libraries,dist.examples"
           description="Execute 'dist' on all modules">
 
     <antcall   target="execute">
@@ -608,17 +631,41 @@
   </target>
 
 
-  <!-- Subtarget of "release" for JDK 1.4 artifacts -->
-  <target        name="release.14">
-
-    <echo     message="---------- Create Release Artifacts For Version ${project.version}
----------"/>
+  <!-- Subtarget of "release" for JDK 1.4 library artifacts -->
+  <target        name="release.14.libraries"
+              depends="dist.libraries">
 
     <!-- Construct overall release directory -->
     <mkdir        dir="${target.dir}"/>
     <mkdir        dir="${target.dir}/dist"/>
-    <mkdir        dir="${target.dir}/webapps"/>
     <mkdir        dir="${dist.dir}"/>
 
+    <!-- Copy clay-plugin artifacts -->
+    <copy       todir="${target.dir}/dist">
+      <fileset    dir="clay-plugin/dist/lib"
+             includes="*.jar"/>
+    </copy>
+
+    <!-- Copy core-library artifacts -->
+    <copy       todir="${target.dir}/dist">
+      <fileset    dir="core-library/dist/lib"
+             includes="*.jar"/>
+    </copy>
+
+    <!-- Copy test-framework artifacts -->
+    <copy       todir="${target.dir}/dist">
+      <fileset    dir="test-framework/dist/lib"
+             includes="*.jar"/>
+    </copy>
+
+  </target>
+
+
+  <!-- Subtarget of "release" for JDK 1.4 source artifacts -->
+  <target        name="release.14.sources">
+
+    <echo     message="---------- Create Release Artifacts For Version ${project.version}
----------"/>
+
     <!-- Copy release-wide documentation -->
     <copy       todir="${target.dir}"
                  file="build.xml"/>
@@ -636,16 +683,24 @@
              includes="*.html"/>
     </copy>
 
+    <!-- Copy blank starter app artifacts -->
+    <mkdir        dir="${target.dir}/blank"/>
+    <mkdir        dir="${target.dir}/blank/ext"/>
+    <mkdir        dir="${target.dir}/blank/lib"/>
+    <copy       todir="${target.dir}/blank">
+      <fileset    dir="blank"
+             includes="*.xml *.txt default.properties src/** xdocs/**"
+             excludes="**/.svn"/>
+      <fileset    dir="blank/dist/"
+             includes="docs/**"/>
+    </copy>
+
     <!-- Copy clay-plugin artifacts -->
     <mkdir        dir="${target.dir}/clay-plugin"/>
     <copy       todir="${target.dir}/clay-plugin">
       <fileset    dir="clay-plugin/dist"
              excludes="lib/**"/>
     </copy>
-    <copy       todir="${target.dir}/dist">
-      <fileset    dir="clay-plugin/dist/lib"
-             includes="*.jar"/>
-    </copy>
 
     <!-- Copy core-library artifacts -->
     <mkdir        dir="${target.dir}/core-library"/>
@@ -653,10 +708,6 @@
       <fileset    dir="core-library/dist"
              excludes="lib/**"/>
     </copy>
-    <copy       todir="${target.dir}/dist">
-      <fileset    dir="core-library/dist/lib"
-             includes="*.jar"/>
-    </copy>
 
     <!-- Copy test-framework artifacts -->
     <mkdir        dir="${target.dir}/test-framework"/>
@@ -664,20 +715,17 @@
       <fileset    dir="test-framework/dist"
              excludes="lib/**"/>
     </copy>
-    <copy       todir="${target.dir}/dist">
-      <fileset    dir="test-framework/dist/lib"
-             includes="*.jar"/>
-    </copy>
 
     <!-- Copy use-cases artifacts -->
     <mkdir        dir="${target.dir}/use-cases"/>
+    <mkdir        dir="${target.dir}/use-cases/ext"/>
+    <mkdir        dir="${target.dir}/use-cases/lib"/>
     <copy       todir="${target.dir}/use-cases">
-      <fileset    dir="use-cases/dist"
-             excludes="**/*.war"/>
-    </copy>
-    <copy       todir="${target.dir}/webapps">
-      <fileset    dir="use-cases/dist"
-             includes="**/*.war"/>
+      <fileset    dir="use-cases"
+             includes="*.xml *.txt default.properties src/** xdocs/**"
+             excludes="**/.svn"/>
+      <fileset    dir="use-cases/dist/"
+             includes="docs/**"/>
     </copy>
 
     <!-- Copy standalone Tiles JAR to dist for convenience -->
@@ -689,8 +737,32 @@
   </target>
 
 
-  <!-- Subtarget of "release" for JDK 1.5 artifacts -->
-  <target        name="release.15" if="jdk15.present">
+  <!-- Subtarget of "release" for JDK 1.4 web applicatons -->
+  <target        name="release.14.webapps">
+
+    <copy       todir="${dist.dir}"
+                 file="blank/dist/shale-blank-${project.version}.war"/>
+
+    <copy       todir="${dist.dir}"
+                 file="use-cases/dist/shale-usecases-${project.version}.war"/>
+
+  </target>
+
+
+  <!-- Subtarget of "release" for JDK 1.5 library artifacts -->
+  <target        name="release.15.libraries" if="jk15.present">
+
+    <!-- Copy tiger artifacts -->
+    <copy       todir="${target.dir}/dist">
+      <fileset    dir="tiger/dist/lib"
+             includes="*.jar"/>
+    </copy>
+
+  </target>
+
+
+  <!-- Subtarget of "release" for JDK 1.5 source artifacts -->
+  <target        name="release.15.sources" if="jdk15.present">
 
     <!-- Copy tiger artifacts -->
     <mkdir        dir="${target.dir}/tiger"/>
@@ -698,30 +770,61 @@
       <fileset    dir="tiger/dist"
              excludes="lib/**"/>
     </copy>
-    <copy       todir="${target.dir}/dist">
-      <fileset    dir="tiger/dist/lib"
-             includes="*.jar"/>
-    </copy>
+
+  </target>
+
+
+  <!-- Subtarget of "release" for JDK 1.4 web applicatons -->
+  <target        name="release.15.webapps" if="jdk15.present">
+
+  </target>
+
+
+  <!-- Subtarget of "release" for dependencies archives -->
+  <target        name="release.dependencies">
+
+    <tar      tarfile="${dist.dir}/shale-dependencies-${project.version}.tar.gz"
+              basedir="${basedir}"
+          compression="gzip"
+             longfile="gnu"
+             includes="lib/**"
+             excludes="jsf-ri/**"/>
+
+    <zip      zipfile="${dist.dir}/shale-dependencies-${project.version}.zip"
+              basedir="${basedir}"
+             includes="lib/**"
+             excludes="jsf-ri/**"/>
 
   </target>
 
 
   <target        name="release"
-              depends="clean-release,dist,release.14,release.15"
+              depends="clean-release,
+                       dist.libraries,
+                       release.14.libraries,
+                       release.15.libraries,
+                       dist.examples,
+                       release.14.sources,
+                       release.15.sources,
+                       release.14.webapps,
+                       release.15.webapps,
+                       release.dependencies"
           description="Construct release artifacts">
 
     <!-- Construct archive files -->
-    <tar      tarfile="${dist.dir}/struts-shale-${project.version}.tar.gz"
+    <tar      tarfile="${dist.dir}/shale-framework-${project.version}.tar.gz"
           compression="gzip"
              longfile="gnu">
-      <tarfileset dir="${target.dir}" prefix="struts-shale-${project.version}"/>
+      <tarfileset dir="${target.dir}" prefix="shale-framework-${project.version}"/>
     </tar>
-    <zip     destfile="${dist.dir}/struts-shale-${project.version}.zip">
-      <zipfileset dir="${target.dir}" prefix="struts-shale-${project.version}"/>
+    <zip     destfile="${dist.dir}/shale-framework-${project.version}.zip">
+      <zipfileset dir="${target.dir}" prefix="shale-framework-${project.version}"/>
     </zip>
   </target>
 
 
+
+
   <!-- ==================== Internal Targets =============================== -->
 
 
@@ -761,6 +864,10 @@
   <!-- Recursively execute ${target} across JDK 1.4 example apps -->
   <target        name="execute.14.examples">
 
+    <echo     message="Executing ${target} on module blank"/>
+    <ant          dir="${basedir}/blank"
+               target="${target}"/>
+
     <echo     message="Executing ${target} on module use-cases"/>
     <ant          dir="${basedir}/use-cases"
                target="${target}"/>
@@ -772,6 +879,16 @@
   <target        name="execute.15.examples" if="jdk15.present">
 
   </target>
+
+
+  <!-- Recursively execute ${target} across library modules -->
+  <target        name="execute.libraries"
+              depends="execute.14.libraries,execute.15.libraries"/>
+
+
+  <!-- Recursively execute ${target} across example modules -->
+  <target        name="execute.examples"
+              depends="execute.14.examples,execute.15.examples"/>
 
 
   <!-- Recursively execute ${target} across all modules -->

Modified: struts/shale/trunk/use-cases/build.xml
URL: http://svn.apache.org/viewcvs/struts/shale/trunk/use-cases/build.xml?rev=371824&r1=371823&r2=371824&view=diff
==============================================================================
--- struts/shale/trunk/use-cases/build.xml (original)
+++ struts/shale/trunk/use-cases/build.xml Mon Jan 23 21:34:42 2006
@@ -52,7 +52,7 @@
   <!-- Build Defaults -->
   <property name="build.home"      value="${basedir}/target"/>
   <property name="dist.home"       value="${basedir}/dist"/>
-  <property name="context.path"    value="struts-shale-usecases"/>
+  <property name="context.path"    value="shale-usecases"/>
   <property name="project.name"    value="Struts-Shale Use Cases"/>
   <property name="project.package" value="org.apache.shale.usecases"/>
   <property name="project.version" value="0.1-dev"/>
@@ -364,7 +364,7 @@
                                 excludes="build.properties"/>
     </copy>
 
-    <jar   jarfile="${dist.home}/${context.path}.war"
+    <jar   jarfile="${dist.home}/${context.path}-${project.version}.war"
            basedir="${build.home}/${context.path}"/>
 
     <mkdir     dir="${dist.home}/src"/>



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@struts.apache.org
For additional commands, e-mail: dev-help@struts.apache.org


Mime
View raw message