struts-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From David Graham <grahamdavid1...@yahoo.com>
Subject RE: Building contrib packages WAS Re: cvs commit: jakarta-struts/contrib/tag-doc build.xml
Date Sun, 10 Aug 2003 02:22:54 GMT
--- Steve Raeburn <sraeburn@apache.org> wrote:
> o.a.s.util.GenericDataSource is in the core and extends the legacy
> GenericDataSource so legacy needs to be built first.

That's a good point.

> 
> It is deprecated since 1.1. Can we get rid of all legacy / DataSource
> stuff
> for 1.2?

I believe that was the plan all along but I've been waiting for Ted to
remove it because he (thankfully :-) took the lead in adding it.  I
haven't looked into it but hopefully it will be a simple build.xml change
and removal from cvs.

David

> 
> Steve
> 
> > -----Original Message-----
> > From: David Graham [mailto:grahamdavid1980@yahoo.com]
> > Sent: August 9, 2003 4:03 PM
> > To: Struts Developers List
> > Subject: Building contrib packages WAS Re: cvs commit:
> > jakarta-struts/contrib/tag-doc build.xml
> >
> >
> > While we're somewhat on this topic I'd like to get some clarification
> on
> > the build process.  Why do struts-el and struts-legacy get built with
> the
> > standard Struts build file?  Struts-EL has *never* built on my machine
> and
> > I have just taken it on faith the rest of Struts built properly. 
> Also,
> > after struts-legacy was added I've had to run my builds twice.  The
> first
> > one always fails and the second succeeds (well, not really succeeds
> > because struts-el fails).
> >
> > In general, I don't see a reason for contrib packages to be built with
> the
> > rest of Struts.  Am I missing something?
> >
> > David
> >
> > --- craigmcc@apache.org wrote:
> > > craigmcc    2003/08/09 12:29:30
> > >
> > >   Modified:    .        build.xml
> > >                contrib/struts-el build.xml
> > >
> > > contrib/struts-el/src/share/org/apache/strutsel/taglib/html
> > >                         ELFormTag.java ELHtmlTag.java
> > >                         ELJavascriptValidatorTag.java
> > >                contrib/struts-faces build.xml
> > >                contrib/struts-legacy build.xml
> > >                contrib/tag-doc build.xml
> > >   Log:
> > >   Correct loading order of properties files to go from most local
> > > (current
> > >   directory) to most global (${user.home}/build.properties).  Since
> Ant
> > >   follows a "first definition wins" strategy, this makes the most
> sense
> > >   for our convention of allowing local overrides of global values. 
> It
> > > also
> > >   means that I can now do an "ant dist" in the top level directory
> with
> > > only
> > >   one thing in my build.properties file (jdk.version=1.4), so this
> > > should fix
> > >   the nightly builds as well (verifying that is my next step).
> > >
> > >   Also fixed some compile errors in struts-el -- I don't know how
> that
> > > code
> > >   could have compiled for anyone.  Could someone more familiar with
> that
> > >   library make sure I did the changes correctly?
> > >
> > >   Revision  Changes    Path
> > >   1.118     +5 -2      jakarta-struts/build.xml
> > >
> > >   Index: build.xml
> > >  
> ===================================================================
> > >   RCS file: /home/cvs/jakarta-struts/build.xml,v
> > >   retrieving revision 1.117
> > >   retrieving revision 1.118
> > >   diff -u -r1.117 -r1.118
> > >   --- build.xml	8 Aug 2003 06:00:55 -0000	1.117
> > >   +++ build.xml	9 Aug 2003 19:29:30 -0000	1.118
> > >   @@ -113,9 +113,9 @@
> > >    -->
> > >
> > >        <!-- Load local and user build preferences -->
> > >   -    <property file="${user.home}/build.properties"/>
> > >   -    <property file="../build.properties"/>
> > >        <property file="build.properties"/>
> > >   +    <property file="../build.properties"/>
> > >   +    <property file="${user.home}/build.properties"/>
> > >
> > >        <!-- Default values for unspecified properties -->
> > >        <property name="catalina.home"
> > > value="../jakarta-tomcat-4.0/build"/>
> > >   @@ -204,6 +204,9 @@
> > >
> > >        <!-- Web directory -->
> > >        <property name="web.dir" value="web"/>
> > >   +
> > >   +    <!-- Pointer to struts-legacy.jar -->
> > >   +    <property name="struts-legacy.jar"
> > > value="${basedir}/contrib/struts-legacy/dist/struts-legacy.jar"/>
> > >
> > >        <!-- Compilation Classpath -->
> > >        <path id="compile.classpath">
> > >
> > >
> > >
> > >   1.17      +4 -4      jakarta-struts/contrib/struts-el/build.xml
> > >
> > >   Index: build.xml
> > >  
> ===================================================================
> > >   RCS file: /home/cvs/jakarta-struts/contrib/struts-el/build.xml,v
> > >   retrieving revision 1.16
> > >   retrieving revision 1.17
> > >   diff -u -r1.16 -r1.17
> > >   --- build.xml	13 Jun 2003 03:22:14 -0000	1.16
> > >   +++ build.xml	9 Aug 2003 19:29:30 -0000	1.17
> > >   @@ -51,10 +51,10 @@
> > >     -->
> > >
> > >     <!-- Load local and user build preferences -->
> > >   - <property file="${user.home}/build.properties"/>
> > >   - <property file="../../../build.properties"/>
> > >   - <property file="../../build.properties"/>
> > >     <property file="build.properties"/>
> > >   + <property file="../../build.properties"/>
> > >   + <property file="../../../build.properties"/>
> > >   + <property file="${user.home}/build.properties"/>
> > >
> > >     <!-- Default values for unspecified properties -->
> > >     <property name="jdbc20ext.jar" value="../jdbc2_0-stdext.jar"/>
> > >   @@ -219,7 +219,7 @@
> > >    -->
> > >      <copy todir="${build.home}/library">
> > >       <fileset dir="${jstl.home}/tld" includes="*.tld"/>
> > >   -   <fileset dir="${struts.home}/dist/lib" includes="*.tld"/>
> > >   +   <fileset dir="../../dist/lib" includes="*.tld"/>
> > >      </copy>
> > >     </target>
> > >
> > >
> > >
> > >
> > >   1.9       +7 -7
> > >
> > jakarta-struts/contrib/struts-el/src/share/org/apache/strutsel/tag
> > lib/html/ELFormTag.java
> > >
> > >   Index: ELFormTag.java
> > >  
> ===================================================================
> > >   RCS file:
> > >
> > /home/cvs/jakarta-struts/contrib/struts-el/src/share/org/apache/st
> > rutsel/taglib/html/ELFormTag.java,v
> > >   retrieving revision 1.8
> > >   retrieving revision 1.9
> > >   diff -u -r1.8 -r1.9
> > >   --- ELFormTag.java	26 Jul 2003 05:48:02 -0000	1.8
> > >   +++ ELFormTag.java	9 Aug 2003 19:29:30 -0000	1.9
> > >   @@ -386,9 +386,9 @@
> > >                                                this, pageContext))
> !=
> > > null)
> > >                setScope(string);
> > >
> > >   -        if ((bool = EvalHelper.evalBoolean("scriptLanguage",
> > > getScriptLanguageExpr(),
> > >   -                                           this, pageContext)) !=
> > > null)
> > >   -            setScriptLanguage(bool.booleanValue());
> > >   +        if ((string = EvalHelper.evalString("scriptLanguage",
> > > getScriptLanguageExpr(),
> > >   +                                            this, pageContext))
> !=
> > > null)
> > >   +            setScriptLanguageExpr(string);
> > >
> > >            if ((string = EvalHelper.evalString("style",
> getStyleExpr(),
> > >                                                this, pageContext))
> !=
> > > null)
> > >
> > >
> > >
> > >   1.8       +7 -7
> > >
> > jakarta-struts/contrib/struts-el/src/share/org/apache/strutsel/tag
> > lib/html/ELHtmlTag.java
> > >
> > >   Index: ELHtmlTag.java
> > >  
> ===================================================================
> > >   RCS file:
> > >
> 
=== message truncated ===


__________________________________
Do you Yahoo!?
Yahoo! SiteBuilder - Free, easy-to-use web site design software
http://sitebuilder.yahoo.com

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


Mime
View raw message