cvs commit: jakarta-commons-sandbox/jelly project.xml

[dion]

dion2003/01/11 14:25:44

  Modified:jellyproject.xml
  Log:
  Remove beanshell from the dependencies
  
  Revision  ChangesPath
  1.122 +0 -12 jakarta-commons-sandbox/jelly/project.xml
  
  Index: project.xml
  ===
  RCS file: /home/cvs/jakarta-commons-sandbox/jelly/project.xml,v
  retrieving revision 1.121
  retrieving revision 1.122
  diff -u -r1.121 -r1.122
  --- project.xml   8 Jan 2003 05:05:09 -   1.121
  +++ project.xml   11 Jan 2003 22:25:44 -  1.122
  @@ -310,18 +310,6 @@
 2.3.1
   
   
  -
  -
  -
  -  
  -
  -  bsh
  -  1.2-b3
  -
  -
 
 
 
  
  
  

--
To unsubscribe, e-mail:   
For additional commands, e-mail: 

cvs commit: jakarta-commons-sandbox/jelly project.xml

[dion]

dion2003/01/07 21:05:10

  Modified:jellyproject.xml
  Log:
  Remove bsf dependencies from core
  
  Revision  ChangesPath
  1.121 +0 -6  jakarta-commons-sandbox/jelly/project.xml
  
  Index: project.xml
  ===
  RCS file: /home/cvs/jakarta-commons-sandbox/jelly/project.xml,v
  retrieving revision 1.120
  retrieving revision 1.121
  diff -u -r1.120 -r1.121
  --- project.xml   8 Jan 2003 04:52:47 -   1.120
  +++ project.xml   8 Jan 2003 05:05:09 -   1.121
  @@ -322,12 +322,6 @@
 1.2-b3
   
   
  -  
  -
  -  bsf
  -  2.2
  -
  -
 
 
 
  
  
  

--
To unsubscribe, e-mail:   
For additional commands, e-mail: 

cvs commit: jakarta-commons-sandbox/jelly project.xml

[dion]

dion2003/01/07 20:52:47

  Modified:jellyproject.xml
  Log:
  Remove email deps from core
  
  Revision  ChangesPath
  1.120 +0 -12 jakarta-commons-sandbox/jelly/project.xml
  
  Index: project.xml
  ===
  RCS file: /home/cvs/jakarta-commons-sandbox/jelly/project.xml,v
  retrieving revision 1.119
  retrieving revision 1.120
  diff -u -r1.119 -r1.120
  --- project.xml   7 Jan 2003 16:27:49 -   1.119
  +++ project.xml   8 Jan 2003 04:52:47 -   1.120
  @@ -328,18 +328,6 @@
 2.2
   
   
  -  
  -
  -  jaf
  -  1.0.2
  -  activation-1.0.2.jar
  -
  -
  -
  -  javamail
  -  1.2
  -
  -
 
 
 
  
  
  

--
To unsubscribe, e-mail:   
For additional commands, e-mail: 

cvs commit: jakarta-commons-sandbox/jelly project.xml

[dion]

dion2003/01/07 08:27:49

  Modified:jellyproject.xml
  Log:
  Remove jms from core
  
  Revision  ChangesPath
  1.119 +0 -11 jakarta-commons-sandbox/jelly/project.xml
  
  Index: project.xml
  ===
  RCS file: /home/cvs/jakarta-commons-sandbox/jelly/project.xml,v
  retrieving revision 1.118
  retrieving revision 1.119
  diff -u -r1.118 -r1.119
  --- project.xml   7 Jan 2003 15:00:02 -   1.118
  +++ project.xml   7 Jan 2003 16:27:49 -   1.119
  @@ -328,17 +328,6 @@
 2.2
   
   
  -  
  -
  -  commons-messenger
  -  1.0-dev-8
  -
  -
  -
  -  jms
  -  1.0.2b
  -
  -
 
   
 jaf
  
  
  

--
To unsubscribe, e-mail:   
For additional commands, e-mail: 

cvs commit: jakarta-commons-sandbox/jelly project.xml

[jstrachan]

jstrachan2003/01/07 00:44:27

  Modified:jellyproject.xml
  Log:
  Added a breakdown of the packages used in Jelly to make it more clear what is the 
supported, public end user API, what packages are to be used by tag implementators and 
what packages are implementation details.
  
  This change is only used by CVS HEAD of Maven.
  
  Revision  ChangesPath
  1.116 +22 -0 jakarta-commons-sandbox/jelly/project.xml
  
  Index: project.xml
  ===
  RCS file: /home/cvs/jakarta-commons-sandbox/jelly/project.xml,v
  retrieving revision 1.115
  retrieving revision 1.116
  diff -u -r1.115 -r1.116
  --- project.xml   7 Jan 2003 07:44:18 -   1.115
  +++ project.xml   7 Jan 2003 08:44:27 -   1.116
  @@ -18,6 +18,28 @@
   
 2002
 org.apache.commons.jelly
  +  
  + 
  + Core Public API
  + org.apache.commons.jelly
  + 
  + 
  + Utility classes for using Jelly from Ant
  + org.apache.commons.jelly.task
  + 
  + 
  + Utility classes for using Jelly from Servlets
  + org.apache.commons.jelly.servlet
  + 
  + 
  + Classes used by Tag Implementors
  + 
org.apache.commons.jelly.impl,org.apache.commons.jelly.tags,org.apache.commons.jelly.expression
  + 
  + 
  + Tag Implementations
  + org.apache.commons.jelly.tags.*
  + 
  +  
 Commons Jelly
   
 
  
  
  

--
To unsubscribe, e-mail:   
For additional commands, e-mail: 

cvs commit: jakarta-commons-sandbox/jelly project.xml

[jstrachan]

jstrachan2003/01/06 23:44:18

  Modified:jellyproject.xml
  Log:
  added back nekohtml which is required for the custom doclet. Though its not really a 
core Jelly dependency. 
  We can probably implement a better mechanism for generating the tag documentation 
and to remove this dependency later.
  
  Revision  ChangesPath
  1.115 +5 -0  jakarta-commons-sandbox/jelly/project.xml
  
  Index: project.xml
  ===
  RCS file: /home/cvs/jakarta-commons-sandbox/jelly/project.xml,v
  retrieving revision 1.114
  retrieving revision 1.115
  diff -u -r1.114 -r1.115
  --- project.xml   7 Jan 2003 07:36:19 -   1.114
  +++ project.xml   7 Jan 2003 07:44:18 -   1.115
  @@ -268,6 +268,11 @@
 1.3
   
   
  +
  +  nekohtml
  +  0.7.1
  +
  +
   
   
 jdbc
  
  
  

--
To unsubscribe, e-mail:   
For additional commands, e-mail: 

cvs commit: jakarta-commons-sandbox/jelly project.xml

[jstrachan]

jstrachan2003/01/06 23:36:20

  Modified:jellyproject.xml
  Log:
  removed some commented out dependencies
  
  Revision  ChangesPath
  1.114 +0 -86 jakarta-commons-sandbox/jelly/project.xml
  
  Index: project.xml
  ===
  RCS file: /home/cvs/jakarta-commons-sandbox/jelly/project.xml,v
  retrieving revision 1.113
  retrieving revision 1.114
  diff -u -r1.113 -r1.114
  --- project.xml   6 Jan 2003 17:58:14 -   1.113
  +++ project.xml   7 Jan 2003 07:36:19 -   1.114
  @@ -280,21 +280,10 @@
   
   
   
  -  nekohtml
  -  0.7.1
  -
  -
  -
 servletapi
 2.3
   
   
  -
  -
   
 xalan
 2.3.1
  @@ -306,13 +295,6 @@
 || These will be sub-projects one day, when Maven handles them gracefully
 -->
   
  - 
  -

   
 bsh
  @@ -325,24 +307,6 @@
 2.2
   
   
  - 
  -
  - 
  -
  -
  -

   
 commons-messenger
  @@ -354,48 +318,12 @@
 1.0.2b
   
   
  - 
  -
  - 
  -
  -

   
 quartz
 SNAPSHOT
   
   
  -
  -
  - 
  -

   
 jaf
  @@ -427,20 +355,6 @@
 1.0
   
   -->
  -
  - 
  -
  - 
  -  
  -  
 
 
   [EMAIL PROTECTED]
  
  
  

--
To unsubscribe, e-mail:   
For additional commands, e-mail: 

Re: cvs commit: jakarta-commons-sandbox/jelly project.xml

[dion]

Morgan Delagrange <[EMAIL PROTECTED]> wrote on 07/01/2003 04:56:12 AM:

> 
> --- [EMAIL PROTECTED] wrote:
> > dion2003/01/06 08:54:07
> > 
> >   Modified:jellyproject.xml
> >   Log:
> >   Change current version to reflect:
> >   a) It's a snapshot
> >   b) It's not yet 1.0-beta-4
> > 
> 
> Is this really necessary?  Now I have to go and change
> all the individual taglib builds from SNAPSHOT to
> 1.0-beta-4-SNAPSHOT, then I have to do it again every
> time we have a new beta.  I don't see how 1.0-beta-4
> snapshot is any more meaningful.  I'd rather point to
> SNAPSHOT (the closest Maven has to HEAD) until we have
> a released version to point to.
This is what it used to be, without the SNAPSHOT.

We wen't from 1.0-beta-1 to 1.0-beta-2 to 1.0-beta-3 and are now in the 
middle of 1.0-beta-4. So it is more meaningful, as there is some history 
in the existing versions on ibiblio.

I don't understand why you have to go change any of the existing taglib 
builds, as they are all using SNAPSHOT, which is just the term for the 
latest (and symlinked) release in the repository (local or remote). A 
SNAPSHOT should never be needed, as you can create a 

maven jar:snapshot

And copy the resulting jar to the repository (there are admin scripts to 
do it to ibiblio, you can do it locally by hand), as 
commons-jelly-SNAPSHOT.jar

The -SNAPSHOT.jar is not representative of the  tag, it's the 
latest build of that jar, regardless of version.

I hope this helps explain things.
--
dIon Gillard, Multitask Consulting
Blog:  http://www.freeroller.net/page/dion/Weblog
Work:  http://www.multitask.com.au



--
To unsubscribe, e-mail:   
For additional commands, e-mail: 

Re: cvs commit: jakarta-commons-sandbox/jelly project.xml

[Morgan Delagrange]

--- [EMAIL PROTECTED] wrote:
> dion2003/01/06 08:54:07
> 
>   Modified:jellyproject.xml
>   Log:
>   Change current version to reflect:
>   a) It's a snapshot
>   b) It's not yet 1.0-beta-4
>   

Is this really necessary?  Now I have to go and change
all the individual taglib builds from SNAPSHOT to
1.0-beta-4-SNAPSHOT, then I have to do it again every
time we have a new beta.  I don't see how 1.0-beta-4
snapshot is any more meaningful.  I'd rather point to
SNAPSHOT (the closest Maven has to HEAD) until we have
a released version to point to.

- Morgan

=
Morgan Delagrange
http://jakarta.apache.org/taglibs
http://jakarta.apache.org/commons
http://axion.tigris.org
http://jakarta.apache.org/watchdog

__
Do you Yahoo!?
Yahoo! Mail Plus - Powerful. Affordable. Sign up now.
http://mailplus.yahoo.com

--
To unsubscribe, e-mail:   
For additional commands, e-mail: 

cvs commit: jakarta-commons-sandbox/jelly project.xml

[dion]

dion2003/01/06 08:54:07

  Modified:jellyproject.xml
  Log:
  Change current version to reflect:
  a) It's a snapshot
  b) It's not yet 1.0-beta-4
  
  Revision  ChangesPath
  1.112 +1 -1  jakarta-commons-sandbox/jelly/project.xml
  
  Index: project.xml
  ===
  RCS file: /home/cvs/jakarta-commons-sandbox/jelly/project.xml,v
  retrieving revision 1.111
  retrieving revision 1.112
  diff -u -r1.111 -r1.112
  --- project.xml   6 Jan 2003 16:48:04 -   1.111
  +++ project.xml   6 Jan 2003 16:54:07 -   1.112
  @@ -7,7 +7,7 @@
 3
 commons-jelly
 commons-jelly
  -  SNAPSHOT
  +  1.0-beta-4-SNAPSHOT
 
 
   Apache Software Foundation
  
  
  

--
To unsubscribe, e-mail:   
For additional commands, e-mail: 

cvs commit: jakarta-commons-sandbox/jelly project.xml

[dion]

dion2003/01/06 08:48:04

  Modified:jellyproject.xml
  Log:
  Altered dependencies inline with extracted tags
  
  Revision  ChangesPath
  1.111 +16 -10jakarta-commons-sandbox/jelly/project.xml
  
  Index: project.xml
  ===
  RCS file: /home/cvs/jakarta-commons-sandbox/jelly/project.xml,v
  retrieving revision 1.110
  retrieving revision 1.111
  diff -u -r1.110 -r1.111
  --- project.xml   6 Jan 2003 08:18:09 -   1.110
  +++ project.xml   6 Jan 2003 16:48:04 -   1.111
  @@ -280,6 +280,11 @@
   
   
   
  +  nekohtml
  +  0.6.5
  +
  +
  +
 servletapi
 2.3
   
  @@ -349,7 +354,7 @@
 1.0.2b
   
   
  - 
  + 
   
  - 
  + 
   
  - 
  + 
   

   
  @@ -402,6 +407,7 @@
 1.0.2
 activation-1.0.2.jar
   
  +
   
 javamail
 1.2
  @@ -433,13 +439,13 @@
 0.8
   -->
   
  - 
  + 
 
  -  
  +  
 
 
   [EMAIL PROTECTED]
  
  
  

--
To unsubscribe, e-mail:   
For additional commands, e-mail: 

cvs commit: jakarta-commons-sandbox/jelly project.xml

[dion]

dion2003/01/06 00:18:09

  Modified:jellyproject.xml
  Log:
  Remove xmlunit from dependencies.
  At some point soon we should:
  1) regen the gump descriptor
  2) redeploy commons-jelly on ibiblio
  3) Update Maven's dependencies to include the new tag jars
  
  Revision  ChangesPath
  1.110 +2 -2  jakarta-commons-sandbox/jelly/project.xml
  
  Index: project.xml
  ===
  RCS file: /home/cvs/jakarta-commons-sandbox/jelly/project.xml,v
  retrieving revision 1.109
  retrieving revision 1.110
  diff -u -r1.109 -r1.110
  --- project.xml   5 Jan 2003 19:25:47 -   1.109
  +++ project.xml   6 Jan 2003 08:18:09 -   1.110
  @@ -427,11 +427,11 @@
   
   -->
   
  - 
  + 
   

   
  
  
  

--
To unsubscribe, e-mail:   
For additional commands, e-mail: 

cvs commit: jakarta-commons-sandbox/jelly project.xml

[dion]

dion2003/01/04 21:55:50

  Modified:jellyproject.xml
  Log:
  Remove antlr dependency
  
  Revision  ChangesPath
  1.108 +2 -2  jakarta-commons-sandbox/jelly/project.xml
  
  Index: project.xml
  ===
  RCS file: /home/cvs/jakarta-commons-sandbox/jelly/project.xml,v
  retrieving revision 1.107
  retrieving revision 1.108
  diff -u -r1.107 -r1.108
  --- project.xml   5 Jan 2003 01:28:35 -   1.107
  +++ project.xml   5 Jan 2003 05:55:49 -   1.108
  @@ -301,12 +301,12 @@
 || These will be sub-projects one day, when Maven handles them gracefully
 -->
   
  - 
  + 
   

   
  
  
  

--
To unsubscribe, e-mail:   
For additional commands, e-mail: 

cvs commit: jakarta-commons-sandbox/jelly project.xml

[morgand]

morgand 2003/01/04 17:28:35

  Modified:jellyproject.xml
  Log:
  moved ant and jsl to separate taglibs, removed dependencies on ant,
  ant-optional, and grant, changed version name to SNAPSHOT
  
  Revision  ChangesPath
  1.107 +1 -15 jakarta-commons-sandbox/jelly/project.xml
  
  Index: project.xml
  ===
  RCS file: /home/cvs/jakarta-commons-sandbox/jelly/project.xml,v
  retrieving revision 1.106
  retrieving revision 1.107
  diff -u -r1.106 -r1.107
  --- project.xml   3 Jan 2003 17:55:30 -   1.106
  +++ project.xml   5 Jan 2003 01:28:35 -   1.107
  @@ -7,7 +7,7 @@
 3
 commons-jelly
 commons-jelly
  -  1.0-beta-4
  +  SNAPSHOT
 
 
   Apache Software Foundation
  @@ -232,15 +232,6 @@
 
   &commonDeps;
   
  -
  -  ant
  -  1.5.1
  -
  -
  -
  -  ant+optional
  -  1.5.1
  -
   
   
  
  
  

--
To unsubscribe, e-mail:   
For additional commands, e-mail: 

cvs commit: jakarta-commons-sandbox/jelly project.xml

[morgand]

morgand 2003/01/03 09:55:30

  Modified:jellyproject.xml
  Log:
  removed hsqldb - no longer necessary
  
  Revision  ChangesPath
  1.106 +2 -2  jakarta-commons-sandbox/jelly/project.xml
  
  Index: project.xml
  ===
  RCS file: /home/cvs/jakarta-commons-sandbox/jelly/project.xml,v
  retrieving revision 1.105
  retrieving revision 1.106
  diff -u -r1.105 -r1.106
  --- project.xml   3 Jan 2003 05:02:17 -   1.105
  +++ project.xml   3 Jan 2003 17:55:30 -   1.106
  @@ -410,11 +410,11 @@
   
   -->
   
  - 
  + 
   

   
  
  
  

--
To unsubscribe, e-mail:   
For additional commands, e-mail: 

cvs commit: jakarta-commons-sandbox/jelly project.xml

[morgand]

morgand 2003/01/02 21:02:17

  Modified:jellyproject.xml
  Log:
  moved jeez into a separate build, removed unused dependency on werkz
  
  Revision  ChangesPath
  1.105 +2 -2  jakarta-commons-sandbox/jelly/project.xml
  
  Index: project.xml
  ===
  RCS file: /home/cvs/jakarta-commons-sandbox/jelly/project.xml,v
  retrieving revision 1.104
  retrieving revision 1.105
  diff -u -r1.104 -r1.105
  --- project.xml   3 Jan 2003 01:38:25 -   1.104
  +++ project.xml   3 Jan 2003 05:02:17 -   1.105
  @@ -298,11 +298,11 @@
 2.3
   
   
  -
  +
   
   
 xalan
  
  
  

--
To unsubscribe, e-mail:   
For additional commands, e-mail: 

cvs commit: jakarta-commons-sandbox/jelly project.xml

[morgand]

morgand 2003/01/02 17:38:25

  Modified:jellyproject.xml
  Log:
  added the common dependency entity and removed dependencies for betwixt,
  http, and jetty, which now live in separate builds
  
  Revision  ChangesPath
  1.104 +15 -58jakarta-commons-sandbox/jelly/project.xml
  
  Index: project.xml
  ===
  RCS file: /home/cvs/jakarta-commons-sandbox/jelly/project.xml,v
  retrieving revision 1.103
  retrieving revision 1.104
  diff -u -r1.103 -r1.104
  --- project.xml   31 Dec 2002 07:38:29 -  1.103
  +++ project.xml   3 Jan 2003 01:38:25 -   1.104
  @@ -1,5 +1,8 @@
   
  -
  +
  +  
  +]>
   
 3
 commons-jelly
  @@ -226,6 +229,9 @@
 

 
  +  
  +&commonDeps;
  +
   
 ant
 1.5.1
  @@ -236,31 +242,11 @@
 1.5.1
   
   
  -
  -  commons-beanutils
  -  
  -  SNAPSHOT
  -
  -
  -
  -  commons-collections
  -  2.1
  -
  -
  +
   
   
 commons-cli
  @@ -283,21 +269,6 @@
 1.0-beta-4
   
   
  -
  -  commons-jexl
  -  1.0-beta-1
  -
  -
  -
  -  commons-logging
  -  1.0
  -
  -
  -
  -  dom4j
  -  1.4-dev-8
  -
  -

   
 forehead
  @@ -311,11 +282,6 @@
 1.3
   
   
  -
  -  jaxp
  -  1.2
  -
  -
   
   
 jdbc
  @@ -343,15 +309,6 @@
 2.3.1
   
   
  -
  -  xerces
  -  2.0.2
  -
  -
  -
  -  xml-apis
  -  1.0.b2
  -
   
   
  + 
   
  - 
  + 
   
  -
  +
   

   
  
  
  

--
To unsubscribe, e-mail:   
For additional commands, e-mail: 

cvs commit: jakarta-commons-sandbox/jelly project.xml

[jstrachan]

jstrachan2002/12/11 04:34:49

  Modified:jellyproject.xml
  Log:
  patch to use consistent version of Ant and Ant+optional
  
  Revision  ChangesPath
  1.99  +1 -1  jakarta-commons-sandbox/jelly/project.xml
  
  Index: project.xml
  ===
  RCS file: /home/cvs/jakarta-commons-sandbox/jelly/project.xml,v
  retrieving revision 1.98
  retrieving revision 1.99
  diff -u -r1.98 -r1.99
  --- project.xml   10 Dec 2002 08:58:43 -  1.98
  +++ project.xml   11 Dec 2002 12:34:49 -  1.99
  @@ -225,7 +225,7 @@
   
   
 ant+optional
  -  1.5
  +  1.5.1
   
   
   
  
  
  

--
To unsubscribe, e-mail:   
For additional commands, e-mail: 

cvs commit: jakarta-commons-sandbox/jelly project.xml

[jstrachan]

jstrachan2002/12/10 00:58:43

  Modified:jellyproject.xml
  Log:
  Patched to use Ant 1.5.1 for Peter Lynch's maven issues
  
  Revision  ChangesPath
  1.98  +1 -1  jakarta-commons-sandbox/jelly/project.xml
  
  Index: project.xml
  ===
  RCS file: /home/cvs/jakarta-commons-sandbox/jelly/project.xml,v
  retrieving revision 1.97
  retrieving revision 1.98
  diff -u -r1.97 -r1.98
  --- project.xml   9 Dec 2002 15:18:26 -   1.97
  +++ project.xml   10 Dec 2002 08:58:43 -  1.98
  @@ -220,7 +220,7 @@
 
   
 ant
  -  1.5
  +  1.5.1
   
   
   
  
  
  

--
To unsubscribe, e-mail:   
For additional commands, e-mail: 

cvs commit: jakarta-commons-sandbox/jelly project.xml

[jstrachan]

jstrachan2002/12/09 07:18:26

  Modified:jellyproject.xml
  Added:   jelly/src/java/org/apache/commons/jelly/servlet
JellyServlet.java
  Log:
  Applied patch supplied by Kelvin Tan to provide a Servlet for evaluating Jelly 
scripts inside a servlet engine.
  
  Revision  ChangesPath
  1.1  
jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/servlet/JellyServlet.java
  
  Index: JellyServlet.java
  ===
  /*
   * $Header: 
/home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/servlet/JellyServlet.java,v
 1.1 2002/12/09 15:18:26 jstrachan Exp $
   * $Revision: 1.1 $
   * $Date: 2002/12/09 15:18:26 $
   *
   * 
   *
   * The Apache Software License, Version 1.1
   *
   * Copyright (c) 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 [EMAIL PROTECTED]
   *
   * 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
   * .
   * 
   * $Id: JellyServlet.java,v 1.1 2002/12/09 15:18:26 jstrachan Exp $
   */
  
  package org.apache.commons.jelly.servlet;
  
  import java.io.File;
  import java.io.IOException;
  import java.io.PrintWriter;
  import java.io.StringWriter;
  import java.io.UnsupportedEncodingException;
  import java.net.MalformedURLException;
  import java.net.URL;
  
  import javax.servlet.ServletException;
  import javax.servlet.ServletOutputStream;
  import javax.servlet.http.HttpServlet;
  import javax.servlet.http.HttpServletRequest;
  import javax.servlet.http.HttpServletResponse;
  
  import org.apache.commons.jelly.JellyContext;
  import org.apache.commons.jelly.XMLOutput;
  
  /**
   * Servlet for handling display of Jelly-fied XML files. Modelled after 
VelocityServlet.
   * 
   * @author Kelvin Tan
   * @version $Revision: 1.1 $
   */
  public class JellyServlet extends HttpServlet {
/**
 * The HTTP request object context key.
 */
public static final String REQUEST = "request";
  
/**
 * The HTTP response object context key.
 */
public static final String RESPONSE = "response";
  
protected void doGet(
HttpServletRequest request,
HttpServletResponse response)
throws ServletException, IOException {

doRequest(request, response);
}
  
protected void doPost(
HttpServletRequest

cvs commit: jakarta-commons-sandbox/jelly project.xml

[jstrachan]

jstrachan2002/11/25 10:40:44

  Modified:jelly/src/java/org/apache/commons/jelly/tags/jetty
ResponseBodyTag.java
   jellyproject.xml
  Log:
  Patch to use the latest version of Jetty which should hopefully fix the GUMP build 
problems.
  
  Revision  ChangesPath
  1.3   +1 -1  
jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/jetty/ResponseBodyTag.java
  
  Index: ResponseBodyTag.java
  ===
  RCS file: 
/home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/jetty/ResponseBodyTag.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ResponseBodyTag.java  30 Oct 2002 13:22:44 -  1.2
  +++ ResponseBodyTag.java  25 Nov 2002 18:40:43 -  1.3
  @@ -93,7 +93,7 @@
   ByteArrayISO8859Writer writer = new ByteArrayISO8859Writer(1500);
   writer.write(getBodyText());
   writer.flush();
  -httpResponse.setContentLength(writer.length());
  +httpResponse.setContentLength(writer.size());
   writer.writeTo(httpResponse.getOutputStream());
   
   }
  
  
  
  1.92  +1 -1  jakarta-commons-sandbox/jelly/project.xml
  
  Index: project.xml
  ===
  RCS file: /home/cvs/jakarta-commons-sandbox/jelly/project.xml,v
  retrieving revision 1.91
  retrieving revision 1.92
  diff -u -r1.91 -r1.92
  --- project.xml   13 Nov 2002 18:48:30 -  1.91
  +++ project.xml   25 Nov 2002 18:40:44 -  1.92
  @@ -364,7 +364,7 @@
   
   
 jetty
  -  4.1-rc6
  +  4.2.2
   
   

  
  
  

--
To unsubscribe, e-mail:   
For additional commands, e-mail: 

cvs commit: jakarta-commons-sandbox/jelly project.xml

[jstrachan]

jstrachan2002/11/05 05:06:13

  Modified:jelly/src/java/org/apache/commons/jelly/tags/jms
JMSTagLibrary.java SubscribeTag.java
   jellyproject.xml
  Added:   jelly/src/java/org/apache/commons/jelly/tags/jms
ConsumerTag.java StopwatchTag.java
  Log:
  Added a ConsumerTag interface to allow JMS message consumers to be nested to 
implement different behaviours such as transactions, message adornment and 
transformation and simple stuff like timing.
  
  Also added a simple  tag which can be used to time the throughput of 
messages for a subscription
  
  Revision  ChangesPath
  1.5   +1 -0  
jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/jms/JMSTagLibrary.java
  
  Index: JMSTagLibrary.java
  ===
  RCS file: 
/home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/jms/JMSTagLibrary.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- JMSTagLibrary.java30 Oct 2002 19:16:25 -  1.4
  +++ JMSTagLibrary.java5 Nov 2002 13:06:13 -   1.5
  @@ -80,6 +80,7 @@
   registerTag("property", PropertyTag.class);
   registerTag("receive", ReceiveTag.class);
   registerTag("send", SendTag.class);
  +registerTag("stopwatch", StopwatchTag.class);
   registerTag("subscribe", SubscribeTag.class);
   registerTag("textMessage", TextMessageTag.class);
   }
  
  
  
  1.3   +1 -1  
jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/jms/SubscribeTag.java
  
  Index: SubscribeTag.java
  ===
  RCS file: 
/home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/jms/SubscribeTag.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- SubscribeTag.java 30 Oct 2002 19:16:25 -  1.2
  +++ SubscribeTag.java 5 Nov 2002 13:06:13 -   1.3
  @@ -79,7 +79,7 @@
* @author mailto:jstrachan@;apache.org">James Strachan
* @version $Revision$
*/
  -public class SubscribeTag extends MessageOperationTag {
  +public class SubscribeTag extends MessageOperationTag implements ConsumerTag {
   
   /** The Log to which logging calls will be made. */
   private static final Log log = LogFactory.getLog(SubscribeTag.class);
  
  
  
  1.1  
jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/jms/ConsumerTag.java
  
  Index: ConsumerTag.java
  ===
  /*
   * $Header: 
/home/cvs/jakarta-commons-sandbox/jelly/src/taglibs/beanshell/src/java/org/apache/commons/jelly/tags/beanshell/BeanShellExpressionFactory.java,v
 1.1 2002/05/21 07:58:55 jstrachan Exp $
   * $Revision: 1.1 $
   * $Date: 2002/05/21 07:58:55 $
   *
   * 
   *
   * The Apache Software License, Version 1.1
   *
   * Copyright (c) 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 [EMAIL PROTECTED]
   *
   * 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 CON

cvs commit: jakarta-commons-sandbox/jelly project.xml

[jstrachan]

jstrachan2002/10/23 04:00:31

  Modified:jellyproject.xml
  Log:
  Added Tim as a contributor
  
  Revision  ChangesPath
  1.83  +8 -0  jakarta-commons-sandbox/jelly/project.xml
  
  Index: project.xml
  ===
  RCS file: /home/cvs/jakarta-commons-sandbox/jelly/project.xml,v
  retrieving revision 1.82
  retrieving revision 1.83
  diff -u -r1.82 -r1.83
  --- project.xml   22 Oct 2002 15:13:43 -  1.82
  +++ project.xml   23 Oct 2002 11:00:31 -  1.83
  @@ -175,6 +175,14 @@
Developer
 
   
  +
  +  Tim Anderson
  +  [EMAIL PROTECTED]
  +  Intalio, Inc.
  +  
  + Developer
  +  
  +
 
   
 
  
  
  

--
To unsubscribe, e-mail:   
For additional commands, e-mail: 

cvs commit: jakarta-commons-sandbox/jelly project.xml

[jstrachan]

jstrachan2002/10/10 06:19:40

  Modified:jellyproject.xml
  Log:
  Fixed issue tracking URL
  
  Revision  ChangesPath
  1.79  +1 -1  jakarta-commons-sandbox/jelly/project.xml
  
  Index: project.xml
  ===
  RCS file: /home/cvs/jakarta-commons-sandbox/jelly/project.xml,v
  retrieving revision 1.78
  retrieving revision 1.79
  diff -u -r1.78 -r1.79
  --- project.xml   10 Oct 2002 09:27:52 -  1.78
  +++ project.xml   10 Oct 2002 13:19:40 -  1.79
  @@ -27,7 +27,7 @@
 
 
 http://jakarta.apache.org/commons/sandbox/jelly/
  -  
http://nagoya.apache.org/scarab/servlet/scarab/
  +  
http://jira.werken.com/BrowseProject.jspa?id=10012
 jakarta.apache.org
 /www/jakarta.apache.org/commons/sandbox/jelly/
 
/www/jakarta.apache.org/builds/jakarta-commons-sandbox/jelly/
  
  
  

--
To unsubscribe, e-mail:   
For additional commands, e-mail: 

cvs commit: jakarta-commons-sandbox/jelly project.xml

[jstrachan]

jstrachan2002/10/10 02:27:52

  Modified:jelly/src/java/org/apache/commons/jelly jelly.properties
   jellyproject.xml
  Added:   jelly/src/java/org/apache/commons/jelly/tags/email
EmailTag.java package.html EmailTagLibrary.java
  Log:
  Added Jason Horman's email tag library submission so that email can be sent from a 
Jelly script. Many thanks Jason!
  
  Also added Jason and Morgan to the development team page
  
  Revision  ChangesPath
  1.24  +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.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- jelly.properties  28 Aug 2002 08:58:00 -  1.23
  +++ jelly.properties  10 Oct 2002 09:27:51 -  1.24
  @@ -17,6 +17,7 @@
   html = org.apache.commons.jelly.tags.html.HTMLTagLibrary
   betwixt  = org.apache.commons.jelly.tags.betwixt.BetwixtTagLibrary
   jms = org.apache.commons.jelly.tags.jms.JMSTagLibrary
  +email= org.apache.commons.jelly.tags.email.EmailTagLibrary
   validate= org.apache.commons.jelly.tags.validate.ValidateTagLibrary
   ojb = org.apache.commons.jelly.tags.ojb.OjbTagLibrary
   beanshell   = org.apache.commons.jelly.tags.beanshell.BeanShellTagLibrary
  
  
  
  1.1  
jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/email/EmailTag.java
  
  Index: EmailTag.java
  ===
  /*
   * $Header: 
/home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/xml/XMLTagLibrary.java,v
 1.9 2002/06/18 08:31:02 jstrachan Exp $
   * $Revision: 1.9 $
   * $Date: 2002/06/18 08:31:02 $
   *
   * 
   *
   * 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 [EMAIL PROTECTED]
   *
   * 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
   * .
   * 
   * $Id: XMLTagLibrary.java,v 1.9 2002/06/18 08:31:02 jstrachan Exp $
   */
  package org.apache.commons.jelly.tags.email;
  
  import org.apache.commons.jelly.TagSupport;
  import org.apache.commons.jelly.XMLOutput;
  import org.apache.commons.jelly.Jel

cvs commit: jakarta-commons-sandbox/jelly project.xml

[jstrachan]

jstrachan2002/10/02 04:03:38

  Modified:jelly/src/java/org/apache/commons/jelly Jelly.java
   jelly/src/java/org/apache/commons/jelly/tags/util
UtilTagLibrary.java
   jellyproject.xml
  Added:   jelly/src/java/org/apache/commons/jelly/tags/util
PropertiesTag.java
  Log:
  Applied Jim Birchfield's patches to support both a jelly.properties file when 
running Jelly from the command line as well as a new  tag to load 
properties from a file or URI in Jelly script.
  
  Revision  ChangesPath
  1.15  +78 -8 
jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/Jelly.java
  
  Index: Jelly.java
  ===
  RCS file: 
/home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/Jelly.java,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- Jelly.java9 Aug 2002 19:11:56 -   1.14
  +++ Jelly.java2 Oct 2002 11:03:38 -   1.15
  @@ -65,10 +65,13 @@
   import java.io.File;
   import java.io.FileWriter;
   import java.io.InputStream;
  +import java.io.FileInputStream;
   import java.io.OutputStreamWriter;
   import java.io.Writer;
   import java.net.MalformedURLException;
   import java.net.URL;
  +import java.util.Enumeration;
  +import java.util.Properties;
   
   import org.apache.commons.jelly.parser.XMLParser;
   import org.apache.commons.logging.Log;
  @@ -96,10 +99,11 @@
   /** The URL of the root context for other scripts */
   private URL rootContext;
   
  -
  +/** Whether we have loaded the properties yet */
  +private boolean loadedProperties = false;
  +
   public Jelly() {
   }
  -
   public static void main(String[] args) throws Exception {
   
   try
  @@ -155,11 +159,18 @@
   }
   }
   }
  +
  +
   
   /**
* Compiles the script
*/
   public Script compileScript() throws Exception {
  +if (! loadedProperties) {
  +loadedProperties = true;
  +loadJellyProperties();
  +}
  +
   XMLParser parser = new XMLParser();
   parser.setContext(getJellyContext());
   Script script = parser.parse(getUrl().openStream());
  @@ -169,7 +180,7 @@
   }
   return script;
   }
  -
  +
   
   // Properties
   //- 
   
  @@ -234,5 +245,64 @@
   return file.toURL();
   }
   return new URL(name);
  +}
  +
  +/**
  + * Attempts to load jelly.properties from the current directory,
  + * the users home directory or from the classpath
  + */
  +protected void loadJellyProperties() {
  +InputStream is = null;
  +
  +String userDir = System.getProperty("user.home");
  +File f = new File(userDir + File.separator + "jelly.properties");
  +try {
  +if (f.exists()) {
  +is = new FileInputStream(f);
  +loadProperties(is);
  +}
  +}
  +catch (Exception e) {
  +log.error( "Caught exception while loading: " + f.getName() + ". 
Reason: " + e, e );
  +}
  +
  +f = new File("jelly.properties");
  +try {
  +if (f.exists()) {
  +is = new FileInputStream(f);
  +loadProperties(is);
  +}
  +}
  +catch (Exception e) {
  +log.error( "Caught exception while loading: " + f.getName() + ". 
Reason: " + e, e );
  +}
  +
  +
  +is = getClass().getClassLoader().getResourceAsStream("jelly.properties");
  +if (is != null) {
  +try {
  +loadProperties(is);
  +}
  +catch (Exception e) {
  +log.error( "Caught exception while loading jelly.properties from 
the classpath. Reason: " + e, e );
  +}
  +}
  +}
  +
  +/**
  + * Loads the properties from the given input stream 
  + */
  +protected void loadProperties(InputStream is) throws Exception {
  +JellyContext context = getJellyContext();
  +Properties props = new Properties();
  +props.load(is);
  +Enumeration enum = props.propertyNames();
  +while (enum.hasMoreElements()) {
  +String key = (String) enum.nextElement();
  +String value = props.getProperty(key);
  +
  +// @todo we should parse the value in case its an Expression
  +context.setVariable(key, value);
  +}
   }
   }
  
  
  
  1.2   +6 -5  
jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/util/UtilTagLibrary.java
  
  Index: UtilTagLibrary.java

cvs commit: jakarta-commons-sandbox/jelly project.xml

[jstrachan]

jstrachan2002/09/30 01:05:45

  Modified:jelly/src/test/org/apache/commons/jelly/xml
transformExampleAllInLine.jelly
transformExampleSAXOutput.jelly TestXMLTags.java
transformExample.jelly
   jelly/src/java/org/apache/commons/jelly/tags/xml
XMLTagLibrary.java ParseTag.java TransformTag.java
   jelly/src/test/org/apache/commons/jelly/xml/schematron
transformSchematronExample.jelly
   jellyproject.xml
  Added:   jelly/src/test/org/apache/commons/jelly/xml
transformParamExample.xml transformParamExample.xsl
transformExampleXmlVar.jelly
transformParamExample2.jelly
transformExampleXmlVar.xml
transformExampleSAXOutputNestedTransforms.jelly
transformExample5.xsl transformParamExample.jelly
transformExample4.xsl transformExample3.xsl
transformExample2.xsl transformExample1.xsl
   jelly/src/java/org/apache/commons/jelly/tags/xml
ParamTag.java
  Log:
  Applied Robert Leftwich's patches to support efficent SAX based XSLT pipelines via 
nested  tags. Groovy stuff!
  This turns Jelly into a flexible, fast XSLT pipeline engine! Nice work Robert!
  There's still a couple of issue to work out but this is looking really neat
  
  Revision  ChangesPath
  1.2   +3 -3  
jakarta-commons-sandbox/jelly/src/test/org/apache/commons/jelly/xml/transformExampleAllInLine.jelly
  
  Index: transformExampleAllInLine.jelly
  ===
  RCS file: 
/home/cvs/jakarta-commons-sandbox/jelly/src/test/org/apache/commons/jelly/xml/transformExampleAllInLine.jelly,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- transformExampleAllInLine.jelly   25 Sep 2002 08:37:50 -  1.1
  +++ transformExampleAllInLine.jelly   30 Sep 2002 08:05:44 -  1.2
  @@ -2,7 +2,7 @@
   
   
 
  - http://www.w3.org/1999/XSL/Transform"; 
version="1.0">
  +http://www.w3.org/1999/XSL/Transform"; 
version="1.0">
   
 
   
  @@ -16,9 +16,9 @@
 
   
   
  - 
  +
   
  -  
  +  
   
 It works!
   
  
  
  
  1.2   +14 -14
jakarta-commons-sandbox/jelly/src/test/org/apache/commons/jelly/xml/transformExampleSAXOutput.jelly
  
  Index: transformExampleSAXOutput.jelly
  ===
  RCS file: 
/home/cvs/jakarta-commons-sandbox/jelly/src/test/org/apache/commons/jelly/xml/transformExampleSAXOutput.jelly,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- transformExampleSAXOutput.jelly   26 Sep 2002 12:28:21 -  1.1
  +++ transformExampleSAXOutput.jelly   30 Sep 2002 08:05:44 -  1.2
  @@ -2,7 +2,7 @@
   
   
 
  - http://www.w3.org/1999/XSL/Transform"; 
version="1.0">
  +http://www.w3.org/1999/XSL/Transform"; 
version="1.0">
   
 
   
  @@ -16,20 +16,20 @@
 
   
   
  - 
  +
   
  - 
  -  
  -   
  - 
  -   It works!
  - 
  -   
  -   
  - 
  +
  + 
  +  
  +
  +  It works!
  +
  +  
  +  
  +
 
   
   
  
  
  
  1.7   +34 -5 
jakarta-commons-sandbox/jelly/src/test/org/apache/commons/jelly/xml/TestXMLTags.java
  
  Index: TestXMLTags.java
  ===
  RCS file: 
/home/cvs/jakarta-commons-sandbox/jelly/src/test/org/apache/commons/jelly/xml/TestXMLTags.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- TestXMLTags.java  26 Sep 2002 12:28:21 -  1.6
  +++ TestXMLTags.java  30 Sep 2002 08:05:44 -  1.7
  @@ -139,7 +139,7 @@
   );
   assertEquals("Produces the correct output", "It works!", text);
   }
  -
  +
   public void testTransformAllInLine() throws Exception {
   String text = evaluteScriptAsText(
   "src/test/org/apache/commons/jelly/xml/transformExampleAllInLine.jelly"
  @@ -147,6 +147,21 @@
   assertEquals("Produces the correct output", "It works!", text);
   }
   
  +public void testTransformParams() throws Exception {
  +String text = evaluteScriptAsText(
  +"src/test/org/apache/commons/jelly/xml/transformParamExample.jelly"
  +);
  +assertEquals("Produces the correct output", "It works!", text);
  +}
  +
  +public void testTransformParamsInLine() throws Exception {
  +
  +String text = evaluteScriptAsTe

cvs commit: jakarta-commons-sandbox/jelly project.xml

[jstrachan]

jstrachan2002/09/25 01:37:51

  Modified:jelly/src/java/org/apache/commons/jelly/tags/xml
XMLTagLibrary.java ParseTag.java
   jelly/src/test/org/apache/commons/jelly/xml TestXMLTags.java
   jelly/src/java/org/apache/commons/jelly JellyContext.java
   jellyproject.xml
  Added:   jelly/src/test/org/apache/commons/jelly/xml/schematron
transformSchematronExample.jelly
test-schematron.xml schematron-wrapper.xsl
skeleton1-5.xsl source.xml
   jelly/src/java/org/apache/commons/jelly/tags/xml
TransformTag.java
   jelly/src/test/org/apache/commons/jelly/xml
transformExampleAllInLine.jelly
transformExample.xsl transformExample.jelly
  Log:
  Applied Robert Leftwich's excellent patches to add full support for  
for executing XSLT on some XML.
  The XML or the XSLT can come from the tags body just like the  tag in 
JSTL.
  
  Ultimately this tag can be used to implement sophisticated XSLT pipelining such 
as...
  
  
  
  
  
  
  
  
  
  which can then be used in association with servlet engines, SOAP services or just 
generating static content.
  
  It'd be nice to optimize the implementation at some point so that it can work 
totally on SAX in the above example. But this is an awesome start.
  
  Also do check out the groovy unit test cases such as the Schematron examples. It'd 
be nice to maybe generate a native Jelly implementaiton of Schematron...
  
  Revision  ChangesPath
  1.1  
jakarta-commons-sandbox/jelly/src/test/org/apache/commons/jelly/xml/schematron/transformSchematronExample.jelly
  
  Index: transformSchematronExample.jelly
  ===
  
  
  

  

  
Report count=:assert count=

  
  
  
  
  
  
  1.1  
jakarta-commons-sandbox/jelly/src/test/org/apache/commons/jelly/xml/schematron/test-schematron.xml
  
  Index: test-schematron.xml
  ===
  http://www.ascc.net/xml/schematron";
   icon="http://www.ascc.net/xml/resource/schematron/bilby.jpg";
   defaultPhase="built">
  
   This is an example schema for the Building Projects 
XML language.
  
   
  
  
   
  
   
  completed
  admin
   
  
  
   
  
  Constraints which are applied during construction
  
  
 A house should 
have 4 walls
 The house is 
incomplete, it still needs a roof
 An incomplete house must have
 a builder assigned to it
 An incomplete house cannot have an 
owner
  
  
   
  
   
  Constraints which are applied after construction
  
  
 A house should 
have 4 walls
 The house is 
incomplete, it still needs a roof
 An incomplete house must have
 an owner
 An incomplete house doesn't need 
a builder
  
  
   
  
   
  
  Adminstrative constraints which are 
always applied
  
  
 A house must have an 
address
  
  
  
 
 An address may only include street, town and postcode elements.
 
 An address must include the street 
details
 An address must identify the 
town
 An address must have a 
postcode
  
  
  
  
 A  element must have a first 
name
 A  element must have a last 
name
  
  
  
 
 A  must be 
certified
  
  
  
 
 An  must have a 
telephone
  
  
  
 Certification numbers must be recorded
 in the number attribute
  
  
   
  
   
  
  Its an odd house which has more or less than four walls! Consult 
your architect...
  
  
  
  Its an odd house which has no roof! Consult your architect...
  
  
   
  
   
  
  
  
  
  1.1  
jakarta-commons-sandbox/jelly/src/test/org/apache/commons/jelly/xml/schematro

cvs commit: jakarta-commons-sandbox/jelly project.xml

[jstrachan]

jstrachan2002/09/20 06:46:13

  Modified:jellyproject.xml
  Log:
  Added Otto as a contributor
  
  Revision  ChangesPath
  1.70  +8 -0  jakarta-commons-sandbox/jelly/project.xml
  
  Index: project.xml
  ===
  RCS file: /home/cvs/jakarta-commons-sandbox/jelly/project.xml,v
  retrieving revision 1.69
  retrieving revision 1.70
  diff -u -r1.69 -r1.70
  --- project.xml   18 Sep 2002 18:47:56 -  1.69
  +++ project.xml   20 Sep 2002 13:46:13 -  1.70
  @@ -126,6 +126,14 @@
Inventor of Mock Tags
 
   
  +
  +  Otto von Wachter
  +  [EMAIL PROTECTED]
  +  
  +  
  + Author of the tutorials
  +  
  +
 
   
 
  
  
  

--
To unsubscribe, e-mail:   
For additional commands, e-mail: 

cvs commit: jakarta-commons-sandbox/jelly project.xml

[jstrachan]

jstrachan2002/09/18 11:47:56

  Modified:jellyproject.xml
  Log:
  incremented the pre-release snapshot build number
  
  Revision  ChangesPath
  1.69  +1 -1  jakarta-commons-sandbox/jelly/project.xml
  
  Index: project.xml
  ===
  RCS file: /home/cvs/jakarta-commons-sandbox/jelly/project.xml,v
  retrieving revision 1.68
  retrieving revision 1.69
  diff -u -r1.68 -r1.69
  --- project.xml   17 Sep 2002 12:36:26 -  1.68
  +++ project.xml   18 Sep 2002 18:47:56 -  1.69
  @@ -4,7 +4,7 @@
 3
 commons-jelly
 commons-jelly
  -  1.0-beta-3
  +  1.0-beta-4
 
 
   Apache Software Foundation
  
  
  

--
To unsubscribe, e-mail:   
For additional commands, e-mail: 

cvs commit: jakarta-commons-sandbox/jelly project.xml

[jstrachan]

jstrachan2002/09/17 05:36:26

  Modified:jellyproject.xml
  Log:
  Added the common-user list
  
  Revision  ChangesPath
  1.68  +6 -0  jakarta-commons-sandbox/jelly/project.xml
  
  Index: project.xml
  ===
  RCS file: /home/cvs/jakarta-commons-sandbox/jelly/project.xml,v
  retrieving revision 1.67
  retrieving revision 1.68
  diff -u -r1.67 -r1.68
  --- project.xml   6 Sep 2002 09:09:20 -   1.67
  +++ project.xml   17 Sep 2002 12:36:26 -  1.68
  @@ -52,6 +52,12 @@
 [EMAIL PROTECTED]
 
http://nagoya.apache.org/eyebrowse/SummarizeList?[EMAIL PROTECTED]
   
  +
  +  Commons User List
  +  [EMAIL PROTECTED]
  +  [EMAIL PROTECTED]
  +  
http://nagoya.apache.org/eyebrowse/SummarizeList?[EMAIL PROTECTED]
  +
 
 
 
  
  
  

--
To unsubscribe, e-mail:   
For additional commands, e-mail: 

cvs commit: jakarta-commons-sandbox/jelly project.xml

[jstrachan]

jstrachan2002/06/12 06:21:34

  Modified:jellyproject.xml
  Log:
  removed unnecessary dependency on log4j which is no longer needed (now werkz isn't 
using it directly)
  
  Revision  ChangesPath
  1.15  +0 -8  jakarta-commons-sandbox/jelly/project.xml
  
  Index: project.xml
  ===
  RCS file: /home/cvs/jakarta-commons-sandbox/jelly/project.xml,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- project.xml   12 Jun 2002 04:38:50 -  1.14
  +++ project.xml   12 Jun 2002 13:21:34 -  1.15
  @@ -151,14 +151,6 @@
   
   
   
  -
  -
  -  log4j
  -  required
  -  1.1.3
  -  log4j-1.1.3.jar
  -
  -
   
 hsqldb
 required
  
  
  

--
To unsubscribe, e-mail:   
For additional commands, e-mail: 

cvs commit: jakarta-commons-sandbox/jelly project.xml

[werken]

werken  2002/06/11 21:38:50

  Modified:jellyproject.xml
  Log:
  Added jakarta-ant as a  in order to decrease the
  amount of exceptions thrown by demo.werkz2.
  
  Revision  ChangesPath
  1.14  +5 -0  jakarta-commons-sandbox/jelly/project.xml
  
  Index: project.xml
  ===
  RCS file: /home/cvs/jakarta-commons-sandbox/jelly/project.xml,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- project.xml   12 Jun 2002 04:32:28 -  1.13
  +++ project.xml   12 Jun 2002 04:38:50 -  1.14
  @@ -90,6 +90,11 @@
   
   -->
   
  +  ant
  +  1.4.1
  +
  +
  +
 commons-logging
 required
 1.0
  
  
  

--
To unsubscribe, e-mail:   
For additional commands, e-mail: 

cvs commit: jakarta-commons-sandbox/jelly project.xml

[dion]

dion2002/06/07 05:26:46

  Modified:jellyproject.xml
  Log:
  supposed to add my name before committing to the project :)
  
  Revision  ChangesPath
  1.11  +12 -1 jakarta-commons-sandbox/jelly/project.xml
  
  Index: project.xml
  ===
  RCS file: /home/cvs/jakarta-commons-sandbox/jelly/project.xml,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- project.xml   2 Jun 2002 18:00:38 -   1.10
  +++ project.xml   7 Jun 2002 12:26:46 -   1.11
  @@ -63,8 +63,19 @@
 [EMAIL PROTECTED]
 Adeptra , Inc.
   
  +
  +
  +  dIon Gillard
  +  dion
  +  [EMAIL PROTECTED]
  +  Multitask Consulting
  +  
  +Interested party
  +  
  +
  +
 
  -  
  +
 
   
 commons-logging
  
  
  

--
To unsubscribe, e-mail:   
For additional commands, e-mail: 

cvs commit: jakarta-commons-sandbox/jelly project.xml

[jstrachan]

jstrachan02/05/23 16:53:42

  Modified:jelly/src/java/org/apache/commons/jelly TagLibrary.java
Jelly.java
   jelly/xdocs index.xml
   jellyproject.xml
  Log:
  Build and unit tests all seem to work fine now. The LinkageError that was occurring 
on the unit tests has now gone away; the trick is not to put any JAXP / Xerces related 
dependencies in project.xml
  
  Revision  ChangesPath
  1.8   +19 -8 
jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/TagLibrary.java
  
  Index: TagLibrary.java
  ===
  RCS file: 
/home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/TagLibrary.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- TagLibrary.java   17 May 2002 15:18:12 -  1.7
  +++ TagLibrary.java   23 May 2002 23:53:42 -  1.8
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/TagLibrary.java,v
 1.7 2002/05/17 15:18:12 jstrachan Exp $
  - * $Revision: 1.7 $
  - * $Date: 2002/05/17 15:18:12 $
  + * $Header: 
/home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/TagLibrary.java,v
 1.8 2002/05/23 23:53:42 jstrachan Exp $
  + * $Revision: 1.8 $
  + * $Date: 2002/05/23 23:53:42 $
*
* 
*
  @@ -57,7 +57,7 @@
* information on the Apache Software Foundation, please see
* .
* 
  - * $Id: TagLibrary.java,v 1.7 2002/05/17 15:18:12 jstrachan Exp $
  + * $Id: TagLibrary.java,v 1.8 2002/05/23 23:53:42 jstrachan Exp $
*/
   
   package org.apache.commons.jelly;
  @@ -74,7 +74,7 @@
   /** Taglib represents the metadata for a Jelly custom tag 
library.
 *
 * @author mailto:[EMAIL PROTECTED]";>James Strachan
  -  * @version $Revision: 1.7 $
  +  * @version $Revision: 1.8 $
 */
   
   public abstract class TagLibrary {
  @@ -106,18 +106,29 @@
   String attributeValue)
   throws Exception {
   
  +ExpressionFactory myFactory = getExpressionFactory();
  +if (myFactory == null) {
  +myFactory = factory;
  +}
  +if (myFactory != null) {
  +return myFactory.createExpression(attributeValue);
  +}
   // will use the default expression instead
  -
   return null;
  -
   }
  -
  +
  +
   // Implementation methods
   //- 
   
   /** Registers a tag class for a given tag name */
   protected void registerTag(String name, Class type) {
   tags.put(name, type);
  +}
  +
  +/** Allows derived tag libraries to use their own factory */
  +protected ExpressionFactory getExpressionFactory() {
  +return null;
   }
   
   }
  
  
  
  1.11  +5 -6  
jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/Jelly.java
  
  Index: Jelly.java
  ===
  RCS file: 
/home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/Jelly.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- Jelly.java17 May 2002 15:18:12 -  1.10
  +++ Jelly.java23 May 2002 23:53:42 -  1.11
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/Jelly.java,v 
1.10 2002/05/17 15:18:12 jstrachan Exp $
  - * $Revision: 1.10 $
  - * $Date: 2002/05/17 15:18:12 $
  + * $Header: 
/home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/Jelly.java,v 
1.11 2002/05/23 23:53:42 jstrachan Exp $
  + * $Revision: 1.11 $
  + * $Date: 2002/05/23 23:53:42 $
*
* 
*
  @@ -57,7 +57,7 @@
* information on the Apache Software Foundation, please see
* .
* 
  - * $Id: Jelly.java,v 1.10 2002/05/17 15:18:12 jstrachan Exp $
  + * $Id: Jelly.java,v 1.11 2002/05/23 23:53:42 jstrachan Exp $
*/
   
   package org.apache.commons.jelly;
  @@ -80,7 +80,7 @@
* or can be used as the basis of an Ant task.
*
* @author mailto:[EMAIL PROTECTED]";>James Strachan
  - * @version $Revision: 1.10 $
  + * @version $Revision: 1.11 $
*/
   public class Jelly {
   
  @@ -94,7 +94,6 @@
   private URL url;
   
   /** The URL of the root context for other scripts */
  -
   private URL rootContext;
   
   
  
  
  
  1.3   +341 -46   jakarta-commons-sandbox/jelly/xdocs/index.xml
  
  Index: index.xml
  ===
  RCS file: /home/cvs/jakarta-commons-sandbox/jelly/xdocs/index.xml,v
  retrieving revision 1.2
  retrieving revi

cvs commit: jakarta-commons-sandbox/jelly project.xml

[jstrachan]

jstrachan02/05/22 00:36:48

  Modified:jellyproject.xml
  Log:
  Commented out XML based dependencies which cause a class loading problem when 
running the unit tests
  
  Revision  ChangesPath
  1.5   +2 -0  jakarta-commons-sandbox/jelly/project.xml
  
  Index: project.xml
  ===
  RCS file: /home/cvs/jakarta-commons-sandbox/jelly/project.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- project.xml   21 May 2002 19:36:56 -  1.4
  +++ project.xml   22 May 2002 07:36:48 -  1.5
  @@ -112,6 +112,7 @@
 hsqldb-1.7.0.jar
   
   
  +
   
 
 
  
  
  

--
To unsubscribe, e-mail:   
For additional commands, e-mail: