polx 2003/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 Changes Path
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 -0000 1.2
+++ tag-project.xml 25 Dec 2003 21:58:38 -0000 1.3
@@ -7,7 +7,7 @@
<organization>
<name>Apache Software Foundation</name>
<url>http://jakarta.apache.org/</url>
- <logo>http://jakarta.apache.org/images/jakarta-logo-blue.gif</logo>
+ <logo>http://jakarta.apache.org/images/jakarta-logo.gif</logo>
</organization>
<inceptionYear>2002</inceptionYear>
<package>org.apache.commons.jelly.tags.ant</package>
@@ -20,16 +20,19 @@
</description>
<shortDescription>Commons Jelly Tag Library</shortDescription>
- <url>http://jakarta.apache.org/commons/sandbox/jelly/</url>
-
<issueTrackingUrl>http://jira.werken.com/BrowseProject.jspa?id=10012</issueTrackingUrl>
+
<url>http://jakarta.apache.org/commons/jelly/libs/${pom.id.substring(33)}/index.html</url>
+
<issueTrackingUrl>http://jira.codehaus.org/secure/BrowseProject.jspa?id=10012</issueTrackingUrl>
+
<siteAddress>jakarta.apache.org</siteAddress>
- <siteDirectory>/www/jakarta.apache.org/commons/sandbox/jelly/tags/</siteDirectory>
-
<distributionDirectory>/www/jakarta.apache.org/builds/jakarta-commons-sandbox/jelly/tags/</distributionDirectory>
+
<siteDirectory>/www/jakarta.apache.org/commons/jelly/jelly-tags/${pom.id.substring(33)}/</siteDirectory>
+
<distributionDirectory>/www/jakarta.apache.org/builds/jakarta-commons/jelly/jelly-tags/${pom.id.substring(33)}/</distributionDirectory>
+
<repository>
- <connection>scm:cvs:pserver:[EMAIL
PROTECTED]:/home/cvspublic:jakarta-commons-sandbox/jelly/jelly-tags/ant/</connection>
-
<url>http://cvs.apache.org/viewcvs/jakarta-commons-sandbox/jelly/jelly-tags/ant/</url>
+ <connection>scm:cvs:pserver:[EMAIL
PROTECTED]:/home/cvspublic:jakarta-commons/jelly/jelly-tags/${pom.id.substring(33)}</connection>
+
<url>http://cvs.apache.org/viewcvs/jakarta-commons/jelly/jelly-tags/${pom.id.substring(33)}/</url>
</repository>
+
<mailingLists>
<mailingList>
<name>Commons Dev List</name>
@@ -253,7 +256,7 @@
<dependency>
<id>dom4j</id>
- <version>1.4-dev-8</version>
+ <version>1.4</version>
</dependency>
<dependency>
1.1 jakarta-commons/jelly/jelly-tags/tag-navigation.xml
Index: tag-navigation.xml
===================================================================
<?xml version="1.0" encoding="ISO-8859-1"?>
<project name="@pom.name@">
<title>@pom.name@</title>
<organizationLogo
href="http://jakarta.apache.org/images/jakarta-logo.gif";>Jakarta</organizationLogo>
<body><!-- note, all links will be relativized at HTML production... -->
<links><item name="Jelly"
href="http://jakarta.apache.org/commons/jelly"/></links>
<menu name="@pom.name@">
<item name="Overview" href="/index.html"/>
<item name="Tags" href="/tags.html"/>
</menu>
</body>
</project>
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
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- project.xml 6 Feb 2003 17:01:40 -0000 1.13
+++ project.xml 25 Dec 2003 21:58:38 -0000 1.14
@@ -14,13 +14,13 @@
</description>
<shortDescription>Commons Jelly Ant Tag Library</shortDescription>
-
<siteDirectory>/www/jakarta.apache.org/commons/sandbox/jelly/tags/ant</siteDirectory>
+ <!--
<siteDirectory>/www/jakarta.apache.org/commons/sandbox/jelly/tags/ant</siteDirectory>
<distributionDirectory>/www/jakarta.apache.org/builds/jakarta-commons-sandbox/jelly/tags/ant</distributionDirectory>
<repository>
<connection>scm:cvs:pserver:[EMAIL
PROTECTED]:/home/cvspublic:jakarta-commons-sandbox/jelly/jelly-tags/ant/</connection>
<url>http://cvs.apache.org/viewcvs/jakarta-commons-sandbox/jelly/jelly-tags/ant/</url>
</repository>
-
+ -->
<dependencies>
1.6 +2 -2 jakarta-commons/jelly/jelly-tags/antlr/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-commons/jelly/jelly-tags/antlr/project.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- project.xml 27 Jan 2003 05:24:16 -0000 1.5
+++ project.xml 25 Dec 2003 21:58:38 -0000 1.6
@@ -10,13 +10,13 @@
</description>
<shortDescription>Commons Jelly Antlr Tag Library</shortDescription>
-
<siteDirectory>/www/jakarta.apache.org/commons/sandbox/jelly/tags/antlr</siteDirectory>
+ <!--
<siteDirectory>/www/jakarta.apache.org/commons/sandbox/jelly/tags/antlr</siteDirectory>
<distributionDirectory>/www/jakarta.apache.org/builds/jakarta-commons-sandbox/jelly/tags/antlr</distributionDirectory>
<repository>
<connection>scm:cvs:pserver:[EMAIL
PROTECTED]:/home/cvspublic:jakarta-commons-sandbox/jelly/jelly-tags/antlr/</connection>
<url>http://cvs.apache.org/viewcvs/jakarta-commons-sandbox/jelly/jelly-tags/antlr/</url>
</repository>
-
+ -->
<dependencies>
1.3 +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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- project.xml 27 Jan 2003 05:24:15 -0000 1.2
+++ project.xml 25 Dec 2003 21:58:38 -0000 1.3
@@ -10,13 +10,13 @@
</description>
<shortDescription>This is a Jelly library for Avalon</shortDescription>
-
<siteDirectory>/www/jakarta.apache.org/commons/sandbox/jelly/avalon</siteDirectory>
+ <!--
<siteDirectory>/www/jakarta.apache.org/commons/sandbox/jelly/avalon</siteDirectory>
<distributionDirectory>/www/jakarta.apache.org/builds/jakarta-commons-sandbox/jelly/avalon</distributionDirectory>
<repository>
<connection>scm:cvs:pserver:[EMAIL
PROTECTED]:/home/cvspublic:jakarta-commons-sandbox/jelly/jelly-tags/avalon/</connection>
<url>http://cvs.apache.org/viewcvs/jakarta-commons-sandbox/jelly/jelly-tags/avalon/</url>
</repository>
-
+ -->
<dependencies>
1.8 +2 -2 jakarta-commons/jelly/jelly-tags/bean/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-commons/jelly/jelly-tags/bean/project.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- project.xml 27 Jan 2003 05:24:16 -0000 1.7
+++ project.xml 25 Dec 2003 21:58:38 -0000 1.8
@@ -13,13 +13,13 @@
<url>http://jakarta.apache.org/commons/sandbox/jelly/tags/bean/</url>
- <siteDirectory>/www/jakarta.apache.org/commons/sandbox/jelly/bean/</siteDirectory>
+ <!--
<siteDirectory>/www/jakarta.apache.org/commons/sandbox/jelly/bean/</siteDirectory>
<distributionDirectory>/www/jakarta.apache.org/builds/jakarta-commons-sandbox/jelly/tags/bean</distributionDirectory>
<repository>
<connection>scm:cvs:pserver:[EMAIL
PROTECTED]:/home/cvspublic:jakarta-commons-sandbox/jelly/jelly-tags/bean/</connection>
<url>http://cvs.apache.org/viewcvs/jakarta-commons-sandbox/jelly/jelly-tags/bean/</url>
</repository>
-
+ -->
<dependencies>
1.6 +2 -2 jakarta-commons/jelly/jelly-tags/beanshell/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-commons/jelly/jelly-tags/beanshell/project.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- project.xml 27 Jan 2003 05:24:15 -0000 1.5
+++ project.xml 25 Dec 2003 21:58:38 -0000 1.6
@@ -10,12 +10,12 @@
</description>
<shortDescription>Commons Jelly BeanShell Tag Library</shortDescription>
-
<siteDirectory>/www/jakarta.apache.org/commons/sandbox/jelly/tags/beanshell</siteDirectory>
+ <!--
<siteDirectory>/www/jakarta.apache.org/commons/sandbox/jelly/tags/beanshell</siteDirectory>
<distributionDirectory>/www/jakarta.apache.org/builds/jakarta-commons-sandbox/jelly/tags/beanshell</distributionDirectory>
<repository>
<connection>scm:cvs:pserver:[EMAIL
PROTECTED]:/home/cvspublic:jakarta-commons-sandbox/jelly/jelly-tags/beanshell/</connection>
<url>http://cvs.apache.org/viewcvs/jakarta-commons-sandbox/jelly/jelly-tags/beanshell/</url>
- </repository>
+ </repository> -->
<dependencies>
1.13 +2 -2 jakarta-commons/jelly/jelly-tags/betwixt/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-commons/jelly/jelly-tags/betwixt/project.xml,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- project.xml 27 Jan 2003 05:24:14 -0000 1.12
+++ project.xml 25 Dec 2003 21:58:38 -0000 1.13
@@ -10,12 +10,12 @@
</description>
<shortDescription>Commons Jelly Betwixt Tag Library</shortDescription>
-
<siteDirectory>/www/jakarta.apache.org/commons/sandbox/jelly/tags/betwixt/</siteDirectory>
+ <!--
<siteDirectory>/www/jakarta.apache.org/commons/sandbox/jelly/tags/betwixt/</siteDirectory>
<distributionDirectory>/www/jakarta.apache.org/builds/jakarta-commons-sandbox/jelly/tags/betwixt</distributionDirectory>
<repository>
<connection>scm:cvs:pserver:[EMAIL
PROTECTED]:/home/cvspublic:jakarta-commons-sandbox/jelly/jelly-tags/betwixt/</connection>
<url>http://cvs.apache.org/viewcvs/jakarta-commons-sandbox/jelly/jelly-tags/betwixt/</url>
- </repository>
+ </repository> -->
<dependencies>
1.6 +2 -2 jakarta-commons/jelly/jelly-tags/bsf/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-commons/jelly/jelly-tags/bsf/project.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- project.xml 5 Mar 2003 08:11:56 -0000 1.5
+++ project.xml 25 Dec 2003 21:58:38 -0000 1.6
@@ -10,12 +10,12 @@
</description>
<shortDescription>Commons Jelly BSF Tag Library</shortDescription>
-
<siteDirectory>/www/jakarta.apache.org/commons/sandbox/jelly/tags/bsf</siteDirectory>
+ <!--
<siteDirectory>/www/jakarta.apache.org/commons/sandbox/jelly/tags/bsf</siteDirectory>
<distributionDirectory>/www/jakarta.apache.org/builds/jakarta-commons-sandbox/jelly/tags/bsf</distributionDirectory>
<repository>
<connection>scm:cvs:pserver:[EMAIL
PROTECTED]:/home/cvspublic:jakarta-commons-sandbox/jelly/jelly-tags/bsf/</connection>
<url>http://cvs.apache.org/viewcvs/jakarta-commons-sandbox/jelly/jelly-tags/bsf/</url>
- </repository>
+ </repository>-->
<dependencies>
1.8 +2 -2 jakarta-commons/jelly/jelly-tags/define/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-commons/jelly/jelly-tags/define/project.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- project.xml 27 Jan 2003 05:24:16 -0000 1.7
+++ project.xml 25 Dec 2003 21:58:38 -0000 1.8
@@ -11,14 +11,14 @@
</description>
<shortDescription>Commons Jelly Define Tag Library</shortDescription>
- <url>http://jakarta.apache.org/commons/sandbox/jelly/tags/define/</url>
+ <!-- <url>http://jakarta.apache.org/commons/sandbox/jelly/tags/define/</url>
<siteDirectory>/www/jakarta.apache.org/commons/sandbox/jelly/define/</siteDirectory>
<distributionDirectory>/www/jakarta.apache.org/builds/jakarta-commons-sandbox/jelly/tags/define</distributionDirectory>
<repository>
<connection>scm:cvs:pserver:[EMAIL
PROTECTED]:/home/cvspublic:jakarta-commons-sandbox/jelly/jelly-tags/define/</connection>
<url>http://cvs.apache.org/viewcvs/jakarta-commons-sandbox/jelly/jelly-tags/define/</url>
- </repository>
+ </repository> -->
<dependencies>
1.6 +2 -2 jakarta-commons/jelly/jelly-tags/dynabean/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-commons/jelly/jelly-tags/dynabean/project.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- project.xml 27 Jan 2003 05:24:17 -0000 1.5
+++ project.xml 25 Dec 2003 21:58:38 -0000 1.6
@@ -11,7 +11,7 @@
</description>
<shortDescription>Commons Jelly Dyna Bean Tag Library</shortDescription>
- <url>http://jakarta.apache.org/commons/sandbox/jelly/tags/dynabean/</url>
+ <!-- <url>http://jakarta.apache.org/commons/sandbox/jelly/tags/dynabean/</url>
<siteDirectory>/www/jakarta.apache.org/commons/sandbox/jelly/dynabean/</siteDirectory>
<distributionDirectory>/www/jakarta.apache.org/builds/jakarta-commons-sandbox/jelly/tags/dynabean</distributionDirectory>
@@ -19,7 +19,7 @@
<connection>scm:cvs:pserver:[EMAIL
PROTECTED]:/home/cvspublic:jakarta-commons-sandbox/jelly/jelly-tags/dynabean/</connection>
<url>http://cvs.apache.org/viewcvs/jakarta-commons-sandbox/jelly/jelly-tags/dynabean/</url>
</repository>
-
+ -->
<dependencies>
1.5 +8 -5 jakarta-commons/jelly/jelly-tags/email/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-commons/jelly/jelly-tags/email/project.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- project.xml 27 Jan 2003 05:24:15 -0000 1.4
+++ project.xml 25 Dec 2003 21:58:38 -0000 1.5
@@ -10,12 +10,12 @@
</description>
<shortDescription>Commons Jelly e-mail Tag Library</shortDescription>
-
<siteDirectory>/www/jakarta.apache.org/commons/sandbox/jelly/tags/email</siteDirectory>
+ <!--
<siteDirectory>/www/jakarta.apache.org/commons/sandbox/jelly/tags/email</siteDirectory>
<distributionDirectory>/www/jakarta.apache.org/builds/jakarta-commons-sandbox/jelly/tags/email</distributionDirectory>
<repository>
<connection>scm:cvs:pserver:[EMAIL
PROTECTED]:/home/cvspublic:jakarta-commons-sandbox/jelly/jelly-tags/email/</connection>
<url>http://cvs.apache.org/viewcvs/jakarta-commons-sandbox/jelly/jelly-tags/email/</url>
- </repository>
+ </repository> -->
<dependencies>
@@ -31,14 +31,17 @@
<!-- START for run time -->
<dependency>
- <id>jaf</id>
+ <groupId>jaf</groupId>
<version>1.0.2</version>
- <jar>activation-1.0.2.jar</jar>
+ <artifactId>activation</artifactId>
+ <url>http://java.sun.com/beans/glasgow/jaf.html</url>
</dependency>
<dependency>
- <id>javamail</id>
+ <groupId>javamail</groupId>
+ <artifactId>mail</artifactId>
<version>1.2</version>
+ <url>http://java.sun.com/products/javamail/javamail-1_2.html</url>
</dependency>
<!-- END for run time -->
1.7 +2 -2 jakarta-commons/jelly/jelly-tags/fmt/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-commons/jelly/jelly-tags/fmt/project.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- project.xml 27 Jan 2003 05:24:16 -0000 1.6
+++ project.xml 25 Dec 2003 21:58:38 -0000 1.7
@@ -12,14 +12,14 @@
</description>
<shortDescription>Commons Jelly FMT Tag Library</shortDescription>
- <url>http://jakarta.apache.org/commons/sandbox/jelly/tags/fmt/</url>
+ <!-- <url>http://jakarta.apache.org/commons/sandbox/jelly/tags/fmt/</url>
<siteDirectory>/www/jakarta.apache.org/commons/sandbox/jelly/fmt/</siteDirectory>
<distributionDirectory>/www/jakarta.apache.org/builds/jakarta-commons-sandbox/jelly/tags/fmt</distributionDirectory>
<repository>
<connection>scm:cvs:pserver:[EMAIL
PROTECTED]:/home/cvspublic:jakarta-commons-sandbox/jelly/jelly-tags/fmt/</connection>
<url>http://cvs.apache.org/viewcvs/jakarta-commons-sandbox/jelly/jelly-tags/fmt/</url>
- </repository>
+ </repository> -->
<dependencies>
1.14 +2 -2 jakarta-commons/jelly/jelly-tags/html/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-commons/jelly/jelly-tags/html/project.xml,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- project.xml 3 Feb 2003 07:59:37 -0000 1.13
+++ project.xml 25 Dec 2003 21:58:38 -0000 1.14
@@ -10,13 +10,13 @@
</description>
<shortDescription>Commons Jelly HTML Tag Library</shortDescription>
- <url>http://jakarta.apache.org/commons/sandbox/jelly/tags/html</url>
+ <!-- <url>http://jakarta.apache.org/commons/sandbox/jelly/tags/html</url>
<siteDirectory>/www/jakarta.apache.org/commons/sandbox/jelly/tags/html</siteDirectory>
<distributionDirectory>/www/jakarta.apache.org/builds/jakarta-commons-sandbox/jelly/tags/html</distributionDirectory>
<repository>
<connection>scm:cvs:pserver:[EMAIL
PROTECTED]:/home/cvspublic:jakarta-commons-sandbox/jelly/jelly-tags/html/</connection>
<url>http://cvs.apache.org/viewcvs/jakarta-commons-sandbox/jelly/jelly-tags/html/</url>
- </repository>
+ </repository>-->
<dependencies>
1.10 +2 -2 jakarta-commons/jelly/jelly-tags/http/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-commons/jelly/jelly-tags/http/project.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- project.xml 27 Jan 2003 05:24:16 -0000 1.9
+++ project.xml 25 Dec 2003 21:58:38 -0000 1.10
@@ -11,13 +11,13 @@
</description>
<shortDescription>Commons Jelly HTTP Tag Library</shortDescription>
- <url>http://jakarta.apache.org/commons/sandbox/jelly/tags/http/</url>
+ <!-- <url>http://jakarta.apache.org/commons/sandbox/jelly/tags/http/</url>
<siteDirectory>/www/jakarta.apache.org/commons/sandbox/jelly/tags/http</siteDirectory>
<distributionDirectory>/www/jakarta.apache.org/builds/jakarta-commons-sandbox/jelly/tags/http</distributionDirectory>
<repository>
<connection>scm:cvs:pserver:[EMAIL
PROTECTED]:/home/cvspublic:jakarta-commons-sandbox/jelly/jelly-tags/http/</connection>
<url>http://cvs.apache.org/viewcvs/jakarta-commons-sandbox/jelly/jelly-tags/http/</url>
- </repository>
+ </repository> -->
<dependencies>
1.5 +2 -2 jakarta-commons/jelly/jelly-tags/interaction/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-commons/jelly/jelly-tags/interaction/project.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- project.xml 27 Jan 2003 05:24:16 -0000 1.4
+++ project.xml 25 Dec 2003 21:58:38 -0000 1.5
@@ -10,12 +10,12 @@
</description>
<shortDescription>Commons Jelly Interaction Tag Library</shortDescription>
-
<siteDirectory>/www/jakarta.apache.org/commons/sandbox/jelly/tags/interaction</siteDirectory>
+ <!--
<siteDirectory>/www/jakarta.apache.org/commons/sandbox/jelly/tags/interaction</siteDirectory>
<distributionDirectory>/www/jakarta.apache.org/builds/jakarta-commons-sandbox/jelly/tags/interaction</distributionDirectory>
<repository>
<connection>scm:cvs:pserver:[EMAIL
PROTECTED]:/home/cvspublic:jakarta-commons-sandbox/jelly/jelly-tags/interaction/</connection>
<url>http://cvs.apache.org/viewcvs/jakarta-commons-sandbox/jelly/jelly-tags/interaction/</url>
- </repository>
+ </repository>-->
<dependencies>
1.13 +5 -4 jakarta-commons/jelly/jelly-tags/jetty/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-commons/jelly/jelly-tags/jetty/project.xml,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- project.xml 7 Feb 2003 13:31:53 -0000 1.12
+++ project.xml 25 Dec 2003 21:58:38 -0000 1.13
@@ -11,20 +11,20 @@
</description>
<shortDescription>Commons Jelly Jetty Tag Library</shortDescription>
- <url>http://jakarta.apache.org/commons/sandbox/jelly/tags/jetty/</url>
+ <!-- <url>http://jakarta.apache.org/commons/sandbox/jelly/tags/jetty/</url>
<siteDirectory>/www/jakarta.apache.org/commons/sandbox/jelly/tags/jetty/</siteDirectory>
<distributionDirectory>/www/jakarta.apache.org/builds/jakarta-commons-sandbox/jelly/tags/jetty</distributionDirectory>
<repository>
<connection>scm:cvs:pserver:[EMAIL
PROTECTED]:/home/cvspublic:jakarta-commons-sandbox/jelly/jelly-tags/jetty/</connection>
<url>http://cvs.apache.org/viewcvs/jakarta-commons-sandbox/jelly/jelly-tags/jetty/</url>
- </repository>
+ </repository>-->
<dependencies>
<!-- START for compilation -->
-
+ <!-- may need JDK 1.4 for jsse -->
<dependency>
<id>commons-jelly</id>
<version>SNAPSHOT</version>
@@ -49,6 +49,7 @@
<version>SNAPSHOT</version>
</dependency>
+ <!-- PL: Commented out as it might be this is part of JDK 1.4...
<dependency>
<id>jsse</id>
<version>1.0.3</version>
@@ -57,7 +58,7 @@
<dependency>
<id>jsse+jnet</id>
<version>1.0.3</version>
- </dependency>
+ </dependency> -->
<!-- END for testing -->
1.5 +2 -2 jakarta-commons/jelly/jelly-tags/jface/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-commons/jelly/jelly-tags/jface/project.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- project.xml 17 May 2003 12:10:05 -0000 1.4
+++ project.xml 25 Dec 2003 21:58:38 -0000 1.5
@@ -11,12 +11,12 @@
</description>
<shortDescription>Commons Jelly jface Tag Library</shortDescription>
-
<siteDirectory>/www/jakarta.apache.org/commons/sandbox/jelly/tags/jface</siteDirectory>
+ <!--
<siteDirectory>/www/jakarta.apache.org/commons/sandbox/jelly/tags/jface</siteDirectory>
<distributionDirectory>/www/jakarta.apache.org/builds/jakarta-commons-sandbox/jelly/tags/jface</distributionDirectory>
<repository>
<connection>scm:cvs:pserver:[EMAIL
PROTECTED]:/home/cvspublic:jakarta-commons-sandbox/jelly/jelly-tags/jface/</connection>
<url>http://cvs.apache.org/viewcvs/jakarta-commons-sandbox/jelly/jelly-tags/jface/</url>
- </repository>
+ </repository>-->
<dependencies>
1.5 +3 -2 jakarta-commons/jelly/jelly-tags/jms/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-commons/jelly/jelly-tags/jms/project.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- project.xml 27 Jan 2003 05:24:16 -0000 1.4
+++ project.xml 25 Dec 2003 21:58:38 -0000 1.5
@@ -10,12 +10,12 @@
</description>
<shortDescription>Commons Jelly JMS Tag Library</shortDescription>
-
<siteDirectory>/www/jakarta.apache.org/commons/sandbox/jelly/tags/jms</siteDirectory>
+ <!--
<siteDirectory>/www/jakarta.apache.org/commons/sandbox/jelly/tags/jms</siteDirectory>
<distributionDirectory>/www/jakarta.apache.org/builds/jakarta-commons-sandbox/jelly/tags/jms</distributionDirectory>
<repository>
<connection>scm:cvs:pserver:[EMAIL
PROTECTED]:/home/cvspublic:jakarta-commons-sandbox/jelly/jelly-tags/jms/</connection>
<url>http://cvs.apache.org/viewcvs/jakarta-commons-sandbox/jelly/jelly-tags/jms/</url>
- </repository>
+ </repository>-->
<dependencies>
@@ -37,6 +37,7 @@
<dependency>
<id>jms</id>
<version>1.0.2b</version>
+ <url>http://java.sun.com/products/jms/</url>
</dependency>
</dependencies>
1.2 +2 -3 jakarta-commons/jelly/jelly-tags/jmx/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-commons/jelly/jelly-tags/jmx/project.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- project.xml 20 Mar 2003 17:03:18 -0000 1.1
+++ project.xml 25 Dec 2003 21:58:38 -0000 1.2
@@ -14,14 +14,13 @@
<shortDescription>Commons Jelly JMX Tag Library</shortDescription>
- <url>http://jakarta.apache.org/commons/jelly/tags/jmx/</url>
-
+ <!-- <url>http://jakarta.apache.org/commons/jelly/tags/jmx/</url>
<siteDirectory>/www/jakarta.apache.org/commons/jelly/jmx/</siteDirectory>
<distributionDirectory>/www/jakarta.apache.org/builds/jakarta-commons/jelly/tags/jmx</distributionDirectory>
<repository>
<connection>scm:cvs:pserver:[EMAIL
PROTECTED]:/home/cvspublic:jakarta-commons/jelly/jelly-tags/jmx/</connection>
<url>http://cvs.apache.org/viewcvs/jakarta-commons-sandbox/jelly/jelly-tags/jmx/</url>
- </repository>
+ </repository>-->
<dependencies>
1.15 +2 -2 jakarta-commons/jelly/jelly-tags/jsl/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-commons/jelly/jelly-tags/jsl/project.xml,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- project.xml 27 Jan 2003 05:38:16 -0000 1.14
+++ project.xml 25 Dec 2003 21:58:38 -0000 1.15
@@ -11,14 +11,14 @@
</description>
<shortDescription>Commons Jelly JSL Tag Library</shortDescription>
- <url>http://jakarta.apache.org/commons/sandbox/jelly/tags/jsl/</url>
+ <!-- <url>http://jakarta.apache.org/commons/sandbox/jelly/tags/jsl/</url>
<siteDirectory>/www/jakarta.apache.org/commons/sandbox/jelly/jsl/</siteDirectory>
<distributionDirectory>/www/jakarta.apache.org/builds/jakarta-commons-sandbox/jelly/tags/jsl</distributionDirectory>
<repository>
<connection>scm:cvs:pserver:[EMAIL
PROTECTED]:/home/cvspublic:jakarta-commons-sandbox/jelly/jelly-tags/jsl/</connection>
<url>http://cvs.apache.org/viewcvs/jakarta-commons-sandbox/jelly/jelly-tags/jsl/</url>
- </repository>
+ </repository>-->
<dependencies>
1.3 +5 -2 jakarta-commons/jelly/jelly-tags/junit/project.properties
Index: project.properties
===================================================================
RCS file: /home/cvs/jakarta-commons/jelly/jelly-tags/junit/project.properties,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- project.properties 10 Feb 2003 06:30:24 -0000 1.2
+++ project.properties 25 Dec 2003 21:58:39 -0000 1.3
@@ -1,7 +1,6 @@
# -------------------------------------------------------------------
# P R O J E C T P R O P E R T I E S
# -------------------------------------------------------------------
-
maven.junit.fork=true
maven.compile.deprecation = on
@@ -10,4 +9,8 @@
maven.dist.install.dir = /usr/local/jelly
maven.checkstyle.properties=../tag-checkstyle.properties
-maven.license.licenseFile=${basedir}/../../../LICENSE
+maven.license.licenseFile=${basedir}/../../LICENSE.txt
+
+maven.xdoc.developmentProcessUrl=http://jakarta.apache.org/commons/charter.html
+maven.xdoc.poweredby.image =maven-feather.png
+
1.6 +2 -2 jakarta-commons/jelly/jelly-tags/junit/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-commons/jelly/jelly-tags/junit/project.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- project.xml 27 Jan 2003 05:24:15 -0000 1.5
+++ project.xml 25 Dec 2003 21:58:39 -0000 1.6
@@ -11,14 +11,14 @@
</description>
<shortDescription>Commons Jelly JUnit Tag Library</shortDescription>
- <url>http://jakarta.apache.org/commons/sandbox/jelly/tags/junit/</url>
+ <!-- <url>http://jakarta.apache.org/commons/sandbox/jelly/tags/junit/</url>
<siteDirectory>/www/jakarta.apache.org/commons/sandbox/jelly/junit/</siteDirectory>
<distributionDirectory>/www/jakarta.apache.org/builds/jakarta-commons-sandbox/jelly/tags/junit</distributionDirectory>
<repository>
<connection>scm:cvs:pserver:[EMAIL
PROTECTED]:/home/cvspublic:jakarta-commons-sandbox/jelly/jelly-tags/junit/</connection>
<url>http://cvs.apache.org/viewcvs/jakarta-commons-sandbox/jelly/jelly-tags/junit/</url>
- </repository>
+ </repository>-->
<dependencies>
1.5 +2 -2 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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- project.xml 27 Jan 2003 05:24:15 -0000 1.4
+++ project.xml 25 Dec 2003 21:58:39 -0000 1.5
@@ -11,14 +11,14 @@
</description>
<shortDescription>Commons Jelly Log Tag Library</shortDescription>
- <url>http://jakarta.apache.org/commons/sandbox/jelly/tags/log/</url>
+ <!-- <url>http://jakarta.apache.org/commons/sandbox/jelly/tags/log/</url>
<siteDirectory>/www/jakarta.apache.org/commons/sandbox/jelly/log/</siteDirectory>
<distributionDirectory>/www/jakarta.apache.org/builds/jakarta-commons-sandbox/jelly/tags/log</distributionDirectory>
<repository>
<connection>scm:cvs:pserver:[EMAIL
PROTECTED]:/home/cvspublic:jakarta-commons-sandbox/jelly/jelly-tags/log/</connection>
<url>http://cvs.apache.org/viewcvs/jakarta-commons-sandbox/jelly/jelly-tags/log/</url>
- </repository>
+ </repository>-->
<dependencies>
1.6 +2 -2 jakarta-commons/jelly/jelly-tags/ojb/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-commons/jelly/jelly-tags/ojb/project.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- project.xml 27 Jan 2003 05:24:15 -0000 1.5
+++ project.xml 25 Dec 2003 21:58:39 -0000 1.6
@@ -11,13 +11,13 @@
</description>
<shortDescription>Commons Jelly OjB Tag Library</shortDescription>
- <url>http://jakarta.apache.org/commons/sandbox/jelly/tags/ojb/</url>
+ <!-- <url>http://jakarta.apache.org/commons/sandbox/jelly/tags/ojb/</url>
<siteDirectory>/www/jakarta.apache.org/commons/sandbox/jelly/tags/ojb</siteDirectory>
<distributionDirectory>/www/jakarta.apache.org/builds/jakarta-commons-sandbox/jelly/tags/ojb</distributionDirectory>
<repository>
<connection>scm:cvs:pserver:[EMAIL
PROTECTED]:/home/cvspublic:jakarta-commons-sandbox/jelly/jelly-tags/ojb/</connection>
<url>http://cvs.apache.org/viewcvs/jakarta-commons-sandbox/jelly/jelly-tags/ojb/</url>
- </repository>
+ </repository>-->
<dependencies>
1.7 +2 -2 jakarta-commons/jelly/jelly-tags/quartz/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-commons/jelly/jelly-tags/quartz/project.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- project.xml 29 Jan 2003 15:37:48 -0000 1.6
+++ project.xml 25 Dec 2003 21:58:39 -0000 1.7
@@ -10,12 +10,12 @@
</description>
<shortDescription>Commons Jelly Quartz Tag Library</shortDescription>
-
<siteDirectory>/www/jakarta.apache.org/commons/sandbox/jelly/tags/quartz</siteDirectory>
+ <!--
<siteDirectory>/www/jakarta.apache.org/commons/sandbox/jelly/tags/quartz</siteDirectory>
<distributionDirectory>/www/jakarta.apache.org/builds/jakarta-commons-sandbox/jelly/tags/quartz</distributionDirectory>
<repository>
<connection>scm:cvs:pserver:[EMAIL
PROTECTED]:/home/cvspublic:jakarta-commons-sandbox/jelly/jelly-tags/quartz/</connection>
<url>http://cvs.apache.org/viewcvs/jakarta-commons-sandbox/jelly/jelly-tags/quartz/</url>
- </repository>
+ </repository>-->
<dependencies>
1.6 +19 -7 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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- project.xml 27 Jan 2003 05:24:15 -0000 1.5
+++ project.xml 25 Dec 2003 21:58:39 -0000 1.6
@@ -10,12 +10,12 @@
</description>
<shortDescription>Commons Jelly SOAP Tag Library</shortDescription>
-
<siteDirectory>/www/jakarta.apache.org/commons/sandbox/jelly/tags/soap</siteDirectory>
+ <!--
<siteDirectory>/www/jakarta.apache.org/commons/sandbox/jelly/tags/soap</siteDirectory>
<distributionDirectory>/www/jakarta.apache.org/builds/jakarta-commons-sandbox/jelly/tags/soap</distributionDirectory>
<repository>
<connection>scm:cvs:pserver:[EMAIL
PROTECTED]:/home/cvspublic:jakarta-commons-sandbox/jelly/jelly-tags/soap/</connection>
<url>http://cvs.apache.org/viewcvs/jakarta-commons-sandbox/jelly/jelly-tags/soap/</url>
- </repository>
+ </repository>-->
<dependencies>
@@ -23,7 +23,7 @@
<!-- START for compilation -->
-
+ <!-- may need JDK 1.4 -->
<dependency>
<id>commons-jelly</id>
<version>SNAPSHOT</version>
@@ -35,15 +35,26 @@
</dependency>
<dependency>
- <id>jaxrpc</id>
- <version>1.0</version>
+ <groupId>jaxrpc</groupId>
+ <artifactId>jaxrpc-api</artifactId>
+ <version>1.1-FCS</version>
+ <url>http://java.sun.com/webservices/webservicespack.html</url>
</dependency>
<dependency>
- <id>saaj</id>
- <version>1.1</version>
+ <groupId>saaj</groupId>
+ <artifactId>saaj-api</artifactId>
+ <version>1.2-FCS</version>
+ <url>http://java.sun.com/webservices/webservicespack.html</url>
</dependency>
+ <dependency>
+ <id>jax-qname</id>
+ <version>1.0</version>
+ <url>http://java.sun.com/webservices/webservicespack.html</url>
+ </dependency>
+
+
<!-- START for running demos -->
<dependency>
@@ -57,6 +68,7 @@
<dependency>
<id>servletapi</id>
<version>2.3</version>
+ <url>http://java.sun.com/products/servlets/</url>
</dependency>
<!-- END for running demos -->
1.7 +3 -1 jakarta-commons/jelly/jelly-tags/sql/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-commons/jelly/jelly-tags/sql/project.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- project.xml 27 Jan 2003 05:24:17 -0000 1.6
+++ project.xml 25 Dec 2003 21:58:39 -0000 1.7
@@ -29,10 +29,12 @@
<version>SNAPSHOT</version>
</dependency>
+ <!-- unneeded at least for java 1.4 -->
+ <!--
<dependency>
<id>jdbc</id>
<version>2.0</version>
- </dependency>
+ </dependency> -->
<!-- END for compilation -->
1.5 +4 -0 jakarta-commons/jelly/jelly-tags/swing/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/jakarta-commons/jelly/jelly-tags/swing/maven.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- maven.xml 28 Jul 2003 00:34:11 -0000 1.4
+++ maven.xml 25 Dec 2003 21:58:39 -0000 1.5
@@ -55,5 +55,9 @@
</java>
</goal>
+
+ <goal name="trash">
+ <echo>${pom.id.substring(28)}</echo>
+ </goal>
</project>
1.4 +5 -1 jakarta-commons/jelly/jelly-tags/swing/project.properties
Index: project.properties
===================================================================
RCS file: /home/cvs/jakarta-commons/jelly/jelly-tags/swing/project.properties,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- project.properties 10 Feb 2003 06:30:25 -0000 1.3
+++ project.properties 25 Dec 2003 21:58:39 -0000 1.4
@@ -10,4 +10,8 @@
maven.dist.install.dir = /usr/local/jelly
maven.checkstyle.properties=../tag-checkstyle.properties
-maven.license.licenseFile=${basedir}/../../../LICENSE
+maven.license.licenseFile=${basedir}/../../LICENSE.txt
+
+maven.xdoc.developmentProcessUrl=http://jakarta.apache.org/commons/charter.html
+maven.xdoc.poweredby.image =maven-feather.png
+
1.10 +3 -2 jakarta-commons/jelly/jelly-tags/swing/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-commons/jelly/jelly-tags/swing/project.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- project.xml 27 Jan 2003 05:24:15 -0000 1.9
+++ project.xml 25 Dec 2003 21:58:39 -0000 1.10
@@ -2,7 +2,7 @@
<project>
<extend>${basedir}/../tag-project.xml</extend>
<id>commons-jelly-tags-swing</id>
- <name>commons-jelly-tags-swing</name>
+ <name>JellySwing</name>
<package>org.apache.commons.jelly.tags.swing</package>
@@ -11,7 +11,7 @@
</description>
<shortDescription>Commons Jelly Swing Tag Library</shortDescription>
- <url>http://jakarta.apache.org/commons/sandbox/jelly/tags/swing/</url>
+ <!-- <url>http://jakarta.apache.org/commons/sandbox/jelly/tags/swing/</url>
<siteDirectory>/www/jakarta.apache.org/commons/sandbox/jelly/tags/swing/</siteDirectory>
<distributionDirectory>/www/jakarta.apache.org/builds/jakarta-commons-sandbox/jelly/tags/swing</distributionDirectory>
@@ -19,6 +19,7 @@
<connection>scm:cvs:pserver:[EMAIL
PROTECTED]:/home/cvspublic:jakarta-commons-sandbox/jelly/jelly-tags/swing/</connection>
<url>http://cvs.apache.org/viewcvs/jakarta-commons-sandbox/jelly/jelly-tags/swing/</url>
</repository>
+ -->
<dependencies>
1.1 jakarta-commons/jelly/jelly-tags/swing/xdocs/index.xml
Index: index.xml
===================================================================
<?xml version="1.0"?>
<document>
<properties>
<title>JellySwing</title>
<author email="[EMAIL PROTECTED]">James Strachan</author>
</properties>
<body>
<section name="JellySwing">
<p>
JellySwing is a simple Jelly tag-library which can be used to create Swing
user interfaces.
It allows XML documents (Jelly scripts) to be used to define the layout and
rendering of Swing
front ends which avoids lots of mundane Java coding, using markup to define
the view
of your front end and allowing you to bind to Java code for the business
objects and models.
</p>
<p>
This mechanism uses seperation of concerns and MVC ideas from web
applications, allowing the rendering
of your Swing front end to be easily transformed (since its XML) into
different styles while leaving your
model and business objects untouched. It also allows different views to be
constructed independently of your models.
</p>
<p>
There is an example JellySwing script
<a
href="http://cvs.apache.org/viewcvs.cgi/jakarta-commons/jelly/jelly-tags/swing/src/test/org/apache/commons/jelly/swing/example.jelly?rev=HEAD";>here</a>
</p>
<p>
To try running the example type the following command then you should see a
full Swing user interface
appear with pull down menus, a splitter pane, a form, entry fields, buttons
and a table.
(you should run this from within the
<code>[jelly-home]/jelly-tags/swing</code>).
</p>
<source>maven demo:swing</source>
<p>
This example even shows that simple actions can be coded in Jelly script
too! Though typically most
complex logic and models (such as TableModel, TreeModel) should be written
in Java code.
Then Jelly script can be used to create the view and bind in the models.
</p>
</section>
<section name="JellyRunner">
<p>
JellyRunner is a simple example Swing user interface written with JellySwing.
You can view the source to it
<a
href="http://cvs.apache.org/viewcvs.cgi/jakarta-commons/jelly/jelly-tags/swing/src/test/org/apache/commons/jelly/swing/run.jelly?rev=HEAD";>here</a>
</p>
<p>
If you invoke it via the following command you will get a small Swing UI
that allows you to
choose Jelly scripts to invoke, within the current JVM.
</p>
<source> maven jelly:runner</source>
<p>
This makes developing Jelly scripts and JellySwing scripts in particular,
much more RAD-like.
You can keep JellyRunner open, edit a Jelly script and just hit the 'Run'
button and the
script executes instantaneously, there's no waiting for a JVM to startup.
</p>
</section>
<section name="Comparing JellySwing with Java code for Swing">
<p>
There's a simple demo written by Otto von Wachter which demonstrates how
Jelly can be used
for templating HTML.
</p>
<p>
The demo was orignally written in
<a
href="http://cvs.apache.org/viewcvs.cgi/jakarta-commons/jelly/jelly-tags/swing/src/test/org/apache/commons/jelly/demos/HomepageBuilder.java?rev=HEAD";>Java
code</a>
to implement a simple Swing UI
As an experiment the same Swing user interface has been written
<a
href="http://cvs.apache.org/viewcvs.cgi/jakarta-commons/jelly/jelly-tags/swing/src/test/org/apache/commons/jelly/demos/homepageBuilder.jelly?rev=HEAD";>as
a JellyScript</a>
as well.
While this is a fairly simple Swing UI and not a particularly great example
of the power of JellySwing,
it does highlight the main difference between the two appraches.
</p>
</section>
</body>
</document>
1.1 jakarta-commons/jelly/jelly-tags/swing/xdocs/navigation.xml
Index: navigation.xml
===================================================================
<?xml version="1.0" encoding="ISO-8859-1"?>
<project name="JellySwing">
<title>Jelly Swing</title>
<organizationLogo href="/images/jakarta-logo-blue.gif">Jakarta</organizationLogo>
<body><!-- note, all links will be relativized at HTML production... -->
<menu name="JellySwing">
<item name="Overview" href="/index.html"/>
<item name="Tags" href="/tags.html"/>
</menu>
</body>
</project>
1.8 +2 -2 jakarta-commons/jelly/jelly-tags/swt/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-commons/jelly/jelly-tags/swt/project.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- project.xml 31 Jan 2003 12:54:02 -0000 1.7
+++ project.xml 25 Dec 2003 21:58:39 -0000 1.8
@@ -11,12 +11,12 @@
</description>
<shortDescription>Commons Jelly SWT Tag Library</shortDescription>
-
<siteDirectory>/www/jakarta.apache.org/commons/sandbox/jelly/tags/swt</siteDirectory>
+ <!--
<siteDirectory>/www/jakarta.apache.org/commons/sandbox/jelly/tags/swt</siteDirectory>
<distributionDirectory>/www/jakarta.apache.org/builds/jakarta-commons-sandbox/jelly/tags/swt</distributionDirectory>
<repository>
<connection>scm:cvs:pserver:[EMAIL
PROTECTED]:/home/cvspublic:jakarta-commons-sandbox/jelly/jelly-tags/swt/</connection>
<url>http://cvs.apache.org/viewcvs/jakarta-commons-sandbox/jelly/jelly-tags/swt/</url>
- </repository>
+ </repository>-->
<dependencies>
1.6 +2 -2 jakarta-commons/jelly/jelly-tags/threads/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-commons/jelly/jelly-tags/threads/project.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- project.xml 27 Jan 2003 05:24:17 -0000 1.5
+++ project.xml 25 Dec 2003 21:58:39 -0000 1.6
@@ -11,14 +11,14 @@
</description>
<shortDescription>Commons Jelly Threads Tag Library</shortDescription>
- <url>http://jakarta.apache.org/commons/sandbox/jelly/tags/threads/</url>
+ <!-- <url>http://jakarta.apache.org/commons/sandbox/jelly/tags/threads/</url>
<siteDirectory>/www/jakarta.apache.org/commons/sandbox/jelly/threads/</siteDirectory>
<distributionDirectory>/www/jakarta.apache.org/builds/jakarta-commons-sandbox/jelly/tags/threads</distributionDirectory>
<repository>
<connection>scm:cvs:pserver:[EMAIL
PROTECTED]:/home/cvspublic:jakarta-commons-sandbox/jelly/jelly-tags/threads/</connection>
<url>http://cvs.apache.org/viewcvs/jakarta-commons-sandbox/jelly/jelly-tags/threads/</url>
- </repository>
+ </repository>-->
<dependencies>
1.8 +2 -2 jakarta-commons/jelly/jelly-tags/util/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-commons/jelly/jelly-tags/util/project.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- project.xml 6 Feb 2003 17:01:08 -0000 1.7
+++ project.xml 25 Dec 2003 21:58:39 -0000 1.8
@@ -11,12 +11,12 @@
</description>
<shortDescription>Commons Jelly Util Tag Library</shortDescription>
-
<siteDirectory>/www/jakarta.apache.org/commons/sandbox/jelly/tags/util</siteDirectory>
+ <!--
<siteDirectory>/www/jakarta.apache.org/commons/sandbox/jelly/tags/util</siteDirectory>
<distributionDirectory>/www/jakarta.apache.org/builds/jakarta-commons-sandbox/jelly/tags/util</distributionDirectory>
<repository>
<connection>scm:cvs:pserver:[EMAIL
PROTECTED]:/home/cvspublic:jakarta-commons-sandbox/jelly/jelly-tags/util/</connection>
<url>http://cvs.apache.org/viewcvs/jakarta-commons-sandbox/jelly/jelly-tags/util/</url>
- </repository>
+ </repository>-->
<dependencies>
1.4 +27 -6
jakarta-commons/jelly/jelly-tags/util/src/java/org/apache/commons/jelly/tags/util/LoadTextTag.java
Index: LoadTextTag.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/jelly/jelly-tags/util/src/java/org/apache/commons/jelly/tags/util/LoadTextTag.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- LoadTextTag.java 9 Oct 2003 21:21:26 -0000 1.3
+++ LoadTextTag.java 25 Dec 2003 21:58:39 -0000 1.4
@@ -67,7 +67,9 @@
import java.io.FileReader;
import java.io.InputStream;
import java.io.InputStreamReader;
+import java.io.FileInputStream;
import java.io.IOException;
+import java.io.UnsupportedEncodingException;
import java.io.Reader;
import org.apache.commons.jelly.JellyTagException;
@@ -92,6 +94,7 @@
private String var;
private File file;
private String uri;
+ private String encoding;
public LoadTextTag() {
}
@@ -112,9 +115,14 @@
}
try {
- reader = new FileReader(file);
+ if ( encoding == null )
+ reader = new FileReader(file);
+ else
+ reader = new InputStreamReader(new
FileInputStream(file),encoding);
} catch (FileNotFoundException e) {
throw new JellyTagException("could not find the file",e);
+ } catch (UnsupportedEncodingException e) {
+ throw new JellyTagException("Could not use the encoding \"" +
encoding + "\".",e);
}
}
else {
@@ -186,6 +194,19 @@
*/
public void setUri(String uri) {
this.uri = uri;
+ }
+
+ /** Sets the encoding to be used to read the file, defaults to the
platform-encoding.
+ */
+ public void setEncoding(String encName) {
+ this.encoding = encName;
+ }
+
+ /** Returns the encoding set.
+ * @return the encoding set with [EMAIL PROTECTED] #setEncoding(String)}
+ */
+ public String getEncoding() {
+ return encoding;
}
1.10 +2 -2 jakarta-commons/jelly/jelly-tags/validate/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-commons/jelly/jelly-tags/validate/project.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- project.xml 15 Sep 2003 00:42:19 -0000 1.9
+++ project.xml 25 Dec 2003 21:58:39 -0000 1.10
@@ -11,12 +11,12 @@
</description>
<shortDescription>Commons Jelly Validate Tag Library</shortDescription>
-
<siteDirectory>/www/jakarta.apache.org/commons/sandbox/jelly/tags/validate</siteDirectory>
+ <!--
<siteDirectory>/www/jakarta.apache.org/commons/sandbox/jelly/tags/validate</siteDirectory>
<distributionDirectory>/www/jakarta.apache.org/builds/jakarta-commons-sandbox/jelly/tags/validate</distributionDirectory>
<repository>
<connection>scm:cvs:pserver:[EMAIL
PROTECTED]:/home/cvspublic:jakarta-commons-sandbox/jelly/jelly-tags/validate/</connection>
<url>http://cvs.apache.org/viewcvs/jakarta-commons-sandbox/jelly/jelly-tags/validate/</url>
- </repository>
+ </repository>-->
<dependencies>
1.5 +2 -2 jakarta-commons/jelly/jelly-tags/velocity/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-commons/jelly/jelly-tags/velocity/project.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- project.xml 27 Jan 2003 05:24:15 -0000 1.4
+++ project.xml 25 Dec 2003 21:58:39 -0000 1.5
@@ -10,12 +10,12 @@
</description>
<shortDescription>Commons Jelly Velocity Tag Library</shortDescription>
-
<siteDirectory>/www/jakarta.apache.org/commons/sandbox/jelly/tags/velocity</siteDirectory>
+ <!--
<siteDirectory>/www/jakarta.apache.org/commons/sandbox/jelly/tags/velocity</siteDirectory>
<distributionDirectory>/www/jakarta.apache.org/builds/jakarta-commons-sandbox/jelly/tags/velocity</distributionDirectory>
<repository>
<connection>scm:cvs:pserver:[EMAIL
PROTECTED]:/home/cvspublic:jakarta-commons-sandbox/jelly/jelly-tags/velocity/</connection>
<url>http://cvs.apache.org/viewcvs/jakarta-commons-sandbox/jelly/jelly-tags/velocity/</url>
- </repository>
+ </repository>-->
<dependencies>
1.6 +2 -2 jakarta-commons/jelly/jelly-tags/xml/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-commons/jelly/jelly-tags/xml/project.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- project.xml 27 Jan 2003 05:24:15 -0000 1.5
+++ project.xml 25 Dec 2003 21:58:39 -0000 1.6
@@ -11,14 +11,14 @@
</description>
<shortDescription>Commons Jelly XML Tag Library</shortDescription>
- <url>http://jakarta.apache.org/commons/sandbox/jelly/tags/xml/</url>
+ <!-- <url>http://jakarta.apache.org/commons/sandbox/jelly/tags/xml/</url>
<siteDirectory>/www/jakarta.apache.org/commons/sandbox/jelly/xml/</siteDirectory>
<distributionDirectory>/www/jakarta.apache.org/builds/jakarta-commons-sandbox/jelly/tags/xml</distributionDirectory>
<repository>
<connection>scm:cvs:pserver:[EMAIL
PROTECTED]:/home/cvspublic:jakarta-commons-sandbox/jelly/jelly-tags/xml/</connection>
<url>http://cvs.apache.org/viewcvs/jakarta-commons-sandbox/jelly/jelly-tags/xml/</url>
- </repository>
+ </repository>-->
<dependencies>
1.8 +2 -2 jakarta-commons/jelly/jelly-tags/xmlunit/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-commons/jelly/jelly-tags/xmlunit/project.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- project.xml 27 Jan 2003 05:24:15 -0000 1.7
+++ project.xml 25 Dec 2003 21:58:39 -0000 1.8
@@ -11,14 +11,14 @@
</description>
<shortDescription>Commons Jelly XMLUnit Tag Library</shortDescription>
- <url>http://jakarta.apache.org/commons/sandbox/jelly/tags/xmlunit/</url>
+ <!-- <url>http://jakarta.apache.org/commons/sandbox/jelly/tags/xmlunit/</url>
<siteDirectory>/www/jakarta.apache.org/commons/sandbox/jelly/tags/xmlunit/</siteDirectory>
<distributionDirectory>/www/jakarta.apache.org/builds/jakarta-commons-sandbox/jelly/tags/xmlunit</distributionDirectory>
<repository>
<connection>scm:cvs:pserver:[EMAIL
PROTECTED]:/home/cvspublic:jakarta-commons-sandbox/jelly/jelly-tags/xmlunit/</connection>
<url>http://cvs.apache.org/viewcvs/jakarta-commons-sandbox/jelly/jelly-tags/xmlunit/</url>
- </repository>
+ </repository>-->
<dependencies>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
![http://jakarta.apache.org/images/jakarta-logo.gif"](http://jakarta.apache.org/images/jakarta-logo.gif"){kind=link}