husted      2003/06/06 08:46:11

  Modified:    contrib/struts-legacy STATUS.txt build.properties.sample
                        build.xml
  Added:       contrib/struts-legacy build.properties
  Log:
  Minor changes to struts-legacy packaging in preparation for its release.
  
  Revision  Changes    Path
  1.2       +8 -2      jakarta-struts/contrib/struts-legacy/STATUS.txt
  
  Index: STATUS.txt
  ===================================================================
  RCS file: /home/cvs/jakarta-struts/contrib/struts-legacy/STATUS.txt,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- STATUS.txt        9 May 2003 10:14:42 -0000       1.1
  +++ STATUS.txt        6 Jun 2003 15:46:10 -0000       1.2
  @@ -4,8 +4,14 @@
   This distribution contains classes which have been removed from the
   core Struts distribution but may still be of interest.
   
  -These files are considered "stable" and are not actively maintained.
  +The classes are considered "stable" but are *not* actively maintained.
  +(Hence, the name "legacy".)
   
  -This distribution currently requires Java 1.4.
  +This distribution can be built against Java 1.3 or Java 1.4.
  +
  +To provide best compatiblity, Java 1.3 is the default.
  +
  +The target JDK may be changed by copying "build.properties.sample"
  +as "build.properties" and making the appropriate changes.
   
   ###
  
  
  
  1.3       +5 -5      jakarta-struts/contrib/struts-legacy/build.properties.sample
  
  Index: build.properties.sample
  ===================================================================
  RCS file: /home/cvs/jakarta-struts/contrib/struts-legacy/build.properties.sample,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- build.properties.sample   17 May 2003 13:15:08 -0000      1.2
  +++ build.properties.sample   6 Jun 2003 15:46:11 -0000       1.3
  @@ -3,13 +3,13 @@
   
   
   # Commons Packages
  -commons.home=../../jakarta-commons
  -commons-logging.jar=${commons.home}/commons-logging/dist/commons-beanutils.jar"/>
  +# commons.home=../../jakarta-commons
  +# commons-logging.jar=${commons.home}/commons-logging/commons-logging.jar
   
   # JDK verson under which to compile [1.3 or 1.4]
  -jdk.version=1.4
  +# jdk.version=1.3
   
   # JDBC 2.0 Standard Extensions (javax.sql) JAR File
  -# jdbc20ext.jar=/opt/JavaSoft/lib/jdbc2_0-stdext.jar
   # jdbc20ext.jar=../../../Java/Programs/sun/jdbc2_0-stdext.jar
  +# jdbc20ext.jar=/opt/JavaSoft/lib/jdbc2_0-stdext.jar
   
  
  
  
  1.5       +28 -10    jakarta-struts/contrib/struts-legacy/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-struts/contrib/struts-legacy/build.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- build.xml 17 May 2003 13:20:46 -0000      1.4
  +++ build.xml 6 Jun 2003 15:46:11 -0000       1.5
  @@ -20,7 +20,9 @@
   
       <property name="commons.home"            location="../../../jakarta-commons"/>
       <property name="commons-logging.jar"     
location="${commons.home}/commons-logging/dist/commons-logging.jar"/>
  -    <property name="jdk.version"             value="1.4"/>
  +    <property name="jdk.version"             value="1.3"/>
  +    <property name="jdbc20ext.jar"           
location="./../../Java/Programs/sun/jdbc2_0-stdext.jar"/>
  +
   
       <!-- ========== Local System Paths ==================================== -->
   
  @@ -30,6 +32,7 @@
       <property name="source.home"             location="src/java"/>
       <property name="source.jdk.home"         location="src/jdk"/>
   
  +
       <!-- ========== Java Compilation Defaults ============================= -->
       <!-- These defaults may be overridden by user preferences from above    -->
   
  @@ -44,7 +47,7 @@
         <pathelement location="${jdbc20ext.jar}"/>
       </path>
   
  -    <path id="source.path">
  +    <path id="source.classpath">
         <pathelement location="${source.jdk.home}/${jdk.version}"/>
         <pathelement location="${source.home}"/>
       </path>
  @@ -54,11 +57,12 @@
       <property name="project.title"           value="Struts Legacy Distribution"/>
       <property name="project.version"         value="1.0"/>
       <property name="project.distname"        value="struts-legacy"/>
  +    <property name="project.package"         value="org.apache.struts.faces"/>
  +    <property name="project.version"         value="1.0"/>
   
   
       <!-- ========== Executable Targets ======================================== -->
   
  -
       <target name="init"
        description="Initialize and evaluate conditionals">
           <echo message="---------- ${project.title} ${project.version} ----------"/>
  @@ -78,7 +82,6 @@
           <mkdir dir="${dist.home}/docs/api"/>
       </target>
   
  -
       <target name="resources" depends="prepare"
        description="Copy static resources">
           <tstamp/>
  @@ -91,7 +94,6 @@
           </copy>
       </target>
   
  -
       <target name="compile" depends="resources"
        description="Compile library classes">
           <javac srcdir="${source.home}"
  @@ -99,15 +101,31 @@
                   debug="${compile.debug}"
             deprecation="${compile.deprecation}"
                optimize="${compile.optimize}">
  -            <sourcepath>
  -                <pathelement location="${source.jdk.home}/${jdk.version}"/>
  -            </sourcepath>
  +            <sourcepath refid="source.classpath" />
               <classpath refid="compile.classpath"/>
           </javac>
       </target>
   
  +    <target name="docs" depends="prepare"
  +     description="Create generated documentation and JavaDocs">
  +
  +      <javadoc
  +          sourcepath="src/java"
  +             destdir="${dist.home}/docs/api"
  +              author="true"
  +             private="true"
  +             version="true"
  +        packagenames="org.apache.struts.*"
  +         windowtitle="${project.title} (Version ${project.version})"
  +            doctitle="${project.title} (Version ${project.version})"
  +              bottom="Copyright &#169; 2001-2003 - Apache Software Foundation">
  +          <sourcepath refid="source.classpath" />
  +          <classpath refid="compile.classpath"/>
  +      </javadoc>
  +
  +    </target>
   
  -    <target name="dist" depends="compile"
  +    <target name="dist" depends="compile,docs"
        description="Create binary distribution">
           <copy  todir="${dist.home}" file="LICENSE.txt"/>
           <jar jarfile="${dist.home}/${project.distname}.jar"
  
  
  
  1.1                  jakarta-struts/contrib/struts-legacy/build.properties
  
  Index: build.properties
  ===================================================================
  # build.properties.sample -- Sample build.properties for "struts-legacy"
  # $Id: build.properties,v 1.1 2003/06/06 15:46:11 husted Exp $
  
  
  # Commons Packages
  # commons.home=../../jakarta-commons
  # commons-logging.jar=${commons.home}/commons-logging/commons-logging.jar
  commons.home=/opt/Commons
  commons-logging.jar=${commons.home}/commons-logging-1.0.2/commons-logging.jar
  # JDK verson under which to compile [1.3 or 1.4]
  # jdk.version=1.3
  
  # JDBC 2.0 Standard Extensions (javax.sql) JAR File
  jdbc20ext.jar=/opt/JavaSoft/lib/jdbc2_0-stdext.jar
  # jdbc20ext.jar=../../../Java/Programs/sun/jdbc2_0-stdext.jar
  
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to