svn commit: r448486 - in /jakarta/commons/proper/jelly/trunk: jelly-tags/tag-project.xml parent-project.xml
Author: polx Date: Thu Sep 21 01:20:49 2006 New Revision: 448486 URL: http://svn.apache.org/viewvc?view=rev&rev=448486 Log: Upgrading to jexl 1.1 which is now released. paul Modified: jakarta/commons/proper/jelly/trunk/jelly-tags/tag-project.xml jakarta/commons/proper/jelly/trunk/parent-project.xml Modified: jakarta/commons/proper/jelly/trunk/jelly-tags/tag-project.xml URL: http://svn.apache.org/viewvc/jakarta/commons/proper/jelly/trunk/jelly-tags/tag-project.xml?view=diff&rev=448486&r1=448485&r2=448486 == --- jakarta/commons/proper/jelly/trunk/jelly-tags/tag-project.xml (original) +++ jakarta/commons/proper/jelly/trunk/jelly-tags/tag-project.xml Thu Sep 21 01:20:49 2006 @@ -268,7 +268,7 @@ commons-jexl commons-jexl - 1.0 + 1.1 Modified: jakarta/commons/proper/jelly/trunk/parent-project.xml URL: http://svn.apache.org/viewvc/jakarta/commons/proper/jelly/trunk/parent-project.xml?view=diff&rev=448486&r1=448485&r2=448486 == --- jakarta/commons/proper/jelly/trunk/parent-project.xml (original) +++ jakarta/commons/proper/jelly/trunk/parent-project.xml Thu Sep 21 01:20:49 2006 @@ -1,3 +1,4 @@ +
svn commit: r417175 - in /jakarta/commons/proper/jelly/trunk/jelly-tags/ant/src/java/org/apache/commons/jelly: tags/ant/AntTag.java task/AntJellyContext.java
Author: polx
Date: Mon Jun 26 04:48:58 2006
New Revision: 417175
URL: http://svn.apache.org/viewvc?rev=417175&view=rev
Log:
Fixing JELLY-232 with a method to safely invoke toString.
Also fixing the data-type coercion assumption as reported (and patched)
by Hang Sun in JELLY-228.
paul
Modified:
jakarta/commons/proper/jelly/trunk/jelly-tags/ant/src/java/org/apache/commons/jelly/tags/ant/AntTag.java
jakarta/commons/proper/jelly/trunk/jelly-tags/ant/src/java/org/apache/commons/jelly/task/AntJellyContext.java
Modified:
jakarta/commons/proper/jelly/trunk/jelly-tags/ant/src/java/org/apache/commons/jelly/tags/ant/AntTag.java
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/jelly/trunk/jelly-tags/ant/src/java/org/apache/commons/jelly/tags/ant/AntTag.java?rev=417175&r1=417174&r2=417175&view=diff
==
---
jakarta/commons/proper/jelly/trunk/jelly-tags/ant/src/java/org/apache/commons/jelly/tags/ant/AntTag.java
(original)
+++
jakarta/commons/proper/jelly/trunk/jelly-tags/ant/src/java/org/apache/commons/jelly/tags/ant/AntTag.java
Mon Jun 26 04:48:58 2006
@@ -245,7 +245,7 @@
try {
if (log.isDebugEnabled()) {
log.debug("About to set the: " + tagName
-+ " property on: " + parentObject + " to
value: "
++ " property on: " +
safeToString(parentObject) + " to value: "
+ nested + " with type: " + nested.getClass()
);
}
@@ -263,7 +263,7 @@
BeanUtils.setProperty( parentObject, tagName, nested );
}
catch (Exception e) {
-log.debug("Caught exception trying to set property: "
+ tagName + " on: " + parentObject);
+log.debug("Caught exception trying to set property: "
+ tagName + " on: " + safeToString(parentObject));
}
}
}
@@ -351,7 +351,7 @@
public void setBeanProperty(Object object, String name, Object value)
throws JellyTagException {
if ( log.isDebugEnabled() ) {
-log.debug( "Setting bean property on: "+ object + " name: " +
name + " value: " + value );
+log.debug( "Setting bean property on: "+ safeToString(object )+ "
name: " + name + " value: " + safeToString(value));
}
IntrospectionHelper ih = IntrospectionHelper.getHelper(
object.getClass() );
@@ -394,7 +394,7 @@
if ( object != null ) {
IntrospectionHelper ih = IntrospectionHelper.getHelper(
object.getClass() );
-if ( ih != null ) {
+if ( ih != null && ! (object instanceof AntTag)) {
try {
dataType = ih.createElement( getAntProject(), object,
name.toLowerCase() );
} catch (BuildException be) {
@@ -450,7 +450,7 @@
else {
dataType = createDataType(ctor, new Object[] { getAntProject()
}, name, "an Ant project");
}
-if (dataType != null) {
+if (dataType != null && dataType instanceof DataType) {
((DataType)dataType).setProject( getAntProject() );
}
}
@@ -557,6 +557,17 @@
tag = tag.getParent();
}
return null;
+}
+
+private String safeToString(Object o) {
+if(o==null) return "null";
+String r = null;
+try {
+r = o.toString();
+} catch(Exception ex) {}
+if(r == null)
+r = "(object of class " + o.getClass() + ")";
+return r;
}
}
Modified:
jakarta/commons/proper/jelly/trunk/jelly-tags/ant/src/java/org/apache/commons/jelly/task/AntJellyContext.java
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/jelly/trunk/jelly-tags/ant/src/java/org/apache/commons/jelly/task/AntJellyContext.java?rev=417175&r1=417174&r2=417175&view=diff
==
---
jakarta/commons/proper/jelly/trunk/jelly-tags/ant/src/java/org/apache/commons/jelly/task/AntJellyContext.java
(original)
+++
jakarta/commons/proper/jelly/trunk/jelly-tags/ant/src/java/org/apache/commons/jelly/task/AntJellyContext.java
Mon Jun 26 04:48:58 2006
@@ -53,7 +53,10 @@
}
if ( log.isDebugEnabled() ) {
-log.debug( "Looking up variable: " + name + " answer: " + answer );
+String answerString = null;
+try { answerString = answe
svn commit: r416178 - /jakarta/commons/proper/jelly/tags/COMMONS-JELLY-INTERACTION-1_1/parent-project.xml
Author: polx Date: Wed Jun 21 16:59:44 2006 New Revision: 416178 URL: http://svn.apache.org/viewvc?rev=416178&view=rev Log: Removing the SNAPSHOT version for jexl in parent project. I think it was overridden anyways. This triple inheritance is not nice. paul Modified: jakarta/commons/proper/jelly/tags/COMMONS-JELLY-INTERACTION-1_1/parent-project.xml Modified: jakarta/commons/proper/jelly/tags/COMMONS-JELLY-INTERACTION-1_1/parent-project.xml URL: http://svn.apache.org/viewvc/jakarta/commons/proper/jelly/tags/COMMONS-JELLY-INTERACTION-1_1/parent-project.xml?rev=416178&r1=416177&r2=416178&view=diff == --- jakarta/commons/proper/jelly/tags/COMMONS-JELLY-INTERACTION-1_1/parent-project.xml (original) +++ jakarta/commons/proper/jelly/tags/COMMONS-JELLY-INTERACTION-1_1/parent-project.xml Wed Jun 21 16:59:44 2006 @@ -30,7 +30,7 @@ commons-jexl commons-jexl - SNAPSHOT + 1.0 - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r416175 - in /jakarta/commons/proper/jelly/tags/COMMONS-JELLY-INTERACTION-1_1: parent-project.xml project.xml tag-project.xml xdocs/changes.xml
Author: polx
Date: Wed Jun 21 16:44:32 2006
New Revision: 416175
URL: http://svn.apache.org/viewvc?rev=416175&view=rev
Log:
Correct version in changes and project.xml.
Also included the parent-project.xml and tag-project.xml which are needed in
the tag if it is checked out alone thus guaranteeing a minimal functionning
build.
paul
Added:
jakarta/commons/proper/jelly/tags/COMMONS-JELLY-INTERACTION-1_1/parent-project.xml
jakarta/commons/proper/jelly/tags/COMMONS-JELLY-INTERACTION-1_1/tag-project.xml
Modified:
jakarta/commons/proper/jelly/tags/COMMONS-JELLY-INTERACTION-1_1/project.xml
jakarta/commons/proper/jelly/tags/COMMONS-JELLY-INTERACTION-1_1/xdocs/changes.xml
Added:
jakarta/commons/proper/jelly/tags/COMMONS-JELLY-INTERACTION-1_1/parent-project.xml
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/jelly/tags/COMMONS-JELLY-INTERACTION-1_1/parent-project.xml?rev=416175&view=auto
==
---
jakarta/commons/proper/jelly/tags/COMMONS-JELLY-INTERACTION-1_1/parent-project.xml
(added)
+++
jakarta/commons/proper/jelly/tags/COMMONS-JELLY-INTERACTION-1_1/parent-project.xml
Wed Jun 21 16:44:32 2006
@@ -0,0 +1,90 @@
+
+
+
+
+ commons-jelly-parent
+ commons-jelly
+
+
+
+
+
+ commons-jexl
+ commons-jexl
+ SNAPSHOT
+
+
+
+ xml-apis
+ xml-apis
+ 1.0.b2
+
+
+
+ commons-beanutils
+ commons-beanutils
+ 1.6
+
+true
+
+
+
+
+ commons-collections
+ commons-collections
+ 2.1
+
+true
+
+
+
+
+ commons-logging
+ commons-logging
+ 1.0.3
+
+true
+
+
+
+
+ dom4j
+ dom4j
+ 1.6.1
+
+
+
+ jaxen
+ jaxen
+ 1.1-beta-8
+
+
+
+ xerces
+ xerces
+ 2.2.1
+
+xml-xerces
+
+
+
+
Modified:
jakarta/commons/proper/jelly/tags/COMMONS-JELLY-INTERACTION-1_1/project.xml
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/jelly/tags/COMMONS-JELLY-INTERACTION-1_1/project.xml?rev=416175&r1=416174&r2=416175&view=diff
==
--- jakarta/commons/proper/jelly/tags/COMMONS-JELLY-INTERACTION-1_1/project.xml
(original)
+++ jakarta/commons/proper/jelly/tags/COMMONS-JELLY-INTERACTION-1_1/project.xml
Wed Jun 21 16:44:32 2006
@@ -17,10 +17,10 @@
-->
- ${basedir}/../tag-project.xml
+ ${basedir}/tag-project.xml
commons-jelly-tags-interaction
commons-jelly-tags-interaction
- 1.1-RC1
+ 1.1
org.apache.commons.jelly.tags.interaction
This is a Jelly interface to the user.
Commons Jelly Interaction Tag Library
Added:
jakarta/commons/proper/jelly/tags/COMMONS-JELLY-INTERACTION-1_1/tag-project.xml
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/jelly/tags/COMMONS-JELLY-INTERACTION-1_1/tag-project.xml?rev=416175&view=auto
==
---
jakarta/commons/proper/jelly/tags/COMMONS-JELLY-INTERACTION-1_1/tag-project.xml
(added)
+++
jakarta/commons/proper/jelly/tags/COMMONS-JELLY-INTERACTION-1_1/tag-project.xml
Wed Jun 21 16:44:32 2006
@@ -0,0 +1,370 @@
+
+
+
+ parent-project.xml
+ 3
+ commons-jelly
+
+
+Apache Software Foundation
+http://jakarta.apache.org/
+http://jakarta.apache.org/images/jakarta-logo.gif
+
+ 2002
+ org.apache.commons.jelly.tags.ant
+ /images/logo.gif
+
+ jakarta
+
+
+ This is a Jelly tag.
+
+ Commons Jelly Tag Library
+
+
http://jakarta.apache.org/commons/jelly/libs/${pom.id.substring(33)}/index.html
+
http://issues.apache.org/jira/browse/JELLY
+
+ cvs.apache.org
+
/www/jakarta.apache.org/commons/jelly/libs/${pom.id.substring(33)}/
+
/www/jakarta.apache.org/builds/jakarta-commons/jelly/jelly-tags/${pom.id.substring(33)}/
+
+
+
scm:svn:http://svn.apache.org/repos/asf/jakarta/commons/proper/jelly/trunk/jelly-tags/${pom.artifactId.substring(19)}
+
scm:svn:https://svn.apache.org/repos/asf/jakarta/commons/proper/jelly/trunk/jelly-tags/${pom.artifactId.substring(19)}
+
http://svn.apache.org/viewcvs.cgi/jakarta/commons/proper/jelly/trunk/jelly-tags/${pom.artifactId.substring(19)}
+
+
+
+
+
+ Commons Dev List
+ [EMAIL PROTECTED]
+ [EMAIL PROTECTED]
+ http://mail-archives.apache.org/eyebrowse/[EMAIL
PROTECTED]
+
+
+ Commons User List
+ [EMAIL PROTECTED]
+ [EMAIL PROTECTED]
+ http://mail-archives.apache.org/eyebrowse/[EMAIL
PROTECTED]
+
+
+
+
+
+ James Strachan
+ jstrachan
+ [EMAIL PROTECTED]
+ SpiritSoft, Inc.
+
+
+ Geir Magnusson Jr.
+ geirm
+ [EMAIL PROTECTED]
+ Adeptra, Inc.
+
+
+ Bob McWhirter
+ werken
+ [EMAIL PROTECTED]
+ The Werken Comp
svn commit: r416174 - in /jakarta/commons/proper/jelly/trunk/jelly-tags/interaction: project.xml xdocs/changes.xml
Author: polx
Date: Wed Jun 21 16:39:38 2006
New Revision: 416174
URL: http://svn.apache.org/viewvc?rev=416174&view=rev
Log:
Correctly marking the release in changes as well!
paul
Modified:
jakarta/commons/proper/jelly/trunk/jelly-tags/interaction/project.xml
jakarta/commons/proper/jelly/trunk/jelly-tags/interaction/xdocs/changes.xml
Modified: jakarta/commons/proper/jelly/trunk/jelly-tags/interaction/project.xml
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/jelly/trunk/jelly-tags/interaction/project.xml?rev=416174&r1=416173&r2=416174&view=diff
==
--- jakarta/commons/proper/jelly/trunk/jelly-tags/interaction/project.xml
(original)
+++ jakarta/commons/proper/jelly/trunk/jelly-tags/interaction/project.xml Wed
Jun 21 16:39:38 2006
@@ -20,7 +20,7 @@
${basedir}/../tag-project.xml
commons-jelly-tags-interaction
commons-jelly-tags-interaction
- 1.1-RC1
+ 1.1
org.apache.commons.jelly.tags.interaction
This is a Jelly interface to the user.
Commons Jelly Interaction Tag Library
Modified:
jakarta/commons/proper/jelly/trunk/jelly-tags/interaction/xdocs/changes.xml
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/jelly/trunk/jelly-tags/interaction/xdocs/changes.xml?rev=416174&r1=416173&r2=416174&view=diff
==
--- jakarta/commons/proper/jelly/trunk/jelly-tags/interaction/xdocs/changes.xml
(original)
+++ jakarta/commons/proper/jelly/trunk/jelly-tags/interaction/xdocs/changes.xml
Wed Jun 21 16:39:38 2006
@@ -25,7 +25,7 @@
Paul Libbrecht
-
+
Enhanced the usage of AskTag with a custom completion list, upgraded
depdendency to JLine 0.9.5.
AskTag now uses JLine which allows history, auto-completion, and
edition of answers.
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r416153 - /jakarta/commons/proper/jelly/tags/COMMONS-JELLY-INTERACTION-1_1/
Author: polx Date: Wed Jun 21 15:59:04 2006 New Revision: 416153 URL: http://svn.apache.org/viewvc?rev=416153&view=rev Log: Tag for the release 1.1 of Jelly-Tags-Interaction. paul Added: jakarta/commons/proper/jelly/tags/COMMONS-JELLY-INTERACTION-1_1/ - copied from r416152, jakarta/commons/proper/jelly/trunk/jelly-tags/interaction/ - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r416151 - /jakarta/commons/proper/jelly/trunk/jelly-tags/interaction/project.xml
Author: polx
Date: Wed Jun 21 15:56:50 2006
New Revision: 416151
URL: http://svn.apache.org/viewvc?rev=416151&view=rev
Log:
Adding tag-mark.
paul
Modified:
jakarta/commons/proper/jelly/trunk/jelly-tags/interaction/project.xml
Modified: jakarta/commons/proper/jelly/trunk/jelly-tags/interaction/project.xml
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/jelly/trunk/jelly-tags/interaction/project.xml?rev=416151&r1=416150&r2=416151&view=diff
==
--- jakarta/commons/proper/jelly/trunk/jelly-tags/interaction/project.xml
(original)
+++ jakarta/commons/proper/jelly/trunk/jelly-tags/interaction/project.xml Wed
Jun 21 15:56:50 2006
@@ -20,7 +20,7 @@
${basedir}/../tag-project.xml
commons-jelly-tags-interaction
commons-jelly-tags-interaction
- 1.1-SNAPSHOT
+ 1.1-RC1
org.apache.commons.jelly.tags.interaction
This is a Jelly interface to the user.
Commons Jelly Interaction Tag Library
@@ -29,6 +29,11 @@
1.0
1.0
COMMONS-JELLY-INTERACTION-1_0
+
+
+ 1.1
+ 1.1
+ COMMONS-JELLY-INTERACTION-1_1
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r416149 - /jakarta/commons/proper/jelly/trunk/jelly-tags/tag-project.xml
Author: polx Date: Wed Jun 21 15:46:31 2006 New Revision: 416149 URL: http://svn.apache.org/viewvc?rev=416149&view=rev Log: Adding myself as a developer (!). paul Modified: jakarta/commons/proper/jelly/trunk/jelly-tags/tag-project.xml Modified: jakarta/commons/proper/jelly/trunk/jelly-tags/tag-project.xml URL: http://svn.apache.org/viewvc/jakarta/commons/proper/jelly/trunk/jelly-tags/tag-project.xml?rev=416149&r1=416148&r2=416149&view=diff == --- jakarta/commons/proper/jelly/trunk/jelly-tags/tag-project.xml (original) +++ jakarta/commons/proper/jelly/trunk/jelly-tags/tag-project.xml Wed Jun 21 15:46:31 2006 @@ -117,6 +117,13 @@ itch-scratcher Jakarta PMC + + Paul Libbrecht + [EMAIL PROTECTED] + + Developer + + @@ -172,13 +179,6 @@ Developer - - Paul Libbrecht - [EMAIL PROTECTED] - - Developer - - Jim Birchfield [EMAIL PROTECTED] - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r415197 - /jakarta/commons/proper/jelly/trunk/jelly-tags/maven.xml
Author: polx Date: Sun Jun 18 14:18:37 2006 New Revision: 415197 URL: http://svn.apache.org/viewvc?rev=415197&view=rev Log: Copy LICENSE.txt and NOTICE.txt inside classes before jarring. paul Modified: jakarta/commons/proper/jelly/trunk/jelly-tags/maven.xml Modified: jakarta/commons/proper/jelly/trunk/jelly-tags/maven.xml URL: http://svn.apache.org/viewvc/jakarta/commons/proper/jelly/trunk/jelly-tags/maven.xml?rev=415197&r1=415196&r2=415197&view=diff == --- jakarta/commons/proper/jelly/trunk/jelly-tags/maven.xml (original) +++ jakarta/commons/proper/jelly/trunk/jelly-tags/maven.xml Sun Jun 18 14:18:37 2006 @@ -19,4 +19,9 @@ + + + + + - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r414956 - in /jakarta/commons/proper/jelly/trunk/jelly-tags/interaction/xdocs: changes.xml navigation.xml
Author: polx Date: Fri Jun 16 16:22:47 2006 New Revision: 414956 URL: http://svn.apache.org/viewvc?rev=414956&view=rev Log: Little polish to the site... paul Modified: jakarta/commons/proper/jelly/trunk/jelly-tags/interaction/xdocs/changes.xml jakarta/commons/proper/jelly/trunk/jelly-tags/interaction/xdocs/navigation.xml Modified: jakarta/commons/proper/jelly/trunk/jelly-tags/interaction/xdocs/changes.xml URL: http://svn.apache.org/viewvc/jakarta/commons/proper/jelly/trunk/jelly-tags/interaction/xdocs/changes.xml?rev=414956&r1=414955&r2=414956&view=diff == --- jakarta/commons/proper/jelly/trunk/jelly-tags/interaction/xdocs/changes.xml (original) +++ jakarta/commons/proper/jelly/trunk/jelly-tags/interaction/xdocs/changes.xml Fri Jun 16 16:22:47 2006 @@ -26,8 +26,8 @@ - AskTag now uses JLine which allows history, auto-completion, and edition of answers. Enhanced the usage of AskTag with a custom completion list, upgraded depdendency to JLine 0.9.5. + AskTag now uses JLine which allows history, auto-completion, and edition of answers. Modified: jakarta/commons/proper/jelly/trunk/jelly-tags/interaction/xdocs/navigation.xml URL: http://svn.apache.org/viewvc/jakarta/commons/proper/jelly/trunk/jelly-tags/interaction/xdocs/navigation.xml?rev=414956&r1=414955&r2=414956&view=diff == --- jakarta/commons/proper/jelly/trunk/jelly-tags/interaction/xdocs/navigation.xml (original) +++ jakarta/commons/proper/jelly/trunk/jelly-tags/interaction/xdocs/navigation.xml Fri Jun 16 16:22:47 2006 @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. --> - + Interaction Tag Library @@ -22,6 +22,7 @@ + - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r414955 - /jakarta/commons/proper/jelly/trunk/jelly-tags/interaction/src/java/org/apache/commons/jelly/tags/interaction/AskTag.java
Author: polx
Date: Fri Jun 16 16:22:25 2006
New Revision: 414955
URL: http://svn.apache.org/viewvc?rev=414955&view=rev
Log:
Style cleanup.
paul
Modified:
jakarta/commons/proper/jelly/trunk/jelly-tags/interaction/src/java/org/apache/commons/jelly/tags/interaction/AskTag.java
Modified:
jakarta/commons/proper/jelly/trunk/jelly-tags/interaction/src/java/org/apache/commons/jelly/tags/interaction/AskTag.java
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/jelly/trunk/jelly-tags/interaction/src/java/org/apache/commons/jelly/tags/interaction/AskTag.java?rev=414955&r1=414954&r2=414955&view=diff
==
---
jakarta/commons/proper/jelly/trunk/jelly-tags/interaction/src/java/org/apache/commons/jelly/tags/interaction/AskTag.java
(original)
+++
jakarta/commons/proper/jelly/trunk/jelly-tags/interaction/src/java/org/apache/commons/jelly/tags/interaction/AskTag.java
Fri Jun 16 16:22:25 2006
@@ -26,10 +26,10 @@
import jline.History;
import jline.SimpleCompletor;
-import org.apache.commons.jelly.TagSupport;
-import org.apache.commons.jelly.XMLOutput;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.commons.jelly.TagSupport;
+import org.apache.commons.jelly.XMLOutput;
/**
* Jelly Tag that asks the user a question, and puts his answer into a
variable,
@@ -42,6 +42,9 @@
private static Log logger = LogFactory.getLog(AskTag.class);
+/** The history of previous user-inputs.*/
+private static History consoleHistory = new History();
+
/** The question to ask to the user. */
private String question;
@@ -54,9 +57,6 @@
/** The default value, if the user doesn't answer. */
private String defaultInput;
-/** The user's input */
-private String input = "";
-
/** The prompt to display before the user input. */
private String prompt = ">";
@@ -66,7 +66,6 @@
/** Whether to complete with previous completions as well. */
private boolean useHistoryCompletor = true;
-private static History consoleHistory = new History();
/**
* Sets the question to ask to the user. If a "default" attribute is
@@ -149,6 +148,7 @@
}
ConsoleReader consoleReader;
+String input = null;
try {
consoleReader = new ConsoleReader();
@@ -157,9 +157,6 @@
consoleReader = null;
}
-String disableJlineProp = System.getProperty("ask.jline.disable");
-boolean disableJline = (disableJlineProp != null && disableJlineProp
-.equals("true"));
try {
if (consoleReader != null
@@ -172,8 +169,8 @@
consoleReader.setBellEnabled(false);
// add old commands as tab completion history
-ArrayList oldCommandsAsList = useHistoryCompletor ?
-new ArrayList(consoleHistory.getHistoryList()) : new
ArrayList(0);
+List oldCommandsAsList = useHistoryCompletor
+? new ArrayList(consoleHistory.getHistoryList()) : new
ArrayList(0);
// add predefined commands if given
if (completor != null && !completor.isEmpty()) {
oldCommandsAsList.addAll(completor);
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r413825 - /jakarta/commons/proper/jelly/trunk/maven.xml
Author: polx Date: Tue Jun 13 00:41:07 2006 New Revision: 413825 URL: http://svn.apache.org/viewvc?rev=413825&view=rev Log: Including a comment about upgrading gump's descriptor. paul Modified: jakarta/commons/proper/jelly/trunk/maven.xml Modified: jakarta/commons/proper/jelly/trunk/maven.xml URL: http://svn.apache.org/viewvc/jakarta/commons/proper/jelly/trunk/maven.xml?rev=413825&r1=413824&r2=413825&view=diff == --- jakarta/commons/proper/jelly/trunk/maven.xml (original) +++ jakarta/commons/proper/jelly/trunk/maven.xml Tue Jun 13 00:41:07 2006 @@ -589,5 +589,10 @@ + - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r412107 - in /jakarta/commons/proper/jelly/trunk: jelly-tags/tag-project.xml parent-project.xml xdocs/changes.xml
Author: polx
Date: Tue Jun 6 05:39:23 2006
New Revision: 412107
URL: http://svn.apache.org/viewvc?rev=412107&view=rev
Log:
Moving to dom4j 1.6.1 and jaxen 1.1-beta-8.
paul
Modified:
jakarta/commons/proper/jelly/trunk/jelly-tags/tag-project.xml
jakarta/commons/proper/jelly/trunk/parent-project.xml
jakarta/commons/proper/jelly/trunk/xdocs/changes.xml
Modified: jakarta/commons/proper/jelly/trunk/jelly-tags/tag-project.xml
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/jelly/trunk/jelly-tags/tag-project.xml?rev=412107&r1=412106&r2=412107&view=diff
==
--- jakarta/commons/proper/jelly/trunk/jelly-tags/tag-project.xml (original)
+++ jakarta/commons/proper/jelly/trunk/jelly-tags/tag-project.xml Tue Jun 6
05:39:23 2006
@@ -36,7 +36,7 @@
Commons Jelly Tag Library
http://jakarta.apache.org/commons/jelly/libs/${pom.id.substring(33)}/index.html
-
http://issues.apache.org/jira/secure/BrowseProject.jspa?id=10012
+
http://issues.apache.org/jira/browse/JELLY
cvs.apache.org
/www/jakarta.apache.org/commons/jelly/libs/${pom.id.substring(33)}/
@@ -286,7 +286,7 @@
dom4j
dom4j
- 1.5
+ 1.6.1
Modified: jakarta/commons/proper/jelly/trunk/parent-project.xml
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/jelly/trunk/parent-project.xml?rev=412107&r1=412106&r2=412107&view=diff
==
--- jakarta/commons/proper/jelly/trunk/parent-project.xml (original)
+++ jakarta/commons/proper/jelly/trunk/parent-project.xml Tue Jun 6 05:39:23
2006
@@ -69,7 +69,7 @@
dom4j
dom4j
- 1.5.2
+ 1.6.1
Modified: jakarta/commons/proper/jelly/trunk/xdocs/changes.xml
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/jelly/trunk/xdocs/changes.xml?rev=412107&r1=412106&r2=412107&view=diff
==
--- jakarta/commons/proper/jelly/trunk/xdocs/changes.xml (original)
+++ jakarta/commons/proper/jelly/trunk/xdocs/changes.xml Tue Jun 6 05:39:23
2006
@@ -26,6 +26,7 @@
Restored JellyContext.isCacheTags and
its behavior for backwards compatibility
+ Moved to dom4j 1.6.1 and jaxen
1.1-beta-8
Improve tag caching
to improve memory consumption
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r406153 - /jakarta/commons/proper/jelly/trunk/src/java/org/apache/commons/jelly/tags/core/ParseTag.java
Author: polx
Date: Sat May 13 14:46:04 2006
New Revision: 406153
URL: http://svn.apache.org/viewcvs?rev=406153&view=rev
Log:
Fix for JELLY-218. I wish we had a unit test to verify this...
paul
Modified:
jakarta/commons/proper/jelly/trunk/src/java/org/apache/commons/jelly/tags/core/ParseTag.java
Modified:
jakarta/commons/proper/jelly/trunk/src/java/org/apache/commons/jelly/tags/core/ParseTag.java
URL:
http://svn.apache.org/viewcvs/jakarta/commons/proper/jelly/trunk/src/java/org/apache/commons/jelly/tags/core/ParseTag.java?rev=406153&r1=406152&r2=406153&view=diff
==
---
jakarta/commons/proper/jelly/trunk/src/java/org/apache/commons/jelly/tags/core/ParseTag.java
(original)
+++
jakarta/commons/proper/jelly/trunk/src/java/org/apache/commons/jelly/tags/core/ParseTag.java
Sat May 13 14:46:04 2006
@@ -192,7 +192,9 @@
}
try {
-getXMLReader().parse( new InputSource( new StringReader( text ) )
);
+XMLReader xmlReader = getXMLReader();
+xmlReader.setContentHandler(getJellyParser());
+xmlReader.parse( new InputSource( new StringReader( text ) ) );
}
catch (Exception e) {
throw new JellyTagException(e);
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r406152 - /jakarta/commons/proper/jelly/trunk/src/test/org/apache/commons/jelly/expression/TestExpressions.java
Author: polx
Date: Sat May 13 14:35:11 2006
New Revision: 406152
URL: http://svn.apache.org/viewcvs?rev=406152&view=rev
Log:
Added a test for $${xx} to be output as ${x}.
This is used by some but was not tested.
This is important for JELLY-187.
paul
Modified:
jakarta/commons/proper/jelly/trunk/src/test/org/apache/commons/jelly/expression/TestExpressions.java
Modified:
jakarta/commons/proper/jelly/trunk/src/test/org/apache/commons/jelly/expression/TestExpressions.java
URL:
http://svn.apache.org/viewcvs/jakarta/commons/proper/jelly/trunk/src/test/org/apache/commons/jelly/expression/TestExpressions.java?rev=406152&r1=406151&r2=406152&view=diff
==
---
jakarta/commons/proper/jelly/trunk/src/test/org/apache/commons/jelly/expression/TestExpressions.java
(original)
+++
jakarta/commons/proper/jelly/trunk/src/test/org/apache/commons/jelly/expression/TestExpressions.java
Sat May 13 14:35:11 2006
@@ -69,6 +69,17 @@
assertExpression("ham and ${maven.home.foo} pizza", "ham and cheese
pizza");
assertExpression("${maven.home.foo.length()}", new Integer(6));
}
+
+/** tests that $${xx} is output as ${xx}. This trick is ued
+by several plugins to generate other jelly files or ant files.
+The maven ant plugin is one of them. */
+public void testExpressionsEvalOutput() throws Exception {
+String expressionText = "ham and $${maven.home.foo} pizza";
+Expression expression = CompositeExpression.parse(expressionText,
factory);
+assertTrue( "Created a valid expression for: " + expressionText,
expression != null );
+String value = (String) expression.evaluate(context);
+assertEquals("$${xx} should output ${xx}","ham and ${maven.home.foo}
pizza",value);
+}
public void testNotConditions() throws Exception {
context.setVariable("a", Boolean.TRUE);
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r406151 - /jakarta/commons/proper/jelly/trunk/jelly-tags/jsl/src/test/org/apache/commons/jelly/jsl/TestJSL.java
Author: polx
Date: Sat May 13 14:02:26 2006
New Revision: 406151
URL: http://svn.apache.org/viewcvs?rev=406151&view=rev
Log:
Spurious debug test-output left here, sorry.
paul
Modified:
jakarta/commons/proper/jelly/trunk/jelly-tags/jsl/src/test/org/apache/commons/jelly/jsl/TestJSL.java
Modified:
jakarta/commons/proper/jelly/trunk/jelly-tags/jsl/src/test/org/apache/commons/jelly/jsl/TestJSL.java
URL:
http://svn.apache.org/viewcvs/jakarta/commons/proper/jelly/trunk/jelly-tags/jsl/src/test/org/apache/commons/jelly/jsl/TestJSL.java?rev=406151&r1=406150&r2=406151&view=diff
==
---
jakarta/commons/proper/jelly/trunk/jelly-tags/jsl/src/test/org/apache/commons/jelly/jsl/TestJSL.java
(original)
+++
jakarta/commons/proper/jelly/trunk/jelly-tags/jsl/src/test/org/apache/commons/jelly/jsl/TestJSL.java
Sat May 13 14:02:26 2006
@@ -62,7 +62,6 @@
Document document = runScript(
"src/test/org/apache/commons/jelly/jsl/example.jelly" );
Element small = (Element)
document.selectSingleNode("/html/body/small");
-new org.dom4j.io.XMLWriter(new
java.io.FileOutputStream("file.xml")).write(document);
//assertTrue( " starts with 'James Elson'",
small.getText().trim().startsWith("James Elson") );
assertEquals( "I am a title!", small.valueOf( "h2" ).trim() );
assertEquals( "Twas a dark, rainy night...", small.valueOf( "small"
).trim() );
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r406084 - /jakarta/commons/proper/jelly/trunk/jelly-tags/jsl/src/test/org/apache/commons/jelly/jsl/TestJSL.java
Author: polx
Date: Sat May 13 05:20:33 2006
New Revision: 406084
URL: http://svn.apache.org/viewcvs?rev=406084&view=rev
Log:
Removing odd assert-test... this makes it all run with dom4j 1.6.1
by me.
paul
Modified:
jakarta/commons/proper/jelly/trunk/jelly-tags/jsl/src/test/org/apache/commons/jelly/jsl/TestJSL.java
Modified:
jakarta/commons/proper/jelly/trunk/jelly-tags/jsl/src/test/org/apache/commons/jelly/jsl/TestJSL.java
URL:
http://svn.apache.org/viewcvs/jakarta/commons/proper/jelly/trunk/jelly-tags/jsl/src/test/org/apache/commons/jelly/jsl/TestJSL.java?rev=406084&r1=406083&r2=406084&view=diff
==
---
jakarta/commons/proper/jelly/trunk/jelly-tags/jsl/src/test/org/apache/commons/jelly/jsl/TestJSL.java
(original)
+++
jakarta/commons/proper/jelly/trunk/jelly-tags/jsl/src/test/org/apache/commons/jelly/jsl/TestJSL.java
Sat May 13 05:20:33 2006
@@ -62,7 +62,8 @@
Document document = runScript(
"src/test/org/apache/commons/jelly/jsl/example.jelly" );
Element small = (Element)
document.selectSingleNode("/html/body/small");
-assertTrue( " starts with 'James Elson'",
small.getText().startsWith("James Elson") );
+new org.dom4j.io.XMLWriter(new
java.io.FileOutputStream("file.xml")).write(document);
+//assertTrue( " starts with 'James Elson'",
small.getText().trim().startsWith("James Elson") );
assertEquals( "I am a title!", small.valueOf( "h2" ).trim() );
assertEquals( "Twas a dark, rainy night...", small.valueOf( "small"
).trim() );
assertEquals( "dfjsdfjsdf", small.valueOf( "p" ).trim() );
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r406083 - /jakarta/commons/proper/jelly/trunk/jelly-tags/jsl/src/test/org/apache/commons/jelly/jsl/suite.jelly
Author: polx Date: Sat May 13 05:19:38 2006 New Revision: 406083 URL: http://svn.apache.org/viewcvs?rev=406083&view=rev Log: Fixed the evil error which had nothing to do with jaxen but with jexl... the i variable was an integer which jaxen cannot compare to an attribute value... fixed by using i = i.toString(). paul Modified: jakarta/commons/proper/jelly/trunk/jelly-tags/jsl/src/test/org/apache/commons/jelly/jsl/suite.jelly Modified: jakarta/commons/proper/jelly/trunk/jelly-tags/jsl/src/test/org/apache/commons/jelly/jsl/suite.jelly URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/jelly/trunk/jelly-tags/jsl/src/test/org/apache/commons/jelly/jsl/suite.jelly?rev=406083&r1=406082&r2=406083&view=diff == --- jakarta/commons/proper/jelly/trunk/jelly-tags/jsl/src/test/org/apache/commons/jelly/jsl/suite.jelly (original) +++ jakarta/commons/proper/jelly/trunk/jelly-tags/jsl/src/test/org/apache/commons/jelly/jsl/suite.jelly Sat May 13 05:19:38 2006 @@ -129,7 +129,8 @@ - + + - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r405668 - /jakarta/commons/proper/jelly/trunk/jelly-tags/interaction/src/test/org/apache/commons/jelly/tags/interaction/sample.jelly
Author: polx
Date: Wed May 10 00:52:22 2006
New Revision: 405668
URL: http://svn.apache.org/viewcvs?rev=405668&view=rev
Log:
Added "born before the 20th century" into the question...
(really non serious change)
paul
Modified:
jakarta/commons/proper/jelly/trunk/jelly-tags/interaction/src/test/org/apache/commons/jelly/tags/interaction/sample.jelly
Modified:
jakarta/commons/proper/jelly/trunk/jelly-tags/interaction/src/test/org/apache/commons/jelly/tags/interaction/sample.jelly
URL:
http://svn.apache.org/viewcvs/jakarta/commons/proper/jelly/trunk/jelly-tags/interaction/src/test/org/apache/commons/jelly/tags/interaction/sample.jelly?rev=405668&r1=405667&r2=405668&view=diff
==
---
jakarta/commons/proper/jelly/trunk/jelly-tags/interaction/src/test/org/apache/commons/jelly/tags/interaction/sample.jelly
(original)
+++
jakarta/commons/proper/jelly/trunk/jelly-tags/interaction/src/test/org/apache/commons/jelly/tags/interaction/sample.jelly
Wed May 10 00:52:22 2006
@@ -24,7 +24,7 @@
${x.add('Pascal')}${x.add('Einstein')}
-
Your answer was: ${answer}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r405533 - /jakarta/commons/proper/jelly/trunk/jelly-tags/interaction/xdocs/changes.xml
Author: polx Date: Tue May 9 13:56:28 2006 New Revision: 405533 URL: http://svn.apache.org/viewcvs?rev=405533&view=rev Log: Added my change documentation. paul Modified: jakarta/commons/proper/jelly/trunk/jelly-tags/interaction/xdocs/changes.xml Modified: jakarta/commons/proper/jelly/trunk/jelly-tags/interaction/xdocs/changes.xml URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/jelly/trunk/jelly-tags/interaction/xdocs/changes.xml?rev=405533&r1=405532&r2=405533&view=diff == --- jakarta/commons/proper/jelly/trunk/jelly-tags/interaction/xdocs/changes.xml (original) +++ jakarta/commons/proper/jelly/trunk/jelly-tags/interaction/xdocs/changes.xml Tue May 9 13:56:28 2006 @@ -22,10 +22,12 @@ Changes dIon Gillard +Paul Libbrecht AskTag now uses JLine which allows history, auto-completion, and edition of answers. + Enhanced the usage of AskTag with a custom completion list, upgraded depdendency to JLine 0.9.5. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r405527 - in /jakarta/commons/proper/jelly/trunk/jelly-tags/interaction: project.xml src/java/org/apache/commons/jelly/tags/interaction/AskTag.java src/test/org/apache/commons/jelly/tags/i
Author: polx
Date: Tue May 9 13:45:57 2006
New Revision: 405527
URL: http://svn.apache.org/viewcvs?rev=405527&view=rev
Log:
Applying patch at JELLY-229 of Lukas Theussl.
Complementing with a better sample script and a method
to ignore the history in the completor if need be.
paul
Modified:
jakarta/commons/proper/jelly/trunk/jelly-tags/interaction/project.xml
jakarta/commons/proper/jelly/trunk/jelly-tags/interaction/src/java/org/apache/commons/jelly/tags/interaction/AskTag.java
jakarta/commons/proper/jelly/trunk/jelly-tags/interaction/src/test/org/apache/commons/jelly/tags/interaction/sample.jelly
Modified: jakarta/commons/proper/jelly/trunk/jelly-tags/interaction/project.xml
URL:
http://svn.apache.org/viewcvs/jakarta/commons/proper/jelly/trunk/jelly-tags/interaction/project.xml?rev=405527&r1=405526&r2=405527&view=diff
==
--- jakarta/commons/proper/jelly/trunk/jelly-tags/interaction/project.xml
(original)
+++ jakarta/commons/proper/jelly/trunk/jelly-tags/interaction/project.xml Tue
May 9 13:45:57 2006
@@ -36,8 +36,9 @@
jline
jline
- 0.9.0
-
+ 0.9.5
+ jar
+
commons-cli
commons-cli
Modified:
jakarta/commons/proper/jelly/trunk/jelly-tags/interaction/src/java/org/apache/commons/jelly/tags/interaction/AskTag.java
URL:
http://svn.apache.org/viewcvs/jakarta/commons/proper/jelly/trunk/jelly-tags/interaction/src/java/org/apache/commons/jelly/tags/interaction/AskTag.java?rev=405527&r1=405526&r2=405527&view=diff
==
---
jakarta/commons/proper/jelly/trunk/jelly-tags/interaction/src/java/org/apache/commons/jelly/tags/interaction/AskTag.java
(original)
+++
jakarta/commons/proper/jelly/trunk/jelly-tags/interaction/src/java/org/apache/commons/jelly/tags/interaction/AskTag.java
Tue May 9 13:45:57 2006
@@ -19,6 +19,9 @@
import java.io.IOException;
import java.io.InputStreamReader;
+import java.util.List;
+import java.util.ArrayList;
+
import jline.ConsoleReader;
import jline.History;
import jline.SimpleCompletor;
@@ -35,12 +38,11 @@
*
* @author mailto:[EMAIL PROTECTED]">Stéphane Mor
*/
-public class AskTag extends TagSupport
-{
+public class AskTag extends TagSupport {
private static Log logger = LogFactory.getLog(AskTag.class);
-/** The question to ask to the user */
+/** The question to ask to the user. */
private String question;
/**
@@ -49,15 +51,21 @@
*/
private String answer = "interact.answer";
-/** The default value, if the user doesn't answer */
+/** The default value, if the user doesn't answer. */
private String defaultInput;
/** The user's input */
private String input = "";
-/** The prompt to display before the user input */
+/** The prompt to display before the user input. */
private String prompt = ">";
+/** A list of predefined commands for tab completion. */
+private List completor;
+
+/** Whether to complete with previous completions as well. */
+private boolean useHistoryCompletor = true;
+
private static History consoleHistory = new History();
/**
@@ -72,8 +80,8 @@
}
/**
- * Sets the name of the variable that will hold the answer This defaults to
- * "interact.answer".
+ * Sets the name of the variable that will hold the answer.
+ * This defaults to "interact.answer".
*
* @param answer
*the name of the variable that will hold the answer
@@ -86,7 +94,7 @@
* Sets the default answer to the question. If it is present, it will
appear
* inside [].
*
- * @param default
+ * @param defaultInput
*the default answer to the question
*/
public void setDefault(String defaultInput) {
@@ -96,7 +104,7 @@
/**
* Sets the prompt that will be displayed before the user's input.
*
- * @param promt
+ * @param prompt
*the prompt that will be displayed before the user's input.
*/
public void setPrompt(String prompt) {
@@ -104,7 +112,26 @@
}
/**
- * Perform functionality provided by the tag
+ * Sets the list of predefined commands.
+ *
+ * @param list
+ *the list of commands used for tab completion.
+ */
+public void setCompletor(List list) {
+this.completor = list;
+}
+
+/**
+ * Whether the completion should also happen on previously
+ * entered lines (default true).
+ * @param should whether it should
+ */
+public void setUseHistoryCompletor(boolean should) {
+this.useHistoryCompletor = should;
+}
+
+/**
+ * Perform functionality p
svn commit: r394397 - in /jakarta/commons/proper/jelly/trunk: jelly-tags/tag-project.xml parent-project.xml
Author: polx Date: Sat Apr 15 16:25:06 2006 New Revision: 394397 URL: http://svn.apache.org/viewcvs?rev=394397&view=rev Log: Upgrade to jaxen beta-8 which seems to work better with the XML taglib (at least tried here and by Felipe). Results of these should be shown in gump in the following days. paul Modified: jakarta/commons/proper/jelly/trunk/jelly-tags/tag-project.xml jakarta/commons/proper/jelly/trunk/parent-project.xml Modified: jakarta/commons/proper/jelly/trunk/jelly-tags/tag-project.xml URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/jelly/trunk/jelly-tags/tag-project.xml?rev=394397&r1=394396&r2=394397&view=diff == --- jakarta/commons/proper/jelly/trunk/jelly-tags/tag-project.xml (original) +++ jakarta/commons/proper/jelly/trunk/jelly-tags/tag-project.xml Sat Apr 15 16:25:06 2006 @@ -292,7 +292,7 @@ jaxen jaxen - 1.1-beta-2 + 1.1-beta-8 @@ -351,7 +351,7 @@ -maven-changelog-plugin + maven-changes-plugin maven-checkstyle-plugin maven-developer-activity-plugin Modified: jakarta/commons/proper/jelly/trunk/parent-project.xml URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/jelly/trunk/parent-project.xml?rev=394397&r1=394396&r2=394397&view=diff == --- jakarta/commons/proper/jelly/trunk/parent-project.xml (original) +++ jakarta/commons/proper/jelly/trunk/parent-project.xml Sat Apr 15 16:25:06 2006 @@ -30,7 +30,7 @@ commons-jexl commons-jexl - 1.0 + SNAPSHOT @@ -75,7 +75,7 @@ jaxen jaxen - 1.1-beta-4 + 1.1-beta-8 - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r239470 - /jakarta/commons/proper/jelly/trunk/jelly-tags/project.properties
Author: polx
Date: Tue Aug 23 15:36:01 2005
New Revision: 239470
URL: http://svn.apache.org/viewcvs?rev=239470&view=rev
Log:
Enabling maven upload of snapshots.
paul
Modified:
jakarta/commons/proper/jelly/trunk/jelly-tags/project.properties
Modified: jakarta/commons/proper/jelly/trunk/jelly-tags/project.properties
URL:
http://svn.apache.org/viewcvs/jakarta/commons/proper/jelly/trunk/jelly-tags/project.properties?rev=239470&r1=239469&r2=239470&view=diff
==
--- jakarta/commons/proper/jelly/trunk/jelly-tags/project.properties (original)
+++ jakarta/commons/proper/jelly/trunk/jelly-tags/project.properties Tue Aug 23
15:36:01 2005
@@ -45,3 +45,19 @@
rulesets/strings.xml
maven.changelog.factory=org.apache.maven.svnlib.SvnChangeLogFactory
+
+# Repositories to upload by default... snapshots
+maven.repo.list=apache.snapshots
+
+# Repository to deploy snapshots
+maven.repo.apache.snapshots=scp://cvs.apache.org
+maven.repo.apache.snapshots.directory=/www/cvs.apache.org/repository
+## supposing these variables (*.releases.* are defined at the user-level)
+maven.repo.apache.snapshots.username=${maven.repo.apache.releases.username}
+maven.repo.apache.snapshots.privatekey=${maven.repo.apache.releases.privatekey}
+maven.repo.apache.snapshots.passphrase=${maven.repo.apache.releases.passphrase}
+
+# Repository to deploy releases, need manual addressing
+maven.repo.apache.releases=scp://people.apache.org
+maven.repo.apache.releases.directory=/www/www.apache.org/dist/java-repository
+
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r231483 - /jakarta/commons/proper/jelly/trunk/src/java/org/apache/commons/jelly/impl/StaticTag.java
Author: polx
Date: Thu Aug 11 10:15:34 2005
New Revision: 231483
URL: http://svn.apache.org/viewcvs?rev=231483&view=rev
Log:
Filed by Diogo Quintela... setAttribute seems called at every run which
would, because of SAX's AttributesImpl way of handling attributes, fill a
list.
Thanks Diogo!
paul
Modified:
jakarta/commons/proper/jelly/trunk/src/java/org/apache/commons/jelly/impl/StaticTag.java
Modified:
jakarta/commons/proper/jelly/trunk/src/java/org/apache/commons/jelly/impl/StaticTag.java
URL:
http://svn.apache.org/viewcvs/jakarta/commons/proper/jelly/trunk/src/java/org/apache/commons/jelly/impl/StaticTag.java?rev=231483&r1=231482&r2=231483&view=diff
==
---
jakarta/commons/proper/jelly/trunk/src/java/org/apache/commons/jelly/impl/StaticTag.java
(original)
+++
jakarta/commons/proper/jelly/trunk/src/java/org/apache/commons/jelly/impl/StaticTag.java
Thu Aug 11 10:15:34 2005
@@ -66,6 +66,8 @@
output.endElement(uri, localName, qname);
} catch (SAXException e) {
throw new JellyTagException(e);
+} finally {
+attributes.clear();
}
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r231346 - in /jakarta/commons/proper/jelly/trunk: jelly-tags/xml/project.xml project.xml
Author: polx
Date: Wed Aug 10 15:52:46 2005
New Revision: 231346
URL: http://svn.apache.org/viewcvs?rev=231346&view=rev
Log:
Version names 1.1-SNAPSHOT and 1.2-SNAPSHOT.
paul
Modified:
jakarta/commons/proper/jelly/trunk/jelly-tags/xml/project.xml
jakarta/commons/proper/jelly/trunk/project.xml
Modified: jakarta/commons/proper/jelly/trunk/jelly-tags/xml/project.xml
URL:
http://svn.apache.org/viewcvs/jakarta/commons/proper/jelly/trunk/jelly-tags/xml/project.xml?rev=231346&r1=231345&r2=231346&view=diff
==
--- jakarta/commons/proper/jelly/trunk/jelly-tags/xml/project.xml (original)
+++ jakarta/commons/proper/jelly/trunk/jelly-tags/xml/project.xml Wed Aug 10
15:52:46 2005
@@ -20,7 +20,7 @@
${basedir}/../tag-project.xml
commons-jelly-tags-xml
commons-jelly-tags-xml
- 1.2-dev
+ 1.2-SNAPSHOT
org.apache.commons.jelly.tags.xml
The Jelly XML Tag Library
Commons Jelly XML Tag Library
Modified: jakarta/commons/proper/jelly/trunk/project.xml
URL:
http://svn.apache.org/viewcvs/jakarta/commons/proper/jelly/trunk/project.xml?rev=231346&r1=231345&r2=231346&view=diff
==
--- jakarta/commons/proper/jelly/trunk/project.xml (original)
+++ jakarta/commons/proper/jelly/trunk/project.xml Wed Aug 10 15:52:46 2005
@@ -21,7 +21,7 @@
3
commons-jelly
commons-jelly
- 1.1-dev
+ 1.1-SNAPSHOT
Apache Software Foundation
http://jakarta.apache.org
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r225599 - /jakarta/commons/proper/jelly/trunk/src/java/org/apache/commons/jelly/XMLOutput.java
Author: polx
Date: Wed Jul 27 13:14:40 2005
New Revision: 225599
URL: http://svn.apache.org/viewcvs?rev=225599&view=rev
Log:
endPrefixMapping shouldn't pop either...
paul
Modified:
jakarta/commons/proper/jelly/trunk/src/java/org/apache/commons/jelly/XMLOutput.java
Modified:
jakarta/commons/proper/jelly/trunk/src/java/org/apache/commons/jelly/XMLOutput.java
URL:
http://svn.apache.org/viewcvs/jakarta/commons/proper/jelly/trunk/src/java/org/apache/commons/jelly/XMLOutput.java?rev=225599&r1=225598&r2=225599&view=diff
==
---
jakarta/commons/proper/jelly/trunk/src/java/org/apache/commons/jelly/XMLOutput.java
(original)
+++
jakarta/commons/proper/jelly/trunk/src/java/org/apache/commons/jelly/XMLOutput.java
Wed Jul 27 13:14:40 2005
@@ -397,7 +397,6 @@
* @see #endElement
*/
public void endPrefixMapping(String prefix) throws SAXException {
-namespaceStack.popNamespace(prefix);
// End prefix mapping was already called after endElement
// contentHandler.endPrefixMapping(prefix);
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r225343 - in /jakarta/commons/proper/jelly/trunk/jelly-tags/jsl: project.xml xdocs/changes.xml
Author: polx Date: Tue Jul 26 09:34:44 2005 New Revision: 225343 URL: http://svn.apache.org/viewcvs?rev=225343&view=rev Log: Dropping commons-grant and moving to Ant taglib 1.1 paul Modified: jakarta/commons/proper/jelly/trunk/jelly-tags/jsl/project.xml jakarta/commons/proper/jelly/trunk/jelly-tags/jsl/xdocs/changes.xml Modified: jakarta/commons/proper/jelly/trunk/jelly-tags/jsl/project.xml URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/jelly/trunk/jelly-tags/jsl/project.xml?rev=225343&r1=225342&r2=225343&view=diff == --- jakarta/commons/proper/jelly/trunk/jelly-tags/jsl/project.xml (original) +++ jakarta/commons/proper/jelly/trunk/jelly-tags/jsl/project.xml Tue Jul 26 09:34:44 2005 @@ -56,7 +56,7 @@ commons-jelly commons-jelly-tags-ant - 1.0 + 1.1 root.maven @@ -82,22 +82,24 @@ ant - 1.5.3-1 + 1.6.5 - - ant+optional - 1.5.3-1 +ant + ant-launcher + 1.6.5 ant - - - commons-grant - 1.0-beta-4 +ant + ant-junit + 1.6.5 + +ant + - + Modified: jakarta/commons/proper/jelly/trunk/jelly-tags/jsl/xdocs/changes.xml URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/jelly/trunk/jelly-tags/jsl/xdocs/changes.xml?rev=225343&r1=225342&r2=225343&view=diff == --- jakarta/commons/proper/jelly/trunk/jelly-tags/jsl/xdocs/changes.xml (original) +++ jakarta/commons/proper/jelly/trunk/jelly-tags/jsl/xdocs/changes.xml Tue Jul 26 09:34:44 2005 @@ -25,6 +25,7 @@ + Dropping commons-grant and moving to Ant jelly-taglib 1.1 (hence to Ant 1.6.5). jsl:applyTemplates mode attribute not functioning. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r219718 - /jakarta/commons/proper/jelly/trunk/project.xml
Author: polx Date: Tue Jul 19 10:20:35 2005 New Revision: 219718 URL: http://svn.apache.org/viewcvs?rev=219718&view=rev Log: Opening commit for the next version... Will probably be called 1.1, or ? paul Modified: jakarta/commons/proper/jelly/trunk/project.xml Modified: jakarta/commons/proper/jelly/trunk/project.xml URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/jelly/trunk/project.xml?rev=219718&r1=219717&r2=219718&view=diff == --- jakarta/commons/proper/jelly/trunk/project.xml (original) +++ jakarta/commons/proper/jelly/trunk/project.xml Tue Jul 19 10:20:35 2005 @@ -21,7 +21,7 @@ 3 commons-jelly commons-jelly - 1.0 + 1.1-dev Apache Software Foundation http://jakarta.apache.org - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r190789 - in /jakarta/commons/proper/jelly/trunk: README-binary-dist.txt maven.xml src/bin/jelly
Author: polx
Date: Wed Jun 15 11:45:32 2005
New Revision: 190789
URL: http://svn.apache.org/viewcvs?rev=190789&view=rev
Log:
Little fixes for the binary distribution:
- support for arguments with spaces
- a readme dedicated for the binary distribution with an explanation about
extensibility (which looks good).
paul
Added:
jakarta/commons/proper/jelly/trunk/README-binary-dist.txt
Modified:
jakarta/commons/proper/jelly/trunk/maven.xml
jakarta/commons/proper/jelly/trunk/src/bin/jelly
Added: jakarta/commons/proper/jelly/trunk/README-binary-dist.txt
URL:
http://svn.apache.org/viewcvs/jakarta/commons/proper/jelly/trunk/README-binary-dist.txt?rev=190789&view=auto
==
--- jakarta/commons/proper/jelly/trunk/README-binary-dist.txt (added)
+++ jakarta/commons/proper/jelly/trunk/README-binary-dist.txt Wed Jun 15
11:45:32 2005
@@ -0,0 +1,50 @@
+ Copyright 2002,2004 The Apache Software Foundation.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+Jelly
+=
+
+Welcome to Jakarta commons Jelly.
+The home page of the project is at
+http://jakarta.apache.org/commons/jelly
+
+This binary distribution allows you to run jelly out of
+the box. It is enough to have the java and jelly (or jelly.bat)
+commands in your path of accessible commands..
+
+Jelly is made of a core with a number of individual tag libraries.
+This binary distribution includes the following tag-libraries:
+- bean
+- define
+- dynabean
+- fmt
+- interaction
+- junit
+- log
+- swing
+- util
+- xml
+
+More can be installed by hand by dropping the jars and the dependencies jars
+in the lib directory (the dependencies can be seen, for each tag-library, in
+the project info section of the documentation).
+
+Please refer to the shipped documentation (in the docs directory) and the
+project website for documentation for each tag-libraries and for example.
+
+Jakarta Commons Jelly is an open-source project of the Apache Software
Foundation
+which relies on feedback of its users on both the issue tracking and the
+mailing-lists. We look forward to hear from you!
+
+Enjoy!
Modified: jakarta/commons/proper/jelly/trunk/maven.xml
URL:
http://svn.apache.org/viewcvs/jakarta/commons/proper/jelly/trunk/maven.xml?rev=190789&r1=190788&r2=190789&view=diff
==
--- jakarta/commons/proper/jelly/trunk/maven.xml (original)
+++ jakarta/commons/proper/jelly/trunk/maven.xml Wed Jun 15 11:45:32 2005
@@ -107,6 +107,8 @@
+
@@ -528,7 +530,7 @@
- ${dep.setVersion("SNAPSHOT")}
+ ${dep.setVersion("SNAPSHOT")}
${deps.add(dep)}
@@ -562,7 +564,9 @@
-
+
+
+
Adding jar
${maven.repo.local}/${dep.groupId}/${dep.type}s/${dep.artifact}.
Modified: jakarta/commons/proper/jelly/trunk/src/bin/jelly
URL:
http://svn.apache.org/viewcvs/jakarta/commons/proper/jelly/trunk/src/bin/jelly?rev=190789&r1=190788&r2=190789&view=diff
==
--- jakarta/commons/proper/jelly/trunk/src/bin/jelly (original)
+++ jakarta/commons/proper/jelly/trunk/src/bin/jelly Wed Jun 15 11:45:32 2005
@@ -34,5 +34,5 @@
-Djelly.home=${JELLY_HOME} \
-Dtools.jar=${JAVA_HOME}/lib/tools.jar \
${JELLY_OPTS} \
- com.werken.forehead.Forehead $*
+ com.werken.forehead.Forehead "$@"
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r189663 - /jakarta/commons/proper/jelly/trunk/jelly-tags/fmt/project.xml
Author: polx Date: Wed Jun 8 15:33:57 2005 New Revision: 189663 URL: http://svn.apache.org/viewcvs?rev=189663&view=rev Log: If Ant taglib is at 1.1, fmt should depend on 1.1 then, not on snapshot anymore. paul Modified: jakarta/commons/proper/jelly/trunk/jelly-tags/fmt/project.xml Modified: jakarta/commons/proper/jelly/trunk/jelly-tags/fmt/project.xml URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/jelly/trunk/jelly-tags/fmt/project.xml?rev=189663&r1=189662&r2=189663&view=diff == --- jakarta/commons/proper/jelly/trunk/jelly-tags/fmt/project.xml (original) +++ jakarta/commons/proper/jelly/trunk/jelly-tags/fmt/project.xml Wed Jun 8 15:33:57 2005 @@ -42,7 +42,7 @@ commons-jelly commons-jelly-tags-ant - 1.1-SNAPSHOT + 1.1 - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r149113 - /jakarta/commons/proper/jelly/trunk/jelly-tags/xml/src/java/org/apache/commons/jelly/tags/xml/SetTag.java /jakarta/commons/proper/jelly/trunk/jelly-tags/xml/src/test/org/apache/commons/jelly/tags/xml/suite.jelly
Author: polx
Date: Sat Jan 29 23:47:05 2005
New Revision: 149113
URL: http://svn.apache.org/viewcvs?view=rev&rev=149113
Log:
x:set was returning empty-list in case of empty results whereas it used
to return a null (which becomes an empty string often in jexl or jelly).
Fixed so that when asString, single, and delim attributes are not set,
it is backwards compatible.
Reverted to the multi-slot evaluation-style as opposed to the single
policy introduced by Michael Schuerig.
paul
Modified:
jakarta/commons/proper/jelly/trunk/jelly-tags/xml/src/java/org/apache/commons/jelly/tags/xml/SetTag.java
jakarta/commons/proper/jelly/trunk/jelly-tags/xml/src/test/org/apache/commons/jelly/tags/xml/suite.jelly
Modified:
jakarta/commons/proper/jelly/trunk/jelly-tags/xml/src/java/org/apache/commons/jelly/tags/xml/SetTag.java
Url:
http://svn.apache.org/viewcvs/jakarta/commons/proper/jelly/trunk/jelly-tags/xml/src/java/org/apache/commons/jelly/tags/xml/SetTag.java?view=diff&rev=149113&p1=jakarta/commons/proper/jelly/trunk/jelly-tags/xml/src/java/org/apache/commons/jelly/tags/xml/SetTag.java&r1=149112&p2=jakarta/commons/proper/jelly/trunk/jelly-tags/xml/src/java/org/apache/commons/jelly/tags/xml/SetTag.java&r2=149113
==
---
jakarta/commons/proper/jelly/trunk/jelly-tags/xml/src/java/org/apache/commons/jelly/tags/xml/SetTag.java
(original)
+++
jakarta/commons/proper/jelly/trunk/jelly-tags/xml/src/java/org/apache/commons/jelly/tags/xml/SetTag.java
Sat Jan 29 23:47:05 2005
@@ -30,9 +30,10 @@
import org.jaxen.JaxenException;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.Iterator;
import java.util.List;
-import java.util.Collections;
+import java.util.ListIterator;
/** A tag which defines a variable from an XPath expression.
* This function creates a variable of type [EMAIL PROTECTED] List} or [EMAIL
PROTECTED] org.dom4j.Node}
@@ -66,6 +67,8 @@
private Boolean single = null;
private Boolean asString = null;
+
+private String delimiter = null;
private String delim = null;
@@ -86,7 +89,7 @@
Object xpathContext = getXPathContext();
Object value = null;
try {
-if(single!=null && single.booleanValue()==true) {
+if( single != null && single.booleanValue() == true ) {
value = select.selectSingleNode(xpathContext);
} else {
value = select.evaluate(xpathContext);
@@ -97,29 +100,74 @@
}
if (value instanceof List) {
+List list = (List) value;
// sort the list if xpCmp is set.
if (xpCmp != null && (xpCmp.getXpath() != null)) {
-Collections.sort((List)value, xpCmp);
+Collections.sort(list, xpCmp);
+}
+if(list.isEmpty()) {
+value = null;
}
}
+
-switch ( determineReturnType() ) {
-case RETURN_NODE_LIST:
-value = valueAsList(value);
-break;
-case RETURN_FIRST_NODE:
-value = valueAsSingle(value);
-break;
-case RETURN_STRING_LIST:
-value = nodeListToStringList(valueAsList(value));
-break;
-case RETURN_DELIMITED_STRING_LIST:
-value =
joinDelimitedElements(nodeListToStringList(valueAsList(value)));
-break;
-case RETURN_FIRST_AS_STRING:
-value = singleValueAsString(valueAsSingle(value));
-break;
+// handle single
+if (single!=null) {
+if (single.booleanValue() == true) {
+if(value instanceof List) {
+List l = (List) value;
+if (l.size() == 0)
+value=null;
+else
+value=l.get(0);
+}
+} else { // single == false
+if(! (value instanceof List) ) {
+List l = null;
+if (value==null) {
+l = new ArrayList(0);
+} else {
+l = new ArrayList(1);
+l.add(value);
+}
+value = l;
+}
+}
+}
+
+// now convert the result(s) to string if need
+if(asString != null && asString.booleanValue()) {
+if(value instanceof Node) {
+value = ((Node) value).getStringValue();
+} else if(value instanceof List) {
+for(ListIterator it = ((List) value).listIterator();
it.hasNext(); ) {
+Object v = it.next();
+if(v instanceof Node) {
+v = ((Node
svn commit: r149026 - /jakarta/commons/proper/jelly/trunk/jelly-tags/interaction/xdocs/changes.xml
Author: polx Date: Sat Jan 29 03:23:49 2005 New Revision: 149026 URL: http://svn.apache.org/viewcvs?view=rev&rev=149026 Log: Documented the patch. paul Modified: jakarta/commons/proper/jelly/trunk/jelly-tags/interaction/xdocs/changes.xml Modified: jakarta/commons/proper/jelly/trunk/jelly-tags/interaction/xdocs/changes.xml Url: http://svn.apache.org/viewcvs/jakarta/commons/proper/jelly/trunk/jelly-tags/interaction/xdocs/changes.xml?view=diff&rev=149026&p1=jakarta/commons/proper/jelly/trunk/jelly-tags/interaction/xdocs/changes.xml&r1=149025&p2=jakarta/commons/proper/jelly/trunk/jelly-tags/interaction/xdocs/changes.xml&r2=149026 == --- jakarta/commons/proper/jelly/trunk/jelly-tags/interaction/xdocs/changes.xml (original) +++ jakarta/commons/proper/jelly/trunk/jelly-tags/interaction/xdocs/changes.xml Sat Jan 29 03:23:49 2005 @@ -24,6 +24,9 @@ dIon Gillard + AskTag now uses JLine which allows history, auto-completion, + and edition of answers. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r148941 - in jakarta/commons/proper/jelly/trunk/jelly-tags/interaction: . src/java/org/apache/commons/jelly/tags/interaction src/test/org/apache/commons/jelly/tags/interaction
Author: polx
Date: Fri Jan 28 14:29:09 2005
New Revision: 148941
URL: http://svn.apache.org/viewcvs?view=rev&rev=148941
Log:
Applying Ryan Christianson's patch... thanks for this Ryan.
Now... as you point out we have no test for this.
It's not really unit testable but a demo should be possible.
There was a file sample.jelly which I somewhat populated... (without experience
with the interaction tag).
I then tried to get this running as maven demo but... weird errors occur.
The same command issued on the command-line works somewhat...
Either a maven expert could provide a thought or someone could further investiga
te or try...
paul
PS: added several dependencies so that one can run with jelly command-line
Modified:
jakarta/commons/proper/jelly/trunk/jelly-tags/interaction/maven.xml
jakarta/commons/proper/jelly/trunk/jelly-tags/interaction/project.xml
jakarta/commons/proper/jelly/trunk/jelly-tags/interaction/src/java/org/apache/commons/jelly/tags/interaction/AskTag.java
jakarta/commons/proper/jelly/trunk/jelly-tags/interaction/src/test/org/apache/commons/jelly/tags/interaction/sample.jelly
Modified: jakarta/commons/proper/jelly/trunk/jelly-tags/interaction/maven.xml
Url:
http://svn.apache.org/viewcvs/jakarta/commons/proper/jelly/trunk/jelly-tags/interaction/maven.xml?view=diff&rev=148941&p1=jakarta/commons/proper/jelly/trunk/jelly-tags/interaction/maven.xml&r1=148940&p2=jakarta/commons/proper/jelly/trunk/jelly-tags/interaction/maven.xml&r2=148941
==
--- jakarta/commons/proper/jelly/trunk/jelly-tags/interaction/maven.xml
(original)
+++ jakarta/commons/proper/jelly/trunk/jelly-tags/interaction/maven.xml Fri Jan
28 14:29:09 2005
@@ -13,6 +13,17 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
+
+
+
+
+ Using classpath:
+
${pom.getDependencyClasspath()}:target/${pom.name}-${pom.currentVersion}.jar
+
+
+
+
Modified: jakarta/commons/proper/jelly/trunk/jelly-tags/interaction/project.xml
Url:
http://svn.apache.org/viewcvs/jakarta/commons/proper/jelly/trunk/jelly-tags/interaction/project.xml?view=diff&rev=148941&p1=jakarta/commons/proper/jelly/trunk/jelly-tags/interaction/project.xml&r1=148940&p2=jakarta/commons/proper/jelly/trunk/jelly-tags/interaction/project.xml&r2=148941
==
--- jakarta/commons/proper/jelly/trunk/jelly-tags/interaction/project.xml
(original)
+++ jakarta/commons/proper/jelly/trunk/jelly-tags/interaction/project.xml
Fri Jan 28 14:29:09 2005
@@ -20,7 +20,7 @@
${basedir}/../tag-project.xml
commons-jelly-tags-interaction
commons-jelly-tags-interaction
- 1.0
+ 1.1
org.apache.commons.jelly.tags.interaction
This is a Jelly interface to the user.
Commons Jelly Interaction Tag Library
@@ -31,5 +31,32 @@
COMMONS-JELLY-INTERACTION-1_0
+
+
+
+jline
+jline
+0.9.0
+jar
+
+
+ commons-cli
+ 1.0
+
+
+
+
+ commons-lang
+ 2.0
+
+true
+
+
+
+ commons-discovery
+ 20030211.213356
+
+
+
Modified:
jakarta/commons/proper/jelly/trunk/jelly-tags/interaction/src/java/org/apache/commons/jelly/tags/interaction/AskTag.java
Url:
http://svn.apache.org/viewcvs/jakarta/commons/proper/jelly/trunk/jelly-tags/interaction/src/java/org/apache/commons/jelly/tags/interaction/AskTag.java?view=diff&rev=148941&p1=jakarta/commons/proper/jelly/trunk/jelly-tags/interaction/src/java/org/apache/commons/jelly/tags/interaction/AskTag.java&r1=148940&p2=jakarta/commons/proper/jelly/trunk/jelly-tags/interaction/src/java/org/apache/commons/jelly/tags/interaction/AskTag.java&r2=148941
==
---
jakarta/commons/proper/jelly/trunk/jelly-tags/interaction/src/java/org/apache/commons/jelly/tags/interaction/AskTag.java
(original)
+++
jakarta/commons/proper/jelly/trunk/jelly-tags/interaction/src/java/org/apache/commons/jelly/tags/interaction/AskTag.java
Fri Jan 28 14:29:09 2005
@@ -15,21 +15,31 @@
*/
package org.apache.commons.jelly.tags.interaction;
-import java.io.InputStreamReader;
import java.io.BufferedReader;
import java.io.IOException;
+import java.io.InputStreamReader;
+
+import jline.ConsoleReader;
+import jline.History;
+import jline.SimpleCompletor;
import org.apache.commons.jelly.TagSupport;
import org.apache.commons.jelly.XMLOutput;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
-/**
- * Jelly Tag that asks the user a question, and puts his answer into
- * a variable, with the attribute "answer&
svn commit: r148883 - in jakarta/commons/proper/jelly/trunk/jelly-tags/xml: src/java/org/apache/commons/jelly/tags/xml src/test/org/apache/commons/jelly/tags/xml xdocs
Author: polx
Date: Fri Jan 28 04:36:23 2005
New Revision: 148883
URL: http://svn.apache.org/viewcvs?view=rev&rev=148883
Log:
Applying Michael Schuerig's patch.
jelly:xml is starting to get a really nifty fully-featured biest!
paul
Modified:
jakarta/commons/proper/jelly/trunk/jelly-tags/xml/src/java/org/apache/commons/jelly/tags/xml/SetTag.java
jakarta/commons/proper/jelly/trunk/jelly-tags/xml/src/test/org/apache/commons/jelly/tags/xml/suite.jelly
jakarta/commons/proper/jelly/trunk/jelly-tags/xml/xdocs/changes.xml
Modified:
jakarta/commons/proper/jelly/trunk/jelly-tags/xml/src/java/org/apache/commons/jelly/tags/xml/SetTag.java
Url:
http://svn.apache.org/viewcvs/jakarta/commons/proper/jelly/trunk/jelly-tags/xml/src/java/org/apache/commons/jelly/tags/xml/SetTag.java?view=diff&rev=148883&p1=jakarta/commons/proper/jelly/trunk/jelly-tags/xml/src/java/org/apache/commons/jelly/tags/xml/SetTag.java&r1=148882&p2=jakarta/commons/proper/jelly/trunk/jelly-tags/xml/src/java/org/apache/commons/jelly/tags/xml/SetTag.java&r2=148883
==
---
jakarta/commons/proper/jelly/trunk/jelly-tags/xml/src/java/org/apache/commons/jelly/tags/xml/SetTag.java
(original)
+++
jakarta/commons/proper/jelly/trunk/jelly-tags/xml/src/java/org/apache/commons/jelly/tags/xml/SetTag.java
Fri Jan 28 04:36:23 2005
@@ -30,6 +30,7 @@
import org.jaxen.JaxenException;
import java.util.ArrayList;
+import java.util.Iterator;
import java.util.List;
import java.util.Collections;
@@ -44,6 +45,12 @@
*/
public class SetTag extends XPathTagSupport {
+private static final int RETURN_NODE_LIST = 0;
+private static final int RETURN_FIRST_NODE = 1;
+private static final int RETURN_STRING_LIST = 2;
+private static final int RETURN_DELIMITED_STRING_LIST = 3;
+private static final int RETURN_FIRST_AS_STRING = 4;
+
/** The Log to which logging calls will be made. */
private Log log = LogFactory.getLog(SetTag.class);
@@ -60,6 +67,8 @@
private Boolean asString = null;
+private String delim = null;
+
public SetTag() {
}
@@ -86,36 +95,30 @@
catch (JaxenException e) {
throw new JellyTagException(e);
}
-
+
if (value instanceof List) {
// sort the list if xpCmp is set.
if (xpCmp != null && (xpCmp.getXpath() != null)) {
Collections.sort((List)value, xpCmp);
}
}
-if (single!=null) {
-if (single.booleanValue()==true) {
-if(value instanceof List) {
-List l = (List) value;
-if (l.size()==0)
-value=null;
-else
-value=l.get(0);
-}
-if(asString!=null && asString.booleanValue() && value
instanceof Node)
-value = ((Node) value).getStringValue();
-} else { // single == false
-if(! (value instanceof List) ) {
-List l = null;
-if (value==null) {
-l = new ArrayList(0);
-} else {
-l = new ArrayList(1);
-l.add(value);
-}
-value = l;
-}
-}
+
+switch ( determineReturnType() ) {
+case RETURN_NODE_LIST:
+value = valueAsList(value);
+break;
+case RETURN_FIRST_NODE:
+value = valueAsSingle(value);
+break;
+case RETURN_STRING_LIST:
+value = nodeListToStringList(valueAsList(value));
+break;
+case RETURN_DELIMITED_STRING_LIST:
+value =
joinDelimitedElements(nodeListToStringList(valueAsList(value)));
+break;
+case RETURN_FIRST_AS_STRING:
+value = singleValueAsString(valueAsSingle(value));
+break;
}
//log.info( "Evaluated xpath: " + select + " as: " + value + " of
type: " + value.getClass().getName() );
@@ -123,6 +126,84 @@
context.setVariable(var, value);
}
+private List valueAsList( final Object value ) {
+if (value instanceof List) {
+return (List)value;
+} else {
+if (value == null) {
+return Collections.EMPTY_LIST;
+} else {
+return Collections.singletonList(value);
+}
+}
+}
+
+private Object valueAsSingle( final Object value ) {
+if (value instanceof List) {
+List l = (List) value;
+if (l.isEmpty())
+return null;
+else
+return l.get(0);
+} else {
+return value;
+}
+}
+
+private St
cvs commit: jakarta-commons/jelly/jelly-tags/swing/src/java/org/apache/commons/jelly/tags/swing ComponentTag.java
polx2005/01/26 14:46:28
Modified:
jelly/jelly-tags/swing/src/java/org/apache/commons/jelly/tags/swing
ComponentTag.java
Log:
First stab at rerunnable tags.
Using DO SOMETHING${x}
One can invoke, later, e.g. in an action-tag, ${myTag.rerun()} which should
repopulate the panel by removing first then re-running the body
ot this tag.
paul
Revision ChangesPath
1.24 +49 -1
jakarta-commons/jelly/jelly-tags/swing/src/java/org/apache/commons/jelly/tags/swing/ComponentTag.java
Index: ComponentTag.java
===
RCS file:
/home/cvs/jakarta-commons/jelly/jelly-tags/swing/src/java/org/apache/commons/jelly/tags/swing/ComponentTag.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- ComponentTag.java 12 Jan 2005 08:59:16 - 1.23
+++ ComponentTag.java 26 Jan 2005 22:46:28 - 1.24
@@ -168,6 +168,40 @@
}
}
}
+
+
+ private String tagName = null;
+
+ private XMLOutput currentOutput = null;
+
+ /** Puts this tag into the context under the given name
+ * allowing later calls to [EMAIL PROTECTED] #rerun()}.
+ * For example, it makes sense to use ${myTag.rerun()} as a child
+ * of an action element.
+ *
+ * @param the name to be used
+ */
+ public void setTagName(String name) {
+ this.tagName = name;
+ }
+
+ /** Runs the body of this script again after clearing the content
+ * of this component.
+ * This is useful to use jelly-logic and "re-populate" a part of the
user-interface
+ * after having updated a model part (e.g. an XML-document).
+ * @throws JellyTagException if anything
+ */
+ public void rerun() throws JellyTagException {
+ Component comp = getComponent();
+ if(comp instanceof java.awt.Container) {
+ ((java.awt.Container) comp).removeAll();
+ }
+ this.doTag(currentOutput,false);
+ if ( comp instanceof javax.swing.JComponent ) {
+ ((javax.swing.JComponent) comp).revalidate();
+ }
+ }
+
/**
* Adds a WindowListener to this component
@@ -290,6 +324,14 @@
* A class may be specified otherwise the Factory will be used.
*/
protected Object newInstance(Class theClass, Map attributes, XMLOutput
output) throws JellyTagException {
+ if (attributes.containsKey("tagName")) {
+ this.setTagName((String)attributes.get("tagName"));
+ addIgnoreProperty("tagName");
+ }
+ if(tagName!=null) {
+ context.setVariable(tagName,this);
+ currentOutput = output;
+ }
try {
if (theClass != null ) {
return theClass.newInstance();
@@ -363,6 +405,7 @@
component.setSize(d);
addIgnoreProperty("size");
}
+
if (attributes.containsKey("debugGraphicsOptions")) {
try {
@@ -398,8 +441,13 @@
* @see
org.apache.commons.jelly.Tag#doTag(org.apache.commons.jelly.XMLOutput)
*/
public void doTag(XMLOutput output) throws JellyTagException {
+this.doTag(output,true);
+}
+
+public void doTag(XMLOutput output, boolean resetBean) throws
JellyTagException {
+if(resetBean) clearBean();
super.doTag(output);
-clearBean();
+//clearBean();
}
/** Sets the bean to null, to prevent it from
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/jelly/jelly-tags/swing/src/java/org/apache/commons/jelly/tags/swing TrTag.java
polx2005/01/26 14:43:57
Modified:
jelly/jelly-tags/swing/src/java/org/apache/commons/jelly/tags/swing
TrTag.java
Log:
Cells are of size 1 now unless indicated.
paul
Revision ChangesPath
1.10 +3 -1
jakarta-commons/jelly/jelly-tags/swing/src/java/org/apache/commons/jelly/tags/swing/TrTag.java
Index: TrTag.java
===
RCS file:
/home/cvs/jakarta-commons/jelly/jelly-tags/swing/src/java/org/apache/commons/jelly/tags/swing/TrTag.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- TrTag.java9 Sep 2004 12:16:57 - 1.9
+++ TrTag.java26 Jan 2005 22:43:57 - 1.10
@@ -69,6 +69,7 @@
invokeBody(output);
// now iterate through the rows and add each one to the layout...
+int colIndex = 0;
for (Iterator iter = cells.iterator(); iter.hasNext(); ) {
Cell cell = (Cell) iter.next();
GridBagConstraints c = cell.getConstraints();
@@ -76,7 +77,8 @@
// are we the last cell in the row
if ( iter.hasNext() ) {
// not last in row
-c.gridwidth = GridBagConstraints.RELATIVE;
+c.gridwidth = 1;
+c.gridx = colIndex++;
}
else {
// end of row
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/jelly maven.xml
polx2005/01/23 16:34:06
Modified:jelly/src/java/org/apache/commons/jelly Jelly.java
jelly/src/java/org/apache/commons/jelly/util
CommandLineParser.java
jelly/xdocs changes.xml
jellymaven.xml
Log:
Adding jelly -h and -v. (help and current-version).
paul
Revision ChangesPath
1.35 +29 -1
jakarta-commons/jelly/src/java/org/apache/commons/jelly/Jelly.java
Index: Jelly.java
===
RCS file:
/home/cvs/jakarta-commons/jelly/src/java/org/apache/commons/jelly/Jelly.java,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- Jelly.java9 Sep 2004 15:10:03 - 1.34
+++ Jelly.java24 Jan 2005 00:34:06 - 1.35
@@ -101,6 +101,34 @@
}
}
}
+
+
+public static String getJellyVersion() {
+return readBuildTimestampResource("jelly-version.txt");
+}
+
+public static String getJellyBuildDate() {
+return readBuildTimestampResource("jelly-build-date.txt");
+}
+
+private static String readBuildTimestampResource(String name) {
+java.io.Reader in = null;
+try {
+java.io.StringWriter w = new java.io.StringWriter();
+in = new
java.io.InputStreamReader(Jelly.class.getResourceAsStream(name),"utf-8");
+int r;
+while ( (r=in.read()) >= 0 ) {
+w.write((char) r);
+}
+return w.toString();
+} catch(Exception ex) {
+ex.printStackTrace();
+try { in.close(); } catch(Exception e) {}
+throw new IllegalStateException("Resource \"" + name + "\" not
found.");
+}
+}
+
+
/**
* Compiles the script
1.10 +50 -13
jakarta-commons/jelly/src/java/org/apache/commons/jelly/util/CommandLineParser.java
Index: CommandLineParser.java
===
RCS file:
/home/cvs/jakarta-commons/jelly/src/java/org/apache/commons/jelly/util/CommandLineParser.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- CommandLineParser.java10 Jan 2005 05:35:17 - 1.9
+++ CommandLineParser.java24 Jan 2005 00:34:06 - 1.10
@@ -19,7 +19,9 @@
import java.io.File;
import java.io.FileWriter;
import java.net.URL;
+import java.util.Arrays;
import java.util.ArrayList;
+import java.util.List;
import java.util.Properties;
import org.apache.commons.cli.CommandLine;
@@ -27,6 +29,7 @@
import org.apache.commons.cli.Options;
import org.apache.commons.cli.ParseException;
import org.apache.commons.cli.Parser;
+import org.apache.commons.cli.HelpFormatter;
import org.apache.commons.jelly.Jelly;
import org.apache.commons.jelly.JellyContext;
import org.apache.commons.jelly.JellyException;
@@ -46,6 +49,8 @@
public class CommandLineParser {
protected static CommandLineParser _instance = new CommandLineParser();
+
+private Options cmdLineOptions = null;
public static CommandLineParser getInstance() {
return _instance;
@@ -66,6 +71,19 @@
} catch (ParseException e) {
throw new JellyException(e);
}
+
+// check for -h or -v
+if (cmdLine.hasOption("h")) {
+new HelpFormatter().printHelp("jelly [scriptFile] [-script
scriptFile] [-o outputFile] [-Dsysprop=syspropval] [-awt]",
+cmdLineOptions);
+System.exit(1);
+}
+if (cmdLine.hasOption("v")) {
+System.err.println("Jelly " + Jelly.getJellyVersion());
+System.err.println(" compiled: " + Jelly.getJellyBuildDate());
+System.err.println("");
+System.exit(1);
+}
// get the -script option. If there isn't one then use args[0]
String scriptFile = null;
@@ -74,6 +92,9 @@
} else {
scriptFile = args[0];
}
+
+// check the -awt option.
+boolean runInSwingThread = cmdLine.hasOption("awt") ||
cmdLine.hasOption("swing");
//
// Use classloader to find file
@@ -93,13 +114,22 @@
Jelly jelly = new Jelly();
jelly.setScript(scriptFile);
-Script script = jelly.compileScript();
+final Script script = jelly.compileScript();
// add the system properties and the command line arguments
-JellyContext con
cvs commit: jakarta-commons/jelly/src/java/org/apache/commons/jelly/tags/core FileTag.java
polx2005/01/23 14:36:53
Modified:jelly/src/test/org/apache/commons/jelly suite.jelly
jelly/src/java/org/apache/commons/jelly/tags/core
FileTag.java
Removed: jelly/src/test/org/apache/commons/jelly testFile.jelly
Log:
testFile.jelly was not used... removing!
Migrated the tests for file into suite.jelly and converted the property
appends to append in FileTag.
paul
Revision ChangesPath
1.22 +16 -1
jakarta-commons/jelly/src/test/org/apache/commons/jelly/suite.jelly
Index: suite.jelly
===
RCS file:
/home/cvs/jakarta-commons/jelly/src/test/org/apache/commons/jelly/suite.jelly,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- suite.jelly 21 Jan 2005 14:44:27 - 1.21
+++ suite.jelly 23 Jan 2005 22:36:53 - 1.22
@@ -344,5 +344,20 @@
-
+
+
+
+
+
+ é#\ü
+
+
+
+
+
+ é#\ü
+
+
+
1.17 +1 -1
jakarta-commons/jelly/src/java/org/apache/commons/jelly/tags/core/FileTag.java
Index: FileTag.java
===
RCS file:
/home/cvs/jakarta-commons/jelly/src/java/org/apache/commons/jelly/tags/core/FileTag.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- FileTag.java 21 Jan 2005 20:42:16 - 1.16
+++ FileTag.java 23 Jan 2005 22:36:53 - 1.17
@@ -119,7 +119,7 @@
* Sets wether to append at the end of the file
* (not really something you normally do with an XML file).
*/
-public void setAppends(boolean doAppend) {
+public void setAppend(boolean doAppend) {
this.doAppend = doAppend;
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/jelly/src/test/org/apache/commons/jelly testFile.jelly
polx2005/01/21 12:42:16
Modified:jelly/src/java/org/apache/commons/jelly/tags/core
FileTag.java
jelly/src/test/org/apache/commons/jelly testFile.jelly
Log:
Fixing issue JELLY-191 raised by Marc Dexet.
"FileTag should allow appending to a file".
It is now possible to use and append boolean attribute.
paul
Revision ChangesPath
1.16 +11 -1
jakarta-commons/jelly/src/java/org/apache/commons/jelly/tags/core/FileTag.java
Index: FileTag.java
===
RCS file:
/home/cvs/jakarta-commons/jelly/src/java/org/apache/commons/jelly/tags/core/FileTag.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- FileTag.java 8 Sep 2004 04:35:22 - 1.15
+++ FileTag.java 21 Jan 2005 20:42:16 - 1.16
@@ -39,6 +39,7 @@
* @author mailto:[EMAIL PROTECTED]">Vinay Chandran
*/
public class FileTag extends TagSupport {
+private boolean doAppend = false;
private String var;
private String name;
private boolean omitXmlDeclaration = false;
@@ -55,7 +56,7 @@
try {
if ( name != null ) {
String encoding = (this.encoding != null) ? this.encoding :
"UTF-8";
-Writer writer = new OutputStreamWriter( new
FileOutputStream( name ), encoding );
+Writer writer = new OutputStreamWriter( new
FileOutputStream( name, doAppend ), encoding );
writeBody(writer);
}
else if (var != null) {
@@ -113,6 +114,15 @@
public void setEncoding(String encoding) {
this.encoding = encoding;
}
+
+/**
+ * Sets wether to append at the end of the file
+ * (not really something you normally do with an XML file).
+ */
+public void setAppends(boolean doAppend) {
+this.doAppend = doAppend;
+}
+
/**
* Returns the var.
1.5 +11 -1
jakarta-commons/jelly/src/test/org/apache/commons/jelly/testFile.jelly
Index: testFile.jelly
===
RCS file:
/home/cvs/jakarta-commons/jelly/src/test/org/apache/commons/jelly/testFile.jelly,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- testFile.jelly8 Sep 2004 05:41:32 - 1.4
+++ testFile.jelly21 Jan 2005 20:42:16 - 1.5
@@ -38,5 +38,15 @@
-
+
+
+
+
+
+
+
+
+ ${testFailure-0}
+
+
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/jelly/jelly-tags/xml/src/test/org/apache/commons/jelly/tags/xml suite.jelly
polx2005/01/17 14:09:29
Modified:jelly/jelly-tags/xml/src/java/org/apache/commons/jelly/tags/xml
SetTag.java
jelly/jelly-tags/xml/src/test/org/apache/commons/jelly/tags/xml
suite.jelly
Log:
Adding an "asString" attribute to so that the result can be used,
right away in such things as String manipulations.
paul
Revision ChangesPath
1.12 +22 -2
jakarta-commons/jelly/jelly-tags/xml/src/java/org/apache/commons/jelly/tags/xml/SetTag.java
Index: SetTag.java
===
RCS file:
/home/cvs/jakarta-commons/jelly/jelly-tags/xml/src/java/org/apache/commons/jelly/tags/xml/SetTag.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- SetTag.java 9 Sep 2004 15:18:54 - 1.11
+++ SetTag.java 17 Jan 2005 22:09:28 - 1.12
@@ -24,6 +24,8 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.dom4j.Node;
+
import org.jaxen.XPath;
import org.jaxen.JaxenException;
@@ -54,7 +56,9 @@
/** Xpath comparator for sorting */
private XPathComparator xpCmp = null;
-private Boolean single=null;
+private Boolean single = null;
+
+private Boolean asString = null;
public SetTag() {
@@ -98,6 +102,8 @@
else
value=l.get(0);
}
+if(asString!=null && asString.booleanValue() && value
instanceof Node)
+value = ((Node) value).getStringValue();
} else { // single == false
if(! (value instanceof List) ) {
List l = null;
@@ -140,6 +146,20 @@
*/
public void setSingle(boolean single) {
this.single = new Boolean(single);
+}
+
+/** If set to true, will ensure that the (XPath) text-value
+ * of the selected node is taken instead of the node
+ * itself.
+ * This ensures that, thereafter, string manipulations
+ * can be performed on the result.
+ * Setting this attribute to true will also set the single
+ * attribute to true.
+ */
+public void setAsString(boolean asString) {
+if(asString)
+this.single = new Boolean(asString);
+this.asString = new Boolean(asString);
}
1.13 +10 -6
jakarta-commons/jelly/jelly-tags/xml/src/test/org/apache/commons/jelly/tags/xml/suite.jelly
Index: suite.jelly
===
RCS file:
/home/cvs/jakarta-commons/jelly/jelly-tags/xml/src/test/org/apache/commons/jelly/tags/xml/suite.jelly,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- suite.jelly 8 Sep 2004 22:26:33 - 1.12
+++ suite.jelly 17 Jan 2005 22:09:28 - 1.13
@@ -283,12 +283,12 @@
-
+
blop1
-
-blop0
+
+blop0
@@ -296,10 +296,14 @@
-
-
+
+
-
+
+
+
+
+
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/jelly/jelly-tags/sql/src/java/org/apache/commons/jelly/tags/sql SqlTagSupport.java
polx2005/01/14 02:05:01
Modified:jelly/jelly-tags/sql/src/java/org/apache/commons/jelly/tags/sql
SqlTagSupport.java
Log:
The body of the tags is now passed unescaped.
This is important for SQL strings using "<" for example.
No test for this, positive or negative... just a user confirmation it works.
paul
Revision ChangesPath
1.6 +1 -0
jakarta-commons/jelly/jelly-tags/sql/src/java/org/apache/commons/jelly/tags/sql/SqlTagSupport.java
Index: SqlTagSupport.java
===
RCS file:
/home/cvs/jakarta-commons/jelly/jelly-tags/sql/src/java/org/apache/commons/jelly/tags/sql/SqlTagSupport.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- SqlTagSupport.java9 Sep 2004 12:16:03 - 1.5
+++ SqlTagSupport.java14 Jan 2005 10:05:01 - 1.6
@@ -61,6 +61,7 @@
// Constructor and initialization
public SqlTagSupport() {
+ super.setEscapeText(false);
}
//*
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/jelly/jelly-tags/swing/src/java/org/apache/commons/jelly/tags/swing ComponentTag.java
polx2005/01/12 00:59:16
Modified:
jelly/jelly-tags/swing/src/java/org/apache/commons/jelly/tags/swing
ComponentTag.java
Log:
Slightly better tolerance for null component when invoking toString().
paul
Revision ChangesPath
1.23 +3 -2
jakarta-commons/jelly/jelly-tags/swing/src/java/org/apache/commons/jelly/tags/swing/ComponentTag.java
Index: ComponentTag.java
===
RCS file:
/home/cvs/jakarta-commons/jelly/jelly-tags/swing/src/java/org/apache/commons/jelly/tags/swing/ComponentTag.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- ComponentTag.java 12 Sep 2004 15:34:32 - 1.22
+++ ComponentTag.java 12 Jan 2005 08:59:16 - 1.23
@@ -83,8 +83,9 @@
}
public String toString() {
-String componentName = getComponent().getName();
-if (componentName == null || componentName.length() == 0)
+ Component comp = getComponent();
+String componentName = (comp!=null) ? comp.getName() : null;
+if (comp!=null && (componentName == null || componentName.length()
== 0))
componentName = getComponent().toString();
return "ComponentTag with bean " + componentName;
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/jelly/src/java/org/apache/commons/jelly XMLOutput.java
polx2005/01/12 00:58:45
Modified:jelly/src/java/org/apache/commons/jelly XMLOutput.java
Log:
Now uses the parent DocumentListener for objectData if that parent is an
XMLOutput.
paul
Revision ChangesPath
1.21 +22 -19
jakarta-commons/jelly/src/java/org/apache/commons/jelly/XMLOutput.java
Index: XMLOutput.java
===
RCS file:
/home/cvs/jakarta-commons/jelly/src/java/org/apache/commons/jelly/XMLOutput.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- XMLOutput.java28 Oct 2004 22:21:43 - 1.20
+++ XMLOutput.java12 Jan 2005 08:58:45 - 1.21
@@ -777,25 +777,28 @@
lexicalHandler.comment(ch, start, length);
}
}
-
- /** Pass data through the pipline.
- * By default, this call is ignored.
- * Subclasses are invited to use this as a way for children tags to
- * pass data to their parent.
- *
- * @param object the data to pass
+
+/** Pass data through the pipline.
+ * By default, this call is ignored.
+ * Subclasses are invited to use this as a way for children tags to
+ * pass data to their parent.
+ *
+ * @param object the data to pass
* @exception SAXException The application may raise an exception.
- */
- public void objectData(Object object) throws SAXException {
- String output=null;
- if(object!=null) {
- output=object.toString();
- write(output);
- } else {
- // we could have a "configurable null-toString"...
- write("null");
- }
- }
+ */
+public void objectData(Object object) throws SAXException {
+if(contentHandler instanceof XMLOutput)
+((XMLOutput) contentHandler).objectData(object);
+else {
+if(object!=null) {
+String output=object.toString();
+write(output);
+} else {
+// we could have a "configurable null-toString"...
+write("null");
+}
+}
+}
// Properties
//-
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/jelly/src/java/org/apache/commons/jelly/impl TagScript.java
polx2005/01/11 14:42:29
Modified:jelly/src/java/org/apache/commons/jelly JellyContext.java
jelly/src/java/org/apache/commons/jelly/impl TagScript.java
Log:
Fixed the test-issues in define taglib by allowing getTagOfScript to walk
the parent contexts.
maven multiproject:artifact runs fine with me now.
paul
Revision ChangesPath
1.64 +6 -1
jakarta-commons/jelly/src/java/org/apache/commons/jelly/JellyContext.java
Index: JellyContext.java
===
RCS file:
/home/cvs/jakarta-commons/jelly/src/java/org/apache/commons/jelly/JellyContext.java,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- JellyContext.java 6 Jan 2005 09:00:12 - 1.63
+++ JellyContext.java 11 Jan 2005 22:42:28 - 1.64
@@ -391,7 +391,12 @@
public Tag getTagOfTagScript(TagScript script) {
if( script == null )
return null;
-return (Tag) tagHolderMap.get(script);
+Tag tag = (Tag) tagHolderMap.get(script);
+ if( tag == null && getParent() != null) {
+ return getParent().getTagOfTagScript(script);
+ } else {
+ return tag;
+ }
}
/** @return the Map that associates the the Tags to Scripts */
1.49 +2 -2
jakarta-commons/jelly/src/java/org/apache/commons/jelly/impl/TagScript.java
Index: TagScript.java
===
RCS file:
/home/cvs/jakarta-commons/jelly/src/java/org/apache/commons/jelly/impl/TagScript.java,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- TagScript.java28 Dec 2004 04:07:34 - 1.48
+++ TagScript.java11 Jan 2005 22:42:29 - 1.49
@@ -291,9 +291,9 @@
tag = createTag();
if ( tag != null ) {
context.setTagForScript(this,tag);
+configureTag(tag,context);
}
}
-configureTag(tag,context);
return tag;
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/jelly/jelly-tags/soap project.xml
polx2005/01/11 14:35:30 Modified:jelly/jelly-tags/soap project.xml Log: Adding dependency to jaxme-api-0.3 for the ridiculous namespace JAXP extension. paul Revision ChangesPath 1.17 +8 -1 jakarta-commons/jelly/jelly-tags/soap/project.xml Index: project.xml === RCS file: /home/cvs/jakarta-commons/jelly/jelly-tags/soap/project.xml,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- project.xml 10 Jan 2005 03:21:06 - 1.16 +++ project.xml 11 Jan 2005 22:35:30 - 1.17 @@ -75,7 +75,14 @@ axis-saaj - + + + + jaxme + jaxme-api + 0.3 + + - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/jelly project.xml
polx2004/12/28 13:21:01 Modified:jellyproject.xml Log: Disabling TestCoreMemoryLeak currently... but I'd really like to make it a checked test... looks like Windows is the target OS where it needs to be fixed. paul Revision ChangesPath 1.159 +3 -0 jakarta-commons/jelly/project.xml Index: project.xml === RCS file: /home/cvs/jakarta-commons/jelly/project.xml,v retrieving revision 1.158 retrieving revision 1.159 diff -u -r1.158 -r1.159 --- project.xml 28 Dec 2004 01:59:41 - 1.158 +++ project.xml 28 Dec 2004 21:21:01 - 1.159 @@ -356,6 +356,9 @@ **/Test*.java + +**/TestCoreMemoryLeak.java + src/test - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/jelly/src/test/org/apache/commons/jelly/core BaseMemoryLeakTest.java
polx2004/12/27 17:46:36
Modified:jelly/src/test/org/apache/commons/jelly/core
BaseMemoryLeakTest.java
Log:
The tagHolderMap size was reported way too often...
paul
Revision ChangesPath
1.2 +5 -5
jakarta-commons/jelly/src/test/org/apache/commons/jelly/core/BaseMemoryLeakTest.java
Index: BaseMemoryLeakTest.java
===
RCS file:
/home/cvs/jakarta-commons/jelly/src/test/org/apache/commons/jelly/core/BaseMemoryLeakTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- BaseMemoryLeakTest.java 28 Dec 2004 01:39:23 - 1.1
+++ BaseMemoryLeakTest.java 28 Dec 2004 01:46:36 - 1.2
@@ -114,11 +114,10 @@
script = parser.parse(scriptISource);
script.run(jc, output);
- log.info("TagHolderMap has " +
jc.getTagHolderMap().size() + " entries.");
- // PL: I don't see why but removing the clear here
- // does make the test fail!
- // As if the WeakHashMap wasn't weak enough...
- jc.clear();
+// PL: I don't see why but removing the clear here
+// does make the test fail!
+// As if the WeakHashMap wasn't weak enough...
+jc.clear();
if (outputEveryXIterations != 0 && i % outputEveryXIterations ==
0) {
parser = null;
@@ -127,6 +126,7 @@
rt.runFinalization();
rt.gc();
long middle = rt.totalMemory() - rt.freeMemory();
+log.info("TagHolderMap has " + jc.getTagHolderMap().size() +
" entries.");
log.info("Memory test after " + i + " runs: "
+ (middle - start));
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/jelly/src/java/org/apache/commons/jelly/util TagUtils.java
polx2004/12/27 17:39:23
Modified:jelly/src/java/org/apache/commons/jelly/impl
StaticTagScript.java TagScript.java
jelly/src/java/org/apache/commons/jelly JellyContext.java
jelly/jelly-tags/xml/src/test/org/apache/commons/jelly/tags/xml
TestParser.java
jelly/jelly-tags/xml/src/java/org/apache/commons/jelly/tags/xml
TransformTag.java
jelly/src/java/org/apache/commons/jelly/util TagUtils.java
Added: jelly/src/test/org/apache/commons/jelly/core
TestCoreMemoryLeak.java BaseMemoryLeakTest.java
Removed: jelly/src/java/org/apache/commons/jelly/impl
WeakReferenceWrapperScript.java
Log:
Tag caching is now done in the JellyContext.
The TestCoreMemoryLeak shows that, at least with some usage of
JellyContext.clear(), one avoids leaks.
Removing Tag-caching flag. Also, removing the WeakReferenceWrapperScript,
both were in the era of ThreadLocal which is to be finished.
Have tested these with an amount of the tag-libs... had to change the XML one
but otherwise apparently none.
Feedback and testing eagerly welcome!
paul
Revision ChangesPath
1.25 +2 -2
jakarta-commons/jelly/src/java/org/apache/commons/jelly/impl/StaticTagScript.java
Index: StaticTagScript.java
===
RCS file:
/home/cvs/jakarta-commons/jelly/src/java/org/apache/commons/jelly/impl/StaticTagScript.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- StaticTagScript.java 16 Sep 2004 01:12:11 - 1.24
+++ StaticTagScript.java 28 Dec 2004 01:39:22 - 1.25
@@ -59,14 +59,14 @@
Tag tag = null;
try {
-tag = getTag();
+tag = getTag(context);
// lets see if we have a dynamic tag
if (tag instanceof StaticTag) {
tag = findDynamicTag(context, (StaticTag) tag);
}
-setTag(tag);
+setTag(tag,context);
} catch (JellyException e) {
throw new JellyTagException(e);
}
1.47 +12 -31
jakarta-commons/jelly/src/java/org/apache/commons/jelly/impl/TagScript.java
Index: TagScript.java
===
RCS file:
/home/cvs/jakarta-commons/jelly/src/java/org/apache/commons/jelly/impl/TagScript.java,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- TagScript.java27 Oct 2004 21:50:53 - 1.46
+++ TagScript.java28 Dec 2004 01:39:22 - 1.47
@@ -61,15 +61,6 @@
/** The Log to which logging calls will be made. */
private static final Log log = LogFactory.getLog(TagScript.class);
-/**
- * Thread local storage for the tag used by the current thread.
- * This allows us to pool tag instances, per thread to reduce object
construction
- * over head, if we need it.
- *
- * Note that we could use the stack and create a new tag for each
invocation
- * if we made a slight change to the Script API to pass in the parent
tag.
- */
-private ThreadLocal tagHolder = new ThreadLocal();
/** The attribute expressions that are created */
protected Map attributes = new Hashtable();
@@ -194,11 +185,8 @@
public void run(JellyContext context, XMLOutput output) throws
JellyTagException {
URL rootURL = context.getRootURL();
URL currentURL = context.getCurrentURL();
-if ( ! context.isCacheTags() ) {
-clearTag();
-}
try {
-Tag tag = getTag();
+Tag tag = getTag(context);
if ( tag == null ) {
return;
}
@@ -295,15 +283,15 @@
/**
* @return the tag to be evaluated, creating it lazily if required.
*/
-public Tag getTag() throws JellyException {
-Tag tag = (Tag) tagHolder.get();
+public Tag getTag(JellyContext context) throws JellyException {
+Tag tag = context.getTagOfTagScript(this);
if ( tag == null ) {
tag = createTag();
if ( tag != null ) {
-tagHolder.set(tag);
+context.setTagForScript(this,tag);
}
}
-configureTag(tag);
+configureTag(tag,context);
return tag;
}
@@ -494,21 +482,20 @@
return null;
}
-
+
/**
* Compiles a newly created tag if required, sets its parent and body.
*/
-protected void configureTag(Tag tag) throws JellyException {
+protected void configureTag(Tag tag, JellyContext context) throws
cvs commit: jakarta-commons/jelly/jelly-tags/swing/src/test/org/apache/commons/jelly/swing gridBagDemo.jelly run.jelly
polx2004/12/19 14:26:22
Modified:
jelly/jelly-tags/swing/src/java/org/apache/commons/jelly/tags/swing
ActionTag.java
jelly/jelly-tags/swing/src/test/org/apache/commons/jelly/swing
gridBagDemo.jelly run.jelly
Log:
Putting demo:swing back on tracks.
Oddly enough, we didn't test enough since either a change in UseBeanTag or in
BeanUtils dependency which made it that several attributes were there but were
actually not matching to correct bean-properties.
Also... ActionTag was firing at startup which is definitely wrong!
paul
Revision ChangesPath
1.12 +5 -1
jakarta-commons/jelly/jelly-tags/swing/src/java/org/apache/commons/jelly/tags/swing/ActionTag.java
Index: ActionTag.java
===
RCS file:
/home/cvs/jakarta-commons/jelly/jelly-tags/swing/src/java/org/apache/commons/jelly/tags/swing/ActionTag.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ActionTag.java9 Sep 2004 12:16:57 - 1.11
+++ ActionTag.java19 Dec 2004 22:26:22 - 1.12
@@ -99,7 +99,7 @@
public void actionPerformed(ActionEvent event) {
context.setVariable( "event", event );
try {
-invokeBody(output);
+ActionTag.super.invokeBody(output);
}
catch (Exception e) {
log.error( "Caught: " + e, e );
@@ -110,6 +110,10 @@
}
return action;
}
+
+ public void invokeBody(XMLOutput output) {
+ // do nothing
+ }
/**
1.6 +3 -3
jakarta-commons/jelly/jelly-tags/swing/src/test/org/apache/commons/jelly/swing/gridBagDemo.jelly
Index: gridBagDemo.jelly
===
RCS file:
/home/cvs/jakarta-commons/jelly/jelly-tags/swing/src/test/org/apache/commons/jelly/swing/gridBagDemo.jelly,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gridBagDemo.jelly 8 Sep 2004 05:34:01 - 1.5
+++ gridBagDemo.jelly 19 Dec 2004 22:26:22 - 1.6
@@ -40,14 +40,14 @@
-
+
-
+
-
+
1.7 +1 -1
jakarta-commons/jelly/jelly-tags/swing/src/test/org/apache/commons/jelly/swing/run.jelly
Index: run.jelly
===
RCS file:
/home/cvs/jakarta-commons/jelly/jelly-tags/swing/src/test/org/apache/commons/jelly/swing/run.jelly,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- run.jelly 8 Sep 2004 05:34:01 - 1.6
+++ run.jelly 19 Dec 2004 22:26:22 - 1.7
@@ -26,7 +26,7 @@
-
+
${chooser.showDialog(frame, 'Choose Jelly file')}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/jelly maven.xml
polx2004/12/08 02:02:17
Modified:jellymaven.xml
Log:
Pack-fat-jar now always includes the jelly in snapshot form... otherwise
mismatches occur...
paul
Revision ChangesPath
1.88 +4 -1 jakarta-commons/jelly/maven.xml
Index: maven.xml
===
RCS file: /home/cvs/jakarta-commons/jelly/maven.xml,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- maven.xml 16 Sep 2004 05:59:27 - 1.87
+++ maven.xml 8 Dec 2004 10:02:17 - 1.88
@@ -400,7 +400,10 @@
-${deps.add(dep)}
+
+ ${dep.setVersion("SNAPSHOT")}
+ ${deps.add(dep)}
+
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/jelly/src/java/org/apache/commons/jelly/util CommandLineParser.java
polx2004/12/08 02:00:29
Modified:jelly/src/java/org/apache/commons/jelly/util
CommandLineParser.java
Log:
Passing a property with "=" sign in the value was giving an "invalid" system
property! Fixed.
paul
Revision ChangesPath
1.8 +5 -10
jakarta-commons/jelly/src/java/org/apache/commons/jelly/util/CommandLineParser.java
Index: CommandLineParser.java
===
RCS file:
/home/cvs/jakarta-commons/jelly/src/java/org/apache/commons/jelly/util/CommandLineParser.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- CommandLineParser.java9 Sep 2004 15:10:05 - 1.7
+++ CommandLineParser.java8 Dec 2004 10:00:28 - 1.8
@@ -146,15 +146,10 @@
// -D args will not be copied into the filteredArgList.
if (arg.startsWith("-D") && (arg.length() > 2)) {
arg = arg.substring(2);
-StringTokenizer toks = new StringTokenizer(arg, "=");
-
-if (toks.countTokens() == 2) {
-// add the tokens to the system properties
-sysProps.setProperty(toks.nextToken(), toks.nextToken());
-} else {
-System.err.println("Invalid system property: " + arg);
-}
-
+ int ePos = arg.indexOf("=");
+ if(ePos==-1 || ePos==0 || ePos==arg.length()-1)
+ System.err.println("Invalid system
property: \"" + arg + "\".");
+ sysProps.setProperty(arg.substring(0,ePos),
arg.substring(ePos+1));
} else {
// add this to the filtered list of arguments
filteredArgList.add(arg);
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/jelly/src/test/org/apache/commons/jelly outputData.jelly
polx2004/10/29 00:46:24
Added: jelly/src/test/org/apache/commons/jelly outputData.jelly
Log:
Very bad style to have forgotten this. Sorry.
paul
Revision ChangesPath
1.1
jakarta-commons/jelly/src/test/org/apache/commons/jelly/outputData.jelly
Index: outputData.jelly
===
${o1.add("string")}
${o1}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/jelly/src/test/org/apache/commons/jelly TestXMLOutput.java
polx2004/10/28 15:21:44
Modified:jelly/src/java/org/apache/commons/jelly XMLOutput.java
jelly/src/java/org/apache/commons/jelly/impl
ExpressionScript.java
jelly/src/java/org/apache/commons/jelly/tags/core
MuteTag.java
jelly/src/test/org/apache/commons/jelly TestXMLOutput.java
Log:
objectData is now used... namely... by Expression children.
This allows MuteTag to avoid the string of these expressions.
paul
Revision ChangesPath
1.20 +15 -7
jakarta-commons/jelly/src/java/org/apache/commons/jelly/XMLOutput.java
Index: XMLOutput.java
===
RCS file:
/home/cvs/jakarta-commons/jelly/src/java/org/apache/commons/jelly/XMLOutput.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- XMLOutput.java28 Oct 2004 20:10:50 - 1.19
+++ XMLOutput.java28 Oct 2004 22:21:43 - 1.20
@@ -51,17 +51,18 @@
/** empty attributes */
private static final Attributes EMPTY_ATTRIBUTES = new AttributesImpl();
+/** The Log to which logging calls will be made. */
+private static final Log log = LogFactory.getLog(XMLOutput.class);
+
+/** the default for escaping of text */
+private static final boolean DEFAULT_ESCAPE_TEXT = false;
+
/** The SAX ContentHandler that output goes to */
private ContentHandler contentHandler;
/** The SAX LexicalHandler that output goes to */
private LexicalHandler lexicalHandler;
-/** The Log to which logging calls will be made. */
-private static final Log log = LogFactory.getLog(XMLOutput.class);
-
-/** the default for escaping of text */
-private static final boolean DEFAULT_ESCAPE_TEXT = false;
public XMLOutput() {
}
@@ -786,7 +787,14 @@
* @exception SAXException The application may raise an exception.
*/
public void objectData(Object object) throws SAXException {
- // do nothing
+ String output=null;
+ if(object!=null) {
+ output=object.toString();
+ write(output);
+ } else {
+ // we could have a "configurable null-toString"...
+ write("null");
+ }
}
// Properties
1.9 +3 -3
jakarta-commons/jelly/src/java/org/apache/commons/jelly/impl/ExpressionScript.java
Index: ExpressionScript.java
===
RCS file:
/home/cvs/jakarta-commons/jelly/src/java/org/apache/commons/jelly/impl/ExpressionScript.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ExpressionScript.java 9 Sep 2004 12:26:22 - 1.8
+++ ExpressionScript.java 28 Oct 2004 22:21:44 - 1.9
@@ -63,11 +63,11 @@
/** Evaluates the body of a tag */
public void run(JellyContext context, XMLOutput output) throws
JellyTagException {
-String text = expression.evaluateAsString(context);
-if ( text != null ) {
+Object result = expression.evaluate(context);
+if ( result != null ) {
try {
- output.write(text);
+ output.objectData(result);
} catch (SAXException e) {
throw new JellyTagException("Could not write to XMLOutput",e);
}
1.3 +16 -6
jakarta-commons/jelly/src/java/org/apache/commons/jelly/tags/core/MuteTag.java
Index: MuteTag.java
===
RCS file:
/home/cvs/jakarta-commons/jelly/src/java/org/apache/commons/jelly/tags/core/MuteTag.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- MuteTag.java 8 Sep 2004 04:35:22 - 1.2
+++ MuteTag.java 28 Oct 2004 22:21:44 - 1.3
@@ -38,12 +38,22 @@
public void doTag(XMLOutput output) throws JellyTagException {
-super.invokeBody(makeMuteOutput());
+super.invokeBody(new MuteXMLOutput());
}
-private XMLOutput makeMuteOutput() {
-return new XMLOutput(new DefaultHandler());
-}
-
} // class TagSupport
+
+/**
+ * An XMLOutput which really outputs nothing, in particular, avoids calling
+ * toString() in objects returned...
+ */
+class MuteXMLOutput extends XMLOutput {
+public MuteXMLOutput() {
+super(new DefaultHandler());
+}
+
+public void objectData(Object o) {
+// do nothing, not even invoke the toString!
+}
+}
1.2 +11 -0
jakarta-commons/jelly/src/test/org/apache/commons/jelly
cvs commit: jakarta-commons/jelly/src/java/org/apache/commons/jelly XMLOutput.java
polx2004/10/28 13:10:50
Modified:jelly/src/java/org/apache/commons/jelly XMLOutput.java
Log:
Adding XMLOutput.objectData() for use by tags that want to "send data"
to "caller tags". This is, currently, mostly unused.
paul
Revision ChangesPath
1.19 +13 -1
jakarta-commons/jelly/src/java/org/apache/commons/jelly/XMLOutput.java
Index: XMLOutput.java
===
RCS file:
/home/cvs/jakarta-commons/jelly/src/java/org/apache/commons/jelly/XMLOutput.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- XMLOutput.java9 Sep 2004 12:25:39 - 1.18
+++ XMLOutput.java28 Oct 2004 20:10:50 - 1.19
@@ -776,6 +776,18 @@
lexicalHandler.comment(ch, start, length);
}
}
+
+ /** Pass data through the pipline.
+ * By default, this call is ignored.
+ * Subclasses are invited to use this as a way for children tags to
+ * pass data to their parent.
+ *
+ * @param object the data to pass
+ * @exception SAXException The application may raise an exception.
+ */
+ public void objectData(Object object) throws SAXException {
+ // do nothing
+ }
// Properties
//-
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/jelly/jelly-tags/define/src/test/org/apache/commons/jelly/tags/define suite.jelly
polx2004/09/09 06:22:33
Modified:jelly/jelly-tags/define/src/test/org/apache/commons/jelly/tags/define
suite.jelly
Log:
Amazing... the test succeeds so that my post on common-devs about
attributes not overriding should be ignored.
paul
Revision ChangesPath
1.4 +13 -0
jakarta-commons/jelly/jelly-tags/define/src/test/org/apache/commons/jelly/tags/define/suite.jelly
Index: suite.jelly
===
RCS file:
/home/cvs/jakarta-commons/jelly/jelly-tags/define/src/test/org/apache/commons/jelly/tags/define/suite.jelly,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- suite.jelly 8 Sep 2004 05:14:39 - 1.3
+++ suite.jelly 9 Sep 2004 13:22:33 - 1.4
@@ -197,5 +197,18 @@
+
+
+ ${varA}
+
+
+
+ obtained is ${obtained}
+
+
+
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/jelly/jelly-tags/xml/src/test/org/apache/commons/jelly/tags/xml suite.jelly
polx2004/09/08 15:26:33
Modified:jelly/jelly-tags/xml/src/java/org/apache/commons/jelly/tags/xml
SetTag.java
jelly/jelly-tags/xml/src/test/org/apache/commons/jelly/tags/xml
suite.jelly
Log:
Added support and test for single="true" (guarantees null or node)
as well as single="false" (guarantees a list, be it empty).
paul
Revision ChangesPath
1.8 +30 -13
jakarta-commons/jelly/jelly-tags/xml/src/java/org/apache/commons/jelly/tags/xml/SetTag.java
Index: SetTag.java
===
RCS file:
/home/cvs/jakarta-commons/jelly/jelly-tags/xml/src/java/org/apache/commons/jelly/tags/xml/SetTag.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- SetTag.java 8 Sep 2004 04:52:22 - 1.7
+++ SetTag.java 8 Sep 2004 22:26:33 - 1.8
@@ -53,7 +53,7 @@
/** Xpath comparator for sorting */
private XPathComparator xpCmp = null;
-private boolean single=false;
+private Boolean single=null;
public SetTag() {
@@ -72,7 +72,11 @@
Object xpathContext = getXPathContext();
Object value = null;
try {
-value = select.evaluate(xpathContext);
+ if(single!=null && single.booleanValue()==true) {
+ value = select.selectSingleNode(xpathContext);
+ } else {
+ value = select.evaluate(xpathContext);
+ }
}
catch (JaxenException e) {
throw new JellyTagException(e);
@@ -84,17 +88,28 @@
Collections.sort((List)value, xpCmp);
}
}
-if (single==true) {
-if(value instanceof List) {
-List l = (List) value;
-if (l.size()==0)
-value=null;
-else
-value=l.get(0);
-}
+if (single!=null) {
+ if (single.booleanValue()==true) {
+ if(value instanceof List) {
+ List l = (List) value;
+ if (l.size()==0)
+ value=null;
+ else
+ value=l.get(0);
+ }
+ } else { // single == false
+ if(! (value instanceof List) ) {
+ if (value==null) {
+ l = new java.util.ArrayList(0)
+ } else {
+ List l = new java.util.ArrayList(1);
+ l.add(value);
+ }
+ value = l;
+ }
+ }
}
-
//log.info( "Evaluated xpath: " + select + " as: " + value + " of type: " +
value.getClass().getName() );
context.setVariable(var, value);
@@ -115,17 +130,19 @@
}
/** If set to true will only take the first element matching.
+ If set to false, guarantees that a list is returned.
It then guarantees that the result is of type
[EMAIL PROTECTED] org.dom4j.Node} thereby making sure that, for example,
when an element is selected, one can directly call such methods
as setAttribute.
*/
public void setSingle(boolean single) {
-this.single = single;
+this.single = new Boolean(single);
}
/** Sets the xpath expression to use to sort selected nodes.
+ * Ignored if single is true.
*/
public void setSort(XPath sortXPath) throws JaxenException {
if (xpCmp == null) xpCmp = new XPathComparator();
1.12 +7 -2
jakarta-commons/jelly/jelly-tags/xml/src/test/org/apache/commons/jelly/tags/xml/suite.jelly
Index: suite.jelly
===
RCS file:
/home/cvs/jakarta-commons/jelly/jelly-tags/xml/src/test/org/apache/commons/jelly/tags/xml/suite.jelly,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- suite.jelly 27 Aug 2004 04:37:45 - 1.11
+++ suite.jelly 8 Sep 2004 22:26:33 - 1.12
@@ -287,14 +287,19 @@
blop1
+
cvs commit: jakarta-commons/jelly maven.xml
polx2004/06/23 01:12:01 Modified:jellymaven.xml Log: Adding the pack-fat-jar with a full set of default values. paul Revision ChangesPath 1.72 +3 -2 jakarta-commons/jelly/maven.xml Index: maven.xml === RCS file: /home/cvs/jakarta-commons/jelly/maven.xml,v retrieving revision 1.71 retrieving revision 1.72 diff -u -r1.71 -r1.72 --- maven.xml 24 May 2004 21:39:35 - 1.71 +++ maven.xml 23 Jun 2004 08:12:01 - 1.72 @@ -344,7 +344,8 @@ - + + @@ -407,7 +408,7 @@ - + - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/jelly/jelly-tags/avalon build.xml
polx2004/06/15 04:24:36 Modified:jelly/jelly-tags/avalon build.xml Log: Fixed name as well. paul Revision ChangesPath 1.5 +3 -3 jakarta-commons/jelly/jelly-tags/avalon/build.xml Index: build.xml === RCS file: /home/cvs/jakarta-commons/jelly/jelly-tags/avalon/build.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- build.xml 24 May 2004 21:39:35 - 1.4 +++ build.xml 15 Jun 2004 11:24:35 - 1.5 @@ -2,7 +2,7 @@ - + @@ -17,7 +17,7 @@ - + @@ -146,7 +146,7 @@ - + - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/jelly/jelly-tags/avalon project.xml
polx2004/06/15 04:22:59
Modified:jelly/jelly-tags/avalon project.xml
Log:
Wrong project-name... or at least... non conformant.
paul
Revision ChangesPath
1.5 +2 -2 jakarta-commons/jelly/jelly-tags/avalon/project.xml
Index: project.xml
===
RCS file: /home/cvs/jakarta-commons/jelly/jelly-tags/avalon/project.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- project.xml 25 Feb 2004 05:53:43 - 1.4
+++ project.xml 15 Jun 2004 11:22:59 - 1.5
@@ -16,8 +16,8 @@
-->
${basedir}/../tag-project.xml
- commons-jelly-avalon
- commons-jelly-avalon
+ commons-jelly-tags-avalon
+ commons-jelly-tags-avalon
org.apache.commons.jelly.avalon
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/jelly/jelly-tags/xmlunit build.xml
polx2004/05/24 14:39:37 Modified:jellybuild.xml commonDependencies.ent maven.xml project.xml jelly/jelly-tags tag-project.xml jelly/jelly-tags/ant build.xml jelly/jelly-tags/antlr build.xml project.xml jelly/jelly-tags/avalon build.xml jelly/jelly-tags/bean build.xml jelly/jelly-tags/beanshell build.xml jelly/jelly-tags/betwixt build.xml jelly/jelly-tags/bsf build.xml jelly/jelly-tags/define build.xml jelly/jelly-tags/dynabean build.xml jelly/jelly-tags/email build.xml jelly/jelly-tags/fmt build.xml jelly/jelly-tags/html build.xml jelly/jelly-tags/http build.xml jelly/jelly-tags/interaction build.xml project.xml jelly/jelly-tags/jaxme build.xml project.xml jelly/jelly-tags/jetty build.xml jelly/jelly-tags/jms build.xml jelly/jelly-tags/jsl build.xml jelly/jelly-tags/junit build.xml jelly/jelly-tags/log build.xml jelly/jelly-tags/ojb build.xml jelly/jelly-tags/quartz build.xml project.xml jelly/jelly-tags/soap build.xml jelly/jelly-tags/sql build.xml jelly/jelly-tags/swing build.xml project.xml jelly/jelly-tags/swt build.xml jelly/jelly-tags/threads build.xml jelly/jelly-tags/util build.xml jelly/jelly-tags/validate build.xml jelly/jelly-tags/velocity build.xml jelly/jelly-tags/xml build.xml jelly/jelly-tags/xmlunit build.xml Log: Upgrading to dom4j 1.5-beta-2, thereby to jaxen 1.1 beta-2. Updated all build.xml. The whole project seems to build fine. Using maven rc3 may be a good advice. paul Revision ChangesPath 1.81 +21 -34jakarta-commons/jelly/build.xml http://cvs.apache.org/viewcvs/jakarta-commons/jelly/build.xml.diff?r1=1.80&r2=1.81 1.10 +6 -1 jakarta-commons/jelly/commonDependencies.ent http://cvs.apache.org/viewcvs/jakarta-commons/jelly/commonDependencies.ent.diff?r1=1.9&r2=1.10 1.71 +1 -1 jakarta-commons/jelly/maven.xml http://cvs.apache.org/viewcvs/jakarta-commons/jelly/maven.xml.diff?r1=1.70&r2=1.71 1.140 +1 -1 jakarta-commons/jelly/project.xml http://cvs.apache.org/viewcvs/jakarta-commons/jelly/project.xml.diff?r1=1.139&r2=1.140 1.7 +13 -18jakarta-commons/jelly/jelly-tags/tag-project.xml http://cvs.apache.org/viewcvs/jakarta-commons/jelly/jelly-tags/tag-project.xml.diff?r1=1.6&r2=1.7 1.9 +19 -30jakarta-commons/jelly/jelly-tags/ant/build.xml http://cvs.apache.org/viewcvs/jakarta-commons/jelly/jelly-tags/ant/build.xml.diff?r1=1.8&r2=1.9 1.4 +12 -23jakarta-commons/jelly/jelly-tags/antlr/build.xml http://cvs.apache.org/viewcvs/jakarta-commons/jelly/jelly-tags/antlr/build.xml.diff?r1=1.3&r2=1.4 1.8 +1 -1 jakarta-commons/jelly/jelly-tags/antlr/project.xml http://cvs.apache.org/viewcvs/jakarta-commons/jelly/jelly-tags/antlr/project.xml.diff?r1=1.7&r2=1.8 1.4 +56 -25jakarta-commons/jelly/jelly-tags/avalon/build.xml http://cvs.apache.org/viewcvs/jakarta-commons/jelly/jelly-tags/avalon/build.xml.diff?r1=1.3&r2=1.4 1.4 +14 -25jakarta-commons/jelly/jelly-tags/bean/build.xml http://cvs.apache.org/viewcvs/jakarta-commons/jelly/jelly-tags/bean/build.xml.diff?r1=1.3&r2=1.4 1.4 +14 -25jakarta-commons/jelly/jelly-tags/beanshell/build.xml http://cvs.apache.org/viewcvs/jakarta-commons/jelly/jelly-tags/beanshell/build.xml.diff?r1=1.3&r2=1.4 1.5 +17 -28jakarta-commons/jelly/jelly-tags/betwixt/build.xml http://cvs.apache.org/viewcvs/jakarta-commons/jelly/jelly-tags/betwixt/build.xml.diff?r1=1.4&r2=1.5 1.4 +12 -23jakarta-commons/jelly/jelly-tags/bsf/build.xml http://cvs.apache.org/viewcvs/jakarta-commons/jelly/jelly-tags/bsf/build.xml.diff?r1=1.3&r2=1.4 1.4 +18 -29jakarta-commons/jelly/jelly-tags/define/build.xml http://cvs.apache.org/viewcvs/jakarta-commons/jelly/jelly-tags/define/build.xml.diff?r1=1.3&r2=1.4 1.4 +12 -23jakarta-commons/jelly/jelly-tags/dynabean/build.xml http://cvs.apache.org/viewcvs/jakarta-commons/jelly/jelly-tags/dynabean/build.xml.diff?r1=1.3&r2=1.4 1.4 +56 -25jakarta-commons/jelly/jelly-tags/email/build.xml http://cvs.apache.org/viewcvs/jakarta-commons/jelly/jelly-tags/email/build.xml.diff?r1=1.3&r2=1.4 1.5 +9 -48 jakarta-commons/jelly/jelly-tags/fmt/build.xml http://cvs.apache.org/viewcvs/j
cvs commit: jakarta-commons/jelly/jelly-tags/log project.xml
polx2004/05/19 06:17:23 Modified:jelly/jelly-tags/log project.xml Log: It looks like the practice is to depend on jelly from the tags and not in the common-build... was missing in log. paul Revision ChangesPath 1.7 +6 -1 jakarta-commons/jelly/jelly-tags/log/project.xml Index: project.xml === RCS file: /home/cvs/jakarta-commons/jelly/jelly-tags/log/project.xml,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- project.xml 1 Mar 2004 01:40:00 - 1.6 +++ project.xml 19 May 2004 13:17:23 - 1.7 @@ -44,6 +44,11 @@ http://jakarta.apache.org/commons/sandbox/jelly/tags/junit/ - + + commons-jelly + SNAPSHOT + + + - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/jelly maven.xml
polx2004/02/04 02:39:04
Modified:jellymaven.xml
Log:
Now with the production of a classpath file and configurable paths.
paul
Revision ChangesPath
1.68 +42 -22jakarta-commons/jelly/maven.xml
Index: maven.xml
===
RCS file: /home/cvs/jakarta-commons/jelly/maven.xml,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- maven.xml 3 Feb 2004 22:52:46 - 1.67
+++ maven.xml 4 Feb 2004 10:39:04 - 1.68
@@ -318,9 +318,22 @@
+
-
+
+
+
+
+
+
+
+
${tagLibs}
@@ -336,13 +349,18 @@
-
-
-
+
+
+
+
+
+
+
+
+
+
${deps.add(dep)}
@@ -355,7 +373,7 @@
${deps.add(tlD)}
-
${deps.add(dep)}
-
+ -->
-
-${deps}
-
-
+
+
+${maven.repo.local}/${dep.groupId}/${dep.type}s/${dep.artifactId}-${dep.version}.${dep.type}${path.separator}
+
-
-
-
-
-
-Adding jar
${maven.repo.local}/${dep.groupId}/${dep.type}s/${dep.artifact}.
-
-
+
+
+
+
+
+
+ Adding jar
${maven.repo.local}/${dep.groupId}/${dep.type}s/${dep.artifact}.
+
+
+
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/jelly maven.xml
polx2004/02/03 14:52:46 Modified:jellymaven.xml Log: Now does not try to build the tags... just packing. paul Revision ChangesPath 1.67 +2 -2 jakarta-commons/jelly/maven.xml Index: maven.xml === RCS file: /home/cvs/jakarta-commons/jelly/maven.xml,v retrieving revision 1.66 retrieving revision 1.67 diff -u -r1.66 -r1.67 --- maven.xml 3 Feb 2004 22:44:17 - 1.66 +++ maven.xml 3 Feb 2004 22:52:46 - 1.67 @@ -316,7 +316,7 @@ - @@ -337,7 +337,7 @@ - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/jelly maven.xml
polx2004/02/03 14:44:17
Modified:jellymaven.xml
Log:
Adding a goal named pack-fat-jar so that one can pack a binary of jelly and
all its dependent in one double-clickable jar.
Use as follows:
maven pack-fat-jar -DtagLibs=xml,util
java -jar target/jellypack.jar myFile.jelly
Not much tested, thanks to comment!
paul
Revision ChangesPath
1.66 +68 -0 jakarta-commons/jelly/maven.xml
Index: maven.xml
===
RCS file: /home/cvs/jakarta-commons/jelly/maven.xml,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- maven.xml 25 Dec 2003 22:09:58 - 1.65
+++ maven.xml 3 Feb 2004 22:44:17 - 1.66
@@ -313,4 +313,72 @@
+
+
+
+
+
+
+
+
+ ${tagLibs}
+
+ Considering taglib tlName "${tlName}".
+
+${taglibs_projects},
+${taglibs_projects}jelly-tags/${tlName}/project.xml
+ ${jellyTaglibNames.add(tlName)}
+
+
+
+
+
+
+
+
+
+ ${deps.add(dep)}
+
+
+
+${tlD.setGroupId("commons-jelly")}
+
+${tlD.setArtifactId(artId)}
+${tlD.setType("jar")}
+${tlD.setVersion("SNAPSHOT")}
+ ${deps.add(tlD)}
+
+
+
+
+
+ ${deps.add(dep)}
+
+
+
+${deps}
+
+
+
+
+
+
+
+
+
+Adding jar
${maven.repo.local}/${dep.groupId}/${dep.type}s/${dep.artifact}.
+
+
+
+
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/jelly/jelly-tags tag-project.xml
polx2004/01/16 13:28:38
Modified:jellyproject.xml
jelly/jelly-tags tag-project.xml
Log:
Moving the issue tracking.
Paul
Revision ChangesPath
1.134 +1 -1 jakarta-commons/jelly/project.xml
Index: project.xml
===
RCS file: /home/cvs/jakarta-commons/jelly/project.xml,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -r1.133 -r1.134
--- project.xml 25 Dec 2003 22:03:05 - 1.133
+++ project.xml 16 Jan 2004 21:28:37 - 1.134
@@ -51,7 +51,7 @@
http://jakarta.apache.org/commons/jelly/
-
http://jira.codehaus.org/secure/BrowseProject.jspa?id=10012
+
http://nagoya.apache.org/jira/secure/BrowseProject.jspa?id=10012
jakarta.apache.org
/www/jakarta.apache.org/commons/${pom.artifactId.substring(8)}/
1.4 +1 -1 jakarta-commons/jelly/jelly-tags/tag-project.xml
Index: tag-project.xml
===
RCS file: /home/cvs/jakarta-commons/jelly/jelly-tags/tag-project.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- tag-project.xml 25 Dec 2003 21:58:38 - 1.3
+++ tag-project.xml 16 Jan 2004 21:28:37 - 1.4
@@ -21,7 +21,7 @@
Commons Jelly Tag Library
http://jakarta.apache.org/commons/jelly/libs/${pom.id.substring(33)}/index.html
-
http://jira.codehaus.org/secure/BrowseProject.jspa?id=10012
+
http://nagoya.apache.org/jira/secure/BrowseProject.jspa?id=10012
jakarta.apache.org
/www/jakarta.apache.org/commons/jelly/jelly-tags/${pom.id.substring(33)}/
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/jelly/xdocs faq.xml gettingstarted.xml index.xml irc.xml jellyswt.xml jellyunit.xml navigation.xml overview.xml pipeline.xml tutorial.xml
polx2003/12/25 14:09:58
Modified:jellymaven.xml
jelly/xdocs faq.xml gettingstarted.xml index.xml irc.xml
jellyswt.xml jellyunit.xml navigation.xml
overview.xml pipeline.xml tutorial.xml
Log:
Website is now built with maven site but this takes very long (about an hour) and
relies on being able to invoke maven executable back (!).
Fixed many inaccuracies in the presentation pages.
Some of these pages could be moved to their taglib as was done with JellySwing.
Paul
Revision ChangesPath
1.65 +53 -42jakarta-commons/jelly/maven.xml
Index: maven.xml
===
RCS file: /home/cvs/jakarta-commons/jelly/maven.xml,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- maven.xml 22 Sep 2003 15:22:57 - 1.64
+++ maven.xml 25 Dec 2003 22:09:58 - 1.65
@@ -2,8 +2,7 @@
-
-About to create lib and bin directories in
${maven.dist.assembly.dir}
+About to create lib and bin directories in ${maven.dist.assembly.dir}
@@ -126,13 +125,9 @@
-
+
-
@@ -173,50 +168,29 @@
-
-
-
-
+
-
+/>-->
+
+
+
+
-
-
-
-
-
-
-
+
@@ -233,7 +207,49 @@
+
+
+
+
+
+
+
+
+
+
+
+ Processing tablib ${tlName}.
+
+
+
+
+
+ Tag-library ${tlname}'s site is up-to-date ?
"${siteIsBuilt}"
+
+ Building tag-library ${tlname}'s site.
+ Outputting navigation to
${dir}/target/generated-xdocs/navigation.xml.
+
+
+
+
+
+
+
+
+
+
+ http://jakarta.apache.org/commons/charter.html"/>
+
+
+
+
+
+
+
+
@@ -286,11 +302,6 @@
description="A private target invoked by the async demo">
-
-
-
1.10 +19 -24jakarta-commons/jelly/xdocs/faq.xml
Index: faq.xml
===
RCS file: /home/cvs/jakarta-commons/jelly/xdocs/faq.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- faq.xml 15 Sep 2003 20:35:01 - 1.9
+++ faq.xml 25 Dec 2003 22:09:58 - 1.10
@@ -124,14 +124,14 @@
Try the following code. Note that the runScript() method below is
overloaded and can take a File, URL etc.
-
+
// pass the output of the script somewhere
Writer someWriter = new FileWriter( "output.xml" );
XMLOutput output = XMLOutput.createXMLOutput( someWriter );
// now run a script using a URL
JellyContext context = new JellyContext();
-context.runScript( "foo.jelly", output );
+context.runScript( "foo.jelly", output );
@@ -196,7 +196,7 @@
-
+
<j:jelly xmlns:j="jelly:core"
xmlns:foo="jelly:com.acme.something.MyTagLibrary">
<foo:bar x="12>
@@ -204,7 +204,7 @@
</foo:bar>
</j:jelly>
-
+
@@ -216,7 +216,7 @@
-
+
<j:jelly xmlns:j="jelly:core" xmlns:foo="jelly:foo">
<foo:bar x="12>
@@ -224,7 +224,7 @@
</foo:bar>
</j:jelly>
-
+
@@ -243,7 +243,7 @@
-
+
public class FooTag extends TagSupport {
private String value;
@@ -252,25 +252,25 @@
.
-}
+}
cvs commit: jakarta-commons/jelly commonDependencies.ent
polx2003/12/25 14:06:30 Modified:jellycommonDependencies.ent Log: Jelly should depend on the latest jexl I believe. Paul Revision ChangesPath 1.8 +1 -1 jakarta-commons/jelly/commonDependencies.ent Index: commonDependencies.ent === RCS file: /home/cvs/jakarta-commons/jelly/commonDependencies.ent,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- commonDependencies.ent23 Jun 2003 02:05:15 - 1.7 +++ commonDependencies.ent25 Dec 2003 22:06:30 - 1.8 @@ -7,7 +7,7 @@ commons-jexl - 1.0-beta-1 + SNAPSHOT - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/jelly LICENSE.txt project.properties
polx2003/12/25 14:05:42
Modified:jellyLICENSE.txt project.properties
Log:
Making the license point to a local file instead of one above.
development process is commons-charter and the maven-logo is the feather one.
Paul
Revision ChangesPath
1.3 +8 -8 jakarta-commons/jelly/LICENSE.txt
Index: LICENSE.txt
===
RCS file: /home/cvs/jakarta-commons/jelly/LICENSE.txt,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- LICENSE.txt 9 Oct 2003 21:21:14 - 1.2
+++ LICENSE.txt 25 Dec 2003 22:05:41 - 1.3
@@ -7,7 +7,7 @@
*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -23,11 +23,11 @@
*distribution.
*
* 3. The end-user documentation included with the redistribution, if
- *any, must include the following acknowledgement:
+ *any, must include the following acknowlegement:
* "This product includes software developed by the
*Apache Software Foundation (http://www.apache.org/)."
- *Alternately, this acknowledgement may appear in the software itself,
- *if and wherever such third-party acknowledgements normally appear.
+ *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
@@ -36,7 +36,7 @@
*
* 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 Software Foundation.
+ *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
1.18 +5 -2 jakarta-commons/jelly/project.properties
Index: project.properties
===
RCS file: /home/cvs/jakarta-commons/jelly/project.properties,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- project.properties22 Sep 2003 15:24:06 - 1.17
+++ project.properties25 Dec 2003 22:05:41 - 1.18
@@ -34,7 +34,10 @@
maven.checkstyle.ignore.public.in.interface = true
-maven.license.licenseFile=${basedir}/../LICENSE
-
maven.xdoc.date=left
maven.xdoc.version=${pom.currentVersion}
+
+
+maven.xdoc.developmentProcessUrl=http://jakarta.apache.org/commons/charter.html
+maven.xdoc.poweredby.image =maven-feather.png
+
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/jelly project.xml
polx2003/12/25 14:03:05 Modified:jellyproject.xml Log: Adding myself as a developer. Changing the organization logo to match the white background of the new site. Paul Revision ChangesPath 1.133 +5 -8 jakarta-commons/jelly/project.xml Index: project.xml === RCS file: /home/cvs/jakarta-commons/jelly/project.xml,v retrieving revision 1.132 retrieving revision 1.133 diff -u -r1.132 -r1.133 --- project.xml 8 Dec 2003 14:35:02 - 1.132 +++ project.xml 25 Dec 2003 22:03:05 - 1.133 @@ -12,7 +12,7 @@ Apache Software Foundation http://www.apache.org -http://jakarta.apache.org/commons/images/jakarta-logo-blue.gif +http://jakarta.apache.org/commons/images/jakarta-logo.gif /images/logo.jpg org.apache.commons.* @@ -134,6 +134,10 @@ mvdb [EMAIL PROTECTED] + + Paul Libbrecht + [EMAIL PROTECTED] + @@ -185,13 +189,6 @@ Developer - - Paul Libbrecht - [EMAIL PROTECTED] - -Developer - - Jim Birchfield [EMAIL PROTECTED] - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/jelly/jelly-tags/xmlunit project.xml
polx2003/12/25 13:58:39
Modified:jelly/jelly-tags tag-project.xml
jelly/jelly-tags/ant project.xml
jelly/jelly-tags/antlr project.xml
jelly/jelly-tags/avalon project.xml
jelly/jelly-tags/bean project.xml
jelly/jelly-tags/beanshell project.xml
jelly/jelly-tags/betwixt project.xml
jelly/jelly-tags/bsf project.xml
jelly/jelly-tags/define project.xml
jelly/jelly-tags/dynabean project.xml
jelly/jelly-tags/email project.xml
jelly/jelly-tags/fmt project.xml
jelly/jelly-tags/html project.xml
jelly/jelly-tags/http project.xml
jelly/jelly-tags/interaction project.xml
jelly/jelly-tags/jetty project.xml
jelly/jelly-tags/jface project.xml
jelly/jelly-tags/jms project.xml
jelly/jelly-tags/jmx project.xml
jelly/jelly-tags/jsl project.xml
jelly/jelly-tags/junit project.properties project.xml
jelly/jelly-tags/log project.xml
jelly/jelly-tags/ojb project.xml
jelly/jelly-tags/quartz project.xml
jelly/jelly-tags/soap project.xml
jelly/jelly-tags/sql project.xml
jelly/jelly-tags/swing maven.xml project.properties
project.xml
jelly/jelly-tags/swt project.xml
jelly/jelly-tags/threads project.xml
jelly/jelly-tags/util project.xml
jelly/jelly-tags/util/src/java/org/apache/commons/jelly/tags/util
LoadTextTag.java
jelly/jelly-tags/validate project.xml
jelly/jelly-tags/velocity project.xml
jelly/jelly-tags/xml project.xml
jelly/jelly-tags/xmlunit project.xml
Added: jelly/jelly-tags tag-navigation.xml
jelly/jelly-tags/swing/xdocs index.xml navigation.xml
Log:
Documentation fixes:
- project-info is now mostly through inheritance (commented out an amount)
- tags now have a navigation.xml (copied before)
- this fixes JELLY-91, JELLY-54, JELLY-52 and JELLY-86
Commit of maven.xml and the general website building comes soon.
Paul
Revision ChangesPath
1.3 +11 -8 jakarta-commons/jelly/jelly-tags/tag-project.xml
Index: tag-project.xml
===
RCS file: /home/cvs/jakarta-commons/jelly/jelly-tags/tag-project.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- tag-project.xml 27 Jan 2003 05:24:17 - 1.2
+++ tag-project.xml 25 Dec 2003 21:58:38 - 1.3
@@ -7,7 +7,7 @@
Apache Software Foundation
http://jakarta.apache.org/
-http://jakarta.apache.org/images/jakarta-logo-blue.gif
+http://jakarta.apache.org/images/jakarta-logo.gif
2002
org.apache.commons.jelly.tags.ant
@@ -20,16 +20,19 @@
Commons Jelly Tag Library
- http://jakarta.apache.org/commons/sandbox/jelly/
-
http://jira.werken.com/BrowseProject.jspa?id=10012
+
http://jakarta.apache.org/commons/jelly/libs/${pom.id.substring(33)}/index.html
+
http://jira.codehaus.org/secure/BrowseProject.jspa?id=10012
+
jakarta.apache.org
- /www/jakarta.apache.org/commons/sandbox/jelly/tags/
-
/www/jakarta.apache.org/builds/jakarta-commons-sandbox/jelly/tags/
+
/www/jakarta.apache.org/commons/jelly/jelly-tags/${pom.id.substring(33)}/
+
/www/jakarta.apache.org/builds/jakarta-commons/jelly/jelly-tags/${pom.id.substring(33)}/
+
-scm:cvs:pserver:[EMAIL
PROTECTED]:/home/cvspublic:jakarta-commons-sandbox/jelly/jelly-tags/ant/
-
http://cvs.apache.org/viewcvs/jakarta-commons-sandbox/jelly/jelly-tags/ant/
+scm:cvs:pserver:[EMAIL
PROTECTED]:/home/cvspublic:jakarta-commons/jelly/jelly-tags/${pom.id.substring(33)}
+
http://cvs.apache.org/viewcvs/jakarta-commons/jelly/jelly-tags/${pom.id.substring(33)}/
+
Commons Dev List
@@ -253,7 +256,7 @@
dom4j
- 1.4-dev-8
+ 1.4
1.1 jakarta-commons/jelly/jelly-tags/tag-navigation.xml
Index: tag-navigation.xml
===
@pom.name@
http://jakarta.apache.org/images/jakarta-logo.gif";>Jakarta
http://jakarta.apache.org/commons/jelly"/>
1.14 +2 -2 jakarta-commons/jelly/jelly-tags/ant/project.xml
Index: project.xml
===
RCS file: /home/cvs/jakarta-commons/jelly/jelly-tags/ant/project.xml,v
retrieving revision 1.13
retrievi
cvs commit: jakarta-commons/jelly/jelly-tags/xml/src/java/org/apache/commons/jelly/tags/xml SetTag.java
polx2003/12/25 13:52:31 Modified:jelly/src/java/org/apache/commons/jelly/tags/core InvokeStaticTag.java InvokeTag.java ForEachTag.java jelly/jelly-tags/xml/src/java/org/apache/commons/jelly/tags/xml SetTag.java Log: Fixing tag-documentation following JELLY-58 not really obeying the patches. Result is already online. Paul Revision ChangesPath 1.4 +5 -7 jakarta-commons/jelly/src/java/org/apache/commons/jelly/tags/core/InvokeStaticTag.java Index: InvokeStaticTag.java === RCS file: /home/cvs/jakarta-commons/jelly/src/java/org/apache/commons/jelly/tags/core/InvokeStaticTag.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- InvokeStaticTag.java 9 Oct 2003 21:21:29 - 1.3 +++ InvokeStaticTag.java 25 Dec 2003 21:52:31 - 1.4 @@ -72,10 +72,8 @@ import org.apache.commons.jelly.XMLOutput; /** - * * A Tag which can invoke a static method on a class, without an * instance of the class being needed. - * * * Like the [EMAIL PROTECTED] InvokeTag}, this tag can take a set of * arguments using the [EMAIL PROTECTED] ArgTag}. 1.5 +6 -6 jakarta-commons/jelly/src/java/org/apache/commons/jelly/tags/core/InvokeTag.java Index: InvokeTag.java === RCS file: /home/cvs/jakarta-commons/jelly/src/java/org/apache/commons/jelly/tags/core/InvokeTag.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- InvokeTag.java9 Oct 2003 21:21:29 - 1.4 +++ InvokeTag.java25 Dec 2003 21:52:31 - 1.5 @@ -71,7 +71,7 @@ import org.apache.commons.jelly.TagSupport; import org.apache.commons.jelly.XMLOutput; -/** A tag which creates a new object of the given type +/** A tag which calls a function in an object instantied by core:new. * * @author Rodney Waldhoff * @version $Revision$ 1.23 +9 -7 jakarta-commons/jelly/src/java/org/apache/commons/jelly/tags/core/ForEachTag.java Index: ForEachTag.java === RCS file: /home/cvs/jakarta-commons/jelly/src/java/org/apache/commons/jelly/tags/core/ForEachTag.java,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- ForEachTag.java 9 Oct 2003 21:21:29 - 1.22 +++ ForEachTag.java 25 Dec 2003 21:52:31 - 1.23 @@ -73,8 +73,10 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -/** A tag which performs an iteration over the results of an XPath expression - * +/** + * Iterates over a collection, iterator or an array of objects. + * + * @author mailto:[EMAIL PROTECTED]">James Strachan * @author mailto:[EMAIL PROTECTED]">James Strachan * @version $Revision$ */ 1.4 +11 -7 jakarta-commons/jelly/jelly-tags/xml/src/java/org/apache/commons/jelly/tags/xml/SetTag.java Index: SetTag.java === RCS file: /home/cvs/jakarta-commons/jelly/jelly-tags/xml/src/java/org/apache/commons/jelly/tags/xml/SetTag.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- SetTag.java 9 Oct 2003 21:21:26 - 1.3 +++ SetTag.java 25 Dec 2003 21:52:31 - 1.4 @@ -76,8 +76,12 @@ import java.util.List; import java.util.Collections; -/** A tag which defines a variable from an XPath expression - * +/** A tag which defines a variable from an XPath expression. + * This function creates a variable of type [EMAIL PROTECTED] List} or [EMAIL PROTECTED] org.dom4j.Node} + * (for example [EMAIL PROTECTED] org.dom4j.Element} or [EMAIL PROTECTED] org.dom4j.Attribute}). + * Thus, the variable created from xml:set can be + * used from the other xml library functions. + * * @author mailto:[EMAIL PROTECTED]">James Strachan * @version $Revision$ */ - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/jelly/jelly-tags/swing/xdocs - New directory
polx03/12/12 03:40:14 jakarta-commons/jelly/jelly-tags/swing/xdocs - New directory - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
