Mail Archive Home | barracuda-commits List | January 2006 Index
| <-- Date Index --> | <-- Thread Index --> |
Author: jkjome
Date: 2006-01-27 07:22:43 +0100 (Fri, 27 Jan 2006)
New Revision: 143
Added:
Barracuda2/trunk/WEB-INF/jars/jtidy-r7-xmlc-2.2.8.jar
Barracuda2/trunk/WEB-INF/jars/xmlc-all-runtime-2.2.8.jar
Barracuda2/trunk/WEB-INF/jars/xmlc-taskdef-2.2.8.jar
Removed:
Barracuda2/trunk/WEB-INF/jars/jtidy-r7-xmlc-2.2.7.1.jar
Barracuda2/trunk/WEB-INF/jars/xmlc-all-runtime-2.2.7.1.jar
Barracuda2/trunk/WEB-INF/jars/xmlc-taskdef-2.2.7.1.jar
Modified:
Barracuda2/trunk/WEB-INF/A_Changes_History.txt
Barracuda2/trunk/WEB-INF/bin/version.properties
Barracuda2/trunk/WEB-INF/jars/readme.txt
Barracuda2/trunk/WEB-INF/src/org/barracudamvc/contrib/dbroggisch/webapp/build.xml
Barracuda2/trunk/WEB-INF/src/org/barracudamvc/contrib/dbroggisch/webapp/src/org/barracudamvc/contrib/dbroggisch/examples/view/pages/ExampleBasePage.java
Barracuda2/trunk/WEB-INF/src/org/barracudamvc/contrib/dbroggisch/webapp/src/org/barracudamvc/contrib/dbroggisch/examples/view/xmlc/options.xmlc
Barracuda2/trunk/WEB-INF/src/org/barracudamvc/contrib/dbroggisch/webapp/src_mockups/examples/FileUpload.html
Barracuda2/trunk/WEB-INF/src/org/barracudamvc/contrib/dbroggisch/webapp/src_mockups/examples/Navigation.html
Barracuda2/trunk/WEB-INF/src/org/barracudamvc/contrib/dbroggisch/webapp/src_mockups/examples/PrefixMapping.html
Barracuda2/trunk/WEB-INF/src/org/barracudamvc/contrib/dbroggisch/webapp/src_mockups/examples/Repopulation.html
Log:
Update to XMLC-2.2.8 and show off new XHTML compatibility with existing HTML
DOM usage by updating Diez' contrib webapp with the only change to Java code
being modifying its chosen OutputOptions for proper XHTML output. Everything
else was build (turning off tidy when XMLC-compiling templates), metadata
(use "xhtml" rather than "xerces" DOM), and templates (using XHTML 1.0
Transitional DTD along with XML Header defining encoding and updating tags to
be well formed XML that validates against the chosen DTD).
Jake
Modified: Barracuda2/trunk/WEB-INF/A_Changes_History.txt
===================================================================
--- Barracuda2/trunk/WEB-INF/A_Changes_History.txt 2006-01-23 16:15:17
UTC (rev 142)
+++ Barracuda2/trunk/WEB-INF/A_Changes_History.txt 2006-01-27 06:22:43
UTC (rev 143)
@@ -10,6 +10,10 @@
in which case you should just list here the files added/modified. If you
check in a patch which someone
contributed, make sure you give credit to them here.
----------------------------------------------------------------------------------------------------
+jrk_012706_1 - Update to XMLC-2.2.8. Much better encoding support and now
the XHTML DOM is compatible with
+ BarracudaMVC! Existing code using the HTML DOM will now work
fine when using the XHTML DOM.
+ I've updated the dbroggisch-contrib webapp to use the XHTML
DOM. Works like a charm!
+
csc_012306_1 - Finished preliminary work on the "build binaries" target,
improving build.xml and some minor
documentation work.
Modified: Barracuda2/trunk/WEB-INF/bin/version.properties
===================================================================
--- Barracuda2/trunk/WEB-INF/bin/version.properties 2006-01-23 16:15:17
UTC (rev 142)
+++ Barracuda2/trunk/WEB-INF/bin/version.properties 2006-01-27 06:22:43
UTC (rev 143)
@@ -1,14 +1,14 @@
version.ant-contrib=ant-contrib-0.5.jar
version.catalina-ant=catalina-ant.jar
version.gnu-regexp=gnu-regexp-1.1.4.jar
-version.jtidy=jtidy-r7-xmlc-2.2.7.1.jar
+version.jtidy=jtidy-r7-xmlc-2.2.8.jar
version.junit=junit-3.8.1.jar
version.servlet=servlet-2.3.jar
version.xalan=xalan-2.6.0.jar
version.xml-apis=xml-apis-1.3.02.jar
version.jivan=jivan-1.0.jar
-version.xmlc-all-runtime=xmlc-all-runtime-2.2.7.1.jar
-version.xmlc-taskdef=xmlc-taskdef-2.2.7.1.jar
+version.xmlc-all-runtime=xmlc-all-runtime-2.2.8.jar
+version.xmlc-taskdef=xmlc-taskdef-2.2.8.jar
version.asm=asm-2.2.1.jar
version.log4j=log4j-1.2.13.jar
version.log4j-sandbox=log4j-sandbox-0.3alpha.jar
Deleted: Barracuda2/trunk/WEB-INF/jars/jtidy-r7-xmlc-2.2.7.1.jar
===================================================================
(Binary files differ)
Added: Barracuda2/trunk/WEB-INF/jars/jtidy-r7-xmlc-2.2.8.jar
===================================================================
(Binary files differ)
Property changes on: Barracuda2/trunk/WEB-INF/jars/jtidy-r7-xmlc-2.2.8.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: Barracuda2/trunk/WEB-INF/jars/readme.txt
===================================================================
--- Barracuda2/trunk/WEB-INF/jars/readme.txt 2006-01-23 16:15:17 UTC (rev
142)
+++ Barracuda2/trunk/WEB-INF/jars/readme.txt 2006-01-27 06:22:43 UTC (rev
143)
@@ -4,7 +4,7 @@
is here for convenience to allow for the <junitreport> task to work. See
more on that in the
descriptions below.
-NOTE: The XMLC jars are from XMLC-2.2.7.1
+NOTE: The XMLC jars are from XMLC-2.2.8
available at:
http://forge.objectweb.org/projects/xmlc/
@@ -44,7 +44,7 @@
- jivan-1.0.jar - Jivan is an HTML DOM loader which is an alternative to
XMLC. See http://www.jivan.org/ for usage.
- - jtidy-r7-xmlc-2.2.7.1.jar - [DOM3 compatible] jtidy r7 with patches...
Java port of Dave Raggett's HTML Tidy, used by XMLC
+ - jtidy-r7-xmlc-2.2.8.jar - [DOM3 compatible] jtidy r7 with patches... Java
port of Dave Raggett's HTML Tidy, used by XMLC
- junit-3.8.1.jar - Unit testing framework used by Barracuda's testing
framework (you
may need to copy this file to $ANT_HOME/lib to run unit tests)
@@ -69,7 +69,7 @@
libraries in separate jars. The one included here excludes XSLTC
capabilities to avoid conflicts with
applications requiring newer versions of BCEL.
- - xmlc-all-runtime-2.2.7.1.jar - [DOM3 compatible] This is a jar composed
of the standard XMLC packages plus the XHTML,
+ - xmlc-all-runtime-2.2.8.jar - [DOM3 compatible] This is a jar composed of
the standard XMLC packages plus the XHTML,
Wireless, and XMLC's customized/patched internal version of Xerces-1.4.4.
Note that this internal
version of Xerces is wrapped into the org.enhydra.apache.xerces namespace
to keep it from clashing
with other versions of Xerces (eg.. Xerces2). Note also that XMLC does
not supply the standard api's
@@ -82,5 +82,5 @@
latest Xerces2 distribution and adding said jars to ANT_HOME/lib,
CATALINA_HOME/common/endorsed, or
whatever makes sense for the environment you are using will do the trick.
- - xmlc-taskdef-2.2.7.1.jar - [DOM3 compatible] The Ant XMLC taskdefs upon
which the Localize task depends.
+ - xmlc-taskdef-2.2.8.jar - [DOM3 compatible] The Ant XMLC taskdefs upon
which the Localize task depends.
\ No newline at end of file
Deleted: Barracuda2/trunk/WEB-INF/jars/xmlc-all-runtime-2.2.7.1.jar
===================================================================
(Binary files differ)
Added: Barracuda2/trunk/WEB-INF/jars/xmlc-all-runtime-2.2.8.jar
===================================================================
(Binary files differ)
Property changes on: Barracuda2/trunk/WEB-INF/jars/xmlc-all-runtime-2.2.8.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: Barracuda2/trunk/WEB-INF/jars/xmlc-taskdef-2.2.7.1.jar
===================================================================
(Binary files differ)
Added: Barracuda2/trunk/WEB-INF/jars/xmlc-taskdef-2.2.8.jar
===================================================================
(Binary files differ)
Property changes on: Barracuda2/trunk/WEB-INF/jars/xmlc-taskdef-2.2.8.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified:
Barracuda2/trunk/WEB-INF/src/org/barracudamvc/contrib/dbroggisch/webapp/build.xml
===================================================================
---
Barracuda2/trunk/WEB-INF/src/org/barracudamvc/contrib/dbroggisch/webapp/build.xml
2006-01-23 16:15:17 UTC (rev 142)
+++
Barracuda2/trunk/WEB-INF/src/org/barracudamvc/contrib/dbroggisch/webapp/build.xml
2006-01-27 06:22:43 UTC (rev 143)
@@ -606,7 +606,7 @@
packagedir="${src.package.path}/${subdir}"
includes="${extension}"
markup="${ml}"
- tidy="true"
+ tidy="false"
verbose="false"
force="${xmlc.force}"
options="${xmlc_options.file}" />
Modified:
Barracuda2/trunk/WEB-INF/src/org/barracudamvc/contrib/dbroggisch/webapp/src/org/barracudamvc/contrib/dbroggisch/examples/view/pages/ExampleBasePage.java
===================================================================
---
Barracuda2/trunk/WEB-INF/src/org/barracudamvc/contrib/dbroggisch/webapp/src/org/barracudamvc/contrib/dbroggisch/examples/view/pages/ExampleBasePage.java
2006-01-23 16:15:17 UTC (rev 142)
+++
Barracuda2/trunk/WEB-INF/src/org/barracudamvc/contrib/dbroggisch/webapp/src/org/barracudamvc/contrib/dbroggisch/examples/view/pages/ExampleBasePage.java
2006-01-27 06:22:43 UTC (rev 143)
@@ -110,9 +110,12 @@
OutputOptions oo =
DefaultDOMWriter.getDefaultOutputOptions(getDocument(getViewContext().getViewCapabilities().getClientLocale()));
//add doctype - need to do here because XMLC can't yet add the one
embedded in the html to the DOM
- oo.setOmitDocType(false);
- oo.setPublicId("-//W3C//DTD HTML 4.01 Transitional//EN");
- oo.setSystemId("http://www.w3.org/TR/html401/loose.dtd";);
+ //oo.setOmitDocType(false);
+ //oo.setPublicId("-//W3C//DTD HTML 4.01 Transitional//EN");
+ //oo.setSystemId("http://www.w3.org/TR/html401/loose.dtd";);
+ oo.setOmitXMLHeader(true);
+ oo.setEnableXHTMLCompatibility(true);
+ oo.setUseAposEntity(false);
//now render the DOM
return new DefaultDOMWriter(oo);
Modified:
Barracuda2/trunk/WEB-INF/src/org/barracudamvc/contrib/dbroggisch/webapp/src/org/barracudamvc/contrib/dbroggisch/examples/view/xmlc/options.xmlc
===================================================================
---
Barracuda2/trunk/WEB-INF/src/org/barracudamvc/contrib/dbroggisch/webapp/src/org/barracudamvc/contrib/dbroggisch/examples/view/xmlc/options.xmlc
2006-01-23 16:15:17 UTC (rev 142)
+++
Barracuda2/trunk/WEB-INF/src/org/barracudamvc/contrib/dbroggisch/webapp/src/org/barracudamvc/contrib/dbroggisch/examples/view/xmlc/options.xmlc
2006-01-27 06:22:43 UTC (rev 143)
@@ -1,4 +1,4 @@
--dom xerces
+-dom xhtml
-for-deferred-parsing
-generate both
-html:encoding iso-8859-1
Modified:
Barracuda2/trunk/WEB-INF/src/org/barracudamvc/contrib/dbroggisch/webapp/src_mockups/examples/FileUpload.html
===================================================================
---
Barracuda2/trunk/WEB-INF/src/org/barracudamvc/contrib/dbroggisch/webapp/src_mockups/examples/FileUpload.html
2006-01-23 16:15:17 UTC (rev 142)
+++
Barracuda2/trunk/WEB-INF/src/org/barracudamvc/contrib/dbroggisch/webapp/src_mockups/examples/FileUpload.html
2006-01-27 06:22:43 UTC (rev 143)
@@ -1,5 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html
+ PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
+<html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="en-US">
<head>
<title>File upload test</title>
</head>
@@ -8,7 +11,7 @@
<table summary="Frames">
<tbody>
<tr>
- <td valign="top" bgcolor="#9999ff">
+ <td valign="top" style="background:#9999ff;">
<!--#include file="NavigationHook.ssi"-->
</td>
<td valign="top">
@@ -18,11 +21,14 @@
<ul id="FileNames">
<li>A uploaded file</li>
</ul>
- <form action="" method="post"
enctype="multipart/form-data" name="FileUpload">
- <input type="file" name="file"><p>
- <input type="submit">
+ <form name="FileUpload" action="" method="post"
enctype="multipart/form-data">
+ <fieldset>
+ <legend>Upload a File</legend>
+ <input type="file" name="file" /><p>
+ <input type="submit" /></p>
+ </fieldset>
</form>
- <hr>
+ <hr />
<address><a href="mailto:deets@xxxxxx";>Diez B.
Roggisch</a></address>
<!-- Created: Thu Jun 13 23:03:40 CEST 2002 -->
<!-- hhmts start -->
Modified:
Barracuda2/trunk/WEB-INF/src/org/barracudamvc/contrib/dbroggisch/webapp/src_mockups/examples/Navigation.html
===================================================================
---
Barracuda2/trunk/WEB-INF/src/org/barracudamvc/contrib/dbroggisch/webapp/src_mockups/examples/Navigation.html
2006-01-23 16:15:17 UTC (rev 142)
+++
Barracuda2/trunk/WEB-INF/src/org/barracudamvc/contrib/dbroggisch/webapp/src_mockups/examples/Navigation.html
2006-01-27 06:22:43 UTC (rev 143)
@@ -1,5 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html
+ PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
+<html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="en-US">
<head>
<title>Naviagtion only</title>
</head>
@@ -9,11 +12,13 @@
<!--#include file="NavigationHook.ssi"-->
- <hr>
+ <hr />
+ <div>
<address><a href="mailto:deets@xxxxxx";>Diez B. Roggisch</a></address>
<!-- Created: Wed Jul 31 18:34:37 CEST 2002 -->
<!-- hhmts start -->
Last modified: Wed Jul 31 19:42:44 CEST 2002
<!-- hhmts end -->
+ </div>
</body>
</html>
Modified:
Barracuda2/trunk/WEB-INF/src/org/barracudamvc/contrib/dbroggisch/webapp/src_mockups/examples/PrefixMapping.html
===================================================================
---
Barracuda2/trunk/WEB-INF/src/org/barracudamvc/contrib/dbroggisch/webapp/src_mockups/examples/PrefixMapping.html
2006-01-23 16:15:17 UTC (rev 142)
+++
Barracuda2/trunk/WEB-INF/src/org/barracudamvc/contrib/dbroggisch/webapp/src_mockups/examples/PrefixMapping.html
2006-01-27 06:22:43 UTC (rev 143)
@@ -1,5 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html
+ PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
+<html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="en-US">
<head>
<title>PrefixMapping</title>
</head>
@@ -10,14 +13,16 @@
<table summary="Frames">
<tbody>
<tr>
- <td valign="top" bgcolor="#9999ff">
+ <td valign="top" style="background:#9999ff;">
<!--#include file="NavigationHook.ssi"-->
</td>
<td valign="top">
<h1>PrefixMapping</h1>
- <form name="Egal" summary="knK" method="POST"
id="TestHook">
- <input type="hidden" name="visited"
value="ParentModel">
- <input type="hidden"
class="Dir::Get_Data.ParentModel.CHILD_COUNT" >
+ <form name="Egal" action="" method="post"
id="TestHook">
+ <div>
+ <input type="hidden" name="visited"
value="ParentModel" />
+ <input type="hidden"
class="Dir::Get_Data.ParentModel.CHILD_COUNT" />
+ </div>
<p>ChildCount:<span
class="Dir::Get_Data.FooModel.CHILD_COUNT">[CHILD_COUNT]</span></p>
<table summary="Egal">
<tbody>
@@ -31,7 +36,7 @@
</td>
</tr>
<tr>
- <td><input
class="Dir::Get_Data.ParentModel.PARENT_NAME" type="text">
+ <td><input
class="Dir::Get_Data.ParentModel.PARENT_NAME" type="text" />
</td>
</tr>
<tr class="Dir::Iterate_Start.ChildModel
Dir::Iterate_Next.ChildModel">
@@ -40,7 +45,7 @@
</tr>
<tr>
<td>
- <input
class="Dir::Get_Data.ChildModel.CHILD_NAME" type="text">
+ <input
class="Dir::Get_Data.ChildModel.CHILD_NAME" type="text" />
</td>
</tr>
<tr
class="Dir::Get_Data.ChildModel.e_CHILD_NAME">
@@ -52,16 +57,16 @@
<td>[DISCARD]</td>
</tr>
- <tr >
- <td><input type="submit"
class="Dir::Get_Data.ControlModel.SUBMIT"></td>
+ <tr>
+ <td><input type="submit"
class="Dir::Get_Data.ControlModel.SUBMIT" /></td>
</tr>
- <tr >
- <td><input type="submit" value="Add
child" class="Dir::Get_Data.ControlModel.ADD"></td>
+ <tr>
+ <td><input type="submit" value="Add
child" class="Dir::Get_Data.ControlModel.ADD" /></td>
</tr>
</tbody>
</table>
</form>
- <hr>
+ <hr />
<address><a href="mailto:deets@xxxxxx";>Diez B.
Roggisch</a></address>
<!-- Created: Tue Apr 16 00:40:29 CEST 2002 -->
<!-- hhmts start -->
Modified:
Barracuda2/trunk/WEB-INF/src/org/barracudamvc/contrib/dbroggisch/webapp/src_mockups/examples/Repopulation.html
===================================================================
---
Barracuda2/trunk/WEB-INF/src/org/barracudamvc/contrib/dbroggisch/webapp/src_mockups/examples/Repopulation.html
2006-01-23 16:15:17 UTC (rev 142)
+++
Barracuda2/trunk/WEB-INF/src/org/barracudamvc/contrib/dbroggisch/webapp/src_mockups/examples/Repopulation.html
2006-01-27 06:22:43 UTC (rev 143)
@@ -1,5 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html
+ PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
+<html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="en-US">
<head>
<title>Repopulation</title>
</head>
@@ -15,10 +18,12 @@
</td>
<td valign="top">
<h1>Repopulation</h1>
- A simple example to demonstrate form repopulation.
Please look into the sources for some explanatory comments.<p>
- <form name="Egal" summary="knK" method="POST">
- <!-- This is the hidden value indicating that this
request has actually been submitted -->
- <input type="hidden" name="visited"
value="ExampleModel">
+ <p>A simple example to demonstrate form repopulation.
Please look into the sources for some explanatory comments.</p>
+ <form name="Egal" action="" method="post">
+ <div>
+ <!-- This is the hidden value indicating that
this request has actually been submitted -->
+ <input type="hidden" name="visited" value="ExampleModel" />
+ </div>
<!-- The point the BTemplate gets bound to -->
<table id="TestHook" summary="Egal">
<tbody>
@@ -37,7 +42,7 @@
VALUE representing (in general) the
text associated with it. This could of course be a
arbitrary BComponent or node.
-->
- <input
class="Dir::Get_Data.ExampleModel_GROUP.KEY" type="radio">
+ <input
class="Dir::Get_Data.ExampleModel_GROUP.KEY" type="radio" />
<span
class="Dir::Get_Data.ExampleModel_GROUP.VALUE">[VALUE]</span>
</td>
</tr>
@@ -47,7 +52,7 @@
</tr>
<tr
class="Dir::Iterate_Start.ExampleModel_CHECKBOX
Dir::Iterate_Next.ExampleModel_CHECKBOX">
- <td><input
class="Dir::Get_Data.ExampleModel_CHECKBOX.KEY" type="checkbox">
+ <td><input
class="Dir::Get_Data.ExampleModel_CHECKBOX.KEY" type="checkbox" />
<span
class="Dir::Get_Data.ExampleModel_CHECKBOX.VALUE">[VALUE]</span>
</td>
</tr>
@@ -66,24 +71,24 @@
<tr >
<td>
- <input type="checkbox"
class="Dir::Get_Data.ExampleModel.SIMPLECHECKBOX">A simple Checkbox
+ <input type="checkbox"
class="Dir::Get_Data.ExampleModel.SIMPLECHECKBOX" />A simple Checkbox
</td>
</tr>
<tr >
<td>
- <textarea
class="Dir::Get_Data.ExampleModel.TEXTAREA"></textarea>
+ <textarea
class="Dir::Get_Data.ExampleModel.TEXTAREA" rows="3" cols="20"></textarea>
</td>
</tr>
<tr >
- <td><input type="submit"
class="Dir::Get_Data.ControlModel.SUBMIT"></td>
+ <td><input type="submit"
class="Dir::Get_Data.ControlModel.SUBMIT" /></td>
</tr>
</tbody>
</table>
</form>
- <hr>
+ <hr />
<address><a href="mailto:deets@xxxxxx";>Diez B.
Roggisch</a></address>
<!-- Created: Tue Apr 16 00:40:29 CEST 2002 -->
<!-- hhmts start -->
| <-- Date Index --> | <-- Thread Index --> |
Powered by MHonArc.
Copyright © 2006-2007, OW2 Consortium | contact | webmaster.