commons-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jstrac...@apache.org
Subject cvs commit: jakarta-commons-sandbox/jelly project.xml
Date Tue, 30 Jul 2002 17:57:20 GMT
jstrachan    2002/07/30 10:57:20

  Modified:    jelly/src/java/org/apache/commons/jelly jelly.properties
               jelly    project.xml
  Added:       jelly/src/java/org/apache/commons/jelly/tags/betwixt
                        ParseTag.java package.html IntrospectorUser.java
                        BetwixtTagLibrary.java IntrospectorTag.java
  Log:
  Added the initial cut of the Betwixt library. 
  This allows Betwixt to be used to parse XML inside a Jelly script. 
  Once the SAXWriter has been added to Betwixt we'll be able to use it for outputting XML
as well.
  
  I'll be testing this code tomorrow but at least right now it compiles ;-)
  
  Revision  Changes    Path
  1.1                  jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/betwixt/ParseTag.java
  
  Index: ParseTag.java
  ===================================================================
  /*
   * $Header: /home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/define/DynamicTag.java,v
1.7 2002/05/17 15:18:12 jstrachan Exp $
   * $Revision: 1.7 $
   * $Date: 2002/05/17 15:18:12 $
   *
   * ====================================================================
   *
   * The Apache Software License, Version 1.1
   *
   * Copyright (c) 1999-2002 The Apache Software Foundation.  All rights
   * reserved.
   *
   * Redistribution and use in source and binary forms, with or without
   * modification, are permitted provided that the following conditions
   * are met:
   *
   * 1. Redistributions of source code must retain the above copyright
   *    notice, this list of conditions and the following disclaimer.
   *
   * 2. Redistributions in binary form must reproduce the above copyright
   *    notice, this list of conditions and the following disclaimer in
   *    the documentation and/or other materials provided with the
   *    distribution.
   *
   * 3. The end-user documentation included with the redistribution, if
   *    any, must include the following acknowlegement:
   *       "This product includes software developed by the
   *        Apache Software Foundation (http://www.apache.org/)."
   *    Alternately, this acknowlegement may appear in the software itself,
   *    if and wherever such third-party acknowlegements normally appear.
   *
   * 4. The names "The Jakarta Project", "Commons", and "Apache Software
   *    Foundation" must not be used to endorse or promote products derived
   *    from this software without prior written permission. For written
   *    permission, please contact apache@apache.org.
   *
   * 5. Products derived from this software may not be called "Apache"
   *    nor may "Apache" appear in their names without prior written
   *    permission of the Apache Group.
   *
   * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
   * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
   * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
   * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
   * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
   * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
   * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
   * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
   * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
   * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
   * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
   * SUCH DAMAGE.
   * ====================================================================
   *
   * This software consists of voluntary contributions made by many
   * individuals on behalf of the Apache Software Foundation.  For more
   * information on the Apache Software Foundation, please see
   * <http://www.apache.org/>.
   * 
   * $Id: DynamicTag.java,v 1.7 2002/05/17 15:18:12 jstrachan Exp $
   */
  package org.apache.commons.jelly.tags.betwixt;
  
  import java.net.URL;
  
  import org.apache.commons.betwixt.XMLIntrospector;
  import org.apache.commons.betwixt.io.BeanReader;
  
  import org.apache.commons.jelly.MissingAttributeException;
  import org.apache.commons.jelly.TagSupport;
  import org.apache.commons.jelly.XMLOutput;
  
  import org.apache.commons.logging.Log;
  import org.apache.commons.logging.LogFactory;
  
  /** 
   * Parses some XML specified via the given URI (which can be relative or an absolute URL)
and outputs the
   * parsed object. Typically this tag is customized by setting the introspector attribute
or nesting a child
   * introspector tag inside it.</p>
   *
   * @author <a href="mailto:jstrachan@apache.org">James Strachan</a>
   * @version $Revision: 1.7 $
   */
  public class ParseTag extends TagSupport implements IntrospectorUser {
  
      /** The Log to which logging calls will be made. */
      private static final Log log = LogFactory.getLog(ParseTag.class);
  
      /** the BeanReader used to parse the XML */
      private BeanReader reader = new BeanReader();
  
      private String uri;
      private String var;
      
      
      public ParseTag() {
      }
  
      // Tag interface
      //-------------------------------------------------------------------------        
           
      public void doTag(final XMLOutput output) throws Exception {
          if ( uri == null ) {
              throw new MissingAttributeException( "uri" );
          }
          if ( var == null ) {
              throw new MissingAttributeException( "var" );
          }
          
          // allow nested introspector tags
          invokeBody(output);
          
          URL url = context.getResource( uri );
          Object value = reader.parse( url.toString() );
          context.setVariable( var, value );
      }
      
      // Properties
      //-------------------------------------------------------------------------        
           
      
      /**
       * Sets the Betwixt XMLIntrospector instance used to define the metadata for how a 
       * bean should appear as XML.
       */
      public void setIntrospector(XMLIntrospector introspector) {
          reader.setXMLIntrospector(introspector);
      }
      
      /**
       * Sets the URI from which XML is parsed. This can be relative to this Jelly script,
use
       * an absolute URI or a full URL
       */
      public void setUri(String uri) {
          this.uri = uri;
      }
      
      /**
       * Sets the variable name to output with the result of the XML parse.
       */
      public void setVar(String var) {
          this.var = var;
      }
      
      
      
      // Implementation methods
      //-------------------------------------------------------------------------        
           
  }
  
  
  
  1.1                  jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/betwixt/package.html
  
  Index: package.html
  ===================================================================
  <html>
  <head>
  </head>
  <body>
  
    <p>A tag library for creating Swing UIs via Jelly script</p>
    </p>
    
  </body>
  </html>
  
  
  
  1.1                  jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/betwixt/IntrospectorUser.java
  
  Index: IntrospectorUser.java
  ===================================================================
  /*
   * $Header: /home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/define/DynamicTag.java,v
1.7 2002/05/17 15:18:12 jstrachan Exp $
   * $Revision: 1.7 $
   * $Date: 2002/05/17 15:18:12 $
   *
   * ====================================================================
   *
   * The Apache Software License, Version 1.1
   *
   * Copyright (c) 1999-2002 The Apache Software Foundation.  All rights
   * reserved.
   *
   * Redistribution and use in source and binary forms, with or without
   * modification, are permitted provided that the following conditions
   * are met:
   *
   * 1. Redistributions of source code must retain the above copyright
   *    notice, this list of conditions and the following disclaimer.
   *
   * 2. Redistributions in binary form must reproduce the above copyright
   *    notice, this list of conditions and the following disclaimer in
   *    the documentation and/or other materials provided with the
   *    distribution.
   *
   * 3. The end-user documentation included with the redistribution, if
   *    any, must include the following acknowlegement:
   *       "This product includes software developed by the
   *        Apache Software Foundation (http://www.apache.org/)."
   *    Alternately, this acknowlegement may appear in the software itself,
   *    if and wherever such third-party acknowlegements normally appear.
   *
   * 4. The names "The Jakarta Project", "Commons", and "Apache Software
   *    Foundation" must not be used to endorse or promote products derived
   *    from this software without prior written permission. For written
   *    permission, please contact apache@apache.org.
   *
   * 5. Products derived from this software may not be called "Apache"
   *    nor may "Apache" appear in their names without prior written
   *    permission of the Apache Group.
   *
   * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
   * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
   * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
   * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
   * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
   * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
   * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
   * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
   * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
   * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
   * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
   * SUCH DAMAGE.
   * ====================================================================
   *
   * This software consists of voluntary contributions made by many
   * individuals on behalf of the Apache Software Foundation.  For more
   * information on the Apache Software Foundation, please see
   * <http://www.apache.org/>.
   * 
   * $Id: DynamicTag.java,v 1.7 2002/05/17 15:18:12 jstrachan Exp $
   */
  package org.apache.commons.jelly.tags.betwixt;
  
  import org.apache.commons.betwixt.XMLIntrospector;
  
  /** 
   * An object which uses an XMLIntrospector such as the parse or output tags.
   *
   * @author <a href="mailto:jstrachan@apache.org">James Strachan</a>
   * @version $Revision: 1.7 $
   */
  public interface IntrospectorUser {
  
      /**
       * Sets the introspector to be used by this object 
       */
      public void setIntrospector(XMLIntrospector introspector);
  }
  
  
  
  1.1                  jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/betwixt/BetwixtTagLibrary.java
  
  Index: BetwixtTagLibrary.java
  ===================================================================
  /*
   * $Header: /home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/xml/XMLTagLibrary.java,v
1.6 2002/05/17 18:04:00 jstrachan Exp $
   * $Revision: 1.6 $
   * $Date: 2002/05/17 18:04:00 $
   *
   * ====================================================================
   *
   * The Apache Software License, Version 1.1
   *
   * Copyright (c) 1999-2002 The Apache Software Foundation.  All rights
   * reserved.
   *
   * Redistribution and use in source and binary forms, with or without
   * modification, are permitted provided that the following conditions
   * are met:
   *
   * 1. Redistributions of source code must retain the above copyright
   *    notice, this list of conditions and the following disclaimer.
   *
   * 2. Redistributions in binary form must reproduce the above copyright
   *    notice, this list of conditions and the following disclaimer in
   *    the documentation and/or other materials provided with the
   *    distribution.
   *
   * 3. The end-user documentation included with the redistribution, if
   *    any, must include the following acknowlegement:
   *       "This product includes software developed by the
   *        Apache Software Foundation (http://www.apache.org/)."
   *    Alternately, this acknowlegement may appear in the software itself,
   *    if and wherever such third-party acknowlegements normally appear.
   *
   * 4. The names "The Jakarta Project", "Commons", and "Apache Software
   *    Foundation" must not be used to endorse or promote products derived
   *    from this software without prior written permission. For written
   *    permission, please contact apache@apache.org.
   *
   * 5. Products derived from this software may not be called "Apache"
   *    nor may "Apache" appear in their names without prior written
   *    permission of the Apache Group.
   *
   * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
   * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
   * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
   * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
   * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
   * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
   * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
   * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
   * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
   * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
   * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
   * SUCH DAMAGE.
   * ====================================================================
   *
   * This software consists of voluntary contributions made by many
   * individuals on behalf of the Apache Software Foundation.  For more
   * information on the Apache Software Foundation, please see
   * <http://www.apache.org/>.
   * 
   * $Id: XMLTagLibrary.java,v 1.6 2002/05/17 18:04:00 jstrachan Exp $
   */
  package org.apache.commons.jelly.tags.betwixt;
  
  import org.apache.commons.jelly.TagLibrary;
  
  /** 
   * A Jelly custom tag library that uses the Betwixt project to parse XML and turn it into
beans or 
   * turn beans into XML
   *
   * @author <a href="mailto:jstrachan@apache.org">James Strachan</a>
   * @version $Revision: 1.6 $
   */
  public class BetwixtTagLibrary extends TagLibrary {
          
      public BetwixtTagLibrary() {
          registerTag( "parse", ParseTag.class );
          registerTag( "introspector", IntrospectorTag.class );
      }
  }
  
  
  
  1.1                  jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/betwixt/IntrospectorTag.java
  
  Index: IntrospectorTag.java
  ===================================================================
  /*
   * $Header: /home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/define/DynamicTag.java,v
1.7 2002/05/17 15:18:12 jstrachan Exp $
   * $Revision: 1.7 $
   * $Date: 2002/05/17 15:18:12 $
   *
   * ====================================================================
   *
   * The Apache Software License, Version 1.1
   *
   * Copyright (c) 1999-2002 The Apache Software Foundation.  All rights
   * reserved.
   *
   * Redistribution and use in source and binary forms, with or without
   * modification, are permitted provided that the following conditions
   * are met:
   *
   * 1. Redistributions of source code must retain the above copyright
   *    notice, this list of conditions and the following disclaimer.
   *
   * 2. Redistributions in binary form must reproduce the above copyright
   *    notice, this list of conditions and the following disclaimer in
   *    the documentation and/or other materials provided with the
   *    distribution.
   *
   * 3. The end-user documentation included with the redistribution, if
   *    any, must include the following acknowlegement:
   *       "This product includes software developed by the
   *        Apache Software Foundation (http://www.apache.org/)."
   *    Alternately, this acknowlegement may appear in the software itself,
   *    if and wherever such third-party acknowlegements normally appear.
   *
   * 4. The names "The Jakarta Project", "Commons", and "Apache Software
   *    Foundation" must not be used to endorse or promote products derived
   *    from this software without prior written permission. For written
   *    permission, please contact apache@apache.org.
   *
   * 5. Products derived from this software may not be called "Apache"
   *    nor may "Apache" appear in their names without prior written
   *    permission of the Apache Group.
   *
   * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
   * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
   * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
   * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
   * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
   * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
   * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
   * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
   * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
   * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
   * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
   * SUCH DAMAGE.
   * ====================================================================
   *
   * This software consists of voluntary contributions made by many
   * individuals on behalf of the Apache Software Foundation.  For more
   * information on the Apache Software Foundation, please see
   * <http://www.apache.org/>.
   * 
   * $Id: DynamicTag.java,v 1.7 2002/05/17 15:18:12 jstrachan Exp $
   */
  package org.apache.commons.jelly.tags.betwixt;
  
  import org.apache.commons.beanutils.Converter;
  import org.apache.commons.beanutils.ConvertUtils;
  import org.apache.commons.beanutils.ConversionException;
  
  import org.apache.commons.betwixt.XMLIntrospector;
  import org.apache.commons.betwixt.strategy.CapitalizeNameMapper;
  import org.apache.commons.betwixt.strategy.DecapitalizeNameMapper;
  import org.apache.commons.betwixt.strategy.HyphenatedNameMapper;
  import org.apache.commons.betwixt.strategy.NameMapper;
          
  
  import org.apache.commons.jelly.JellyException;
  import org.apache.commons.jelly.TagSupport;
  import org.apache.commons.jelly.XMLOutput;
  
  import org.apache.commons.logging.Log;
  import org.apache.commons.logging.LogFactory;
  
  /** 
   * Creates a Betwixt XMLIntrospector instance that can be used with other Betwixt tags.</p>
   *
   * @author <a href="mailto:jstrachan@apache.org">James Strachan</a>
   * @version $Revision: 1.7 $
   */
  public class IntrospectorTag extends TagSupport {
  
      /** The Log to which logging calls will be made. */
      private static final Log log = LogFactory.getLog(IntrospectorTag.class);
  
      private XMLIntrospector introspector;
      private String var;
      
      static {
  
          // register converters to standard Strategies
          ConvertUtils.register( 
              new Converter() {
                  public Object convert(Class type, Object value) {
                      if ( value instanceof String ) {
                          return createNameMapper((String) value);
                      }
                      else if ( value == null ) {
                          return null;
                      }
                      else {
                          throw new ConversionException( 
                              "Don't know how to convert: " + value 
                              + " of type: " + value.getClass().getName() 
                              + " into a NameMapper"
                          );
                      }
                  }
              },
              NameMapper.class
          );
      }
  
  
      
      public IntrospectorTag() {
      }
  
      // Tag interface
      //-------------------------------------------------------------------------        
           
      public void doTag(final XMLOutput output) throws Exception {
  
          invokeBody(output);        
          
          XMLIntrospector introspector = getIntrospector();
          
          if ( var == null ) {
              // the parent tag should be a <parse> or <output> tag
              IntrospectorUser tag = (IntrospectorUser) findAncestorWithClass( IntrospectorUser.class
);
              if ( tag == null ) {
                  throw new JellyException( 
                      "This tag must be nested inside a <parse> or <output> tag,"
                      + " or the 'var' attribute should be specified" 
                  );
              }
              tag.setIntrospector( introspector );
          }
          else {
              context.setVariable( var, introspector );
          }
          
          // now lets clear this introspector so that its recreated again next time
          this.introspector = null;
      }
      
      // Properties
      //-------------------------------------------------------------------------        
           
  
      /**
       * @return the current XMLIntrospector, lazily creating one if required
       */
      public XMLIntrospector getIntrospector() {
          if ( introspector == null ) {
              introspector = createIntrospector();
          }
          return introspector;
      }
      
      /**
       * Sets whether attributes or elements should be used for primitive types.
       * The default is false.
       */
      public void setAttributesForPrimitives(boolean attributesForPrimitives) {
          getIntrospector().setAttributesForPrimitives(attributesForPrimitives);
      }
  
      /**
       * Sets the name mapper used for element names.
       * You can also use the Strings 'lowercase', 'uppercase' or 'hyphenated' 
       * as aliases to the common name mapping strategies or specify a class name String.
       */
      public void setElementNameMapper(NameMapper nameMapper) {
          getIntrospector().setElementNameMapper(nameMapper);
      }
              
      /**
       * Sets the name mapper used for attribute names.
       * You can also use the Strings 'lowercase', 'uppercase' or 'hyphenated' 
       * as aliases to the common name mapping strategies or specify a class name String.
       */
      public void setAttributeNameMapper(NameMapper nameMapper) {
          getIntrospector().setAttributeNameMapper(nameMapper);
      }
              
      
      /**
       * Sets the variable name to output the new XMLIntrospector to.
       * If this attribute is not specified then this tag must be nested
       * inside an &lt;parse&gt; or &lt;output&gt; tag
       */
      public void setVar(String var) {
          this.var = var;
      }
  
      // Implementation methods
      //-------------------------------------------------------------------------        
           
      
      /**
       * Static helper method which will convert the given string into
       * standard named strategies such as 'lowercase', 'uppercase' or 'hyphenated'
       * or use the name as a class name and create a new instance.
       */
      protected static NameMapper createNameMapper(String name) {
          if ( name.equalsIgnoreCase( "lowercase" ) ) {
              return new DecapitalizeNameMapper();
          }
          else if ( name.equalsIgnoreCase( "uppercase" ) ) {
              return new CapitalizeNameMapper();
          }
          else if ( name.equalsIgnoreCase( "hyphenated" ) ) {
              return new HyphenatedNameMapper();
          }
          else {
              // lets try load the class of this name
              Class theClass = null;
              try {
                  theClass = Thread.currentThread().getContextClassLoader().loadClass( name
);
              }
              catch (Exception e) {
                  throw new ConversionException( "Could not load class called: " + name, e
);
              }
              
              Object object = null;
              try {
                  object = theClass.newInstance();
              }
              catch (Exception e) {
                  throw new ConversionException( "Could not instantiate an instance of: "
+ name, e );
              }
              if ( object instanceof NameMapper ) {
                  return (NameMapper) object;
              }
              if ( object == null ) {
                  throw new ConversionException( "No NameMapper created for type: " + name
);
              }
              else {
                  throw new ConversionException( 
                      "Created object: " + object 
                      + " is not a NameMapper! Its type is: " + object.getClass().getName()

                  );
              }
          }
      }
      
      /**
       * Factory method to create a new XMLIntrospector
       */
      protected XMLIntrospector createIntrospector() {
          return new XMLIntrospector();
      }
  }
  
  
  
  1.21      +1 -0      jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/jelly.properties
  
  Index: jelly.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/jelly.properties,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- jelly.properties	25 Jul 2002 01:51:20 -0000	1.20
  +++ jelly.properties	30 Jul 2002 17:57:19 -0000	1.21
  @@ -13,6 +13,7 @@
   
   # optional taglibs
   html		= org.apache.commons.jelly.tags.html.HTMLTagLibrary
  +betwixt		= org.apache.commons.jelly.tags.betwixt.BetwixtTagLibrary
   jms         = org.apache.commons.jelly.tags.jms.JMSTagLibrary
   validate    = org.apache.commons.jelly.tags.validate.ValidateTagLibrary
   ojb         = org.apache.commons.jelly.tags.ojb.OjbTagLibrary
  
  
  
  1.47      +11 -5     jakarta-commons-sandbox/jelly/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/jelly/project.xml,v
  retrieving revision 1.46
  retrieving revision 1.47
  diff -u -r1.46 -r1.47
  --- project.xml	25 Jul 2002 01:51:20 -0000	1.46
  +++ project.xml	30 Jul 2002 17:57:20 -0000	1.47
  @@ -121,11 +121,6 @@
       </dependency>
   
       <dependency>
  -      <id>log4j</id>
  -      <version>1.1.3</version>
  -    </dependency>
  -
  -    <dependency>
         <id>commons-beanutils</id>
         <version>1.4-dev</version>
       </dependency>
  @@ -223,6 +218,12 @@
         <id>commons-httpclient</id>
         <version>2.0-dev</version>
       </dependency>
  +    
  +	<!-- betwixt taglib -->
  +    <dependency>
  +      <id>commons-betwixt</id>
  +      <version>SNAPSHOT</version>
  +    </dependency>
   
   
   	<!-- validate taglib -->
  @@ -240,6 +241,11 @@
       <dependency>
         <id>quartz</id>
         <version>SNAPSHOT</version>
  +    </dependency>
  +
  +    <dependency>
  +      <id>log4j</id>
  +      <version>1.1.3</version>
       </dependency>
   
   	<!-- runtime dependency for validate taglib -->
  
  
  

--
To unsubscribe, e-mail:   <mailto:commons-dev-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:commons-dev-help@jakarta.apache.org>


Mime
View raw message